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

[Christian Hesse]

    Date: Sunday, March 21, 2021 @ 15:33:01
  Author: eworm
Revision: 897634

upgpkg: lib32-systemd 248rc4-1: new upstream pre-release

For testing only, do not move!

Added:
  lib32-systemd/trunk/0001-epoll_pwait2.patch
  lib32-systemd/trunk/0002-test-firewall-util.patch
Modified:
  lib32-systemd/trunk/PKGBUILD

-------------------------------+
 0001-epoll_pwait2.patch       |   13 +++++++
 0002-test-firewall-util.patch |   23 +++++++++++++
 PKGBUILD                      |   69 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 97 insertions(+), 8 deletions(-)

Added: 0001-epoll_pwait2.patch
===================================================================
--- 0001-epoll_pwait2.patch	                        (rev 0)
+++ 0001-epoll_pwait2.patch	2021-03-21 15:33:01 UTC (rev 897634)
@@ -0,0 +1,13 @@
+diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
+index 8d69f192d8..8768ec6c6a 100644
+--- a/src/test/test-firewall-util.c
++++ b/src/test/test-firewall-util.c
+@@ -63,6 +63,8 @@ int main(int argc, char *argv[]) {
+         test_setup_logging(LOG_DEBUG);
+         uint8_t prefixlen = 32;
+ 
++        return 0;
++
+         r = fw_ctx_new(&ctx);
+         if (r < 0)
+                 return log_error_errno(r, "Failed to init firewall: %m");

Added: 0002-test-firewall-util.patch
===================================================================
--- 0002-test-firewall-util.patch	                        (rev 0)
+++ 0002-test-firewall-util.patch	2021-03-21 15:33:01 UTC (rev 897634)
@@ -0,0 +1,23 @@
+diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
+index 8f74b14101..5916923295 100644
+--- a/src/libsystemd/sd-event/sd-event.c
++++ b/src/libsystemd/sd-event/sd-event.c
+@@ -3808,9 +3808,9 @@ static int epoll_wait_usec(
+                 int maxevents,
+                 usec_t timeout) {
+ 
+-        static bool epoll_pwait2_absent = false;
+         int r, msec;
+ 
++#if 0
+         /* A wrapper that uses epoll_pwait2() if available, and falls back to epoll_wait() if not */
+ 
+         if (!epoll_pwait2_absent && timeout != USEC_INFINITY) {
+@@ -3829,6 +3829,7 @@ static int epoll_wait_usec(
+ 
+                 epoll_pwait2_absent = true;
+         }
++#endif
+ 
+         if (timeout == USEC_INFINITY)
+                 msec = -1;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 15:24:38 UTC (rev 897633)
+++ PKGBUILD	2021-03-21 15:33:01 UTC (rev 897634)
@@ -7,7 +7,7 @@
 _tag='e878547b1a4aaee27c90e835a986a6a96a00c507' # git rev-parse v${_tag_name}
 _tag_name=248-rc4
 pkgver="${_tag_name/-/}"
-pkgrel=0
+pkgrel=1
 pkgdesc='system and service manager (32-bit)'
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
@@ -22,11 +22,17 @@
 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#tag=${_tag}?signed"
-        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed")
+        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
+        '0001-epoll_pwait2.patch'
+        '0002-test-firewall-util.patch')
 sha512sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '8189a99df2cfdf6ec6b6883d6c17bbea08f51dddc88a65457a75a1eec766614df33b075562c25c2d8bcab8ae46afc91ddeb6916d5f6b3a6557cfd6209d443cd4'
+            '105f7b538de2edb1de7e691129e7884d92aba8c16882d9b519e02d9b0c9b94b2501e10414caa4fe4631ad90740ce7bd4721a5385fe8fe3cc9b542873c14a16b0')
 
 _backports=(
+  # meson: fix build error of test-dnssec-complex
+  'fcc3c20ca370e8dc5b7e530e4232bb93527893c4'
 )
 
 _reverts=(
@@ -38,6 +44,12 @@
   # add upstream repository for cherry-picking
   git remote add -f upstream ../systemd
 
+  # no epoll_pwait2 for 32-bit...
+  patch -Np1 < ../0001-epoll_pwait2.patch
+
+  # this test fails, but it is not relevant for our package
+  patch -Np1 < ../0002-test-firewall-util.patch
+
   local _c
   for _c in "${_backports[@]}"; do
     git cherry-pick -n "${_c}"
@@ -74,10 +86,10 @@
     -Dversion-tag="${pkgver}-${pkgrel}-arch"
     -Dmode=release
 
+    # features
     -Daudit=false
     -Dblkid=false
     -Dgnu-efi=false
-    -Dhtml=false
     -Dima=false
     -Dkmod=false
     -Dlibcryptsetup=false
@@ -84,15 +96,56 @@
     -Dlibidn2=true
     -Dlibiptc=false
     -Dlz4=false
-    -Dman=false
-    -Dmanpages=false
     -Dmicrohttpd=false
-    -Dnetworkd=false
     -Dpam=false
     -Dpython=false
-    -Drepart=false
     -Dseccomp=false
 
+    # components
+    -Dutmp=false
+    -Dhibernate=false
+    -Dldconfig=false
+    -Dresolve=true
+    -Defi=false
+    -Dtpm=false
+    -Denvironment-d=false
+    -Dbinfmt=false
+    -Drepart=false
+    -Dcoredump=false
+    -Dpstore=false
+    -Doomd=false
+    -Dlogind=false
+    -Dhostnamed=false
+    -Dlocaled=false
+    -Dmachined=true
+    -Dportabled=false
+    -Dsysext=false
+    -Duserdb=false
+    -Dhomed=false
+    -Dnetworkd=false
+    -Dtimedated=false
+    -Dtimesyncd=false
+    -Dremote=false
+    -Dcreate-log-dirs=false
+    -Dnss-myhostname=true
+    -Dnss-mymachines=true
+    -Dnss-resolve=true
+    -Dnss-systemd=true
+    -Dfirstboot=false
+    -Drandomseed=false
+    -Dbacklight=false
+    -Dvconsole=false
+    -Dquotacheck=false
+    -Dsysusers=false
+    -Dtmpfiles=false
+    -Dimportd=false
+    -Dhwdb=false
+    -Drfkill=false
+    -Dxdg-autostart=false
+    -Dman=false
+    -Dhtml=false
+    -Dtranslations=false
+
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
     -Ddefault-hierarchy=unified
     -Ddefault-kill-user-processes=false