From 171a011ad3a131671aeb5a98b9e3adf219ad2865 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Apr 2018 17:36:40 +0100 Subject: gentoo resync : 02.04.2018 --- sys-apps/systemd/Manifest | 17 +- .../files/237-0001-networkctl-display-type.patch | 266 ------------ sys-apps/systemd/files/238-initctl.patch | 46 +++ sys-apps/systemd/metadata.xml | 1 - sys-apps/systemd/systemd-233-r6.ebuild | 458 --------------------- sys-apps/systemd/systemd-237-r2.ebuild | 440 -------------------- sys-apps/systemd/systemd-237-r3.ebuild | 442 -------------------- sys-apps/systemd/systemd-238-r1.ebuild | 437 -------------------- sys-apps/systemd/systemd-238-r3.ebuild | 439 ++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 10 +- 10 files changed, 497 insertions(+), 2059 deletions(-) delete mode 100644 sys-apps/systemd/files/237-0001-networkctl-display-type.patch create mode 100644 sys-apps/systemd/files/238-initctl.patch delete mode 100644 sys-apps/systemd/systemd-233-r6.ebuild delete mode 100644 sys-apps/systemd/systemd-237-r2.ebuild delete mode 100644 sys-apps/systemd/systemd-237-r3.ebuild delete mode 100644 sys-apps/systemd/systemd-238-r1.ebuild create mode 100644 sys-apps/systemd/systemd-238-r3.ebuild (limited to 'sys-apps/systemd') diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 66def60a8181..fe8770a04c7f 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,7 +1,7 @@ -AUX 237-0001-networkctl-display-type.patch 9575 BLAKE2B 17b42e55d7f9eb2452d2826bb62a8b2ee4f6655d686c21a0f6471629aef06f171427baa79a24eff910ff8c3dc0a7612fa48fc6df1f4de2c586852e1eb4498c85 SHA512 8378a1c153e92d3fad084c57badfa9bf13faab5e9e6319ab3be387b1c609cce5fcc481776365da2cfabde7c9f7c9f4fe24e280b53c76d5813eceeec800d173f0 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 CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 @@ -10,19 +10,12 @@ AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a -DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 -DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c88a981358b282fe56d43cd432d0ee0c0245e9c13d5460b94d83908b84a382dad3348b999f2356ab3ef2ae2c542a867d SHA512 3081f4cf64542ba64a28fe2eff11d8040af42255eb99b5210db9d583fc4b4360a4a4bb8769a1e43d38474d69ead681974cb98d4605968b38f98fd3d9b40bf211 -DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d -DIST systemd-237-patches-0.tar.gz 74617 BLAKE2B 52750bb08731e9e694a00fedc1e42beb7c6ad7736d3b6567f2ab094d4356506d10ec11e1c4c62623078d647c3314c71c9f141eb7c8628b610fd8a5e818b90ec6 SHA512 a6db99b330585e57c722bb0e692b0d988d5fbfef60c6cc87efbb7b903e55642c2f03bf6cdc80f15da22d0c41b5051387dac23a2f04238331f235154b17f32d1b -DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b +DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25e125768d2bdef072d5fa7830b9ea012d0986380a1cdea8e369e1fffe89ea7657e4d55de2bae0d785ae374796a4e7c64b SHA512 f7e6fb7bf3b5cde2717a9e5dcd779a4595d6185d1ecdad8405a075edbb55b32c2573558f6af119ff50ea0df8eacef12ae7ee710fadd269f83db0985d76eb22dc DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 -EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe7bb53af2ad1b6ee594582f30cb561c6d2e18226f4401c605cf9bcd53290128c7be441cfa6cd60470e313144009d SHA512 53b2e092bc48bc8d2899d9869e77049e9ce0cc6178ac63bb830544ec0a69a3ba5ba29a82a5ba76ab19dd4ce8997b9ae5ffeb3698780fe086ed5a632ff386c1d3 EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6 -EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1 -EBUILD systemd-237-r3.ebuild 13179 BLAKE2B 75470d89f815d0f4b7b17687e418d26c739160cfdc6a106fbc9f4a18c721894c37f5bcb68b1e2c2153e48cef02d88d6268f70d37326f047b4577ea61cbd6781d SHA512 f61e8b07ee2908d470503ffb561bcf2be47a24d98823feca7a9e37655a3d048fe18e761e0e8d949498efc25b47601ffaf6b72b83e62b7e5365b98e759d320b9f -EBUILD systemd-238-r1.ebuild 13177 BLAKE2B b5cc7874441577984d7c2421050263863cbe20d42bc83d16e5fb60f09cb93acec8026f8bf3da5066e9cb5bfdd1efd47226c2fd47513a2d57e2ea68f9926dc05e SHA512 d48031e4d7a2f4a3602db2c4698ac21075d2fa0bf51a1c20b58c13abd3ac2d092674c6763e59981b095ca861f8adccec84171b8d095832214f94fc688c1d65de EBUILD systemd-238-r2.ebuild 13272 BLAKE2B 1f24a5fb90f29640fd52b1c37d67180c733a5fea1a66ae855daaee797b9458bbf42db3fe915b10e0fd90ebfcbfe9cb415fec7d6d4c83cc529e284725b3463cc7 SHA512 537f5053ce876c4b57677768e249be492e1f8b238d96230ddca780ca1ca3785aeda5b61a805703f3efffa7c8e08196fb3022334d2efbb407178440cfae96b451 -EBUILD systemd-9999.ebuild 12971 BLAKE2B c8795664313560342f21b633bbab3ffb2e8fa71ef17a80852f542036ec77d72a3bac3127f9b41234014f4e5378459d5c72a4507bbb6316bcfa6fc8efe0a6f579 SHA512 e04558c65b09dc9303da2d5c8d78b502b992344e4f711548a5d400dd343f09e2ce4c5c072173b5d7616cb63943b8d2cb8176be920985f0be5a923e195ef391fd -MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544 +EBUILD systemd-238-r3.ebuild 13136 BLAKE2B 6b020f91bd932475f372a372fbc1a20975117dd62ee170252b5056b518a2cfa19a7f8182716c64a63c807de82abaaea2bb8a7aba887fd08f207296eaf497f17c SHA512 866e86d1fb97c0f97a7738374633ba8300e287860554d08702f578a7f516505672f638fdd929757425350a2579670d103ab0ec64f2c3246abde25d1c2e6c468b +EBUILD systemd-9999.ebuild 13051 BLAKE2B a90c984afbc9222285c81c878d3dfdf14e17a11492837a54aeea0ea2ba2398b98964fe828368d06db02b9333886909fdaf0fb094966f8e1fc65129ef2092ad34 SHA512 972ec90323cf00581e6cd72fd7b4c7b103f1f922359b0990531fb419a855a319de33bdcaf3283ce7e0831199e9fc4ee1fa1fe2b9eb0308b55e1b4f4cf91eec1b +MISC metadata.xml 1956 BLAKE2B fa955e0f048412ba4b8784a858dde7ec6ba7d0a84897b018f611f6bee0b71db2bcf570873f8e32edada2e126a3cc89d70c3aba00f2f87a2b83508529ecae6618 SHA512 4b4e0a447070c9bf14957b82085ef7c479ddee3d848f8f9a37df791a83344829351e3fbfddc61d35ecf3e9fe0d86e6059d89a3a7d1e50837028b72b2c36a448c diff --git a/sys-apps/systemd/files/237-0001-networkctl-display-type.patch b/sys-apps/systemd/files/237-0001-networkctl-display-type.patch deleted file mode 100644 index e29cf2206aa2..000000000000 --- a/sys-apps/systemd/files/237-0001-networkctl-display-type.patch +++ /dev/null @@ -1,266 +0,0 @@ -From a18461bc7d446f8e130e9276de4397d00059267f Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Mon, 29 Jan 2018 20:58:24 +0100 -Subject: [PATCH 1/4] networkd: display wireguard devtype - -It's not useful to simply show "none", when we have more interesting -information to display. - -Signed-off-by: Jason A. Donenfeld ---- - src/network/networkctl.c | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/src/network/networkctl.c b/src/network/networkctl.c -index 59ce098cd1..6ce00dff6d 100644 ---- a/src/network/networkctl.c -+++ b/src/network/networkctl.c -@@ -62,18 +62,26 @@ static int link_get_type_string(unsigned short iftype, sd_device *d, char **ret) - - assert(ret); - -- if (iftype == ARPHRD_ETHER && d) { -+ if (d) { - const char *devtype = NULL, *id = NULL; -+ -+ (void) sd_device_get_devtype(d, &devtype); -+ - /* WLANs have iftype ARPHRD_ETHER, but we want - * to show a more useful type string for - * them */ -+ if (iftype == ARPHRD_ETHER) { -+ if (streq_ptr(devtype, "wlan")) -+ id = "wlan"; -+ else if (streq_ptr(devtype, "wwan")) -+ id = "wwan"; -+ } - -- (void) sd_device_get_devtype(d, &devtype); -- -- if (streq_ptr(devtype, "wlan")) -- id = "wlan"; -- else if (streq_ptr(devtype, "wwan")) -- id = "wwan"; -+ /* Likewise, WireGuard has iftype ARPHRD_NONE, -+ * since it's layer 3, but we of course want -+ * something more useful than that. */ -+ if (iftype == ARPHRD_NONE && streq_ptr(devtype, "wireguard")) -+ id = "wireguard"; - - if (id) { - p = strdup(id); - -From f119082e7a1ccfbf50c30a99819b6e303cdf09a1 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Mon, 29 Jan 2018 21:01:46 +0100 -Subject: [PATCH 2/4] networkd: simplify and display all devtypes - -Every place the kernel actually calls SET_NETDEV_DEVTYPE, it's adding a -piece of information that looks useful and relevant for us to use. So -let's use it when it's there. - -The previous matching based on the corresponding ARPHRD didn't really -make much sense. The more sensible logic for getting a textual -representation of the link type is to see if the kernel supplies a -devtype. If it does, great. If not, then we can fall back on the ARPHRD, -as before. - -Signed-off-by: Jason A. Donenfeld ---- - src/network/networkctl.c | 23 +++-------------------- - 1 file changed, 3 insertions(+), 20 deletions(-) - -diff --git a/src/network/networkctl.c b/src/network/networkctl.c -index 6ce00dff6d..8a08304240 100644 ---- a/src/network/networkctl.c -+++ b/src/network/networkctl.c -@@ -63,28 +63,11 @@ static int link_get_type_string(unsigned short iftype, sd_device *d, char **ret) - assert(ret); - - if (d) { -- const char *devtype = NULL, *id = NULL; -+ const char *devtype = NULL; - - (void) sd_device_get_devtype(d, &devtype); -- -- /* WLANs have iftype ARPHRD_ETHER, but we want -- * to show a more useful type string for -- * them */ -- if (iftype == ARPHRD_ETHER) { -- if (streq_ptr(devtype, "wlan")) -- id = "wlan"; -- else if (streq_ptr(devtype, "wwan")) -- id = "wwan"; -- } -- -- /* Likewise, WireGuard has iftype ARPHRD_NONE, -- * since it's layer 3, but we of course want -- * something more useful than that. */ -- if (iftype == ARPHRD_NONE && streq_ptr(devtype, "wireguard")) -- id = "wireguard"; -- -- if (id) { -- p = strdup(id); -+ if (!isempty(devtype)) { -+ p = strdup(devtype); - if (!p) - return -ENOMEM; - - -From fdce7817b9a27a370c01b7dd9da6a84fcae1038e Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Mon, 29 Jan 2018 21:05:36 +0100 -Subject: [PATCH 3/4] networkd: clean up link_get_type_string - -The return value is always ignored, so get rid of it. - -Signed-off-by: Jason A. Donenfeld ---- - src/network/networkctl.c | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/src/network/networkctl.c b/src/network/networkctl.c -index 8a08304240..7b33e0db17 100644 ---- a/src/network/networkctl.c -+++ b/src/network/networkctl.c -@@ -56,7 +56,7 @@ static bool arg_no_pager = false; - static bool arg_legend = true; - static bool arg_all = false; - --static int link_get_type_string(unsigned short iftype, sd_device *d, char **ret) { -+static void link_get_type_string(unsigned short iftype, sd_device *d, char **ret) { - const char *t; - char *p; - -@@ -69,27 +69,25 @@ static int link_get_type_string(unsigned short iftype, sd_device *d, char **ret) - if (!isempty(devtype)) { - p = strdup(devtype); - if (!p) -- return -ENOMEM; -+ return; - - *ret = p; -- return 1; -+ return; - } - } - - t = arphrd_to_name(iftype); - if (!t) { - *ret = NULL; -- return 0; -+ return; - } - - p = strdup(t); - if (!p) -- return -ENOMEM; -+ return; - - ascii_strlower(p); - *ret = p; -- -- return 0; - } - - static void operational_state_to_color(const char *state, const char **on, const char **off) { -@@ -314,7 +312,7 @@ static int list_links(int argc, char *argv[], void *userdata) { - xsprintf(devid, "n%i", links[i].ifindex); - (void) sd_device_new_from_device_id(&d, devid); - -- (void) link_get_type_string(links[i].iftype, d, &t); -+ link_get_type_string(links[i].iftype, d, &t); - - printf("%3i %-16s %-18s %s%-11s%s %s%-10s%s\n", - links[i].ifindex, links[i].name, strna(t), -@@ -807,7 +805,7 @@ static int link_status_one( - (void) sd_device_get_property_value(d, "ID_MODEL", &model); - } - -- (void) link_get_type_string(info->iftype, d, &t); -+ link_get_type_string(info->iftype, d, &t); - - (void) sd_network_link_get_network_file(info->ifindex, &network); - - -From b55822c349d3e0559c1efc7475fd0f74cf086453 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Mon, 29 Jan 2018 21:08:39 +0100 -Subject: [PATCH 4/4] networkd: clean up link_get_type_string returns - -It's cleaner and more consistent to actually return what we were -planning on returning. - -Signed-off-by: Jason A. Donenfeld ---- - src/network/networkctl.c | 28 +++++++++------------------- - 1 file changed, 9 insertions(+), 19 deletions(-) - -diff --git a/src/network/networkctl.c b/src/network/networkctl.c -index 7b33e0db17..14d8ecb03f 100644 ---- a/src/network/networkctl.c -+++ b/src/network/networkctl.c -@@ -56,38 +56,28 @@ static bool arg_no_pager = false; - static bool arg_legend = true; - static bool arg_all = false; - --static void link_get_type_string(unsigned short iftype, sd_device *d, char **ret) { -+static char *link_get_type_string(unsigned short iftype, sd_device *d) { - const char *t; - char *p; - -- assert(ret); -- - if (d) { - const char *devtype = NULL; - - (void) sd_device_get_devtype(d, &devtype); -- if (!isempty(devtype)) { -- p = strdup(devtype); -- if (!p) -- return; -- -- *ret = p; -- return; -- } -+ if (!isempty(devtype)) -+ return strdup(devtype); - } - - t = arphrd_to_name(iftype); -- if (!t) { -- *ret = NULL; -- return; -- } -+ if (!t) -+ return NULL; - - p = strdup(t); - if (!p) -- return; -+ return NULL; - - ascii_strlower(p); -- *ret = p; -+ return p; - } - - static void operational_state_to_color(const char *state, const char **on, const char **off) { -@@ -312,7 +302,7 @@ static int list_links(int argc, char *argv[], void *userdata) { - xsprintf(devid, "n%i", links[i].ifindex); - (void) sd_device_new_from_device_id(&d, devid); - -- link_get_type_string(links[i].iftype, d, &t); -+ t = link_get_type_string(links[i].iftype, d); - - printf("%3i %-16s %-18s %s%-11s%s %s%-10s%s\n", - links[i].ifindex, links[i].name, strna(t), -@@ -805,7 +795,7 @@ static int link_status_one( - (void) sd_device_get_property_value(d, "ID_MODEL", &model); - } - -- link_get_type_string(info->iftype, d, &t); -+ t = link_get_type_string(info->iftype, d); - - (void) sd_network_link_get_network_file(info->ifindex, &network); - diff --git a/sys-apps/systemd/files/238-initctl.patch b/sys-apps/systemd/files/238-initctl.patch new file mode 100644 index 000000000000..399916977433 --- /dev/null +++ b/sys-apps/systemd/files/238-initctl.patch @@ -0,0 +1,46 @@ +From 4d8c7c1b3a5feebca948a3b8663f5be887b57731 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 30 Mar 2018 11:00:17 -0400 +Subject: [PATCH] units: initctl: move the fifo to /run/initctl to match + sysvinit + +The fifo location was moved in sysvinit-2.89. + +http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=80dbcf3de3c1b83aeaa713a8fe5b8d35d8649af2 +--- + units/systemd-initctl.service.in | 2 +- + units/systemd-initctl.socket | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in +index 6cfed3da11f..2b4b957dce3 100644 +--- a/units/systemd-initctl.service.in ++++ b/units/systemd-initctl.service.in +@@ -8,7 +8,7 @@ + # (at your option) any later version. + + [Unit] +-Description=/dev/initctl Compatibility Daemon ++Description=initctl Compatibility Daemon + Documentation=man:systemd-initctl.service(8) + DefaultDependencies=no + +diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket +index 61f877ba7d2..9d975799081 100644 +--- a/units/systemd-initctl.socket ++++ b/units/systemd-initctl.socket +@@ -8,12 +8,12 @@ + # (at your option) any later version. + + [Unit] +-Description=/dev/initctl Compatibility Named Pipe ++Description=initctl Compatibility Named Pipe + Documentation=man:systemd-initctl.service(8) + DefaultDependencies=no + Before=sockets.target + + [Socket] +-ListenFIFO=/run/systemd/initctl/fifo ++ListenFIFO=/run/initctl + Symlinks=/dev/initctl + SocketMode=0600 diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index c0dbc0de0126..d2004bef1076 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -13,7 +13,6 @@ Enable support for sys-process/audit Enable support for uploading journals Enable cryptsetup tools (includes unit generator for crypttab) - Generate systemd.index.7 and systemd.directives.7 Enable EFI boot manager and stub loader (built using sys-boot/gnu-efi) Enable coredump stacktraces in the journal Enable sealing of journal files using gcrypt diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild deleted file mode 100644 index 307333c182d6..000000000000 --- a/sys-apps/systemd/systemd-233-r6.ebuild +++ /dev/null @@ -1,458 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz - !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )" - KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http - idn importd +kmod +lz4 lzma nat pam policykit - qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" - -REQUIRED_USE="importd? ( curl gcrypt lzma )" - -MINKV="3.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - !=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - idn? ( net-dns/libidn:0= ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-237-r2.ebuild b/sys-apps/systemd/systemd-237-r2.ebuild deleted file mode 100644 index 06b717f4da45..000000000000 --- a/sys-apps/systemd/systemd-237-r2.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" - -REQUIRED_USE="importd? ( curl gcrypt lzma )" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - !=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - idn? ( - libidn2? ( net-dns/libidn2 ) - !libidn2? ( net-dns/libidn ) - ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) - pcre? ( dev-libs/libpcre2 ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup kvm 78 - enewgroup render - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${EROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-237-r3.ebuild b/sys-apps/systemd/systemd-237-r3.ebuild deleted file mode 100644 index d0254ee71dbe..000000000000 --- a/sys-apps/systemd/systemd-237-r3.ebuild +++ /dev/null @@ -1,442 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" - -REQUIRED_USE="importd? ( curl gcrypt lzma )" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - !=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - idn? ( - libidn2? ( net-dns/libidn2 ) - !libidn2? ( net-dns/libidn ) - ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) - pcre? ( dev-libs/libpcre2 ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup kvm 78 - enewgroup render - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${EROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild deleted file mode 100644 index 2903bb82e515..000000000000 --- a/sys-apps/systemd/systemd-238-r1.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - 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 ~x86" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" - -REQUIRED_USE="importd? ( curl gcrypt lzma )" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - !=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - idn? ( - libidn2? ( net-dns/libidn2 ) - !libidn2? ( net-dns/libidn ) - ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) - pcre? ( dev-libs/libpcre2 ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup kvm 78 - enewgroup render - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${EROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-238-r3.ebuild b/sys-apps/systemd/systemd-238-r3.ebuild new file mode 100644 index 000000000000..b68ed0bf92ab --- /dev/null +++ b/sys-apps/systemd/systemd-238-r3.ebuild @@ -0,0 +1,439 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +PYTHON_COMPAT=( python{3_4,3_5,3_6} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + !=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( + libidn2? ( net-dns/libidn2 ) + !libidn2? ( net-dns/libidn ) + ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + ! "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup kvm 78 + enewgroup render + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-coredump + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 44e359bc511b..560fc8c4f150 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 ~ppc ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi PYTHON_COMPAT=( python{3_4,3_5,3_6} ) @@ -147,11 +147,15 @@ src_unpack() { } src_prepare() { - local PATCHES=( - ) + # Do NOT add patches here + local PATCHES=() [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + # Add local patches here + PATCHES+=( + ) + if ! use vanilla; then PATCHES+=( "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" -- cgit v1.2.3