gentoo resync : 19.10.2017

2 files changed, 29 insertions, 26 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c3c80ee04b3b..53172a8a8606 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,7 +11,7 @@ AUX 234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch 4075 SHA
 AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 SHA256 7cc3e4098242d9c3bf8db61dc206b38fc54a1128b6870fe2ea213271cd89a472 SHA512 b791f49036981cb6e91d8597e7c0433549208afb661fdbc9631dd66a868cdb0741847bf7188c514179c3a920721568e65f09a38ca9e133ca7226bfad6f4aa1c2 WHIRLPOOL d8837d19fe2b3da2c0149cfc3d958afa05207549056344346520d2fd2fba8c80d2f05a2e883ef45caa26d6ea6c43a433df5222722cd6a9a1967447b8ef08896b
 AUX 234-uucp-group.patch 536 SHA256 b3ef6c7d40d86dfc801ff7839876dcffb299d0b6d5b11fbf081adfe51ee0d8e6 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 WHIRLPOOL dc9bbd2879af33a8ff27e7a13052c51b4ddc1b336bbd58ed0b5e28bb63229acbb355b6316cc58555b12eee8ed2d73ba25ee21286e8e0f429d6760e70dc6de5a4
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 SHA256 a448c39a3d172c03edf4ac303b02251d3c09a9d21c2512ae475c1a92905b97af SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 WHIRLPOOL bd3aeda654fffd90e2b49757f5bdc483284d034a78f134f3c2b1870f11f35d9604d6105b159ff9cd879bb82c57536e363d8bf8cbba1878514cfc894ca009a47f
-AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2414 SHA256 b67d5a0efd02e98d1524355ca16e7c0f39260f8c1907106ae75f11a19498abc9 SHA512 ddd39f42a809250428cef15507c2c5ae9233b28a217effed5cf078851d4358323c20f7b057b26d0872a0e0f93b16841d39745ce3e0ae2ff91f48153ce5457113 WHIRLPOOL 450c518fea75de1cf9f9e23419d32f66061dd47796e07b8298326c65c445358b160ace2fe9d8156bf4c0f1f0a8ebd3cf9f123aefd23d3f2bcc9032d114dbc962
+AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 SHA256 0211aba9502c23e51e154fccdad7712d729caea3869f969313b9dbf08474641a SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 WHIRLPOOL 1f3c1fcc5a161644785aae482d97e2007150d47beae4372fdb30805f291b33e21d2e8e16ea6bc4cc9cf8c0fbd3d8ddfff2504af1e568c519b2398411eca9458e
 AUX generator-path.patch 1046 SHA256 aeb236e19bedc17737ada8953fed61272423b36fd186ffeaff0f14addc488549 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 WHIRLPOOL cbc5eb71fe2f61c95adefca78f29f1acd7ccb7bf9ccb7872326b2c7ed2704f4c856dd7456759c3320496995bef4f94d390b0d5f6d9b2585cb99c4a27faabdf2a
 AUX nsswitch.conf 698 SHA256 56aada9338fad1b105bc5755a85761cab57dc9aba180545be2df0b993b581eb3 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a WHIRLPOOL 160d83a8a136c44d8d4d1fa9c8c321ff792746b6482c29662c93bcab720540591ea95c4c6a68252f024b449360fcdcebf4c78ee0e33be268e8801bede1286200
 DIST systemd-233-man.tar.gz 31386 SHA256 825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 WHIRLPOOL ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159
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 99e7342ffb23..9c11106f6058 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