* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2016-11-04 1:06 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2016-11-04 1:06 UTC (permalink / raw
To: gentoo-commits
commit: d8276475948e02cc91c2819e60638d50ca0e1804
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 00:21:30 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 01:05:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8276475
sys-apps/systemd: pam adjustment
Package-Manager: portage-2.3.2_p3
sys-apps/systemd/files/232-systemd-user-pam.patch | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/sys-apps/systemd/files/232-systemd-user-pam.patch b/sys-apps/systemd/files/232-systemd-user-pam.patch
index a6501ba..9c4b391 100644
--- a/sys-apps/systemd/files/232-systemd-user-pam.patch
+++ b/sys-apps/systemd/files/232-systemd-user-pam.patch
@@ -1,8 +1,16 @@
--- a/src/login/systemd-user.m4
+++ b/src/login/systemd-user.m4
-@@ -9,4 +9,5 @@
- session required pam_selinux.so nottys open
- )m4_dnl
- session required pam_loginuid.so
-+session required pam_limits.so
+@@ -2,11 +2,7 @@
+ #
+ # Used by systemd --user instances.
+
+-account required pam_unix.so
++account include system-services
+
+-m4_ifdef(`HAVE_SELINUX',
+-session required pam_selinux.so close
+-session required pam_selinux.so nottys open
+-)m4_dnl
+-session required pam_loginuid.so
++session include system-services
session optional pam_systemd.so
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2017-08-29 22:21 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2017-08-29 22:21 UTC (permalink / raw
To: gentoo-commits
commit: dcb455acf2a1b7c423a6d4d4996deec8304f585b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 29 08:14:55 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 22:21:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb455ac
sys-apps/systemd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5552
sys-apps/systemd/files/226-kcmp.patch | 31 ---
sys-apps/systemd/files/226-noclean-tmp.patch | 28 --
...heck-for-lz4-in-the-old-and-new-numbering.patch | 44 ---
...dd-check-for-gperf-lookup-function-signat.patch | 302 ---------------------
sys-apps/systemd/files/232-systemd-user-pam.patch | 16 --
sys-apps/systemd/files/CVE-2015-7510.patch | 37 ---
6 files changed, 458 deletions(-)
diff --git a/sys-apps/systemd/files/226-kcmp.patch b/sys-apps/systemd/files/226-kcmp.patch
deleted file mode 100644
index a91f49fb487..00000000000
--- a/sys-apps/systemd/files/226-kcmp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 75b554579b4e962e2c02053129a37611a2dc9133 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 14 Sep 2015 18:55:09 -0400
-Subject: [PATCH] Add fallback for kcmp() in case __NR_kcmp is undefined
-
-IA64 is missing this syscall as of linux-4.2.
-This works around it until the necessary kernel patch gets merged.
----
- src/basic/missing.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index dc1f244..371ef8a 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -1028,7 +1028,12 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
-
- #if !HAVE_DECL_KCMP
- static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
-+#if defined(__NR_kcmp)
- return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
-+#else
-+ errno = ENOSYS;
-+ return -1;
-+#endif
- }
- #endif
-
---
-2.6.4
-
diff --git a/sys-apps/systemd/files/226-noclean-tmp.patch b/sys-apps/systemd/files/226-noclean-tmp.patch
deleted file mode 100644
index 290b1bd3700..00000000000
--- a/sys-apps/systemd/files/226-noclean-tmp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3a44775e2618896526d093f7142934205e46d33a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Sep 2015 10:26:18 -0400
-Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp
-
-Bug: https://bugs.gentoo.org/490676
----
- tmpfiles.d/tmp.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
-index ffdd82f..241fad5 100644
---- a/tmpfiles.d/tmp.conf
-+++ b/tmpfiles.d/tmp.conf
-@@ -8,8 +8,8 @@
- # See tmpfiles.d(5) for details
-
- # Clear tmp directories separately, to make them easier to override
--v /tmp 1777 root root 10d
--v /var/tmp 1777 root root 30d
-+v /tmp 1777 root root
-+v /var/tmp 1777 root root
-
- # Exclude namespace mountpoints created with PrivateTmp=yes
- x /tmp/systemd-private-%b-*
---
-2.5.3
-
diff --git a/sys-apps/systemd/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch b/sys-apps/systemd/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
deleted file mode 100644
index 788f0aa15c7..00000000000
--- a/sys-apps/systemd/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63621678f44325b4c48574f9c9d7a3c499d1a608 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 23 Nov 2016 10:18:30 -0500
-Subject: [PATCH 1/2] build-sys: check for lz4 in the old and new numbering
- scheme (#4717)
-
-lz4 upstream decided to switch to an incompatible numbering scheme
-(1.7.3 follows 131, to match the so version).
-PKG_CHECK_MODULES does not allow two version matches for the same package,
-so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
-"new" numbers (anything below 10 is assume to be new), once for the "old"
-numbers (anything above >= 125). This assumes that the "new" versioning
-will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
-mature project.
-
-Fixed #4690.
----
- configure.ac | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0b10fc7de..1928e65bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
- have_lz4=no
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
- AS_IF([test "x$enable_lz4" != "xno"], [
-- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
-+ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
- have_lz4=yes],
-- have_lz4=no)
-+ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
-+ have_lz4=yes],
-+ have_lz4=no)])
- AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
- [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
- ])
---
-2.11.0
-
diff --git a/sys-apps/systemd/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch b/sys-apps/systemd/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
deleted file mode 100644
index 440ec75bd3b..00000000000
--- a/sys-apps/systemd/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Tue, 10 Jan 2017 02:39:05 -0500
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
- (#5055)
-
-gperf-3.1 generates lookup functions that take a size_t length
-parameter instead of unsigned int. Test for this at configure time.
-
-Fixes: https://github.com/systemd/systemd/issues/5039
----
- configure.ac | 22 ++++++++++++++++++++++
- src/basic/af-list.c | 2 +-
- src/basic/arphrd-list.c | 2 +-
- src/basic/cap-list.c | 2 +-
- src/basic/errno-list.c | 2 +-
- src/core/load-fragment.h | 2 +-
- src/journal/journald-server.h | 2 +-
- src/login/logind.h | 2 +-
- src/network/networkd-conf.h | 2 +-
- src/network/networkd-netdev.h | 2 +-
- src/network/networkd-network.h | 2 +-
- src/nspawn/nspawn-settings.h | 2 +-
- src/resolve/dns-type.c | 2 +-
- src/resolve/resolved-conf.h | 2 +-
- src/test/test-af-list.c | 2 +-
- src/test/test-arphrd-list.c | 2 +-
- src/timesync/timesyncd-conf.h | 2 +-
- src/udev/net/link-config.h | 2 +-
- src/udev/udev-builtin-keyboard.c | 2 +-
- 19 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1928e65bd..5c639e32d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
- #include <sys/resource.h>
- ])
-
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ const char * in_word_set(const char *, size_t);
-+ $GPERF_TEST]
-+ )],
-+ [GPERF_LEN_TYPE=size_t],
-+ [AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ const char * in_word_set(const char *, unsigned);
-+ $GPERF_TEST]
-+ )],
-+ [GPERF_LEN_TYPE=unsigned],
-+ [AC_MSG_ERROR([** unable to determine gperf len type])]
-+ )]
-+)
-+
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
-+
- # ------------------------------------------------------------------------------
- # we use python to build the man page index
- have_python=no
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c
-index 3fac9c508..4b291d177 100644
---- a/src/basic/af-list.c
-+++ b/src/basic/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.h"
-
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "af-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
-index 6792d1ee3..2d598dc66 100644
---- a/src/basic/arphrd-list.c
-+++ b/src/basic/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.h"
-
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "arphrd-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
-index 3e773a06f..d68cc78d0 100644
---- a/src/basic/cap-list.c
-+++ b/src/basic/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.h"
-
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "cap-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
-index 31b66bad5..c6a01eec8 100644
---- a/src/basic/errno-list.c
-+++ b/src/basic/errno-list.c
-@@ -23,7 +23,7 @@
- #include "macro.h"
-
- static const struct errno_name* lookup_errno(register const char *str,
-- register unsigned int len);
-+ register GPERF_LEN_TYPE len);
-
- #include "errno-from-name.h"
- #include "errno-to-name.h"
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index c05f205c3..ede6b1f73 100644
---- a/src/core/load-fragment.h
-+++ b/src/core/load-fragment.h
-@@ -118,7 +118,7 @@ int config_parse_user_group(const char *unit, const char *filename, unsigned lin
- int config_parse_user_group_strv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-
- /* gperf prototypes */
--const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- extern const char load_fragment_gperf_nulstr[];
-
- typedef enum Disabled {
-diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index 99d91496b..d1520c45d 100644
---- a/src/journal/journald-server.h
-+++ b/src/journal/journald-server.h
-@@ -179,7 +179,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne
- void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_;
-
- /* gperf lookup function */
--const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-
-diff --git a/src/login/logind.h b/src/login/logind.h
-index 086fa1eeb..7556ee2e4 100644
---- a/src/login/logind.h
-+++ b/src/login/logind.h
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit);
- int manager_job_is_active(Manager *manager, const char *path);
-
- /* gperf lookup function */
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int manager_set_lid_switch_ignore(Manager *m, usec_t until);
-
-diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
-index c7bfb42a7..00ddb7672 100644
---- a/src/network/networkd-conf.h
-+++ b/src/network/networkd-conf.h
-@@ -23,7 +23,7 @@
-
- int manager_parse_config_file(Manager *m);
-
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_duid_type(
- const char *unit,
-diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
-index 70ff947b9..37c743121 100644
---- a/src/network/networkd-netdev.h
-+++ b/src/network/networkd-netdev.h
-@@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_;
- int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-
- /* gperf */
--const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- /* Macros which append INTERFACE= to the message */
-
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index 42fc82d39..09c3b3a3a 100644
---- a/src/network/networkd-network.h
-+++ b/src/network/networkd-network.h
-@@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign
- /* Legacy IPv4LL support */
- int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- extern const sd_bus_vtable network_vtable[];
-
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
-index 231e6d726..4ae34f8e2 100644
---- a/src/nspawn/nspawn-settings.h
-+++ b/src/nspawn/nspawn-settings.h
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s);
-
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
-
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
-index aaf5ed62c..d89ae28dc 100644
---- a/src/resolve/dns-type.c
-+++ b/src/resolve/dns-type.c
-@@ -29,7 +29,7 @@ typedef const struct {
- } dns_type;
-
- static const struct dns_type_name *
--lookup_dns_type (register const char *str, register unsigned int len);
-+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len);
-
- #include "dns_type-from-name.h"
- #include "dns_type-to-name.h"
-diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
-index fc425a36b..8184d6cad 100644
---- a/src/resolve/resolved-conf.h
-+++ b/src/resolve/resolved-conf.h
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string);
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word);
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string);
-
--const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_dns_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_search_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
-index aeaa0929b..e2479133d 100644
---- a/src/test/test-af-list.c
-+++ b/src/test/test-af-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
-
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "af-from-name.h"
- #include "af-list.h"
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
-index f3989ad20..8f4f342fa 100644
---- a/src/test/test-arphrd-list.c
-+++ b/src/test/test-arphrd-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
-
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "arphrd-from-name.h"
- #include "arphrd-list.h"
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
-index cba0724b1..0280697e9 100644
---- a/src/timesync/timesyncd-conf.h
-+++ b/src/timesync/timesyncd-conf.h
-@@ -22,7 +22,7 @@
- #include "conf-parser.h"
- #include "timesyncd-manager.h"
-
--const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int manager_parse_server_string(Manager *m, ServerType type, const char *string);
-
-diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
-index 91cc0357c..b0d8ceb76 100644
---- a/src/udev/net/link-config.h
-+++ b/src/udev/net/link-config.h
-@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_;
- MACPolicy mac_policy_from_string(const char *p) _pure_;
-
- /* gperf lookup function */
--const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index aa10beafb..09024116f 100644
---- a/src/udev/udev-builtin-keyboard.c
-+++ b/src/udev/udev-builtin-keyboard.c
-@@ -29,7 +29,7 @@
- #include "string-util.h"
- #include "udev.h"
-
--static const struct key *keyboard_lookup_key(const char *str, unsigned len);
-+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
- #include "keyboard-keys-from-name.h"
-
- static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {
---
-2.11.0
-
diff --git a/sys-apps/systemd/files/232-systemd-user-pam.patch b/sys-apps/systemd/files/232-systemd-user-pam.patch
deleted file mode 100644
index 9c4b3910927..00000000000
--- a/sys-apps/systemd/files/232-systemd-user-pam.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/login/systemd-user.m4
-+++ b/src/login/systemd-user.m4
-@@ -2,11 +2,7 @@
- #
- # Used by systemd --user instances.
-
--account required pam_unix.so
-+account include system-services
-
--m4_ifdef(`HAVE_SELINUX',
--session required pam_selinux.so close
--session required pam_selinux.so nottys open
--)m4_dnl
--session required pam_loginuid.so
-+session include system-services
- session optional pam_systemd.so
diff --git a/sys-apps/systemd/files/CVE-2015-7510.patch b/sys-apps/systemd/files/CVE-2015-7510.patch
deleted file mode 100644
index 088adbb1b68..00000000000
--- a/sys-apps/systemd/files/CVE-2015-7510.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb31827d62066a04b02111df3052949fda4b6888 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Mon, 23 Nov 2015 13:59:43 -0500
-Subject: [PATCH] nss-mymachines: do not allow overlong machine names
-
-https://github.com/systemd/systemd/issues/2002
----
- src/nss-mymachines/nss-mymachines.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
-index 969fa96..c98a959 100644
---- a/src/nss-mymachines/nss-mymachines.c
-+++ b/src/nss-mymachines/nss-mymachines.c
-@@ -416,6 +416,9 @@ enum nss_status _nss_mymachines_getpwnam_r(
- if (!e || e == p)
- goto not_found;
-
-+ if (e - p > HOST_NAME_MAX - 1) /* -1 for the last dash */
-+ goto not_found;
-+
- r = parse_uid(e + 1, &uid);
- if (r < 0)
- goto not_found;
-@@ -573,6 +576,9 @@ enum nss_status _nss_mymachines_getgrnam_r(
- if (!e || e == p)
- goto not_found;
-
-+ if (e - p > HOST_NAME_MAX - 1) /* -1 for the last dash */
-+ goto not_found;
-+
- r = parse_gid(e + 1, &gid);
- if (r < 0)
- goto not_found;
---
-2.6.3
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2017-10-18 18:39 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2017-10-18 18:39 UTC (permalink / raw
To: gentoo-commits
commit: f9b7cdf12d269a4eaf0977cea94f9559288da082
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 18:38:37 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 18:39:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b7cdf1
sys-apps/systemd: update patch
Package-Manager: Portage-2.3.11_p4, Repoman-2.3.3_p62
...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 53 ++++++++++++----------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
index 99e7342ffb2..9c11106f605 100644
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+++ b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
@@ -1,14 +1,14 @@
-From 3bd3ac67477ea319cc169dbd1c377912cf8ff198 Mon Sep 17 00:00:00 2001
-From: Susant Sahani <susant@redhat.com>
-Date: Sun, 8 Oct 2017 21:51:35 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in
- kernel.
+From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
+From: Susant Sahani <145210+ssahani@users.noreply.github.com>
+Date: Wed, 18 Oct 2017 11:55:57 +0530
+Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
+ (#7030)
-if FIB Rules in not supported by the kernel then networkd fails to
+If FIB Rules are not supported by the kernel then networkd fails to
start as it retuns error=-EOPNOTSUPP.
In this case just ignore and let start networkd.
-````
+```
sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28
recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48
@@ -22,26 +22,29 @@ Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited,
Fixes #7027
---
- src/network/networkd.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ src/network/networkd-manager.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
-diff --git a/src/network/networkd.c b/src/network/networkd.c
-index d5ba6893e..7f7223c0c 100644
---- a/src/network/networkd.c
-+++ b/src/network/networkd.c
-@@ -133,10 +133,8 @@ int main(int argc, char *argv[]) {
- }
+diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
+index 71445d5dd..200d0f622 100644
+--- a/src/network/networkd-manager.c
++++ b/src/network/networkd-manager.c
+@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
+ return r;
- r = manager_rtnl_enumerate_rules(m);
-- if (r < 0) {
-- log_error_errno(r, "Could not enumerate rules: %m");
-- goto out;
-- }
-+ if (r < 0)
-+ log_warning_errno(r, "Could not enumerate rules: %m");
+ r = sd_netlink_call(m->rtnl, req, 0, &reply);
+- if (r < 0)
++ if (r < 0) {
++ if (r == -EOPNOTSUPP) {
++ log_debug("FIB Rules are not supported by the kernel. Ignoring.");
++ return 0;
++ }
++
+ return r;
++ }
- r = manager_start(m);
- if (r < 0) {
+ for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
+ int k;
--
-2.14.2
+2.15.0.rc1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2017-12-07 0:18 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2017-12-07 0:18 UTC (permalink / raw
To: gentoo-commits
commit: a68d4d6d99bce54902f408696f239223decc25b2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 4 20:21:01 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 00:18:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68d4d6d
sys-apps/systemd: remove unused patches
...0002-cryptsetup-fix-infinite-timeout-6486.patch | 43 ----------
...ke-sure-idn2-conversions-are-roundtrippab.patch | 92 ----------------------
...-sure-we-don-t-process-the-same-method-ca.patch | 29 -------
3 files changed, 164 deletions(-)
diff --git a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch b/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
deleted file mode 100644
index 8ea131adfd0..00000000000
--- a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 793c786f470aeedf443686cff30f97acaff23a04 Mon Sep 17 00:00:00 2001
-From: Andrew Soutar <andrew@andrewsoutar.com>
-Date: Mon, 31 Jul 2017 02:19:16 -0400
-Subject: [PATCH 2/3] cryptsetup: fix infinite timeout (#6486)
-
-0004f698d causes `arg_timeout` to be infinity instead of 0 when timeout=0. The
-logic here now matches this change.
-
-Fixes #6381
----
- src/cryptsetup/cryptsetup.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 3b4c08616..08ed7e53b 100644
---- a/src/cryptsetup/cryptsetup.c
-+++ b/src/cryptsetup/cryptsetup.c
-@@ -56,7 +56,7 @@ static bool arg_tcrypt_veracrypt = false;
- static char **arg_tcrypt_keyfiles = NULL;
- static uint64_t arg_offset = 0;
- static uint64_t arg_skip = 0;
--static usec_t arg_timeout = 0;
-+static usec_t arg_timeout = USEC_INFINITY;
-
- /* Options Debian's crypttab knows we don't:
-
-@@ -670,10 +670,10 @@ int main(int argc, char *argv[]) {
- if (arg_discards)
- flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
-
-- if (arg_timeout > 0)
-- until = now(CLOCK_MONOTONIC) + arg_timeout;
-- else
-+ if (arg_timeout == USEC_INFINITY)
- until = 0;
-+ else
-+ until = now(CLOCK_MONOTONIC) + arg_timeout;
-
- arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
-
---
-2.14.0
-
diff --git a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch b/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
deleted file mode 100644
index e083f854107..00000000000
--- a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 47d36aeaebc3083795de40c80e75f0fda48c3053 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 21 Jul 2017 07:51:07 -0400
-Subject: [PATCH 3/3] resolved: make sure idn2 conversions are roundtrippable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-While working on the gateway→_gateway conversion, I noticed that
-libidn2 strips the leading underscore in some names.
-https://gitlab.com/libidn/libidn2/issues/30 was resolved in
-https://gitlab.com/libidn/libidn2/commit/05d753ea69e2308cd02436d0511f4b844071dc79,
-which disabled "STD3 ASCII rules" by default, i.e. disabled stripping
-of underscores. So the situation is that with previously released libidn2
-versions we would get incorrect behaviour, and once new libidn2 is released,
-we should be OK.
-
-Let's implement a simple test which checks that the name survives the
-roundtrip, and if it doesn't, skip IDN resolution. Under old libidn2 this will
-fail in more cases, and under new libidn2 in fewer, but should be the right
-thing to do also under new libidn2.
----
- src/shared/dns-domain.c | 29 ++++++++++++++++++++++++++---
- src/test/test-dns-domain.c | 6 ++++++
- 2 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index 12c4d65dd..139d286af 100644
---- a/src/shared/dns-domain.c
-+++ b/src/shared/dns-domain.c
-@@ -1274,15 +1274,38 @@ int dns_name_apply_idna(const char *name, char **ret) {
-
- #if defined(HAVE_LIBIDN2)
- int r;
-+ _cleanup_free_ char *t = NULL;
-
- assert(name);
- assert(ret);
-
-- r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) ret,
-+ r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) &t,
- IDN2_NFC_INPUT | IDN2_NONTRANSITIONAL);
-- if (r == IDN2_OK)
-+ log_debug("idn2_lookup_u8: %s → %s", name, t);
-+ if (r == IDN2_OK) {
-+ if (!startswith(name, "xn--")) {
-+ _cleanup_free_ char *s = NULL;
-+
-+ r = idn2_to_unicode_8z8z(t, &s, 0);
-+ if (r != IDN2_OK) {
-+ log_debug("idn2_to_unicode_8z8z(\"%s\") failed: %d/%s",
-+ t, r, idn2_strerror(r));
-+ return 0;
-+ }
-+
-+ if (!streq_ptr(name, s)) {
-+ log_debug("idn2 roundtrip failed: \"%s\" → \"%s\" → \"%s\", ignoring.",
-+ name, t, s);
-+ return 0;
-+ }
-+ }
-+
-+ *ret = t;
-+ t = NULL;
- return 1; /* *ret has been written */
-- log_debug("idn2_lookup_u8(\"%s\") failed: %s", name, idn2_strerror(r));
-+ }
-+
-+ log_debug("idn2_lookup_u8(\"%s\") failed: %d/%s", name, r, idn2_strerror(r));
- if (r == IDN2_2HYPHEN)
- /* The name has two hypens — forbidden by IDNA2008 in some cases */
- return 0;
-diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
-index 11cf0b1f0..cbd2d1e65 100644
---- a/src/test/test-dns-domain.c
-+++ b/src/test/test-dns-domain.c
-@@ -652,6 +652,12 @@ static void test_dns_name_apply_idna(void) {
- test_dns_name_apply_idna_one("föö.bär.", ret, "xn--f-1gaa.xn--br-via");
- test_dns_name_apply_idna_one("xn--f-1gaa.xn--br-via", ret, "xn--f-1gaa.xn--br-via");
-
-+ test_dns_name_apply_idna_one("_443._tcp.fedoraproject.org", ret2,
-+ "_443._tcp.fedoraproject.org");
-+ test_dns_name_apply_idna_one("_443", ret2, "_443");
-+ test_dns_name_apply_idna_one("gateway", ret, "gateway");
-+ test_dns_name_apply_idna_one("_gateway", ret2, "_gateway");
-+
- test_dns_name_apply_idna_one("r3---sn-ab5l6ne7.googlevideo.com", ret2,
- ret2 ? "r3---sn-ab5l6ne7.googlevideo.com" : "");
- }
---
-2.14.0
-
diff --git a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
deleted file mode 100644
index 97230f9dd2a..00000000000
--- a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f7d27d130eaac222b2d11c4d4415c9b599934da8 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 26 Aug 2017 15:19:26 +0200
-Subject: [PATCH] logind: make sure we don't process the same method call twice
- (#6583)
-
-Tiny mistake, big effect.
-
-Fixes: #6375
----
- src/login/logind-session-dbus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index 22e5349a6..649f3c155 100644
---- a/src/login/logind-session-dbus.c
-+++ b/src/login/logind-session-dbus.c
-@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, void *userdata, sd_bus_er
- goto error;
-
- session_save(s);
-- return 0;
-+ return 1;
-
- error:
- session_device_free(sd);
---
-2.14.1
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2018-02-13 22:15 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2018-02-13 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 4d19b7fc1c766527e91703f6efd2970840f6eb33
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 4 08:38:26 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 22:14:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d19b7fc
sys-apps/systemd: remove unused patches
...wdb-and-sysv-generator-if-the-features-ar.patch | 44 -------------------
...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 50 ----------------------
sys-apps/systemd/files/gentoo-uucp-group-r0.patch | 11 -----
3 files changed, 105 deletions(-)
diff --git a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
deleted file mode 100644
index bd2b3364369..00000000000
--- a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c013a410d0ec5f419ce8d53df19946795849591b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 8 Oct 2017 09:47:05 -0400
-Subject: [PATCH] test: skip hwdb and sysv-generator if the features are
- disabled
-
----
- test/meson.build | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/test/meson.build b/test/meson.build
-index 995a97177..c2df7ec22 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -163,9 +163,11 @@ endif
-
- ############################################################
-
--sysv_generator_test_py = find_program('sysv-generator-test.py')
--test('sysv-generator-test',
-- sysv_generator_test_py)
-+if conf.get('HAVE_SYSV_COMPAT') == 1
-+ sysv_generator_test_py = find_program('sysv-generator-test.py')
-+ test('sysv-generator-test',
-+ sysv_generator_test_py)
-+endif
-
- ############################################################
-
-@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl')
- test('udev-test',
- udev_test_pl)
-
--hwdb_test_sh = find_program('hwdb-test.sh')
--test('hwdb-test',
-- hwdb_test_sh)
-+if conf.get('ENABLE_HWDB') == 1
-+ hwdb_test_sh = find_program('hwdb-test.sh')
-+ test('hwdb-test',
-+ hwdb_test_sh)
-+endif
---
-2.14.2
-
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
deleted file mode 100644
index 9c11106f605..00000000000
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
-From: Susant Sahani <145210+ssahani@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 11:55:57 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
- (#7030)
-
-If FIB Rules are not supported by the kernel then networkd fails to
-start as it retuns error=-EOPNOTSUPP.
-In this case just ignore and let start networkd.
-
-```
-sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48
-```
-
-```
-Oct 08 10:22:24 naomi systemd[1]: Starting Network Service...
-Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: Operation not supported
-Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited, code=exited, status=1/FAILURE
-```
-
-Fixes #7027
----
- src/network/networkd-manager.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
-index 71445d5dd..200d0f622 100644
---- a/src/network/networkd-manager.c
-+++ b/src/network/networkd-manager.c
-@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
- return r;
-
- r = sd_netlink_call(m->rtnl, req, 0, &reply);
-- if (r < 0)
-+ if (r < 0) {
-+ if (r == -EOPNOTSUPP) {
-+ log_debug("FIB Rules are not supported by the kernel. Ignoring.");
-+ return 0;
-+ }
-+
- return r;
-+ }
-
- for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
- int k;
---
-2.15.0.rc1
-
diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
deleted file mode 100644
index 89cf552c829..00000000000
--- a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
-
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2018-04-03 18:23 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2018-04-03 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 43a2ba90cdcab456310b81e6a5a85018dd862ffc
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Apr 3 09:18:36 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 18:23:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a2ba90
sys-apps/systemd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/7787
sys-apps/systemd/files/CVE-2017-15908.patch | 39 -------------------------
sys-apps/systemd/files/gentoo-noclean-tmp.patch | 28 ------------------
2 files changed, 67 deletions(-)
diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch
deleted file mode 100644
index 08e5e37514c..00000000000
--- a/sys-apps/systemd/files/CVE-2017-15908.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 25 Oct 2017 11:19:19 +0200
-Subject: [PATCH] resolved: fix loop on packets with pseudo dns types
-
-Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.
-
-https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351
----
- src/resolve/resolved-dns-packet.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index e2f227bfc..35f4d0689 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
-
- found = true;
-
-- while (bitmask) {
-+ for (; bitmask; bit++, bitmask >>= 1)
- if (bitmap[i] & bitmask) {
- uint16_t n;
-
-@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
- if (r < 0)
- return r;
- }
--
-- bit++;
-- bitmask >>= 1;
-- }
- }
-
- if (!found)
---
-2.15.0.rc2
-
diff --git a/sys-apps/systemd/files/gentoo-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
deleted file mode 100644
index 769aa04ccf6..00000000000
--- a/sys-apps/systemd/files/gentoo-noclean-tmp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Sep 2015 10:26:18 -0400
-Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp
-
-Bug: https://bugs.gentoo.org/490676
----
- tmpfiles.d/tmp.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
-index 6bbd1aa..a361062 100644
---- a/tmpfiles.d/tmp.conf
-+++ b/tmpfiles.d/tmp.conf
-@@ -8,8 +8,8 @@
- # See tmpfiles.d(5) for details
-
- # Clear tmp directories separately, to make them easier to override
--q /tmp 1777 root root 10d
--q /var/tmp 1777 root root 30d
-+q /tmp 1777 root root
-+q /var/tmp 1777 root root
-
- # Exclude namespace mountpoints created with PrivateTmp=yes
- x /tmp/systemd-private-%b-*
---
-2.4.10
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 24+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 2948b4feefa5cbdccf406c2575b2bc80ad4a0808
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 12:00:54 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2948b4fe
sys-apps/systemd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/8609
...o-not-try-to-close-already-closed-fd-8392.patch | 26 -------------
...e-do-not-free-heap-allocated-strings-8391.patch | 44 ----------------------
...-check-for-address-to-keep-interface-8458.patch | 37 ------------------
3 files changed, 107 deletions(-)
diff --git a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch b/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch
deleted file mode 100644
index c39575c62b6..00000000000
--- a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5681f772d7bc8226cb10bfc7f9fba0a29e34a54d Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 8 Mar 2018 22:19:35 +0900
-Subject: [PATCH 1/2] sd-bus: do not try to close already closed fd (#8392)
-
-Fixes #8376, which is introduced by 2b33ab0957f453a06b58e4bee482f2c2d4e100c1.
----
- src/libsystemd/sd-bus/bus-socket.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index b5160cff6..166fba157 100644
---- a/src/libsystemd/sd-bus/bus-socket.c
-+++ b/src/libsystemd/sd-bus/bus-socket.c
-@@ -960,8 +960,6 @@ int bus_socket_exec(sd_bus *b) {
- if (r == 0) {
- /* Child */
-
-- safe_close(s[0]);
--
- if (rearrange_stdio(s[1], s[1], STDERR_FILENO) < 0)
- _exit(EXIT_FAILURE);
-
---
-2.16.2
-
diff --git a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch b/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch
deleted file mode 100644
index 3ee2527f77d..00000000000
--- a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 84c5e8010042788a03cff680592b37257b2a6de0 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 8 Mar 2018 22:21:54 +0900
-Subject: [PATCH 2/2] core: do not free heap-allocated strings (#8391)
-
-Fixes #8387.
----
- src/core/mount-setup.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 536c17b4d..9c27972af 100644
---- a/src/core/mount-setup.c
-+++ b/src/core/mount-setup.c
-@@ -248,6 +248,7 @@ int mount_setup_early(void) {
-
- int mount_cgroup_controllers(char ***join_controllers) {
- _cleanup_set_free_free_ Set *controllers = NULL;
-+ bool has_argument = !!join_controllers;
- int r;
-
- if (!cg_is_legacy_wanted())
-@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
-
- /* Mount all available cgroup controllers that are built into the kernel. */
-
-- if (!join_controllers)
-+ if (!has_argument)
- /* The defaults:
- * mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio".
- *
-@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
-
- t = set_remove(controllers, *i);
- if (!t) {
-- free(*i);
-+ if (has_argument)
-+ free(*i);
- continue;
- }
- }
---
-2.16.2
-
diff --git a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch b/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch
deleted file mode 100644
index 693d67152ea..00000000000
--- a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 Mon Sep 17 00:00:00 2001
-From: Filipe Brandenburger <filbranden@google.com>
-Date: Thu, 15 Mar 2018 10:42:38 -0700
-Subject: [PATCH] udev/net-id: Fix check for address to keep interface names
- stable (#8458)
-
-This was a bug inadvertently added by commit 73fc96c8ac0aa9.
-
-The intent of the check is to "match slot address with device by
-stripping the function" (as the comment above states it), for example
-match network device PCI address 0000:05:00.0 (including a .0 for
-function) to PCI slot address 0000:05:00, but changing that to a streq()
-call prevented the match.
-
-Change that to startswith(), which should both fix the bug and make the
-intent of the check more clear and prevent unintentional bugs from being
-introduced by future refactorings.
----
- src/udev/udev-builtin-net_id.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 36994360c7..6efa712930 100644
---- a/src/udev/udev-builtin-net_id.c
-+++ b/src/udev/udev-builtin-net_id.c
-@@ -297,7 +297,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
- if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, dent->d_name) &&
- read_one_line_file(str, &address) >= 0)
- /* match slot address with device by stripping the function */
-- if (streq(address, udev_device_get_sysname(names->pcidev)))
-+ if (startswith(udev_device_get_sysname(names->pcidev), address))
- hotplug_slot = i;
-
- if (hotplug_slot > 0)
---
-2.16.2
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2018-06-04 15:09 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2018-06-04 15:09 UTC (permalink / raw
To: gentoo-commits
commit: cc97247f11197802e32003228380bfb014f7d115
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 4 15:06:37 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 4 15:06:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc97247f
sys-apps/systemd: replace 'compat' with 'files' in nsswitch.conf sample
sys-apps/systemd/files/nsswitch.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd/files/nsswitch.conf b/sys-apps/systemd/files/nsswitch.conf
index 00667c0c088..ebef9ace965 100644
--- a/sys-apps/systemd/files/nsswitch.conf
+++ b/sys-apps/systemd/files/nsswitch.conf
@@ -7,9 +7,9 @@
# nss-resolve - host resolution using resolved
# nss-systemd - dynamic user/group resolution (DynamicUser in unit files)
-passwd: compat mymachines systemd
-shadow: compat
-group: compat mymachines systemd
+passwd: files mymachines systemd
+shadow: files
+group: files mymachines systemd
gshadow: files
hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2018-06-04 15:09 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2018-06-04 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 11c8c4fe228402c3ded8863ad95d91bf9eb0d0d6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 4 15:09:16 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 4 15:09:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c8c4fe
sys-apps/systemd: replace tabs with spaces in nsswitch.conf sample
sys-apps/systemd/files/nsswitch.conf | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/sys-apps/systemd/files/nsswitch.conf b/sys-apps/systemd/files/nsswitch.conf
index ebef9ace965..91dbe757f9f 100644
--- a/sys-apps/systemd/files/nsswitch.conf
+++ b/sys-apps/systemd/files/nsswitch.conf
@@ -7,21 +7,21 @@
# nss-resolve - host resolution using resolved
# nss-systemd - dynamic user/group resolution (DynamicUser in unit files)
-passwd: files mymachines systemd
-shadow: files
-group: files mymachines systemd
-gshadow: files
+passwd: files mymachines systemd
+shadow: files
+group: files mymachines systemd
+gshadow: files
-hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
-networks: files
+hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
+networks: files
-services: db files
-protocols: db files
-rpc: db files
-ethers: db files
-netmasks: files
-netgroup: files
-bootparams: files
+services: db files
+protocols: db files
+rpc: db files
+ethers: db files
+netmasks: files
+netgroup: files
+bootparams: files
-automount: files
-aliases: files
+automount: files
+aliases: files
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2019-06-08 20:44 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2019-06-08 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 284c3c0b7d130ca73ed214365c8ecc2cba30ac6e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 20:41:42 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 20:41:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284c3c0b
sys-apps/systemd: more fixes for gcc 9
Closes: https://bugs.gentoo.org/685534
Package-Manager: Portage-2.3.67_p4, Repoman-2.3.13_p3
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/242-gcc-9.patch | 128 +++++++++++++++++++++++++++++++++
1 file changed, 128 insertions(+)
diff --git a/sys-apps/systemd/files/242-gcc-9.patch b/sys-apps/systemd/files/242-gcc-9.patch
index e12d6571823..e9f690a65be 100644
--- a/sys-apps/systemd/files/242-gcc-9.patch
+++ b/sys-apps/systemd/files/242-gcc-9.patch
@@ -33,3 +33,131 @@ index 533193ac932..6fc82940033 100644
else
log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
+From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2019 10:31:01 -0400
+Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
+
+Fixes: https://github.com/systemd/systemd/issues/12534
+---
+ src/shared/machine-image.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6b9d8fb97a6..6a6d952b424 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -201,11 +201,13 @@ static int image_make(
+ Image **ret) {
+
+ _cleanup_free_ char *pretty_buffer = NULL;
++ _cleanup_free_ char *cwd = NULL;
+ struct stat stbuf;
+ bool read_only;
+ int r;
+
+ assert(dfd >= 0 || dfd == AT_FDCWD);
++ assert(path || dfd == AT_FDCWD);
+ assert(filename);
+
+ /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
+@@ -221,6 +223,9 @@ static int image_make(
+ st = &stbuf;
+ }
+
++ if (!path)
++ safe_getcwd(&cwd);
++
+ read_only =
+ (path && path_startswith(path, "/usr")) ||
+ (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
+@@ -359,7 +364,7 @@ static int image_make(
+
+ block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+ if (block_fd < 0)
+- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ else {
+ /* Refresh stat data after opening the node */
+ if (fstat(block_fd, &stbuf) < 0)
+@@ -373,13 +378,13 @@ static int image_make(
+ int state = 0;
+
+ if (ioctl(block_fd, BLKROGET, &state) < 0)
+- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ else if (state)
+ read_only = true;
+ }
+
+ if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+
+ block_fd = safe_close(block_fd);
+ }
+From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 24 May 2019 10:54:09 +0200
+Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
+ first argument is specified
+
+A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
+---
+ src/shared/machine-image.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6a6d952b424..55e5f08f91e 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -200,8 +200,7 @@ static int image_make(
+ const struct stat *st,
+ Image **ret) {
+
+- _cleanup_free_ char *pretty_buffer = NULL;
+- _cleanup_free_ char *cwd = NULL;
++ _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
+ struct stat stbuf;
+ bool read_only;
+ int r;
+@@ -223,8 +222,12 @@ static int image_make(
+ st = &stbuf;
+ }
+
+- if (!path)
+- safe_getcwd(&cwd);
++ if (!path) {
++ if (dfd == AT_FDCWD)
++ (void) safe_getcwd(&parent);
++ else
++ (void) fd_get_path(dfd, &parent);
++ }
+
+ read_only =
+ (path && path_startswith(path, "/usr")) ||
+@@ -364,7 +367,7 @@ static int image_make(
+
+ block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+ if (block_fd < 0)
+- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ else {
+ /* Refresh stat data after opening the node */
+ if (fstat(block_fd, &stbuf) < 0)
+@@ -378,13 +381,13 @@ static int image_make(
+ int state = 0;
+
+ if (ioctl(block_fd, BLKROGET, &state) < 0)
+- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ else if (state)
+ read_only = true;
+ }
+
+ if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+
+ block_fd = safe_close(block_fd);
+ }
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2019-07-10 19:18 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2019-07-10 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 8f5a6af3500b25641625eb8a1d4300d8ca287c19
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 7 09:21:52 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 19:18:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5a6af3
sys-apps/systemd: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/12399
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/CVE-2019-6454.patch | 198 -----------------------------
1 file changed, 198 deletions(-)
diff --git a/sys-apps/systemd/files/CVE-2019-6454.patch b/sys-apps/systemd/files/CVE-2019-6454.patch
deleted file mode 100644
index 97b7d635e7d..00000000000
--- a/sys-apps/systemd/files/CVE-2019-6454.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- a/src/libsystemd/sd-bus/bus-internal.c
-+++ b/src/libsystemd/sd-bus/bus-internal.c
-@@ -45,7 +45,7 @@
- if (slash)
- return false;
-
-- return true;
-+ return (q - p) <= BUS_PATH_SIZE_MAX;
- }
-
- char* object_path_startswith(const char *a, const char *b) {
---- a/src/libsystemd/sd-bus/bus-internal.h
-+++ b/src/libsystemd/sd-bus/bus-internal.h
-@@ -333,6 +333,10 @@
-
- #define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
- #define BUS_AUTH_SIZE_MAX (64*1024)
-+/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
-+ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
-+ * to not clash unnecessarily with real-life applications. */
-+#define BUS_PATH_SIZE_MAX (64*1024)
-
- #define BUS_CONTAINER_DEPTH 128
-
---- a/src/libsystemd/sd-bus/bus-objects.c
-+++ b/src/libsystemd/sd-bus/bus-objects.c
-@@ -1134,7 +1134,8 @@
- const char *path,
- sd_bus_error *error) {
-
-- char *prefix;
-+ _cleanup_free_ char *prefix = NULL;
-+ size_t pl;
- int r;
-
- assert(bus);
-@@ -1150,7 +1151,12 @@
- return 0;
-
- /* Second, add fallback vtables registered for any of the prefixes */
-- prefix = alloca(strlen(path) + 1);
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-+
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
- if (r < 0)
-@@ -1346,6 +1352,7 @@
- }
-
- int bus_process_object(sd_bus *bus, sd_bus_message *m) {
-+ _cleanup_free_ char *prefix = NULL;
- int r;
- size_t pl;
- bool found_object = false;
-@@ -1370,9 +1377,12 @@
- assert(m->member);
-
- pl = strlen(m->path);
-- do {
-- char prefix[pl+1];
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-
-+ do {
- bus->nodes_modified = false;
-
- r = object_find_and_run(bus, m, m->path, false, &found_object);
-@@ -1499,9 +1509,15 @@
-
- n = hashmap_get(bus->nodes, path);
- if (!n) {
-- char *prefix;
-+ _cleanup_free_ char *prefix = NULL;
-+ size_t pl;
-+
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-
-- prefix = alloca(strlen(path) + 1);
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- n = hashmap_get(bus->nodes, prefix);
- if (n)
-@@ -2091,8 +2107,9 @@
- char **names) {
-
- BUS_DONT_DESTROY(bus);
-+ _cleanup_free_ char *prefix = NULL;
- bool found_interface = false;
-- char *prefix;
-+ size_t pl;
- int r;
-
- assert_return(bus, -EINVAL);
-@@ -2111,6 +2128,12 @@
- if (names && names[0] == NULL)
- return 0;
-
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-+
- do {
- bus->nodes_modified = false;
-
-@@ -2120,7 +2143,6 @@
- if (bus->nodes_modified)
- continue;
-
-- prefix = alloca(strlen(path) + 1);
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names);
- if (r != 0)
-@@ -2252,7 +2274,8 @@
-
- static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
- _cleanup_set_free_ Set *s = NULL;
-- char *prefix;
-+ _cleanup_free_ char *prefix = NULL;
-+ size_t pl;
- int r;
-
- assert(bus);
-@@ -2297,7 +2320,12 @@
- if (bus->nodes_modified)
- return 0;
-
-- prefix = alloca(strlen(path) + 1);
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-+
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = object_added_append_all_prefix(bus, m, s, prefix, path, true);
- if (r < 0)
-@@ -2436,7 +2464,8 @@
-
- static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
- _cleanup_set_free_ Set *s = NULL;
-- char *prefix;
-+ _cleanup_free_ char *prefix = NULL;
-+ size_t pl;
- int r;
-
- assert(bus);
-@@ -2468,7 +2497,12 @@
- if (bus->nodes_modified)
- return 0;
-
-- prefix = alloca(strlen(path) + 1);
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-+
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = object_removed_append_all_prefix(bus, m, s, prefix, path, true);
- if (r < 0)
-@@ -2618,7 +2652,8 @@
- const char *path,
- const char *interface) {
-
-- char *prefix;
-+ _cleanup_free_ char *prefix = NULL;
-+ size_t pl;
- int r;
-
- assert(bus);
-@@ -2632,7 +2667,12 @@
- if (bus->nodes_modified)
- return 0;
-
-- prefix = alloca(strlen(path) + 1);
-+ pl = strlen(path);
-+ assert(pl <= BUS_PATH_SIZE_MAX);
-+ prefix = new(char, pl + 1);
-+ if (!prefix)
-+ return -ENOMEM;
-+
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
- if (r != 0)
-
-
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2019-08-02 20:41 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2019-08-02 20:41 UTC (permalink / raw
To: gentoo-commits
commit: e60754ead10554205e458a6c37ca1017c459b522
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 2 18:51:51 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 2 20:41:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60754ea
sys-apps/systemd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/12601
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/241-version-dep.patch | 111 ---------------------
.../systemd/files/241-wrapper-msan-unpoinson.patch | 76 --------------
sys-apps/systemd/files/gentoo-uucp-group-r1.patch | 11 --
3 files changed, 198 deletions(-)
diff --git a/sys-apps/systemd/files/241-version-dep.patch b/sys-apps/systemd/files/241-version-dep.patch
deleted file mode 100644
index 55abea98931..00000000000
--- a/sys-apps/systemd/files/241-version-dep.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 60722ad778d005790231038eecc4ba3034c1a0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 24 Feb 2019 22:49:38 +0100
-Subject: [PATCH] meson: declare version.h as dep for various targets that
- include build.h
-
-Should fix #11565.
----
- meson.build | 19 +++++++++++++------
- src/core/meson.build | 3 ++-
- src/udev/meson.build | 1 +
- 3 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index ed787d47492..82ecb4d0e69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1634,7 +1634,8 @@ exe = executable('systemd-analyze',
- include_directories : includes,
- link_with : [libcore,
- libshared],
-- dependencies : [threads,
-+ dependencies : [versiondep,
-+ threads,
- librt,
- libseccomp,
- libselinux,
-@@ -2180,7 +2181,8 @@ if conf.get('ENABLE_IMPORTD') == 1
- systemd_pull_sources,
- include_directories : includes,
- link_with : [libshared],
-- dependencies : [libcurl,
-+ dependencies : [versiondep,
-+ libcurl,
- libz,
- libbzip2,
- libxz,
-@@ -2229,7 +2231,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
- systemd_journal_upload_sources,
- include_directories : includes,
- link_with : [libshared],
-- dependencies : [threads,
-+ dependencies : [versiondep,
-+ threads,
- libcurl,
- libgnutls,
- libxz,
-@@ -2555,6 +2558,7 @@ exe = executable('systemd-stdio-bridge',
- 'src/stdio-bridge/stdio-bridge.c',
- include_directories : includes,
- link_with : [libshared],
-+ dependencies : [versiondep],
- install_rpath : rootlibexecdir,
- install : true)
- public_programs += exe
-@@ -2638,7 +2642,8 @@ exe = executable('systemd-udevd',
- link_with : [libudev_core,
- libsystemd_network,
- libudev_static],
-- dependencies : [threads,
-+ dependencies : [versiondep,
-+ threads,
- libkmod,
- libidn,
- libacl,
-@@ -2655,7 +2660,8 @@ exe = executable('udevadm',
- link_with : [libudev_core,
- libsystemd_network,
- libudev_static],
-- dependencies : [threads,
-+ dependencies : [versiondep,
-+ threads,
- libkmod,
- libidn,
- libacl,
-@@ -2795,7 +2801,8 @@ foreach tuple : tests
- sources,
- include_directories : incs,
- link_with : link_with,
-- dependencies : dependencies,
-+ dependencies : [versiondep,
-+ dependencies],
- c_args : defs,
- build_by_default : want_tests != 'false',
- install_rpath : rootlibexecdir,
-diff --git a/src/core/meson.build b/src/core/meson.build
-index 85021bdc010..88fb093732b 100644
---- a/src/core/meson.build
-+++ b/src/core/meson.build
-@@ -150,7 +150,8 @@ libcore = static_library(
- load_fragment_gperf_c,
- load_fragment_gperf_nulstr_c,
- include_directories : includes,
-- dependencies : [threads,
-+ dependencies : [versiondep,
-+ threads,
- librt,
- libseccomp,
- libpam,
-diff --git a/src/udev/meson.build b/src/udev/meson.build
-index 2de88c0d93b..01e4c09f57f 100644
---- a/src/udev/meson.build
-+++ b/src/udev/meson.build
-@@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'],
- prog,
- include_directories : includes,
- c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
-+ dependencies : [versiondep],
- link_with : [libudev_static],
- install_rpath : udev_rpath,
- install : true,
diff --git a/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch b/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch
deleted file mode 100644
index e337b4f4ca5..00000000000
--- a/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c322f379e6ca972f1c4d3409ac97828b1b838d5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 22 Feb 2019 13:07:00 +0100
-Subject: [PATCH] Add wrapper for __msan_unpoinson() to reduce #ifdeffery
-
-This isn't really necessary for the subsequent commit, but I expect that we'll
-need to unpoison more often once we turn on msan in CI, so I think think this
-change makes sense in the long run.
----
- src/basic/alloc-util.h | 10 ++++++++++
- src/basic/random-util.c | 11 ++---------
- 2 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
-index 893a1238ff..78ee34bb71 100644
---- a/src/basic/alloc-util.h
-+++ b/src/basic/alloc-util.h
-@@ -8,6 +8,10 @@
-
- #include "macro.h"
-
-+#if HAS_FEATURE_MEMORY_SANITIZER
-+# include <sanitizer/msan_interface.h>
-+#endif
-+
- typedef void (*free_func_t)(void *p);
-
- /* If for some reason more than 4M are allocated on the stack, let's abort immediately. It's better than
-@@ -160,3 +164,9 @@ void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size);
- (ptr) = NULL; \
- _ptr_; \
- })
-+
-+#if HAS_FEATURE_MEMORY_SANITIZER
-+# define msan_unpoison(r, s) __msan_unpoison(r, s)
-+#else
-+# define msan_unpoison(r, s)
-+#endif
-diff --git a/src/basic/random-util.c b/src/basic/random-util.c
-index f7decf60b6..ca25fd2420 100644
---- a/src/basic/random-util.c
-+++ b/src/basic/random-util.c
-@@ -23,16 +23,13 @@
- # include <linux/random.h>
- #endif
-
-+#include "alloc-util.h"
- #include "fd-util.h"
- #include "io-util.h"
- #include "missing.h"
- #include "random-util.h"
- #include "time-util.h"
-
--#if HAS_FEATURE_MEMORY_SANITIZER
--#include <sanitizer/msan_interface.h>
--#endif
--
- int rdrand(unsigned long *ret) {
-
- #if defined(__i386__) || defined(__x86_64__)
-@@ -58,11 +55,7 @@ int rdrand(unsigned long *ret) {
- "setc %1"
- : "=r" (*ret),
- "=qm" (err));
--
--#if HAS_FEATURE_MEMORY_SANITIZER
-- __msan_unpoison(&err, sizeof(err));
--#endif
--
-+ msan_unpoison(&err, sizeof(err));
- if (!err)
- return -EAGAIN;
-
---
-2.22.0
-
diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r1.patch b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
deleted file mode 100644
index 9c53b8b18ab..00000000000
--- a/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
-
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2020-03-06 19:20 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2020-03-06 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 98fb3b88045ac64e8fd62c9e53e5845ee919fc5f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 19:19:36 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 19:19:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fb3b88
sys-apps/systemd: remove unused patches
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/245-rc1-network-debug.patch | 45 ----------------------
.../systemd/files/245-rc1-sysctl-segfault.patch | 23 -----------
2 files changed, 68 deletions(-)
diff --git a/sys-apps/systemd/files/245-rc1-network-debug.patch b/sys-apps/systemd/files/245-rc1-network-debug.patch
deleted file mode 100644
index e65035f2185..00000000000
--- a/sys-apps/systemd/files/245-rc1-network-debug.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 01ec0028d97fa97d2e433659e24a1517b0e2382e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 5 Feb 2020 11:04:50 -0500
-Subject: [PATCH] network: remove unnecessary link->ifname from debug log
- statements
-
-Since 98b0299479a68ffd414888368907fc776a46b82a, we log the interface
-name automatically via log_link_debug().
-
-Fixes: https://github.com/systemd/systemd/issues/14782
----
- src/network/networkd-dhcp-server.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
-index a6dbe2e596c..bee75a6930e 100644
---- a/src/network/networkd-dhcp-server.c
-+++ b/src/network/networkd-dhcp-server.c
-@@ -45,7 +45,7 @@ static int link_push_uplink_dns_to_dhcp_server(Link *link, sd_dhcp_server *s) {
- size_t n_addresses = 0, n_allocated = 0;
- unsigned i;
-
-- log_link_debug(link, "Copying DNS server information from %s", link->ifname);
-+ log_link_debug(link, "Copying DNS server information from link");
-
- if (!link->network)
- return 0;
-@@ -99,7 +99,7 @@ static int link_push_uplink_ntp_to_dhcp_server(Link *link, sd_dhcp_server *s) {
- if (!link->network)
- return 0;
-
-- log_link_debug(link, "Copying NTP server information from %s", link->ifname);
-+ log_link_debug(link, "Copying NTP server information from link");
-
- STRV_FOREACH(a, link->network->ntp) {
- union in_addr_union ia;
-@@ -148,7 +148,7 @@ static int link_push_uplink_sip_to_dhcp_server(Link *link, sd_dhcp_server *s) {
- if (!link->network)
- return 0;
-
-- log_link_debug(link, "Copying SIP server information from %s", link->ifname);
-+ log_link_debug(link, "Copying SIP server information from link");
-
- STRV_FOREACH(a, link->network->sip) {
- union in_addr_union ia;
diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
deleted file mode 100644
index 7618b2deba5..00000000000
--- a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 6 Feb 2020 19:13:11 +0900
-Subject: [PATCH] sysctl: fix segfault
-
-Fixes #14801.
----
- src/sysctl/sysctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index bbcf0c43235..0cdb740d218 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig
-
- existing = ordered_hashmap_get(*sysctl_options, p);
- if (existing) {
-- if (streq(value, existing->value)) {
-+ if (streq_ptr(value, existing->value)) {
- existing->ignore_failure = existing->ignore_failure || ignore_failure;
- continue;
- }
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2022-07-19 17:10 Conrad Kostecki
0 siblings, 0 replies; 24+ messages in thread
From: Conrad Kostecki @ 2022-07-19 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 2ba4f610a5f50a175ebb56d767d8c78aff457051
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 19 15:30:56 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:08:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba4f610
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26477
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../systemd/files/250.4-random-seed-hash.patch | 74 ----------------------
1 file changed, 74 deletions(-)
diff --git a/sys-apps/systemd/files/250.4-random-seed-hash.patch b/sys-apps/systemd/files/250.4-random-seed-hash.patch
deleted file mode 100644
index efaa8cdfcaac..000000000000
--- a/sys-apps/systemd/files/250.4-random-seed-hash.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/systemd/systemd-stable/commit/ed46ff2bd6ca21d83cae4a94c3ed752ad1b64cce
-
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 3 Jan 2022 18:11:32 +0100
-Subject: [PATCH] random-seed: hash together old seed and new seed before
- writing out file
-
-If we're consuming an on-disk seed, we usually write out a new one after
-consuming it. In that case, we might be at early boot and the randomness
-could be rather poor, and the kernel doesn't guarantee that it'll use
-the new randomness right away for us. In order to prevent the new
-entropy from getting any worse, hash together the old seed and the new
-seed, and replace the final bytes of the new seed with the hash output.
-This way, entropy strictly increases and never regresses.
-
-(cherry picked from commit da2862ef06f22fc8d31dafced6d2d6dc14f2ee0b)
---- a/src/random-seed/random-seed.c
-+++ b/src/random-seed/random-seed.c
-@@ -26,6 +26,7 @@
- #include "random-util.h"
- #include "string-util.h"
- #include "sync-util.h"
-+#include "sha256.h"
- #include "util.h"
- #include "xattr-util.h"
-
-@@ -106,9 +107,11 @@ static int run(int argc, char *argv[]) {
- _cleanup_close_ int seed_fd = -1, random_fd = -1;
- bool read_seed_file, write_seed_file, synchronous;
- _cleanup_free_ void* buf = NULL;
-+ struct sha256_ctx hash_state;
-+ uint8_t hash[32];
- size_t buf_size;
- struct stat st;
-- ssize_t k;
-+ ssize_t k, l;
- int r;
-
- log_setup();
-@@ -242,6 +245,16 @@ static int run(int argc, char *argv[]) {
- if (r < 0)
- log_error_errno(r, "Failed to write seed to /dev/urandom: %m");
- }
-+ /* If we're going to later write out a seed file, initialize a hash state with
-+ * the contents of the seed file we just read, so that the new one can't regress
-+ * in entropy. */
-+ if (write_seed_file) {
-+ sha256_init_ctx(&hash_state);
-+ if (k < 0)
-+ k = 0;
-+ sha256_process_bytes(&k, sizeof(k), &hash_state);
-+ sha256_process_bytes(buf, k, &hash_state);
-+ }
- }
-
- if (write_seed_file) {
-@@ -277,6 +290,17 @@ static int run(int argc, char *argv[]) {
- "Got EOF while reading from /dev/urandom.");
- }
-
-+ /* If we previously read in a seed file, then hash the new seed into the old one,
-+ * and replace the last 32 bytes of the seed with the hash output, so that the
-+ * new seed file can't regress in entropy. */
-+ if (read_seed_file) {
-+ sha256_process_bytes(&k, sizeof(k), &hash_state);
-+ sha256_process_bytes(buf, k, &hash_state);
-+ sha256_finish_ctx(&hash_state, hash);
-+ l = MIN(k, 32);
-+ memcpy((uint8_t *)buf + k - l, hash, l);
-+ }
-+
- r = loop_write(seed_fd, buf, (size_t) k, false);
- if (r < 0)
- return log_error_errno(r, "Failed to write new random seed file: %m");
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2022-08-04 18:39 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2022-08-04 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 85d1220e7b5aa45e66fbc5ea9b78646982e5a04d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Aug 4 18:17:04 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 4 18:39:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d1220e
sys-apps/systemd: remove unused files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26738
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/00-hostnamed-network-user.conf | 6 ------
.../systemd/files/org.freedesktop.hostname1_no_polkit.conf | 11 -----------
2 files changed, 17 deletions(-)
diff --git a/sys-apps/systemd/files/00-hostnamed-network-user.conf b/sys-apps/systemd/files/00-hostnamed-network-user.conf
deleted file mode 100644
index 6b224ba9b937..000000000000
--- a/sys-apps/systemd/files/00-hostnamed-network-user.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Service]
-# By running with these options instead of root, networkd is allowed to request
-# a hostname change via DBUS when policykit is not present
-User=systemd-network
-Group=systemd-hostname
-AmbientCapabilities=CAP_SYS_ADMIN
diff --git a/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf b/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf
deleted file mode 100644
index f4d0271cdb6a..000000000000
--- a/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
- <policy group="systemd-hostname">
- <allow own="org.freedesktop.hostname1"/>
- <allow send_destination="org.freedesktop.hostname1"/>
- <allow receive_sender="org.freedesktop.hostname1"/>
- </policy>
-</busconfig>
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2022-10-19 18:13 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2022-10-19 18:13 UTC (permalink / raw
To: gentoo-commits
commit: b139d67e3e04133620f54b35ab7cba1cd1867d6a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 19 17:06:05 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 18:13:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b139d67e
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27854
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/251-glibc-2.36.patch | 154 ----------------------------
1 file changed, 154 deletions(-)
diff --git a/sys-apps/systemd/files/251-glibc-2.36.patch b/sys-apps/systemd/files/251-glibc-2.36.patch
deleted file mode 100644
index 65693d747ca3..000000000000
--- a/sys-apps/systemd/files/251-glibc-2.36.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-https://bugs.gentoo.org/863218
-https://github.com/systemd/systemd/issues/23984
-https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484
-https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a
-
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sat, 23 Jul 2022 10:38:49 +0000
-Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
- fsconfig_command/mount_attr conflict with glibc 2.36
-
---- a/meson.build
-+++ b/meson.build
-@@ -511,7 +511,6 @@ decl_headers = '''
- #include <uchar.h>
- #include <sys/mount.h>
- #include <sys/stat.h>
--#include <linux/fs.h>
- '''
-
- foreach decl : ['char16_t',
-@@ -523,6 +522,17 @@ foreach decl : ['char16_t',
- # We get -1 if the size cannot be determined
- have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
-
-+ if decl == 'struct mount_attr'
-+ if have
-+ want_linux_fs_h = false
-+ else
-+ have = cc.sizeof(decl,
-+ prefix : decl_headers + '#include <linux/fs.h>',
-+ args : '-D_GNU_SOURCE') > 0
-+ want_linux_fs_h = have
-+ endif
-+ endif
-+
- if decl == 'struct statx'
- if have
- want_linux_stat_h = false
-@@ -538,6 +548,7 @@ foreach decl : ['char16_t',
- endforeach
-
- conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
-+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
-
- foreach ident : ['secure_getenv', '__secure_getenv']
- conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
---- a/src/basic/fd-util.c
-+++ b/src/basic/fd-util.c
-@@ -3,7 +3,9 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <linux/btrfs.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- #include <linux/magic.h>
- #include <sys/ioctl.h>
- #include <sys/resource.h>
---- a/src/core/namespace.c
-+++ b/src/core/namespace.c
-@@ -7,7 +7,9 @@
- #include <sys/file.h>
- #include <sys/mount.h>
- #include <unistd.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
-
- #include "alloc-util.h"
- #include "base-filesystem.h"
---- a/src/shared/mount-util.c
-+++ b/src/shared/mount-util.c
-@@ -7,7 +7,9 @@
- #include <sys/statvfs.h>
- #include <unistd.h>
- #include <linux/loop.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
-
- #include "alloc-util.h"
- #include "chase-symlinks.h"
-
-From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 26 Jul 2022 20:03:12 +0900
-Subject: [PATCH] home: drop conflicted headers
-
-Fixes #24117.
---- a/src/basic/missing_fs.h
-+++ b/src/basic/missing_fs.h
-@@ -64,3 +64,8 @@
- #ifndef FS_PROJINHERIT_FL
- #define FS_PROJINHERIT_FL 0x20000000
- #endif
-+
-+/* linux/fscrypt.h */
-+#ifndef FS_KEY_DESCRIPTOR_SIZE
-+#define FS_KEY_DESCRIPTOR_SIZE 8
-+#endif
---- a/src/home/homework-cifs.c
-+++ b/src/home/homework-cifs.c
-@@ -1,5 +1,10 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-+#include <sys/mount.h>
-+#if WANT_LINUX_FS_H
-+#include <linux/fs.h>
-+#endif
-+
- #include "dirent-util.h"
- #include "fd-util.h"
- #include "fileio.h"
---- a/src/home/homework-luks.c
-+++ b/src/home/homework-luks.c
-@@ -4,7 +4,6 @@
- #include <poll.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/xattr.h>
-
- #if HAVE_VALGRIND_MEMCHECK_H
---- a/src/home/homework-mount.c
-+++ b/src/home/homework-mount.c
-@@ -2,7 +2,9 @@
-
- #include <sched.h>
- #include <sys/mount.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
-
- #include "alloc-util.h"
- #include "fd-util.h"
---- a/src/home/homework.h
-+++ b/src/home/homework.h
-@@ -1,13 +1,14 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
-
--#include <linux/fs.h>
- #include <sys/vfs.h>
-
- #include "sd-id128.h"
-
-+#include "cryptsetup-util.h"
- #include "homework-password-cache.h"
- #include "loop-util.h"
-+#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
- #include "missing_keyctl.h"
- #include "missing_syscall.h"
- #include "user-record.h"
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2023-01-01 18:16 Conrad Kostecki
0 siblings, 0 replies; 24+ messages in thread
From: Conrad Kostecki @ 2023-01-01 18:16 UTC (permalink / raw
To: gentoo-commits
commit: ef3b51926ede813b240e807911eef302ac0c4fdb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan 1 13:43:19 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 18:16:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3b5192
sys-apps/systemd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28917
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-apps/systemd/files/251-meson-0.64.patch | 26 --------------
.../files/251-revert-fortify-source-3-fix.patch | 40 ----------------------
2 files changed, 66 deletions(-)
diff --git a/sys-apps/systemd/files/251-meson-0.64.patch b/sys-apps/systemd/files/251-meson-0.64.patch
deleted file mode 100644
index 6cc200bbd87d..000000000000
--- a/sys-apps/systemd/files/251-meson-0.64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001
-From: Jan Janssen <medhefgo@web.de>
-Date: Sun, 9 Oct 2022 17:16:12 +0200
-Subject: [PATCH] meson: Fix build with --optimization=plain
-
-Note that -O0 is deliberately filtered out as we have to compile with at
-least -O1 due to #24202.
-
-Fixes: #24323
----
- src/boot/efi/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
-index e0cd4ebad993..395386d3eda7 100644
---- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -223,7 +223,7 @@ endif
- if get_option('debug') and get_option('mode') == 'developer'
- efi_cflags += ['-ggdb', '-DEFI_DEBUG']
- endif
--if get_option('optimization') != '0'
-+if get_option('optimization') in ['1', '2', '3', 's', 'g']
- efi_cflags += ['-O' + get_option('optimization')]
- endif
- if get_option('b_ndebug') == 'true' or (
diff --git a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
deleted file mode 100644
index bbe45f85dcf2..000000000000
--- a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Tue, 24 May 2022 23:21:50 +0100
-Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using
- __builtin_dynamic_object_size."
-
-Breaks Clang (even without F_S=3).
-
-This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64.
-
-Bug: https://bugs.gentoo.org/841770
-Bug: https://github.com/systemd/systemd/issues/23150
---- a/src/basic/alloc-util.h
-+++ b/src/basic/alloc-util.h
-@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
- * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the
- * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of
- * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by
-- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated
-- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801).
-- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
-+ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the
-+ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory,
-+ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
- * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner
- * case. */
--
--#if defined __has_builtin
--# if __has_builtin(__builtin_dynamic_object_size)
--# define MALLOC_SIZEOF_SAFE(x) \
-- MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0))
--# endif
--#endif
--
--#ifndef MALLOC_SIZEOF_SAFE
- #define MALLOC_SIZEOF_SAFE(x) \
- MIN(malloc_usable_size(x), __builtin_object_size(x, 0))
--#endif
-
- /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items
- * that fit into the specified memory block */
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2023-04-22 18:16 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2023-04-22 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 8b5bf3dc99f129662ae79b3d986e2ed09fc3ce99
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr 22 17:31:15 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 18:16:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5bf3dc
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30706
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/252-tmpfiles-ub.patch | 71 ----------------------------
1 file changed, 71 deletions(-)
diff --git a/sys-apps/systemd/files/252-tmpfiles-ub.patch b/sys-apps/systemd/files/252-tmpfiles-ub.patch
deleted file mode 100644
index df190d500e34..000000000000
--- a/sys-apps/systemd/files/252-tmpfiles-ub.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/systemd/systemd/pull/25957
-https://github.com/systemd/systemd/pull/25959
-https://github.com/systemd/systemd/commit/9f804ab04d566ff745849e1c4ced680a0447cf76
-https://github.com/systemd/systemd/commit/34680637e838415204850f77c93ca6ca219abaf1
-
-From 9f804ab04d566ff745849e1c4ced680a0447cf76 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 6 Jan 2023 10:58:32 +0000
-Subject: [PATCH] tmpfiles: avoid null free() for acl attributes
-
-When built with ACL support, we might be processing a tmpfiles
-entry where there's no cause for us to call parse_acls_from_arg,
-then we get to the end of parse_line without having ever populated
-i.{acl_access, acl_default}.
-
-Then we pass a null pointer into acl_free().
-
-From UBSAN w/ GCC 13.0.0_pre20230101:
-```
-$ systemd-tmpfiles --clean
-/var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44:14: runtime error: applying non-zero offset 18446744073709551608 to null pointer
- #0 0x7f65d868b482 in acl_free /var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44
- #1 0x55fe7e592249 in item_free_contents ../systemd-9999/src/tmpfiles/tmpfiles.c:2855
- #2 0x55fe7e5a347a in parse_line ../systemd-9999/src/tmpfiles/tmpfiles.c:3158
- #3 0x55fe7e5a347a in read_config_file ../systemd-9999/src/tmpfiles/tmpfiles.c:3897
- #4 0x55fe7e590c61 in read_config_files ../systemd-9999/src/tmpfiles/tmpfiles.c:3985
- #5 0x55fe7e590c61 in run ../systemd-9999/src/tmpfiles/tmpfiles.c:4157
- #6 0x55fe7e590c61 in main ../systemd-9999/src/tmpfiles/tmpfiles.c:4218
- #7 0x7f65d7ebe289 (/usr/lib64/libc.so.6+0x23289)
- #8 0x7f65d7ebe344 in __libc_start_main (/usr/lib64/libc.so.6+0x23344)
- #9 0x55fe7e591900 in _start (/usr/bin/systemd-tmpfiles+0x11900)
-```
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -2852,8 +2852,11 @@ static void item_free_contents(Item *i) {
- strv_free(i->xattrs);
-
- #if HAVE_ACL
-- acl_free(i->acl_access);
-- acl_free(i->acl_default);
-+ if (i->acl_access)
-+ acl_free(i->acl_access);
-+
-+ if (i->acl_default)
-+ acl_free(i->acl_default);
- #endif
- }
-
-
-From 34680637e838415204850f77c93ca6ca219abaf1 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 6 Jan 2023 12:30:36 +0100
-Subject: [PATCH] nspawn: guard acl_free() with a NULL check
-
-Inspired by #25957 there's one other place where we don't guard
-acl_free() calls with a NULL check.
-
-Fix that.
---- a/src/nspawn/nspawn-patch-uid.c
-+++ b/src/nspawn/nspawn-patch-uid.c
-@@ -181,7 +181,9 @@ static int patch_acls(int fd, const char *name, const struct stat *st, uid_t shi
-
- if (S_ISDIR(st->st_mode)) {
- acl_free(acl);
-- acl_free(shifted);
-+
-+ if (shifted)
-+ acl_free(shifted);
-
- acl = shifted = NULL;
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2023-05-06 17:55 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2023-05-06 17:55 UTC (permalink / raw
To: gentoo-commits
commit: a8e9327011b10a57500e823acc7de5efa5bbae8d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May 6 14:40:59 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 6 17:54:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e93270
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../gentoo-systemctl-disable-sysv-sync-r1.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch
deleted file mode 100644
index a9d40be4ab77..000000000000
--- a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d9059d2ef1b0d6034267cc8ff44871d0f82f840f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 8 Nov 2020 12:34:11 -0500
-Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts
-
----
- src/systemctl/systemctl-sysv-compat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c
-index 2dca9e480f..5dcf13ba17 100644
---- a/src/systemctl/systemctl-sysv-compat.c
-+++ b/src/systemctl/systemctl-sysv-compat.c
-@@ -111,7 +111,7 @@ int parse_shutdown_time_spec(const char *t, usec_t *ret) {
- int enable_sysv_units(const char *verb, char **args) {
- int r = 0;
-
--#if HAVE_SYSV_COMPAT
-+#if 0
- _cleanup_(lookup_paths_free) LookupPaths paths = {};
- unsigned f = 0;
-
---
-2.29.0
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2023-08-13 17:32 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2023-08-13 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 178b9f06d59faec27afc5d1f6332b576aebef882
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:42:15 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 17:31:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178b9f06
sys-apps/systemd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32297
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/systemd-254-dt_relr.patch | 26 -------
.../systemd/files/systemd-254-tmpfiles-udev.patch | 88 ----------------------
.../files/systemd-254-varlink-allocate-heap.patch | 40 ----------
3 files changed, 154 deletions(-)
diff --git a/sys-apps/systemd/files/systemd-254-dt_relr.patch b/sys-apps/systemd/files/systemd-254-dt_relr.patch
deleted file mode 100644
index 9adfc11c1dd3..000000000000
--- a/sys-apps/systemd/files/systemd-254-dt_relr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/910570
-https://github.com/systemd/systemd/issues/28520
-https://github.com/systemd/systemd/commit/eff91e2f3863f9e176b383e5c54741c64ca7a636
-
-From eff91e2f3863f9e176b383e5c54741c64ca7a636 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Wed, 26 Jul 2023 11:29:57 +0100
-Subject: [PATCH] efi: link with -z nopack-relative-relocs
-
-elf2efi.py cannot handle DT_RELR relocations, so disable it
-if we can
-
-Fixes https://github.com/systemd/systemd/issues/28520
---- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -174,6 +174,10 @@ efi_c_ld_args = [
- '-T' + elf2efi_lds,
- ]
-
-+# On CentOS 8 the nopack-relative-relocs linker flag is not supported, and we get:
-+# /usr/bin/ld.bfd: warning: -z nopack-relative-relocs ignored
-+efi_c_ld_args += cc.get_supported_link_arguments('-Wl,-z,nopack-relative-relocs')
-+
- # efi_c_args is explicitly passed to targets so that they can override distro-provided flags
- # that should not be used for EFI binaries.
- efi_disabled_c_args = cc.get_supported_arguments(
diff --git a/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch b/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch
deleted file mode 100644
index 04dd166310c8..000000000000
--- a/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugs.gentoo.org/911723
-https://github.com/systemd/systemd/issues/28588
-https://github.com/systemd/systemd/issues/28653
-https://github.com/systemd/systemd/pull/28681
-
-(Skipped first commit as it was a revert of https://github.com/systemd/systemd/commit/a3d610998ad3b4c88224fe89a048a84dbceb652b.patc
-which wasn't in 254.)
-
-From 31845ef554877525dc4ff4f25ad11ad805ebf81c Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sat, 5 Aug 2023 04:37:19 +0900
-Subject: [PATCH 2/4] unit: make udev rules take precesence over tmpfiles
-
-Without this change, there are no ordering between udevd and tmpfiles,
-and if tmpfiles is invoked later it may discard the permission set by
-udevd.
-
-Fixes an issue introduced by b42482af904ae0b94a6e4501ec595448f0ba1c06.
-
-Fixes #28588 and #28653.
---- a/units/systemd-udevd.service.in
-+++ b/units/systemd-udevd.service.in
-@@ -12,6 +12,7 @@ Description=Rule-based Manager for Device Events and Files
- Documentation=man:systemd-udevd.service(8) man:udev(7)
- DefaultDependencies=no
- After=systemd-sysusers.service systemd-hwdb-update.service
-+After=systemd-tmpfiles-setup-dev.service
- Before=sysinit.target
- ConditionPathIsReadWrite=/sys
-
-
-From b768379e8b494b025f41946205944a6f3a1a553f Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sat, 5 Aug 2023 04:52:16 +0900
-Subject: [PATCH 3/4] test: add short test for device node permission
-
---- /dev/null
-+++ b/test/units/testsuite-17.00.sh
-@@ -0,0 +1,18 @@
-+#!/usr/bin/env bash
-+# SPDX-License-Identifier: LGPL-2.1-or-later
-+set -ex
-+set -o pipefail
-+
-+# shellcheck source=test/units/util.sh
-+. "$(dirname "$0")"/util.sh
-+
-+# Tests for issue #28588 and #28653.
-+
-+assert_in "systemd-tmpfiles-setup-dev.service" "$(systemctl show --property After --value systemd-udevd.service)"
-+assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup-dev.service)"
-+
-+if [[ -f /dev/vfio/vfio ]]; then
-+ assert_in "crw-rw-rw-" "$(stat --format=%A /dev/vfio/vfio)"
-+fi
-+
-+exit 0
-
-From 23acdb8d0b04d46ecdc88a45594135c321dbfd5b Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sat, 5 Aug 2023 05:03:16 +0900
-Subject: [PATCH 4/4] test: shorten timeout for 'udevadm monitor'
-
-The command should never finish, it is not necessary to wait so long.
---- a/test/units/testsuite-17.10.sh
-+++ b/test/units/testsuite-17.10.sh
-@@ -79,13 +79,13 @@ udevadm info -w /sys/class/net/$netdev
- udevadm info --wait-for-initialization=5 /sys/class/net/$netdev
- udevadm info -h
-
--assert_rc 124 timeout 5 udevadm monitor
--assert_rc 124 timeout 5 udevadm monitor -k
--assert_rc 124 timeout 5 udevadm monitor -u
--assert_rc 124 timeout 5 udevadm monitor -s net
--assert_rc 124 timeout 5 udevadm monitor --subsystem-match net/$netdev
--assert_rc 124 timeout 5 udevadm monitor -t systemd
--assert_rc 124 timeout 5 udevadm monitor --tag-match hello
-+assert_rc 124 timeout 1 udevadm monitor
-+assert_rc 124 timeout 1 udevadm monitor -k
-+assert_rc 124 timeout 1 udevadm monitor -u
-+assert_rc 124 timeout 1 udevadm monitor -s net
-+assert_rc 124 timeout 1 udevadm monitor --subsystem-match net/$netdev
-+assert_rc 124 timeout 1 udevadm monitor -t systemd
-+assert_rc 124 timeout 1 udevadm monitor --tag-match hello
- udevadm monitor -h
-
- udevadm settle
-
diff --git a/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch b/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch
deleted file mode 100644
index 85f306a175f3..000000000000
--- a/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/911583
-https://github.com/systemd/systemd/issues/28635
-https://github.com/systemd/systemd/commit/b456f2266afd839f8817235475e57c38e9d76dc9
-
-From b456f2266afd839f8817235475e57c38e9d76dc9 Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Wed, 2 Aug 2023 14:55:50 +0200
-Subject: [PATCH] varlink: allocate the buffer for varlink FDs on the heap
-
-Since it's ~16K, which might cause issues in environments with limited
-stack space.
-
-Resolves: #28635
---- a/src/shared/varlink.c
-+++ b/src/shared/varlink.c
-@@ -633,7 +633,7 @@ static int varlink_write(Varlink *v) {
- #define VARLINK_FDS_MAX (16U*1024U)
-
- static int varlink_read(Varlink *v) {
-- CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int) * VARLINK_FDS_MAX)) control;
-+ _cleanup_free_ struct cmsghdr *cmsg_fds = NULL;
- struct iovec iov;
- struct msghdr mh;
- size_t rs;
-@@ -690,9 +690,13 @@ static int varlink_read(Varlink *v) {
- mh = (struct msghdr) {
- .msg_iov = &iov,
- .msg_iovlen = 1,
-- .msg_control = &control,
-- .msg_controllen = sizeof(control),
- };
-+
-+ mh.msg_controllen = CMSG_SPACE(sizeof(int) * VARLINK_FDS_MAX);
-+ mh.msg_control = cmsg_fds = malloc(mh.msg_controllen);
-+ if (!cmsg_fds)
-+ return -ENOMEM;
-+
- n = recvmsg_safe(v->fd, &mh, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
- } else {
- bool prefer_read = v->prefer_read_write;
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2023-10-01 7:34 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2023-10-01 7:34 UTC (permalink / raw
To: gentoo-commits
commit: e1c9f2ae2241b347fcc2d262d365583101913887
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 26 18:04:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 07:32:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c9f2ae
sys-apps/systemd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33072
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/systemd-253.5-services-stop.patch | 36 ---
.../systemd-254.1-tmpfiles-setup-dev-early.patch | 252 ---------------------
2 files changed, 288 deletions(-)
diff --git a/sys-apps/systemd/files/systemd-253.5-services-stop.patch b/sys-apps/systemd/files/systemd-253.5-services-stop.patch
deleted file mode 100644
index 5f2c5aa8890d..000000000000
--- a/sys-apps/systemd/files/systemd-253.5-services-stop.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/systemd/systemd-stable/issues/302
-https://github.com/systemd/systemd/pull/28000
-
-From 5f7f82ba625ee48d662c1f0286f44b8b0918d05d Mon Sep 17 00:00:00 2001
-From: msizanoen <msizanoen@qtmlabs.xyz>
-Date: Mon, 12 Jun 2023 10:30:12 +0700
-Subject: [PATCH] Revert "core/service: when resetting PID also reset known
- flag"
-
-This reverts commit ff32060f2ed37b68dc26256b05e2e69013b0ecfe.
-
-This change is incorrect as we don't want to mark the PID as invalid but
-only mark it as dead.
-
-The change in question also breaks user level socket activation for
-`podman.service` as the termination of the main `podman system service`
-process is not properly handled, causing any application accessing the
-socket to hang.
-
-This is because the user-level `podman.service` unit also hosts two
-non-main processes: `rootlessport` and `rootlessport-child` which causes
-the `cgroup_good` check to still succeed.
-
-The original submitter of this commit is recommended to find another
-more correct way to fix the cgroupsv1 issue on CentOS 8.
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -3752,7 +3752,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
- return;
-
- s->main_pid = 0;
-- s->main_pid_known = false;
- exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status);
-
- if (s->main_command) {
-
diff --git a/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch b/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch
deleted file mode 100644
index 77f6e19fe6c8..000000000000
--- a/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-https://github.com/systemd/systemd/pull/28784
-https://bugs.gentoo.org/911723
-
-From bb7f485f4bddd57bbf50739bafa43d127bab59d6 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sat, 12 Aug 2023 07:54:32 +0900
-Subject: [PATCH] units: introduce systemd-tmpfiles-setup-dev-early.service
-
-This makes tmpfiles, sysusers, and udevd invoked in the following order:
-1. systemd-tmpfiles-setup-dev-early.service
- Create device nodes gracefully, that is, create device nodes anyway
- by ignoring unknown users and groups.
-2. systemd-sysusers.service
- Create users and groups, to make later invocations of tmpfiles and
- udevd can resolve necessary users and groups.
-3. systemd-tmpfiles-setup-dev.service
- Adjust owners of previously created device nodes.
-4. systemd-udevd.service
- Process all devices. Especially to make block devices active and can
- be mountable.
-5. systemd-tmpfiles-setup.service
- Setup basic filesystem.
-
-Follow-up for b42482af904ae0b94a6e4501ec595448f0ba1c06.
-
-Fixes #28653.
-Replaces #28681 and #28732.
----
- man/systemd-tmpfiles.xml | 3 +
- test/TEST-17-UDEV/test.sh | 4 ++
- test/units/testsuite-17.00.sh | 57 +++++++++++++++++++
- units/kmod-static-nodes.service.in | 2 +-
- units/meson.build | 5 ++
- units/systemd-sysusers.service | 2 +
- .../systemd-tmpfiles-setup-dev-early.service | 25 ++++++++
- units/systemd-tmpfiles-setup-dev.service | 3 +-
- units/systemd-tmpfiles-setup.service | 2 +-
- 9 files changed, 100 insertions(+), 3 deletions(-)
- create mode 100755 test/units/testsuite-17.00.sh
- create mode 100644 units/systemd-tmpfiles-setup-dev-early.service
-
-diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
-index decd66d5c667..0db2a4b03b46 100644
---- a/man/systemd-tmpfiles.xml
-+++ b/man/systemd-tmpfiles.xml
-@@ -19,6 +19,7 @@
- <refnamediv>
- <refname>systemd-tmpfiles</refname>
- <refname>systemd-tmpfiles-setup.service</refname>
-+ <refname>systemd-tmpfiles-setup-dev-early.service</refname>
- <refname>systemd-tmpfiles-setup-dev.service</refname>
- <refname>systemd-tmpfiles-clean.service</refname>
- <refname>systemd-tmpfiles-clean.timer</refname>
-@@ -35,6 +36,7 @@
-
- <para>System units:
- <literallayout><filename>systemd-tmpfiles-setup.service</filename>
-+<filename>systemd-tmpfiles-setup-dev-early.service</filename>
- <filename>systemd-tmpfiles-setup-dev.service</filename>
- <filename>systemd-tmpfiles-clean.service</filename>
- <filename>systemd-tmpfiles-clean.timer</filename></literallayout></para>
-@@ -64,6 +66,7 @@
- searched for a matching file and the file found that has the highest priority is executed.</para>
-
- <para>System services (<filename>systemd-tmpfiles-setup.service</filename>,
-+ <filename>systemd-tmpfiles-setup-dev-early.service</filename>,
- <filename>systemd-tmpfiles-setup-dev.service</filename>,
- <filename>systemd-tmpfiles-clean.service</filename>) invoke <command>systemd-tmpfiles</command> to create
- system files and to perform system wide cleanup. Those services read administrator-controlled
-diff --git a/test/TEST-17-UDEV/test.sh b/test/TEST-17-UDEV/test.sh
-index 6b8f08fc328a..f7a907549607 100755
---- a/test/TEST-17-UDEV/test.sh
-+++ b/test/TEST-17-UDEV/test.sh
-@@ -8,5 +8,9 @@ TEST_NO_NSPAWN=1
- # shellcheck source=test/test-functions
- . "${TEST_BASE_DIR:?}/test-functions"
-
-+test_append_files() {
-+ instmods snd_seq snd_timer tun
-+ generate_module_dependencies
-+}
-
- do_test "$@"
-diff --git a/test/units/testsuite-17.00.sh b/test/units/testsuite-17.00.sh
-new file mode 100755
-index 000000000000..d2aec60b1326
---- /dev/null
-+++ b/test/units/testsuite-17.00.sh
-@@ -0,0 +1,57 @@
-+#!/usr/bin/env bash
-+# SPDX-License-Identifier: LGPL-2.1-or-later
-+set -ex
-+set -o pipefail
-+
-+# shellcheck source=test/units/util.sh
-+. "$(dirname "$0")"/util.sh
-+
-+# Tests for issue #28588 and #28653.
-+
-+# On boot, services need to be started in the following order:
-+# 1. systemd-tmpfiles-setup-dev-early.service
-+# 2. systemd-sysusers.service
-+# 3. systemd-tmpfiles-setup-dev.service
-+# 4. systemd-udevd.service
-+
-+output="$(systemctl show --property After --value systemd-udevd.service)"
-+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output"
-+assert_in "systemd-sysusers.service" "$output"
-+assert_in "systemd-tmpfiles-setup-dev.service" "$output"
-+
-+output="$(systemctl show --property After --value systemd-tmpfiles-setup-dev.service)"
-+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output"
-+assert_in "systemd-sysusers.service" "$output"
-+
-+output="$(systemctl show --property After --value systemd-sysusers.service)"
-+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output"
-+
-+check_owner_and_mode() {
-+ local dev=${1?}
-+ local user=${2?}
-+ local group=${3?}
-+ local mode=${4:-}
-+
-+ if [[ -e "$dev" ]]; then
-+ assert_in "$user" "$(stat --format=%U "$dev")"
-+ assert_in "$group" "$(stat --format=%G "$dev")"
-+ if [[ -n "$mode" ]]; then
-+ assert_in "$mode" "$(stat --format=%#0a "$dev")"
-+ fi
-+ fi
-+
-+ return 0
-+}
-+
-+# Check owner and access mode specified in static-nodes-permissions.conf
-+check_owner_and_mode /dev/snd/seq root audio 0660
-+check_owner_and_mode /dev/snd/timer root audio 0660
-+check_owner_and_mode /dev/loop-control root disk 0660
-+check_owner_and_mode /dev/net/tun root root 0666
-+check_owner_and_mode /dev/fuse root root 0666
-+check_owner_and_mode /dev/vfio/vfio root root 0666
-+check_owner_and_mode /dev/kvm root kvm
-+check_owner_and_mode /dev/vhost-net root kvm
-+check_owner_and_mode /dev/vhost-vsock root kvm
-+
-+exit 0
-diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index 777e82d16b90..70605d997e0a 100644
---- a/units/kmod-static-nodes.service.in
-+++ b/units/kmod-static-nodes.service.in
-@@ -10,7 +10,7 @@
- [Unit]
- Description=Create List of Static Device Nodes
- DefaultDependencies=no
--Before=sysinit.target systemd-tmpfiles-setup-dev.service
-+Before=sysinit.target systemd-tmpfiles-setup-dev-early.service
- ConditionCapability=CAP_SYS_MODULE
- ConditionFileNotEmpty=/lib/modules/%v/modules.devname
-
-diff --git a/units/meson.build b/units/meson.build
-index 96ad1dc85016..20665e040874 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -544,6 +544,11 @@ units = [
- 'conditions' : ['ENABLE_TMPFILES'],
- 'symlinks' : ['timers.target.wants/'],
- },
-+ {
-+ 'file' : 'systemd-tmpfiles-setup-dev-early.service',
-+ 'conditions' : ['ENABLE_TMPFILES'],
-+ 'symlinks' : ['sysinit.target.wants/'],
-+ },
- {
- 'file' : 'systemd-tmpfiles-setup-dev.service',
- 'conditions' : ['ENABLE_TMPFILES'],
-diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
-index 84fd66de37aa..de6c71a03825 100644
---- a/units/systemd-sysusers.service
-+++ b/units/systemd-sysusers.service
-@@ -16,6 +16,8 @@ ConditionCredential=|sysusers.extra
-
- DefaultDependencies=no
- After=systemd-remount-fs.service
-+After=systemd-tmpfiles-setup-dev-early.service
-+Before=systemd-tmpfiles-setup-dev.service
- Before=sysinit.target systemd-update-done.service
- Conflicts=shutdown.target initrd-switch-root.target
- Before=shutdown.target initrd-switch-root.target
-diff --git a/units/systemd-tmpfiles-setup-dev-early.service b/units/systemd-tmpfiles-setup-dev-early.service
-new file mode 100644
-index 000000000000..0d6f0daaae32
---- /dev/null
-+++ b/units/systemd-tmpfiles-setup-dev-early.service
-@@ -0,0 +1,25 @@
-+# SPDX-License-Identifier: LGPL-2.1-or-later
-+#
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2.1 of the License, or
-+# (at your option) any later version.
-+
-+[Unit]
-+Description=Create Static Device Nodes in /dev gracefully
-+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-+
-+DefaultDependencies=no
-+Before=sysinit.target local-fs-pre.target systemd-udevd.service
-+Wants=local-fs-pre.target
-+Conflicts=shutdown.target initrd-switch-root.target
-+Before=shutdown.target initrd-switch-root.target
-+
-+[Service]
-+Type=oneshot
-+RemainAfterExit=yes
-+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful
-+SuccessExitStatus=DATAERR CANTCREAT
-+ImportCredential=tmpfiles.*
-diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service
-index acaa9510aa60..3016b497493f 100644
---- a/units/systemd-tmpfiles-setup-dev.service
-+++ b/units/systemd-tmpfiles-setup-dev.service
-@@ -12,6 +12,7 @@ Description=Create Static Device Nodes in /dev
- Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-
- DefaultDependencies=no
-+After=systemd-tmpfiles-setup-dev-early.service
- Before=sysinit.target local-fs-pre.target systemd-udevd.service
- Wants=local-fs-pre.target
- Conflicts=shutdown.target initrd-switch-root.target
-@@ -20,6 +21,6 @@ Before=shutdown.target initrd-switch-root.target
- [Service]
- Type=oneshot
- RemainAfterExit=yes
--ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful
-+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
- SuccessExitStatus=DATAERR CANTCREAT
- ImportCredential=tmpfiles.*
-diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
-index 6c5e3de8fd96..6cae32850f4f 100644
---- a/units/systemd-tmpfiles-setup.service
-+++ b/units/systemd-tmpfiles-setup.service
-@@ -21,7 +21,7 @@ RefuseManualStop=yes
- [Service]
- Type=oneshot
- RemainAfterExit=yes
--ExecStart=systemd-tmpfiles --create --remove --boot
-+ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
- SuccessExitStatus=DATAERR CANTCREAT
- ImportCredential=tmpfiles.*
- ImportCredential=login.motd
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2024-04-18 15:19 Mike Gilbert
0 siblings, 0 replies; 24+ messages in thread
From: Mike Gilbert @ 2024-04-18 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 08925ddd173f638b78303c4c958d4c98a41c60d6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 15:17:58 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 15:17:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08925ddd
sys-apps/systemd: update systemd-test-process-util.patch
Insert empty lines to maintain line numbering for subsequent tests.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/files/systemd-test-process-util.patch | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/sys-apps/systemd/files/systemd-test-process-util.patch b/sys-apps/systemd/files/systemd-test-process-util.patch
index ec1a766764ee..92c7eaf29577 100644
--- a/sys-apps/systemd/files/systemd-test-process-util.patch
+++ b/sys-apps/systemd/files/systemd-test-process-util.patch
@@ -1,4 +1,4 @@
-From 1d3404701bf0c27600dd44b2814cd6caffca877a Mon Sep 17 00:00:00 2001
+From c3f91c76af292e3bd2c6e2b12e37de88cf5d7c72 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 18 Apr 2024 00:04:44 -0400
Subject: [PATCH] test-process-util: remove assert that fails under pid-sandbox
@@ -8,23 +8,24 @@ Upstream refuses to fix this.
Bug: https://bugs.gentoo.org/674458
Bug: https://github.com/systemd/systemd/issues/25015
---
- src/test/test-process-util.c | 3 ---
- 1 file changed, 3 deletions(-)
+ src/test/test-process-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
-index c96bd4341b..4009cf96e2 100644
+index c96bd4341b..9ff1bdc082 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
-@@ -92,9 +92,6 @@ static void test_pid_get_comm_one(pid_t pid) {
+@@ -92,8 +92,8 @@ static void test_pid_get_comm_one(pid_t pid) {
assert_se(r >= 0 || r == -EACCES);
log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno);
- if (!detect_container())
- assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1);
--
++
++
+
(void) getenv_for_pid(pid, "PATH", &i);
log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i));
- }
--
2.44.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2024-06-17 22:36 Conrad Kostecki
0 siblings, 0 replies; 24+ messages in thread
From: Conrad Kostecki @ 2024-06-17 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 60dcbb123200782a1538220d3e859381cba8fe04
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May 31 14:08:21 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 22:34:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60dcbb12
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../systemd/files/systemd-254.9-fchmodat2.patch | 255 ---------------------
1 file changed, 255 deletions(-)
diff --git a/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch b/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch
deleted file mode 100644
index 27bdd121aa60..000000000000
--- a/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 3d93b69fa558b33f1f2b52305fa4c2d836789394 Mon Sep 17 00:00:00 2001
-From: Arseny Maslennikov <arseny@altlinux.org>
-Date: Sun, 15 Oct 2023 11:00:00 +0300
-Subject: [PATCH 1/3] basic/missing_syscall: generate defs for `fchmodat2(2)`
-
-We will need this to set seccomp filters on this system call regardless
-of libseccomp or kernel support.
-
-(cherry picked from commit 3677364cc3a2c5429380cfd3a2472e2da87925c4)
----
- src/basic/missing_syscall_def.h | 68 +++++++++++++++++++++++++++++++++
- src/basic/missing_syscalls.py | 1 +
- 2 files changed, 69 insertions(+)
-
-diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h
-index 402fdd00dc..b5beb434db 100644
---- a/src/basic/missing_syscall_def.h
-+++ b/src/basic/missing_syscall_def.h
-@@ -246,6 +246,74 @@ assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range);
- # endif
- #endif
-
-+#ifndef __IGNORE_fchmodat2
-+# if defined(__aarch64__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__alpha__)
-+# define systemd_NR_fchmodat2 562
-+# elif defined(__arc__) || defined(__tilegx__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__arm__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__i386__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__ia64__)
-+# define systemd_NR_fchmodat2 1476
-+# elif defined(__loongarch_lp64)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__m68k__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(_MIPS_SIM)
-+# if _MIPS_SIM == _MIPS_SIM_ABI32
-+# define systemd_NR_fchmodat2 4452
-+# elif _MIPS_SIM == _MIPS_SIM_NABI32
-+# define systemd_NR_fchmodat2 6452
-+# elif _MIPS_SIM == _MIPS_SIM_ABI64
-+# define systemd_NR_fchmodat2 5452
-+# else
-+# error "Unknown MIPS ABI"
-+# endif
-+# elif defined(__hppa__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__powerpc__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__riscv)
-+# if __riscv_xlen == 32
-+# define systemd_NR_fchmodat2 452
-+# elif __riscv_xlen == 64
-+# define systemd_NR_fchmodat2 452
-+# else
-+# error "Unknown RISC-V ABI"
-+# endif
-+# elif defined(__s390__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__sparc__)
-+# define systemd_NR_fchmodat2 452
-+# elif defined(__x86_64__)
-+# if defined(__ILP32__)
-+# define systemd_NR_fchmodat2 (452 | /* __X32_SYSCALL_BIT */ 0x40000000)
-+# else
-+# define systemd_NR_fchmodat2 452
-+# endif
-+# elif !defined(missing_arch_template)
-+# warning "fchmodat2() syscall number is unknown for your architecture"
-+# endif
-+
-+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
-+# if defined __NR_fchmodat2 && __NR_fchmodat2 >= 0
-+# if defined systemd_NR_fchmodat2
-+assert_cc(__NR_fchmodat2 == systemd_NR_fchmodat2);
-+# endif
-+# else
-+# if defined __NR_fchmodat2
-+# undef __NR_fchmodat2
-+# endif
-+# if defined systemd_NR_fchmodat2 && systemd_NR_fchmodat2 >= 0
-+# define __NR_fchmodat2 systemd_NR_fchmodat2
-+# endif
-+# endif
-+#endif
-+
- #ifndef __IGNORE_getrandom
- # if defined(__aarch64__)
- # define systemd_NR_getrandom 278
-diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py
-index 5ccf02adec..00f72dc7a8 100644
---- a/src/basic/missing_syscalls.py
-+++ b/src/basic/missing_syscalls.py
-@@ -9,6 +9,7 @@ SYSCALLS = [
- 'bpf',
- 'close_range',
- 'copy_file_range',
-+ 'fchmodat2',
- 'getrandom',
- 'memfd_create',
- 'mount_setattr',
---
-2.43.0
-
-
-From c1ffd32c642dcadb844b149fcc0c6fe0dbe8a292 Mon Sep 17 00:00:00 2001
-From: Arseny Maslennikov <arseny@altlinux.org>
-Date: Sun, 15 Oct 2023 11:00:00 +0300
-Subject: [PATCH 2/3] seccomp: include `fchmodat2` in `@file-system`
-
-(cherry picked from commit 6e10405aa25fe5e76b740d9ec59730e3f4470c7a)
----
- src/shared/seccomp-util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
-index bd9660cb35..a9c6279b18 100644
---- a/src/shared/seccomp-util.c
-+++ b/src/shared/seccomp-util.c
-@@ -468,6 +468,7 @@ const SyscallFilterSet syscall_filter_sets[_SYSCALL_FILTER_SET_MAX] = {
- "fchdir\0"
- "fchmod\0"
- "fchmodat\0"
-+ "fchmodat2\0"
- "fcntl\0"
- "fcntl64\0"
- "fgetxattr\0"
---
-2.43.0
-
-
-From da6ec29e7f755e14655132b4e0b04f463f40af3e Mon Sep 17 00:00:00 2001
-From: Arseny Maslennikov <arseny@altlinux.org>
-Date: Sun, 15 Oct 2023 11:00:00 +0300
-Subject: [PATCH 3/3] seccomp: also check the mode parameter of `fchmodat2(2)`
-
-If there is no libseccomp support, just ban the entire syscall instead
-so wrappers will fall back to older, supported syscalls.
-Also reflect all of this in `test-seccomp.c`.
-
-(cherry picked from commit 8b45281daa3a87b4b7a3248263cd0ba929d15596)
----
- src/shared/seccomp-util.c | 24 +++++++++++++++++++++++-
- src/test/test-seccomp.c | 28 ++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
-index a9c6279b18..12fd95d95b 100644
---- a/src/shared/seccomp-util.c
-+++ b/src/shared/seccomp-util.c
-@@ -2038,7 +2038,7 @@ int seccomp_protect_hostname(void) {
- static int seccomp_restrict_sxid(scmp_filter_ctx seccomp, mode_t m) {
- /* Checks the mode_t parameter of the following system calls:
- *
-- * → chmod() + fchmod() + fchmodat()
-+ * → chmod() + fchmod() + fchmodat() + fchmodat2()
- * → open() + creat() + openat()
- * → mkdir() + mkdirat()
- * → mknod() + mknodat()
-@@ -2081,6 +2081,28 @@ static int seccomp_restrict_sxid(scmp_filter_ctx seccomp, mode_t m) {
- else
- any = true;
-
-+#if defined(__SNR_fchmodat2)
-+ r = seccomp_rule_add_exact(
-+ seccomp,
-+ SCMP_ACT_ERRNO(EPERM),
-+ SCMP_SYS(fchmodat2),
-+ 1,
-+ SCMP_A2(SCMP_CMP_MASKED_EQ, m, m));
-+#else
-+ /* It looks like this libseccomp does not know about fchmodat2().
-+ * Pretend the fchmodat2() system call is not supported at all,
-+ * regardless of the kernel version. */
-+ r = seccomp_rule_add_exact(
-+ seccomp,
-+ SCMP_ACT_ERRNO(ENOSYS),
-+ __NR_fchmodat2,
-+ 0);
-+#endif
-+ if (r < 0)
-+ log_debug_errno(r, "Failed to add filter for fchmodat2: %m");
-+ else
-+ any = true;
-+
- r = seccomp_rule_add_exact(
- seccomp,
- SCMP_ACT_ERRNO(EPERM),
-diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
-index 2d06098ddd..3a73262a8b 100644
---- a/src/test/test-seccomp.c
-+++ b/src/test/test-seccomp.c
-@@ -21,6 +21,7 @@
- #include "macro.h"
- #include "memory-util.h"
- #include "missing_sched.h"
-+#include "missing_syscall_def.h"
- #include "nsflags.h"
- #include "nulstr-util.h"
- #include "process-util.h"
-@@ -1003,6 +1004,23 @@ static int real_open(const char *path, int flags, mode_t mode) {
- #endif
- }
-
-+static int try_fchmodat2(int dirfd, const char *path, int flags, mode_t mode) {
-+ /* glibc does not provide a direct wrapper for fchmodat2(). Let's hence define our own wrapper for
-+ * testing purposes that calls the real syscall, on architectures and in environments where
-+ * SYS_fchmodat2 is defined. Otherwise, let's just fall back to the glibc fchmodat() call. */
-+
-+#if defined __NR_fchmodat2 && __NR_fchmodat2 >= 0
-+ int r;
-+ r = (int) syscall(__NR_fchmodat2, dirfd, path, flags, mode);
-+ /* The syscall might still be unsupported by kernel or libseccomp. */
-+ if (r < 0 && errno == ENOSYS)
-+ return fchmodat(dirfd, path, flags, mode);
-+ return r;
-+#else
-+ return fchmodat(dirfd, path, flags, mode);
-+#endif
-+}
-+
- TEST(restrict_suid_sgid) {
- pid_t pid;
-
-@@ -1044,6 +1062,11 @@ TEST(restrict_suid_sgid) {
- assert_se(fchmodat(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) >= 0);
- assert_se(fchmodat(AT_FDCWD, path, 0755, 0) >= 0);
-
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISUID, 0) >= 0);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID, 0) >= 0);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) >= 0);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755, 0) >= 0);
-+
- k = real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID);
- k = safe_close(k);
- assert_se(unlink(z) >= 0);
-@@ -1145,6 +1168,11 @@ TEST(restrict_suid_sgid) {
- assert_se(fchmodat(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) < 0 && errno == EPERM);
- assert_se(fchmodat(AT_FDCWD, path, 0755, 0) >= 0);
-
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISUID, 0) < 0 && errno == EPERM);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID, 0) < 0 && errno == EPERM);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) < 0 && errno == EPERM);
-+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755, 0) >= 0);
-+
- assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID) < 0 && errno == EPERM);
- assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISGID) < 0 && errno == EPERM);
- assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID | S_ISGID) < 0 && errno == EPERM);
---
-2.43.0
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
@ 2024-08-20 8:01 Joonas Niilola
0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2024-08-20 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 6b924a9198c23f8627fbb8509e1e95a12879c274
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 22 16:48:44 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 08:01:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b924a91
sys-apps/systemd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/255-install-format-overflow.patch | 43 ----------------------
1 file changed, 43 deletions(-)
diff --git a/sys-apps/systemd/files/255-install-format-overflow.patch b/sys-apps/systemd/files/255-install-format-overflow.patch
deleted file mode 100644
index 3dca7d8e8ec7..000000000000
--- a/sys-apps/systemd/files/255-install-format-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/systemd/systemd-stable/commit/f85d2c6d1023b1fe558142440b1d63c4fc5f7c98
-https://github.com/systemd/systemd/issues/30448
-https://bugs.gentoo.org/916518
-
-From f85d2c6d1023b1fe558142440b1d63c4fc5f7c98 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sat, 24 Feb 2024 12:05:44 +0000
-Subject: [PATCH] install: fix compiler warning about empty directive argument
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On ppc64el with gcc 13.2 on Ubuntu 24.04:
-
-3s In file included from ../src/basic/macro.h:386,
-483s from ../src/basic/alloc-util.h:10,
-483s from ../src/shared/install.c:12:
-483s ../src/shared/install.c: In function ‘install_changes_dump’:
-483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-483s | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-483s ../src/shared/install.c:432:75: note: format string is defined here
-483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-
-(cherry picked from commit 8040fa55a1cbc34dede3205a902095ecd26c21e3)
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes,
- assert(verb || r >= 0);
-
- for (size_t i = 0; i < n_changes; i++) {
-- if (changes[i].type < 0)
-- assert(verb);
- assert(changes[i].path);
-+ /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there
-+ * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used
-+ * too. */
-+ assert(verb || changes[i].type >= 0);
-+ verb = strna(verb);
-
- /* When making changes here, make sure to also change install_error() in dbus-manager.c. */
-
-
^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2024-08-20 8:02 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-29 22:21 [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-08-20 8:01 Joonas Niilola
2024-06-17 22:36 Conrad Kostecki
2024-04-18 15:19 Mike Gilbert
2023-10-01 7:34 Sam James
2023-08-13 17:32 Mike Gilbert
2023-05-06 17:55 Mike Gilbert
2023-04-22 18:16 Mike Gilbert
2023-01-01 18:16 Conrad Kostecki
2022-10-19 18:13 Mike Gilbert
2022-08-04 18:39 Mike Gilbert
2022-07-19 17:10 Conrad Kostecki
2020-03-06 19:20 Mike Gilbert
2019-08-02 20:41 Mike Gilbert
2019-07-10 19:18 Mike Gilbert
2019-06-08 20:44 Mike Gilbert
2018-06-04 15:09 Mike Gilbert
2018-06-04 15:09 Mike Gilbert
2018-05-27 16:11 Aaron Bauman
2018-04-03 18:23 Mike Gilbert
2018-02-13 22:15 Mike Gilbert
2017-12-07 0:18 Mike Gilbert
2017-10-18 18:39 Mike Gilbert
2016-11-04 1:06 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox