[arch-commits] Commit in systemd/trunk (PKGBUILD)

[Christian Hesse]

    Date: Tuesday, July 4, 2017 @ 08:46:12
  Author: eworm
Revision: 299656

upgpkg: systemd 233.75-1

* switch to systemd-stable, upstream stable commit count is appended
  to version (233.75 -> release 233, 75 stable commits)
  -> We keep both, systemd-stable (for stable branches with cherry-picked
     commits) and systemd (for release tags and source verification).
  -> drop upstream commit from our backports
* apply: core: do not print color console message about gc-ed jobs
* update to upstream keyring fix: core: link user keyring to session
  keyring (#6275)

Modified:
  systemd/trunk/PKGBUILD

----------+
 PKGBUILD |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-04 08:17:30 UTC (rev 299655)
+++ PKGBUILD	2017-07-04 08:46:12 UTC (rev 299656)
@@ -1,10 +1,16 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 # Maintainer: Tom Gundersen <teg at jklm.no>
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=233
-pkgrel=7
+# latest commit on stable branch
+_commit='27c7bc970d9e7ffe060688a8dd77b7747503a564'
+# Bump this to latest major release for signed tag verification,
+# the commit count is handled by pkgver() function.
+pkgver=233.75
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -12,7 +18,8 @@
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git')
 options=('strip')
-source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
+source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
+        'git://github.com/systemd/systemd.git' # pull in for tags
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -25,6 +32,7 @@
         'systemd-tmpfiles.hook'
         'systemd-update.hook')
 sha512sums=('SKIP'
+            'SKIP'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             '691acebb243b9cd7fb63272662f34bdb9aead710c69aee9361ab2322f9f108600ad5b0214fc00b7cb2d9c95db8abd748030625d60d6567efd98663c56ba28c65'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -47,14 +55,14 @@
   '2c7ef56459bf6fe7761595585aa4eed5cd183f27^..2c7ef56459bf6fe7761595585aa4eed5cd183f27^2'
   # networkd: RFC compliant autonomous prefix handling (#5636)
   '6554550f35a7976f9110aff94743d3576d5f02dd'
-  # shared: fix keyring handling in ask-password-api
-  '2c390a919055af01b3ab6cce6dd0f97fb4784460'
-  # resolved: bugfix of null pointer p->question dereferencing (#6020) (CVE-2017-9217)
-  'a924f43f30f9c4acaf70618dd2a055f8b0f166be'
+  # core: do not print color console message about gc-ed jobs
+  '047d7219fde661698d3487fc49e9878c61eefd77'
+  # core: link user keyring to session keyring (#6275)
+  '437a85112e02042b62751395b9e7225628c1b708'
 )
 
 _validate_tag() {
-  local success fingerprint trusted status tag=v$pkgver
+  local success fingerprint trusted status tag=v${pkgver%.*}
 
   parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
 
@@ -80,8 +88,21 @@
   return 0
 }
 
+pkgver() {
+  local version count
+
+  cd "$pkgbase-stable"
+
+  version="$(git describe --abbrev=0 --tags)"
+  count="$(git rev-list --count ${version}..)"
+  printf '%s.%s' "${version#v}" "${count}"
+}
+
 prepare() {
-  cd "$pkgbase"
+  cd "$pkgbase-stable"
+  
+  git remote add upstream ../systemd/
+  git fetch --all
 
   _validate_tag || return
 
@@ -91,8 +112,8 @@
   done
 
   # nss-resolve: drop the internal fallback to libnss_dns
-  git show 5486a31d287f26bcd7c0a4eb2abfa4c074b985f1 -- \
-    Makefile.am src/nss-resolve/nss-resolve.c | git apply --index
+  git show '5486a31d287f26bcd7c0a4eb2abfa4c074b985f1' -- \
+    'Makefile.am' 'src/nss-resolve/nss-resolve.c' | git apply --index
   
   # Resolved packet size (#6214) (FS#54619, CVE-2017-9445)
   git show '751ca3f1de316ca79b60001334dbdf54077e1d01' \
@@ -105,7 +126,7 @@
 }
 
 build() {
-  cd "$pkgbase"
+  cd "$pkgbase-stable"
 
   local timeservers=({0..3}.arch.pool.ntp.org)
 
@@ -161,7 +182,7 @@
           etc/udev/udev.conf)
   install="systemd.install"
 
-  make -C "$pkgbase" DESTDIR="$pkgdir" install
+  make -C "$pkgbase-stable" DESTDIR="$pkgdir" install
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
@@ -168,7 +189,7 @@
   rm -r "$pkgdir/etc/systemd/system/"*.wants
 
   # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
 
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
@@ -227,7 +248,7 @@
   license=('GPL2')
   provides=('libsystemd.so' 'libudev.so')
 
-  make -C "$pkgbase" DESTDIR="$pkgdir" install-rootlibLTLIBRARIES
+  make -C "$pkgbase-stable" DESTDIR="$pkgdir" install-rootlibLTLIBRARIES
 }
 
 package_systemd-sysvcompat() {
@@ -239,7 +260,7 @@
 
   install -dm755 "$pkgdir"/usr/share/man/man8
   cp -d --no-preserve=ownership,timestamp \
-    "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+    "$pkgbase-stable"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
     "$pkgdir"/usr/share/man/man8
 
   install -dm755 "$pkgdir/usr/bin"