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 <flop...@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+ssah...@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"
- 

Reply via email to