[arch-commits] Commit in lib32-systemd/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Mon Mar 22 14:11:42 UTC 2021
Date: Monday, March 22, 2021 @ 14:11:41
Author: eworm
Revision: 898949
fix file names of swapped patches
Modified:
lib32-systemd/trunk/0001-epoll_pwait2.patch
lib32-systemd/trunk/0002-test-firewall-util.patch
lib32-systemd/trunk/PKGBUILD
-------------------------------+
0001-epoll_pwait2.patch | 34 ++++++++++++++++++++++------------
0002-test-firewall-util.patch | 34 ++++++++++++----------------------
PKGBUILD | 4 ++--
3 files changed, 36 insertions(+), 36 deletions(-)
Modified: 0001-epoll_pwait2.patch
===================================================================
--- 0001-epoll_pwait2.patch 2021-03-22 14:11:37 UTC (rev 898948)
+++ 0001-epoll_pwait2.patch 2021-03-22 14:11:41 UTC (rev 898949)
@@ -1,13 +1,23 @@
-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;
+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) {
-+ return 0;
-+
- r = fw_ctx_new(&ctx);
- if (r < 0)
- return log_error_errno(r, "Failed to init firewall: %m");
+- 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: 0002-test-firewall-util.patch
===================================================================
--- 0002-test-firewall-util.patch 2021-03-22 14:11:37 UTC (rev 898948)
+++ 0002-test-firewall-util.patch 2021-03-22 14:11:41 UTC (rev 898949)
@@ -1,23 +1,13 @@
-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) {
+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;
-- 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;
++ return 0;
++
+ r = fw_ctx_new(&ctx);
+ if (r < 0)
+ return log_error_errno(r, "Failed to init firewall: %m");
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-22 14:11:37 UTC (rev 898948)
+++ PKGBUILD 2021-03-22 14:11:41 UTC (rev 898949)
@@ -27,8 +27,8 @@
'0002-test-firewall-util.patch')
sha512sums=('SKIP'
'SKIP'
- '8189a99df2cfdf6ec6b6883d6c17bbea08f51dddc88a65457a75a1eec766614df33b075562c25c2d8bcab8ae46afc91ddeb6916d5f6b3a6557cfd6209d443cd4'
- '105f7b538de2edb1de7e691129e7884d92aba8c16882d9b519e02d9b0c9b94b2501e10414caa4fe4631ad90740ce7bd4721a5385fe8fe3cc9b542873c14a16b0')
+ '105f7b538de2edb1de7e691129e7884d92aba8c16882d9b519e02d9b0c9b94b2501e10414caa4fe4631ad90740ce7bd4721a5385fe8fe3cc9b542873c14a16b0'
+ '8189a99df2cfdf6ec6b6883d6c17bbea08f51dddc88a65457a75a1eec766614df33b075562c25c2d8bcab8ae46afc91ddeb6916d5f6b3a6557cfd6209d443cd4')
_backports=(
# meson: fix build error of test-dnssec-complex
More information about the arch-commits
mailing list