From 618c3037024b4e5328531cdc07c6ceb7486f5329 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Dec 2017 22:30:36 +0000 Subject: gentoo resync : 31.12.2017 (final resync this year) --- sys-apps/Manifest.gz | Bin 48487 -> 48492 bytes sys-apps/collectl/Manifest | 2 + sys-apps/collectl/collectl-4.3.0.ebuild | 45 +++ sys-apps/systemd/Manifest | 22 +- .../files/218-Dont-enable-audit-by-default.patch | 30 -- sys-apps/systemd/files/228-noclean-tmp.patch | 28 -- sys-apps/systemd/files/233-systemd-user-pam.patch | 16 - sys-apps/systemd/files/234-uucp-group.patch | 11 - sys-apps/systemd/files/236-uucp-group.patch | 11 - sys-apps/systemd/files/generator-path.patch | 27 -- .../gentoo-Dont-enable-audit-by-default.patch | 30 ++ sys-apps/systemd/files/gentoo-generator-path.patch | 27 ++ sys-apps/systemd/files/gentoo-noclean-tmp.patch | 28 ++ .../systemd/files/gentoo-systemd-user-pam.patch | 16 + sys-apps/systemd/files/gentoo-uucp-group-r0.patch | 11 + sys-apps/systemd/files/gentoo-uucp-group-r1.patch | 11 + sys-apps/systemd/systemd-233-r6.ebuild | 6 +- sys-apps/systemd/systemd-235-r1.ebuild | 10 +- sys-apps/systemd/systemd-236-r2.ebuild | 435 -------------------- sys-apps/systemd/systemd-236-r4.ebuild | 437 +++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 12 +- 21 files changed, 633 insertions(+), 582 deletions(-) create mode 100644 sys-apps/collectl/collectl-4.3.0.ebuild delete mode 100644 sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch delete mode 100644 sys-apps/systemd/files/228-noclean-tmp.patch delete mode 100644 sys-apps/systemd/files/233-systemd-user-pam.patch delete mode 100644 sys-apps/systemd/files/234-uucp-group.patch delete mode 100644 sys-apps/systemd/files/236-uucp-group.patch delete mode 100644 sys-apps/systemd/files/generator-path.patch create mode 100644 sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch create mode 100644 sys-apps/systemd/files/gentoo-generator-path.patch create mode 100644 sys-apps/systemd/files/gentoo-noclean-tmp.patch create mode 100644 sys-apps/systemd/files/gentoo-systemd-user-pam.patch create mode 100644 sys-apps/systemd/files/gentoo-uucp-group-r0.patch create mode 100644 sys-apps/systemd/files/gentoo-uucp-group-r1.patch delete mode 100644 sys-apps/systemd/systemd-236-r2.ebuild create mode 100644 sys-apps/systemd/systemd-236-r4.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 1d7f9abffc10..f08fa7b7d64e 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest index 0b87b3d00cda..cef85677cfc3 100644 --- a/sys-apps/collectl/Manifest +++ b/sys-apps/collectl/Manifest @@ -4,9 +4,11 @@ DIST collectl-4.0.5.src.tar.gz 624040 BLAKE2B 83e9c0eff03bc1560aa62e97fd788bb3e2 DIST collectl-4.1.0.src.tar.gz 625147 BLAKE2B 60361e16bdc1ac7619d3e36b12f17f02703266fe43f0c0ec59e89a1a0c8d2ffd5a0eb6bc693fab98fdd14d4d8416865f2520f55026105bfef6697e93627c0d4b SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5 DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474a46593180ef18d1cf346a8d52e6b3f43bd6d0b410fc36dcfd694f2ebfd35b232e6939df319e086897a74679affe57c SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8 DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855 +DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879 EBUILD collectl-3.7.4.ebuild 882 BLAKE2B e63145c55030cfef3971416563849a9f161f0a47f1ac55589ec6a43d7bcc6cf21598252ab07fc2823f5b052162d51bf19c34cf86a540bf6c284351e9e4e2a74a SHA512 2b09dbe7cc358fece6f20d00bef7ed391e0ae6b94ccd6b018dce3c04b7e3c62c7058adcc5dd4fb634a65c536d5b9c26cbdf201e66edcb515328c83f767430814 EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252 +EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622 diff --git a/sys-apps/collectl/collectl-4.3.0.ebuild b/sys-apps/collectl/collectl-4.3.0.ebuild new file mode 100644 index 000000000000..c22ce227a617 --- /dev/null +++ b/sys-apps/collectl/collectl-4.3.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk" +HOMEPAGE="http://collectl.sourceforge.net/" +SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz" + +LICENSE="GPL-2 Artistic" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/perl-5.8.8 + virtual/perl-Time-HiRes + >=dev-perl/Archive-Zip-1.20 + sys-apps/ethtool + sys-apps/pciutils" + +HTML_DOCS="docs/*" + +DOCS=( + README + RELEASE-collectl +) + +src_install() { + dobin collectl colmux + + insinto /etc + doins collectl.conf + + insinto /usr/share/collectl + doins *.ph *.std + + insinto /usr/share/collectl/util + insopts -m755 + doins client.pl + + doman man1/* + einstalldocs + + newinitd "${FILESDIR}"/collectl.initd-2 collectl +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index a66a30fad5e6..90181b2b9cef 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,21 +1,21 @@ -AUX 218-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 -AUX 228-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71 -AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c -AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 -AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 -AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 +AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 +AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 +AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71 +AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c +AUX gentoo-uucp-group-r0.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 +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-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 -DIST systemd-236-patches-0.tar.gz 2545 BLAKE2B 9c5aa8e845726b4324cefa41397b0be283b8583cec4b7ded08b3e8909747015bc55fafd8502eac38c62985d5a8a6364e9d3eb71b68b1950c400bde11c14335d9 SHA512 1951fec7ccb1856c7a893a47c6d1931e60465d71ccb9d5a6ace3595d5a2bea75fa92c89aac2791e4deb2df19e580dec87eb0252ed81ed3b8dd4cdf2ca587cf83 +DIST systemd-236-patches-1.tar.gz 3331 BLAKE2B c4ef8881252e79f920572eb73210b205f36ee2a45aaba4bea5e5e8b2f89b92b79deb8e30a62c9163fd0bb2fbc2215e0dda6ca3388b71e4349a8659591c23064e SHA512 d4c93968d03b5f2f2279b030e65399a7d1971eab4d9be8f2122eab67b1fb7b24eef46993beab8400fc782954dc78f400778c3fff5ba4f6c51a14eeb1931c3862 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d -EBUILD systemd-233-r6.ebuild 13575 BLAKE2B a4d8da1fe7fbc67f679524228512e4bd400573ac144327af395ea82ebfee22f58d30bd2b4407ad2f0ee73f6499289ef2fca57568993e9699849463d6c6a9171c SHA512 848b2868bea39128b1163f3fe1e0ba4ae4533225fe054e81f157970795feedded32d7df145ee834010b65943d4c4407839814f1d540a53c8cf82c4333fe0a2d3 -EBUILD systemd-235-r1.ebuild 13484 BLAKE2B 9a037516042b6d8527b1eb4fd248883112b605563ef01492a3ffd98b39d0e51092656824677d46d13e48c4f36ddf5f1d30e3866821bc93ee2b581caa52b71cdc SHA512 76d568a6a97965d9bf38c5e5409da1db6fedde7186f3cebca5a19cfc5b27ce2d711d99cdadefd92630887d4254e87b0355310bb865c122e958b817dc52d8df37 -EBUILD systemd-236-r2.ebuild 12882 BLAKE2B 3091b2e72f9b340141a7492de9a3bcc632fbbf9d00ef9d401c89be736a83d45046437d4d9484745c97c416b80874038d3441dab5d47d15786689973e05a5461e SHA512 2bb6da515ca51b86d14977f762f624eeffb9416062164eca5466befc3a425b7105b06027e9d80b5e0a1b3e7845501c38502797065f553f561a05fcdb94705d13 -EBUILD systemd-9999.ebuild 12821 BLAKE2B 20927186d7ea6bc4a734e9e15d2536ed13a07ab76d95a6e38ad31d366ff78de1c6a7e84b7082af311392e4b38fc0d9e53ec1e5ea225647d3f5e4b18d4bfa868e SHA512 7b1b08bda5299f584db913893a2d90e66aa08bc9df19343202c8847399813e89782de78ea208a9082155a07194da9c9e360cf24243f0459c13c16680dc3142ec +EBUILD systemd-233-r6.ebuild 13584 BLAKE2B ff12a0a8567efcb2e1946bcee741f7f9812953a486711409d0d264d1b28098dc797ee52b7507ab92dcf5b87d516f698689a39a179e676ea1e29b6a7ba837aac2 SHA512 b9c58ceeb3e02b13a0e4b6c6c58d43f0f9f2fe7e487c47e9b33de6f77e2c6139941ce5204598b745dc746c365ae6119f8b7f8ba022195ae844c237fce6f8f4cc +EBUILD systemd-235-r1.ebuild 13506 BLAKE2B 0cbf4561d133839204ff6a7fbd5d984ef72ba0859977b308a58f0d92ed7dbe01eccb38ef2b66aa1423321f014fece45f90a48d18d68c63cf8e7c76e5c82c2637 SHA512 ebacf9761e113be1f8fdf1d1e54ca95ea6c4f3736942b86d6cfc6d18c792178d5a85611e37db4966296e6044fc5263b27e22d4bc8c73ed991cd6f0c9074aa0a3 +EBUILD systemd-236-r4.ebuild 12977 BLAKE2B 05c987a7da3c1f63a32bb8a3b30611ff307c053986bb7648d9132608d74e714bdfab4682c4b6d3815723444acb727b05fdeef1faeb26e8a70e5b84a4ce81875a SHA512 d95a10baff7d28001a2899cb450f834289c26fb7eaac1d75315f3bc12c40106627214080091c6b6202619fe4be6fa49d3969487a6612920d35453d96ffde6ee7 +EBUILD systemd-9999.ebuild 12916 BLAKE2B 6fc7eafd442dee19f373b3ff1c12fed6be21fe4d32ee4ec3c919b67c7ca4b23e4ac341060230ff78018d6e9416d2d51a98e7494351f5d034d09ebe576fb004dd SHA512 f0d94381647e27cf553f200f3a9e918139107de5277bc40f830627c00bb6a087d4b23cd71e406bf2c1e25851621de74e2c99e1e19cd506cb2378988da738a388 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544 diff --git a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch deleted file mode 100644 index f44b4be85d50..000000000000 --- a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Martin Pitt -Date: Sun, 28 Dec 2014 12:49:35 +0100 -Subject: Don't enable audit by default - -It causes flooding of dmesg and syslog, suppressing actually important -messages. - -Don't enable it for now, until a better solution is found: -http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html - -Bug-Debian: https://bugs.debian.org/773528 ---- - src/journal/journald-audit.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 69742fa..25ef743 100644 ---- a/src/journal/journald-audit.c -+++ b/src/journal/journald-audit.c -@@ -542,10 +542,5 @@ int server_open_audit(Server *s) { - if (r < 0) - return log_error_errno(r, "Failed to add audit fd to event loop: %m"); - -- /* We are listening now, try to enable audit */ -- r = enable_audit(s->audit_fd, true); -- if (r < 0) -- log_warning_errno(r, "Failed to issue audit enable call: %m"); -- - return 0; - } diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch deleted file mode 100644 index 769aa04ccf6e..000000000000 --- a/sys-apps/systemd/files/228-noclean-tmp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 25 Sep 2015 10:26:18 -0400 -Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp - -Bug: https://bugs.gentoo.org/490676 ---- - tmpfiles.d/tmp.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf -index 6bbd1aa..a361062 100644 ---- a/tmpfiles.d/tmp.conf -+++ b/tmpfiles.d/tmp.conf -@@ -8,8 +8,8 @@ - # See tmpfiles.d(5) for details - - # Clear tmp directories separately, to make them easier to override --q /tmp 1777 root root 10d --q /var/tmp 1777 root root 30d -+q /tmp 1777 root root -+q /var/tmp 1777 root root - - # Exclude namespace mountpoints created with PrivateTmp=yes - x /tmp/systemd-private-%b-* --- -2.4.10 - diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch b/sys-apps/systemd/files/233-systemd-user-pam.patch deleted file mode 100644 index eb2223e52f27..000000000000 --- a/sys-apps/systemd/files/233-systemd-user-pam.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/login/systemd-user.m4 -+++ b/src/login/systemd-user.m4 -@@ -2,11 +2,7 @@ - # - # Used by systemd --user instances. - --account required pam_unix.so --m4_ifdef(`HAVE_SELINUX', --session required pam_selinux.so close --session required pam_selinux.so nottys open --)m4_dnl --session required pam_loginuid.so -+account include system-auth -+session include system-auth - session optional pam_keyinit.so force revoke - session optional pam_systemd.so diff --git a/sys-apps/systemd/files/234-uucp-group.patch b/sys-apps/systemd/files/234-uucp-group.patch deleted file mode 100644 index 89cf552c8295..000000000000 --- a/sys-apps/systemd/files/234-uucp-group.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" - diff --git a/sys-apps/systemd/files/236-uucp-group.patch b/sys-apps/systemd/files/236-uucp-group.patch deleted file mode 100644 index 9c53b8b18ab9..000000000000 --- a/sys-apps/systemd/files/236-uucp-group.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" - diff --git a/sys-apps/systemd/files/generator-path.patch b/sys-apps/systemd/files/generator-path.patch deleted file mode 100644 index 6912b481f20b..000000000000 --- a/sys-apps/systemd/files/generator-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Mon, 17 Jul 2017 11:21:25 -0400 -Subject: [PATCH 1/3] path-lookup: look for generators in - {,/usr}/lib/systemd/system-generators - -Bug: https://bugs.gentoo.org/625402 ---- - src/shared/path-lookup.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index e2b3f8b74..1ee0e1cdb 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -821,6 +821,8 @@ char **generator_binary_paths(UnitFileScope scope) { - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", -+ "/usr/lib/systemd/system-generators", -+ "/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH, - NULL); - --- -2.14.0 - diff --git a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch new file mode 100644 index 000000000000..f44b4be85d50 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch @@ -0,0 +1,30 @@ +From: Martin Pitt +Date: Sun, 28 Dec 2014 12:49:35 +0100 +Subject: Don't enable audit by default + +It causes flooding of dmesg and syslog, suppressing actually important +messages. + +Don't enable it for now, until a better solution is found: +http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html + +Bug-Debian: https://bugs.debian.org/773528 +--- + src/journal/journald-audit.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c +index 69742fa..25ef743 100644 +--- a/src/journal/journald-audit.c ++++ b/src/journal/journald-audit.c +@@ -542,10 +542,5 @@ int server_open_audit(Server *s) { + if (r < 0) + return log_error_errno(r, "Failed to add audit fd to event loop: %m"); + +- /* We are listening now, try to enable audit */ +- r = enable_audit(s->audit_fd, true); +- if (r < 0) +- log_warning_errno(r, "Failed to issue audit enable call: %m"); +- + return 0; + } diff --git a/sys-apps/systemd/files/gentoo-generator-path.patch b/sys-apps/systemd/files/gentoo-generator-path.patch new file mode 100644 index 000000000000..6912b481f20b --- /dev/null +++ b/sys-apps/systemd/files/gentoo-generator-path.patch @@ -0,0 +1,27 @@ +From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 17 Jul 2017 11:21:25 -0400 +Subject: [PATCH 1/3] path-lookup: look for generators in + {,/usr}/lib/systemd/system-generators + +Bug: https://bugs.gentoo.org/625402 +--- + src/shared/path-lookup.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index e2b3f8b74..1ee0e1cdb 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -821,6 +821,8 @@ char **generator_binary_paths(UnitFileScope scope) { + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", + "/usr/local/lib/systemd/system-generators", ++ "/usr/lib/systemd/system-generators", ++ "/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH, + NULL); + +-- +2.14.0 + diff --git a/sys-apps/systemd/files/gentoo-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch new file mode 100644 index 000000000000..769aa04ccf6e --- /dev/null +++ b/sys-apps/systemd/files/gentoo-noclean-tmp.patch @@ -0,0 +1,28 @@ +From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 25 Sep 2015 10:26:18 -0400 +Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp + +Bug: https://bugs.gentoo.org/490676 +--- + tmpfiles.d/tmp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index 6bbd1aa..a361062 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,8 +8,8 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++q /tmp 1777 root root ++q /var/tmp 1777 root root + + # Exclude namespace mountpoints created with PrivateTmp=yes + x /tmp/systemd-private-%b-* +-- +2.4.10 + diff --git a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch new file mode 100644 index 000000000000..eb2223e52f27 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch @@ -0,0 +1,16 @@ +--- a/src/login/systemd-user.m4 ++++ b/src/login/systemd-user.m4 +@@ -2,11 +2,7 @@ + # + # Used by systemd --user instances. + +-account required pam_unix.so +-m4_ifdef(`HAVE_SELINUX', +-session required pam_selinux.so close +-session required pam_selinux.so nottys open +-)m4_dnl +-session required pam_loginuid.so ++account include system-auth ++session include system-auth + session optional pam_keyinit.so force revoke + session optional pam_systemd.so diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch new file mode 100644 index 000000000000..89cf552c8295 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch @@ -0,0 +1,11 @@ +--- 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" + diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r1.patch b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch new file mode 100644 index 000000000000..9c53b8b18ab9 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch @@ -0,0 +1,11 @@ +--- 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" + diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild index d735dd02ab98..fded2f5f4a08 100644 --- a/sys-apps/systemd/systemd-233-r6.ebuild +++ b/sys-apps/systemd/systemd-233-r6.ebuild @@ -158,9 +158,9 @@ src_prepare() { if ! use vanilla; then PATCHES+=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/233-systemd-user-pam.patch" + "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" + "${FILESDIR}/gentoo-noclean-tmp.patch" + "${FILESDIR}/gentoo-systemd-user-pam.patch" ) fi diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild index 1175508fe8db..a0800a27a1d6 100644 --- a/sys-apps/systemd/systemd-235-r1.ebuild +++ b/sys-apps/systemd/systemd-235-r1.ebuild @@ -156,11 +156,11 @@ src_prepare() { if ! use vanilla; then PATCHES+=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/233-systemd-user-pam.patch" - "${FILESDIR}/234-uucp-group.patch" - "${FILESDIR}/generator-path.patch" + "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" + "${FILESDIR}/gentoo-noclean-tmp.patch" + "${FILESDIR}/gentoo-systemd-user-pam.patch" + "${FILESDIR}/gentoo-uucp-group-r0.patch" + "${FILESDIR}/gentoo-generator-path.patch" ) fi diff --git a/sys-apps/systemd/systemd-236-r2.ebuild b/sys-apps/systemd/systemd-236-r2.ebuild deleted file mode 100644 index 276c398c8a9a..000000000000 --- a/sys-apps/systemd/systemd-236-r2.ebuild +++ /dev/null @@ -1,435 +0,0 @@ -# Copyright 1999-2017 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-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 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}] ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - selinux? ( sys-libs/libselinux:0= ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - 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] ) - !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 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-236-r4.ebuild b/sys-apps/systemd/systemd-236-r4.ebuild new file mode 100644 index 000000000000..816c66a23733 --- /dev/null +++ b/sys-apps/systemd/systemd-236-r4.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2017 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-1.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 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}] ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) + selinux? ( sys-libs/libselinux:0= ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + 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] ) + !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 f8eb096a861c..7122881b52d1 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -151,11 +151,10 @@ src_prepare() { if ! use vanilla; then PATCHES+=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/233-systemd-user-pam.patch" - "${FILESDIR}/236-uucp-group.patch" - "${FILESDIR}/generator-path.patch" + "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" + "${FILESDIR}/gentoo-systemd-user-pam.patch" + "${FILESDIR}/gentoo-uucp-group-r1.patch" + "${FILESDIR}/gentoo-generator-path.patch" ) fi @@ -204,6 +203,8 @@ multilib_src_configure() { -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps -Defi=$(meson_multilib) -Dima=true @@ -392,6 +393,7 @@ pkg_postinst() { enewgroup input enewgroup kvm 78 + enewgroup render enewgroup systemd-journal newusergroup systemd-bus-proxy newusergroup systemd-coredump -- cgit v1.2.3