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

[Christian Hesse]

    Date: Monday, October 9, 2017 @ 20:34:38
  Author: eworm
Revision: 262248

upgpkg: lib32-systemd 235.0-1

new upstream release

Modified:
  lib32-systemd/trunk/PKGBUILD

----------+
 PKGBUILD |  115 +++++++++++++++++++++++--------------------------------------
 1 file changed, 45 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-09 20:08:04 UTC (rev 262247)
+++ PKGBUILD	2017-10-09 20:34:38 UTC (rev 262248)
@@ -1,13 +1,16 @@
-# $Id$ Maintainer: Dave Reisner <dreisner at archlinux.org> Maintainer: Tom Gundersen <teg at jklm.no>
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
 
 pkgname=lib32-systemd
 _pkgbasename=systemd
 # latest commit on stable branch
-_commit='27c7bc970d9e7ffe060688a8dd77b7747503a564'
+_commit='c1719d8bc924ed59448616bd748671c5c7a66d93'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=233.75
-pkgrel=2
+pkgver=235.0
+pkgrel=1
 pkgdesc="system and service manager (32-bit)"
 arch=('x86_64')
 url="https://www.github.com/systemd/systemd"
@@ -14,32 +17,18 @@
 license=('GPL2' 'LGPL2.1')
 depends=('lib32-libgcrypt' 'lib32-xz' 'lib32-libcap' 'lib32-gcc-libs' 'systemd')
 makedepends=('lib32-gcc-libs' 'gcc-multilib' 'lib32-libidn' 'lib32-glib2' 'intltool' 'gperf'
-             'lib32-curl' 'lib32-bzip2' 'lib32-acl' 'git')
+             'lib32-curl' 'lib32-bzip2' 'lib32-acl' 'lib32-gnutls' 'git' 'meson' 'libxslt')
 options=('strip')
-source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
-        'git://github.com/systemd/systemd.git') # pull in for tags
-md5sums=('SKIP'
+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
+sha256sums=('SKIP'
          'SKIP')
-validpgpkeys=(
-  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
-)
 
 _backports=(
-  # build-sys: make RPM macros installation path configurable
-  'ff2e33db54719bfe8feea833571652318c6d197c'
-  # resolved: do not start LLMNR or mDNS stack when no network enables them
-  '2c7ef56459bf6fe7761595585aa4eed5cd183f27^..2c7ef56459bf6fe7761595585aa4eed5cd183f27^2'
-  # networkd: RFC compliant autonomous prefix handling (#5636)
-  '6554550f35a7976f9110aff94743d3576d5f02dd'
-  # core: do not print color console message about gc-ed jobs
-  '047d7219fde661698d3487fc49e9878c61eefd77'
 )
 
 _reverts=(
-  # core: store the invocation ID in the per-service keyring
-  'b3415f5daef49642be3d5f417b8880c078420ff7'
-  # core: run each system service with a fresh session keyring
-  '74dd6b515fa968c5710b396a7664cac335e25ca8'
 )
 
 _validate_tag() {
@@ -81,10 +70,12 @@
 
 prepare() {
   cd "$_pkgbasename-stable"
-  
+
   git remote add upstream ../systemd/
   git fetch --all
 
+  git checkout "${_commit}"
+
   _validate_tag || return
 
   local _commit
@@ -94,19 +85,6 @@
   for _commit in "${_reverts[@]}"; do
     git revert -n "$_commit"
   done
-
-  # nss-resolve: drop the internal fallback to libnss_dns
-  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' \
-    'db848813bae4d28c524b3b6a7dad135e426659ce' \
-    '88795538726a5bbfd9efc13d441cb05e1d7fc139' \
-    '64a21fdaca7c93f1c30b21f6fdbd2261798b161a' \
-    -- . ':!src/resolve/meson.build'  | git apply --index
-
-  ./autogen.sh
 }
 
 build() {
@@ -114,51 +92,48 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd "$_pkgbasename-stable"
-
   local timeservers=({0..3}.arch.pool.ntp.org)
 
-  local configure_options=(
-    --libexecdir=/usr/lib32
-    --libdir=/usr/lib32
-    --localstatedir=/var
-    --sysconfdir=/etc
+  local meson_options=(
+    --libexecdir	/usr/lib32
+    --libdir		/usr/lib32
 
-    --disable-audit
-    --disable-tests
-    --disable-ima
-    --disable-seccomp
-    --disable-pam
-    --disable-kmod
-    --disable-networkd
-    --disable-blkid
-    --disable-libiptc
-    --disable-lz4
-    --disable-manpages
-    --disable-libcryptsetup
-    --without-python
+    -Daudit=false
+    -Dgnuefi=false
+    -Dima=false
+    -Dlz4=false
+    -Dblkid=false
+    -Dkmod=false
+    -Dlibcryptsetup=false
+    -Dlibiptc=false
+    -Dmanpages=false
+    -Dnetworkd=false
+    -Dpam=false
+    -Dpython=false
+    -Dseccomp=false
+    -Dman=false
+    -Dhtml=false
 
-    --with-sysvinit-path=
-    --with-sysvrcnd-path=
-    --with-ntp-servers="${timeservers[*]}"
-    --with-default-dnssec=no
-    --with-dbuspolicydir=/usr/share/dbus-1/system.d
-    --without-kill-user-processes
-    --with-rpmmacrosdir=no
+    -Ddbuspolicydir=/usr/share/dbus-1/system.d
+    -Ddefault-dnssec=no
     # TODO(dreisner): consider changing this to unified
-    --with-default-hierarchy=hybrid
+    -Ddefault-hierarchy=hybrid
+    -Ddefault-kill-user-processes=false
+    -Dfallback-hostname='archlinux'
+    -Dntp-servers="${timeservers[*]}"
+    -Drpmmacrosdir=no
+    -Dsysvinit-path=
+    -Dsysvrcnd-path=
   )
 
-  ./configure "${configure_options[@]}"
+  arch-meson "$_pkgbasename-stable" build "${meson_options[@]}"
 
-  make
+  ninja -C build
 }
 
 package() {
-  cd "$_pkgbasename-stable"
+  DESTDIR="$pkgdir" ninja -C build install
 
-  make DESTDIR="$pkgdir" install
-
   rm -rf "${pkgdir}"/{etc,var}
   rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
 }