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

[Christian Hesse]

    Date: Sunday, March 11, 2018 @ 22:09:49
  Author: eworm
Revision: 306247

upgpkg: lib32-systemd 238.0-1

* new upstream release
* sync with PKGBUILD from core/systemd

Modified:
  lib32-systemd/trunk/PKGBUILD

----------+
 PKGBUILD |   55 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-11 20:35:43 UTC (rev 306246)
+++ PKGBUILD	2018-03-11 22:09:49 UTC (rev 306247)
@@ -6,10 +6,10 @@
 pkgname=lib32-systemd
 _pkgbasename=systemd
 # latest commit on stable branch
-_commit='7909254c7a8ee09d91b8b21fd779320b3e2fe716'
+_commit='738ab7502afb7663d9aacdd73e79025aa7cd0a9b'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=237.64
+pkgver=238.0
 pkgrel=1
 pkgdesc="system and service manager (32-bit)"
 arch=('x86_64')
@@ -21,21 +21,25 @@
              'lib32-gnutls' 'lib32-libelf' 'lib32-libidn' 'lib32-pcre2'
              'libxslt' 'meson')
 options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4')  # Lennart Poettering <lennart at poettering.net>
-source=('git://github.com/systemd/systemd-stable.git'
-        'git://github.com/systemd/systemd.git') # pull in for tags, backports & reverts
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart at poettering.net>
+              '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
+source=('git+https://github.com/systemd/systemd-stable'
+        'git+https://github.com/systemd/systemd')
 sha256sums=('SKIP'
          'SKIP')
 
 _backports=(
+  # core: do not free heap-allocated strings (#8391) (FS#57741)
+  '5cbaad2f6795088db56063d20695c6444595822f'
 )
 
 _reverts=(
 )
 
-_validate_tag() {
+_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
@@ -58,6 +62,21 @@
   esac
 
   return 0
+)
+
+prepare() {
+  cd "$_pkgbasename-stable"
+
+  git remote add -f upstream ../systemd
+  git checkout "$_commit"
+
+  local c
+  for c in "${_backports[@]}"; do
+    git cherry-pick -n "$c"
+  done
+  for c in "${_reverts[@]}"; do
+    git revert -n "$c"
+  done
 }
 
 pkgver() {
@@ -70,26 +89,9 @@
   printf '%s.%s' "${version#v}" "${count}"
 }
 
-prepare() {
-  cd "$_pkgbasename-stable"
-
-  git remote add upstream ../systemd/
-  git fetch --all
-
-  git checkout "${_commit}"
-
+build() {
   _validate_tag || return
 
-  local _commit
-  for _commit in "${_backports[@]}"; do
-    git cherry-pick -n "$_commit"
-  done
-  for _commit in "${_reverts[@]}"; do
-    git revert -n "$_commit"
-  done
-}
-
-build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
@@ -133,6 +135,11 @@
   ninja -C build
 }
 
+check() {
+  cd build
+  meson test
+}
+
 package() {
   DESTDIR="$pkgdir" ninja -C build install