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

[Laurent Carlier]

    Date: Tuesday, September 25, 2018 @ 12:42:26
  Author: lcarlier
Revision: 384799

upgpkg: lib32-systemd 239.2-1

upstream update 239.2

Modified:
  lib32-systemd/trunk/PKGBUILD

----------+
 PKGBUILD |   59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-25 12:39:26 UTC (rev 384798)
+++ PKGBUILD	2018-09-25 12:42:26 UTC (rev 384799)
@@ -5,8 +5,8 @@
 pkgname=lib32-systemd
 _pkgbasename=systemd
 # Can be from either systemd or systemd-stable
-_commit='de7436b02badc82200dc127ff190b8155769b8e7'
-pkgver=239.0
+_commit='c38499d476026d999558a7eee9c95ca2fa41e115'
+pkgver=239.2
 pkgrel=1
 pkgdesc='system and service manager (32-bit)'
 arch=('x86_64')
@@ -15,7 +15,7 @@
 depends=('lib32-gcc-libs' 'lib32-libcap' 'lib32-libgcrypt' 'lib32-xz' 'systemd')
 makedepends=('gcc-multilib' 'git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
              'lib32-curl' 'lib32-dbus' 'lib32-gcc-libs' 'lib32-glib2'
-             'lib32-gnutls' 'lib32-libelf' 'lib32-libidn' 'lib32-pcre2'
+             'lib32-gnutls' 'lib32-libelf' 'lib32-libidn2' 'lib32-pcre2'
              'libxslt' 'meson')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart at poettering.net>
@@ -27,6 +27,11 @@
             'SKIP')
 
 _backports=(
+  # statx fixes
+  '75720bff62a84896e9a0654afc7cf9408cf89a38'
+  '9c869d08d82c73f62ab3527567858ce4b0cf1257'
+  # rename -Ddebug to -Ddebug-extra 
+  '8f6b442a78d0b485f044742ad90b2e8271b4e68e'
 )
 
 _reverts=(
@@ -41,12 +46,12 @@
   # the verified tag is in)
   git merge --ff-only "${_commit}"
 
-  local c
-  for c in "${_backports[@]}"; do
-    git cherry-pick -n "$c"
+  local _c
+  for _c in "${_backports[@]}"; do
+    git cherry-pick -n "${_c}"
   done
-  for c in "${_reverts[@]}"; do
-    git revert -n "$c"
+  for _c in "${_reverts[@]}"; do
+    git revert -n "${_c}"
   done
 }
 
@@ -55,9 +60,10 @@
 
   cd "$_pkgbasename-stable"
 
-  version="$(git describe --abbrev=0 --tags)"
-  count="$(git rev-list --count ${version}..)"
-  printf '%s.%s' "${version#v}" "${count}"
+  local _version _count
+  _version="$(git describe --abbrev=0 --tags)"
+  _count="$(git rev-list --count ${_version}..)"
+  printf '%s.%s' "${_version#v}" "${_count}"
 }
 
 build() {
@@ -65,15 +71,29 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  local timeservers=({0..3}.arch.pool.ntp.org)
-
-  local meson_options=(
+  local _timeservers=({0..3}.arch.pool.ntp.org)
+  local _nameservers=(
+    # We use these public name services, ordered by their
+    # privacy policy (hopefully):
+    #  * Cloudflare (https://1.1.1.1/)
+    #  * Quad9 without filtering (https://www.quad9.net/)
+    #  * Google (https://developers.google.com/speed/public-dns/)
+    1.1.1.1
+    9.9.9.10
+    8.8.8.8
+    2606:4700:4700::1111
+    2620:fe::10
+    2001:4860:4860::8888
+  )
+ 
+  local _meson_options=(
     --libexecdir	/usr/lib32
     --libdir		/usr/lib32
 
     -Daudit=false
-    -Dgnuefi=false
+    -Dgnu-efi=false
     -Dima=false
+    -Dlibidn2=true
     -Dlz4=false
     -Dblkid=false
     -Dkmod=false
@@ -88,25 +108,24 @@
     -Dhtml=false
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
-    -Ddefault-dnssec=no
     # TODO(dreisner): consider changing this to unified
     -Ddefault-hierarchy=hybrid
     -Ddefault-kill-user-processes=false
     -Dfallback-hostname='archlinux'
-    -Dntp-servers="${timeservers[*]}"
+    -Dntp-servers="${_timeservers[*]}"
+    -Ddns-servers="${_nameservers[*]}"
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=
   )
 
-  arch-meson "$_pkgbasename-stable" build "${meson_options[@]}"
+  arch-meson "$_pkgbasename-stable" build "${_meson_options[@]}"
 
   ninja -C build
 }
 
 check() {
-  cd build
-  meson test
+  meson test -C build
 }
 
 package() {