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?= <[email protected]> -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?= <[email protected]> -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" -
