lib32-systemd 239.0

lib32-systemd/PKGBUILD

@@ -1,10 +1,10 @@
 pkgname=lib32-systemd
 _pkgbasename=systemd
 # latest commit on stable branch
-_commit='f398c546c6fc43121131f41acec56b5a851bd35e'
+_commit='de7436b02badc82200dc127ff190b8155769b8e7'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=238.76
+pkgver=239.0
 pkgrel=1
 pkgdesc="system and service manager (32-bit)"
 arch=('x86_64')
@@ -18,10 +18,11 @@ makedepends=('gcc-multilib' 'git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=('git+https://github.com/systemd/systemd-stable'
-        'git+https://github.com/systemd/systemd')
+source=(# fragment is latest tag for source verification, final merge in prepare()
+        "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}"
+        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}")
 sha256sums=('SKIP'
-         'SKIP')
+            'SKIP')
 
 _backports=(
 )
@@ -29,40 +30,15 @@ _backports=(
 _reverts=(
 )
 
-_validate_tag() (
-  local success fingerprint trusted status tag=v${pkgver%.*}
-
-  cd "$srcdir/$_pkgbasename-stable"
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
-)
-
 prepare() {
   cd "$_pkgbasename-stable"
 
+  # add upstream repository for cherry-picking
   git remote rm upstream || true
   git remote add -f upstream ../systemd
-  git checkout "$_commit"
+  # merge the latest stable commit (fast-foward only to make sure
+  # the verified tag is in)
+  git merge --ff-only "${_commit}"
 
   local c
   for c in "${_backports[@]}"; do
@@ -78,21 +54,16 @@ pkgver() {
 
   cd "$_pkgbasename-stable"
 
-  git checkout "$_commit"
-
   version="$(git describe --abbrev=0 --tags)"
   count="$(git rev-list --count ${version}..)"
   printf '%s.%s' "${version#v}" "${count}"
 }
-
 build() {
-  _validate_tag || return
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  local timeservers=({0..3}.chakra.pool.ntp.org)
+  local _timeservers=({0..3}.chakra.pool.ntp.org)
 
   local meson_options=(
     --libexecdir	/usr/lib32
@@ -123,7 +94,7 @@ build() {
     -Ddefault-hierarchy=hybrid
     -Ddefault-kill-user-processes=false
     -Dfallback-hostname='archlinux'
-    -Dntp-servers="${timeservers[*]}"
+    -Dntp-servers="${_timeservers[*]}"
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=