gentoo resync : 29.05.2018

6 files changed, 4 insertions, 114 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 19746f21ca25..b92f8da86a73 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,3 @@
-AUX 238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch 865 BLAKE2B e1f0765b2b500f34db613b6d7720e2da02c0f3346768a4053706641c61834e04a483d7ba96dabcf9935c39db3219f4871151ccb0069390afd724be9d8694c89a SHA512 eafe369e6df89cb18122273711395a0d9a624b00c7e5aa0bd872e3241129321110f76cf10fb0e98a02268c36f0bc118870706467c5b41f32eb7e3db4075fcacc
-AUX 238-0002-core-do-not-free-heap-allocated-strings-8391.patch 1664 BLAKE2B 6a3f9ec23b9c28ade566cece1e0b70a5217e3e0881ba9dab6ad3e4d74bc50a0d8b1ec5ff5550da778acb63abbc5467e5690633dd509b42430ff8b485e1645a03 SHA512 1d103a6c033063a2250bb1ef7858f358f49f6ce2d599d94491054afb7808881fd338d24cf8997eafcfb5efeeb564b34c10680bde6079941f41a3ba653d71cafd
-AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688 BLAKE2B 19faeab810419669a6743ebc6a3051b2f5060f6de793a3f7c9c21fce26d395dcad95f6b8aee58fe133d11e2b02e8847d1df4cde30a5dc237f615a8656f823f30 SHA512 075f7d6f20f33f5e0b07ae993853e969e0d54d0a0683302ab1ab7c4047185397f39aaa894cbe4104e75ae65f8944fb5af47e9f8adb1e66c28b152c6d6e863eff
 AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62
 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a
 AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0
@@ -16,6 +13,6 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7b3bf7c6c56b6b02faf3c010af467d09477d7c03efbf58a9511ba4cd2cff3a1e92d0a7f793419d41fe87fb0b5d97 SHA512 ab0bb749a02f9e296d6a4dffc481616bc286127b970122d9d1337cadf3cfe40be44e9f76cf95d0f89d758ef329f4c06bb734643e40f16afca00329b71780449c
-EBUILD systemd-238-r7.ebuild 13143 BLAKE2B a53d102b7007faf0c8b4d200f27dd713fd101e90061ed4e2375d61deac49899c6ed9893eb2c946b96eadb69d2c91dbf302f0b8b98b0c211275fa6323a5f7e268 SHA512 3b6df28916d99e57dcdc35438a9661362d92388a12883ba41ac1ff85d66aec06d9a71d657640ceda6899c69b0387a5a2c1fe6ed7da573125e9463116917b0718
-EBUILD systemd-9999.ebuild 13116 BLAKE2B 7a90220be1694281dbd8ed450125b1fc34dac92b464e8f41aee69a55811cd8a67e721663a11ce7cd51d182652327c56b505056e1b6eec354bf80ed5e1dab2184 SHA512 b03004fbdf6ba83eebac851793419065c389ed3a830c869edd77c7a772629aa5b076b3d1233ae46dc5ab1b407229dcb10442de46d91edc4c8a896e22812559a0
+EBUILD systemd-238-r7.ebuild 13149 BLAKE2B 0d022de012f3356c3212fa58b7a3f06850ff3a556fad82ac07e48d3da95ad3e99a7417d509c32c68ac7bf036f378e2d5e2da8922d824c1e000ddcbf7f0b7a517 SHA512 dbcdff2bc64142faec96b493057f09d1f2d60825c851e1539a5f71508c56b14f206ab59d40450df5f74b0ce05cdea4498a5649b56a6face6111a246b5ccb1f25
+EBUILD systemd-9999.ebuild 13122 BLAKE2B 478c90259a73810bef9d1c81acaa3db7a4bb9b91265ab545821622933dc61c2f7de4460b3d98a6e68967400be101db93292741d4dd116b4a0ca216db728d4e78 SHA512 061994cc6c2783e8b00049f8679592de30d608f1e95032d91150c738583f54acb2ff0e3e1f9573d1b7b50875b58ea499a2ae78eb6b87fe91ffdd84daef088acf
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
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 c39575c62b67..000000000000
--- 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 3ee2527f77d2..000000000000
--- 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 693d67152ea9..000000000000
--- 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
-
diff --git a/sys-apps/systemd/systemd-238-r7.ebuild b/sys-apps/systemd/systemd-238-r7.ebuild
index e65ddd901dd0..52bfc26bf58c 100644
--- a/sys-apps/systemd/systemd-238-r7.ebuild
+++ b/sys-apps/systemd/systemd-238-r7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ia64 ~mips ~ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8112fd15fef7..779db468b79b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )