diff options
Diffstat (limited to 'sys-apps')
117 files changed, 1259 insertions, 3287 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 8f8a7e69673f..89ec6f9a281c 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index 46acb63cd2f6..715d40b98feb 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,3 +1,3 @@ -DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892 -EBUILD acl-2.3.1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922 +DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc +EBUILD acl-2.3.1.ebuild 1346 BLAKE2B 5270fed16c2fadaff921731337936b0827883cc23b55cf06567cbe5bcf2d99db9461870f96a147754afee0e2854342c4aacfafc2a7aabb1b56743f475a3aeca6 SHA512 d058a34c71748ba1fc015eeb585b2221380d7ac532dbf1d8a7750c5e80c997c17ba4cc6f4d16c31a62265e917672b99db32312099debf0ea31a9e4dcd4091019 MISC metadata.xml 294 BLAKE2B f6827801a85f1509d29af1d248c5fa42bed4b445e4af08506afc8851a9777645ced2d5e6960257a421d793dc2c0e92b0cf485c2a855b83789c57e3b5eff0ee1b SHA512 b5a85ca1e4d407937d73ccbe5415e7ae9828ad67ce33455b1ad71e76aabaf9f51807967709c4f4b3b5b51c05181568bc26f9c00f34afa22d749a327f63077a56 diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild index 5ab955ac8363..02c3ea044708 100644 --- a/sys-apps/acl/acl-2.3.1.ebuild +++ b/sys-apps/acl/acl-2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib-minimal usr-ldscript DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index 16b896fe8904..738b891ee07d 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -1,5 +1,5 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8 -DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b -EBUILD attr-2.5.1.ebuild 2488 BLAKE2B 937097787557daf163827410ffa5744d59e1988c6a02eabce1b6fcb6df7e6e42b8dd6a189707372af7e11216234a6d136bb068e54c5f9b322b369b2f1144c63a SHA512 8b62fe97d9169b5ca235140e76dced003867b0f226f932ac6b026470e484bfe08037ed832c36371dae45fc2b84c2d7273b1eac355b529f50ee60b537266c36e5 -EBUILD attr-9999.ebuild 2496 BLAKE2B 86f50f1cfb70b9984adea2ab6072d999d0c37d2d9f7b79d016145c0ee8d8d5517a6cce748e45b27e8008392e0d0eaf9670f6645b332985232f89a45542552c6f SHA512 093175c072ca47791f740cedc8ee0ec06607d31b2ba91bd54bf5e715ca422c48ba08e58ab718814f6717bc9a4dcd05dd932cbc96f8386de93dc95980886d7709 +DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932 +EBUILD attr-2.5.1.ebuild 2488 BLAKE2B a8eede33b92e897bc4a6f4d095c8c9e10883b666436377857c45cb1848fe4193a2dd18d4570df50e961da6b9a5671440dc7b87c3d3e044cf7d570d8fef48648e SHA512 634f7c1180fe5abee1bcd3031209246c17965a7ca84f4a4352953ccca82a38580c470ab9f515b10f36ee1f0d4aa5f67e16e8a26c387a6a0d898f3b24ab22f634 +EBUILD attr-9999.ebuild 2496 BLAKE2B 70cef07eef67e16a6a5797c1fe4d8de1f70e020dfd382c751ac0dd7438c8b356c6bf1c9af3756581391d12cb78a8d1c79e692d97e521d0276f300c75daa5f70a SHA512 08b471eeb09ff42be9e9fde2dc708343e5777a8d69bf84df13d00c115410a2940e14f9ae92463b5e30ee595157eb429edcaaedd45aec724c26e6d99a7bbb97f4 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild index 54825bea2267..3b56e970bec5 100644 --- a/sys-apps/attr/attr-2.5.1.ebuild +++ b/sys-apps/attr/attr-2.5.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" fi DESCRIPTION="Extended attributes tools" diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild index 50b844e8a1e7..d133ed272c1e 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" fi DESCRIPTION="Extended attributes tools" diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest index 44ca029f75d9..3d50ac15deef 100644 --- a/sys-apps/baselayout-prefix/Manifest +++ b/sys-apps/baselayout-prefix/Manifest @@ -6,5 +6,5 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51 -EBUILD baselayout-prefix-2.6-r3.ebuild 11255 BLAKE2B dcd79a6855740262d2c0480123d83155ed818715cef3a5abc871e8bcc2d390d852070c2af52b719eca99298a936a94ba7411695624977d99c648e7d15a108ef7 SHA512 b3611ea3a3faf32e5d97343c25677c184bdfa32b4e0efdf079661b0535aaed5693eabadda490024b62f9df5cd8b91e626ffb9e50be1f565741fa386450eefc17 +EBUILD baselayout-prefix-2.6-r3.ebuild 11262 BLAKE2B 21d9dbe915ec0b68b196e0d9f11e8881601da1d5c0422159bcc3fb75de155919d018da5a3979415ea42cc6c96761ca263076da8e6bb35258ed196a8d13e8d01c SHA512 be93117c26649c1b6ed200be0636fa50d59d92df47017c46fa0e2fc1daa0ec19356245f779561932d5bd57a83ff43d442c2bda22b9167d1e4a934a0b5fc0c5c2 MISC metadata.xml 318 BLAKE2B e4e9554f93f0416e68ed66ece441c6d837122e398981f8d4565ab76d267460cc5a9e0511142bc1c7f65fc07c65e1c348c61c77938395f9ad064471de4e08380f SHA512 63c449f6d3359f4ca3dee70a5f547c9a31dd063852e4f03b3b636430a2a73ef1fb4a400c5f78afb7b1da998815a001f75792461412ec839b9f9822aa64beb873 diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild index 0c5f5bbe14e1..72df7fd7769c 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2" - KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~arm ~arm64 ~ppc64 ~riscv ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi LICENSE="GPL-2" diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest index 5a7a64b14e58..4ccf4be6de25 100644 --- a/sys-apps/ccs-tools/Manifest +++ b/sys-apps/ccs-tools/Manifest @@ -2,5 +2,5 @@ AUX ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch 248 BLAKE2B d148183a08e932088b098 AUX ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch 3747 BLAKE2B f93a7a5bf11a732445eafbf0ce6d5ce2f8c31795911c568735b6967a3be7a69caba924441b5ad84bf5570a9f1253b60a64c88b54cba1544c03130419ee315635 SHA512 3780231c966a0f22dd6e70df9de6d2bd8f7596544b224e1d8bfe79ce6a5bfcf27a154c82f70b5e3f329cf49371beba4e32f98ca1da00063dea791e5fe063842c AUX ccs-tools-1.8.3_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10 DIST ccs-tools-1.8.3-20130214.tar.gz 227657 BLAKE2B 318e3899b85ee322b4391816d642ae855eb7cb03c345725c95e7e01a8e6acb54db900ccdd2f85b6d4ecab5ef40768e80b559979d7b37bf42679a520379d2b56c SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba -EBUILD ccs-tools-1.8.3_p20130214.ebuild 1616 BLAKE2B 0fc1f24b41416b3d83a10e416887e45b44c0166a953340367b08a4281be95098dbd753697b5b407ed81940eaf461327411e22e16280d3b03b3e70f629e2c7eea SHA512 08c8e2fc104a462f242aac9d4ba0cf78b5ab95ea1c0c35d0faa4ad45ef4fb8006dfa548eb3b45455cd60dd29f23b731402f1277ca9f336fbede1089e60e65f76 +EBUILD ccs-tools-1.8.3_p20130214.ebuild 1678 BLAKE2B fdf48df324b9bf0813637e5d5f24e056698c235c0d12d961d5c72616ef2a957bef8d9e19b5c68fbeea4a9b415d7305897caf93cc4cc34de97f509cc20a228d55 SHA512 6546af65eb2d1923100498745bb30b4f13f6f1f88c86b5f8678e9b9f12fad0f48191476b12756fad94ee7627f37336cbb0cee92c49915e1c79a6f1e8922a5d87 MISC metadata.xml 247 BLAKE2B 094fdb53a7aea9a340d96e5a8142e4e414ff80e2871ba3daa8f5f38ef9783a781194d4d55e88a291dd158f8ce1871615007d8b3f909b2041c9328a69659986c4 SHA512 8d046edfd3967c4edc91d357db3a64c9a762c2ee2ea7811d4c9e4049c2ca5eca7a0e7031339c70650b124f65154e98e234eac9749f9d70f7ceb825ecbadadbca diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild index 4e3640cdef0a..545914f17ca3 100644 --- a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild +++ b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit flag-o-matic toolchain-funcs MY_P="${P/_p/-}" DESCRIPTION="TOMOYO Linux tools" -HOMEPAGE="http://tomoyo.sourceforge.jp/" +HOMEPAGE="https://tomoyo.sourceforge.jp/" SRC_URI="mirror://sourceforge.jp/tomoyo/49693/${MY_P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="test" -CDEPEND=" +COMMON_DEPEND=" sys-libs/ncurses:0= sys-libs/readline:0=" -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} sys-apps/which" -DEPEND="${CDEPEND} - virtual/pkgconfig" +DEPEND="${COMMON_DEPEND}" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}"/${P}-warnings.patch "${FILESDIR}"/${P}-ncurses-underlinking.patch @@ -38,6 +37,8 @@ src_prepare() { -e "s:/usr/lib:/usr/$(get_libdir):g" \ -e "s:= /:= ${EPREFIX}/:g" \ Include.make || die + + gunzip usr_share_man/man8/ccs*.8.gz || die } src_configure() { diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest index 90489a6b9f21..9f9ac398937c 100644 --- a/sys-apps/checkpolicy/Manifest +++ b/sys-apps/checkpolicy/Manifest @@ -1,8 +1,6 @@ -DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168 -DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30 -EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035 -EBUILD checkpolicy-3.2.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2 +DIST checkpolicy-3.4-rc1.tar.gz 69829 BLAKE2B 7d217c79b689b8d08a4d16b174ac01bbee48ced7cc0920792a7263f3143f77838ba9f75ce7a3919a7eaa5818ac7ebdd1890a5fdc050680e45341bfe06dec634b SHA512 9aac4bd862f6dcb654cdbc786e0f89f8eccf2f93e6368b3d458a4a15210a558552ffeb64be9daf57bf3309bf74661a4eb6a5a336e64357f6e99bf3b7946d9b45 EBUILD checkpolicy-3.3.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2 -EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b +EBUILD checkpolicy-3.4_rc1.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b +EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc diff --git a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild deleted file mode 100644 index 1b8381709ac8..000000000000 --- a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -MY_P="${P//_/-}" -MY_RELEASEDATE="20200710" - -SEPOL_VER="${PV}" -SEMNG_VER="${PV}" - -DESCRIPTION="SELinux policy compiler" -HOMEPAGE="http://userspace.selinuxproject.org" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER}" -BDEPEND="sys-devel/flex - sys-devel/bison" - -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}" - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - YACC="bison -y" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" -} - -src_install() { - default - - if use debug; then - dobin "${S}/test/dismod" - dobin "${S}/test/dispol" - fi -} - -pkg_postinst() { - if ! tc-is-cross-compiler; then - einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy." - fi -} diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild index bba94c05097a..b699f09c01de 100644 --- a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux policy compiler" HOMEPAGE="http://userspace.selinuxproject.org" @@ -13,8 +16,9 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild index f2cee8075367..b699f09c01de 100644 --- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux policy compiler" HOMEPAGE="http://userspace.selinuxproject.org" @@ -13,8 +16,9 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 3710f19f4bcf..50a76cf7453d 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -5,8 +5,13 @@ AUX coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patc DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 +DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30 +DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f +DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa +DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91 EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c EBUILD coreutils-9.0-r1.ebuild 6067 BLAKE2B 3d35f7334effe9b7f913168d37139d26b96e553eaadd7ae309d4ea525a55632ae6bb9d66947553b6d24f8aea95cdb8913cc1cc1c37e9f12a07003c9951f11924 SHA512 e90e144a12fa05c19bdba824846f6f2e659ebf4bd97725f4d8e7592d8cf2b6c19a5846ccfcfeab78a3c7c117a5533a7b008ae86f506951e96f755fc07e9d22bd -EBUILD coreutils-9.0-r2.ebuild 6170 BLAKE2B 648bd182171162fdc1064939a55f2a8a7a83588c3f01641a744dd75ace3da02a56e0b9717c8f440f7f9bdf1eaa909fa224c0ede65649c4279185b444290de16c SHA512 563c6c3b5ee499aa33c8e8b2853dbb2255f2c0a220510ae8b40fe336abf494a20814f60f0081586f7446c566c92ede7ddecfd835af66a12d137c74d41306b503 +EBUILD coreutils-9.0-r2.ebuild 6543 BLAKE2B d8df4d40534c22482176f488be76b5f5905a527531b812b1eb34cd0a91ef3a4a1bd888676cd70b26e794584ea2d289af889b06bb5ce9775e9c4df39e01d9b2e7 SHA512 dc7cac6990f45cb1556fc59ae4d4fe01b35b701fec64e8d240d093b0771ea196144f148452d5b5d953804a3c126e2918676750c41698c8f3dae73bbb35a6fb54 EBUILD coreutils-9.0.ebuild 5919 BLAKE2B d77953c6649536031894dfb4dc7464c1d23639848dfbed13a86e2a742e9070cbc58058904dbce008555eeeaca9141e058e544645e88707e41f27fd7e9f7e9fa4 SHA512 a7193dec152d0674e4fb4333597694b2063efff6a4d020cc6ce3090f1d65398dc30aa9ef32de9b6cbfc98ec61611f66c3c6eaa1001055838d187088fb1025a17 +EBUILD coreutils-9.1.ebuild 6770 BLAKE2B d8ce51e2ea87aa59fe30d5b3acf9025b6d638515e3bb88ddd8f978b6d2b642f89316bcb20a28d5c48412583cc7eebb93dd38c77d0c0fe8353dd85054f37ef4ac SHA512 14d87a18f95b7f6ad0204a993dcc0c9f41aaa9466f31218f05278099997c6e7e3e06593c124f406e6ce84b1e0c8e5039b889ff86bdcfeeca2f317ccf758e3899 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595 diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild index c8d7eca8e649..e55e9bf82f73 100644 --- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.0-r2.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig PATCH="${PN}-8.30-patches-01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" @@ -14,7 +14,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz !vanilla? ( mirror://gentoo/${PATCH}.tar.xz https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz - )" + ) + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" LICENSE="GPL-3" SLOT="0" @@ -42,6 +43,7 @@ BDEPEND=" dev-util/strace ${PYTHON_DEPS} ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) " RDEPEND+=" hostname? ( !sys-apps/net-tools[hostname] ) @@ -64,6 +66,15 @@ pkg_setup() { fi } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { local PATCHES=( # Upstream patches diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild new file mode 100644 index 000000000000..776a67104587 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.1.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig + +MY_PATCH="${PN}-9.0_p20220409-patches-01" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/" + +if [[ ${PV} == *_p* ]] ; then + # Note: could put this in devspace, but if it's gone, we don't want + # it in tree anyway. It's just for testing. + MY_SNAPSHOT="$(ver_cut 1-2).193-54bec" + SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" + S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +fi + +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) +" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + !<sys-apps/util-linux-2.13 + !<sys-apps/sandbox-2.10-r4 + !sys-apps/stat + !net-mail/base64 + !sys-apps/mktemp + !<app-forensics/tct-1.18-r1 + !<net-fs/netatalk-2.0.3-r4" + +pkg_setup() { + if use test ; then + python-any-r1_pkg_setup + fi +} + +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + +src_prepare() { + local PATCHES=( + # Upstream patches + ) + + if ! use vanilla ; then + PATCHES+=( "${WORKDIR}"/patch ) + fi + + default + + # Since we've patched many .c files, the make process will try to + # re-build the manpages by running `./bin --help`. When doing a + # cross-compile, we can't do that since 'bin' isn't a native bin. + # + # Also, it's not like we changed the usage on any of these things, + # so let's just update the timestamps and skip the help2man step. + set -- man/*.x + touch ${@/%x/1} || die + + # Avoid perl dep for compiled in dircolors default (bug #348642) + if ! has_version dev-lang/perl ; then + touch src/dircolors.h || die + touch ${@/%x/1} || die + fi +} + +src_configure() { + local myconf=( + --with-packager="Gentoo" + --with-packager-version="${PVR} (p${PATCH_VER:-0})" + --with-packager-bug-reports="https://bugs.gentoo.org/" + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools + --enable-install-program="arch,$(usev hostname),$(usev kill)" + --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" + --enable-largefile + $(usex caps '' --disable-libcap) + $(use_enable nls) + $(use_enable acl) + $(use_enable multicall single-binary) + $(use_enable xattr) + $(use_with gmp libgmp) + ) + + if use gmp ; then + myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr ) + fi + + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then + # bug #311569 + export fu_cv_sys_stat_statfs2_bsize=yes + # bug #416629 + export gl_cv_func_realpath_works=yes + fi + + # bug #409919 + export gl_cv_func_mknod_works=yes + + if use static ; then + append-ldflags -static + # bug #321821 + sed -i '/elf_sys=yes/s:yes:no:' configure || die + fi + + if ! use selinux ; then + # bug #301782 + export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no + fi + + econf "${myconf[@]}" +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #439574): + # - tests/du/long-from-unreadable.sh} (bug #413621) + # - tests/rm/deep-2.sh (bug #413621) + # - tests/dd/no-allocate.sh (bug #629660) + if has usersandbox ${FEATURES} ; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + + # Non-root tests will fail if the full path isn't + # accessible to non-root users + chmod -R go-w "${WORKDIR}" || die + chmod a+rx "${WORKDIR}" || die + + # coreutils tests like to do `mount` and such with temp dirs, + # so make sure: + # - /etc/mtab is writable (bug #265725) + # - /dev/loop* can be mounted (bug #269758) + mkdir -p "${T}"/mount-wrappers || die + mkwrap() { + local w ww + for w in "${@}" ; do + ww="${T}/mount-wrappers/${w}" + cat <<-EOF > "${ww}" + #!${EPREFIX}/bin/sh + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" + EOF + chmod a+rx "${ww}" || die + done + } + mkwrap mount umount + + addwrite /dev/full + #export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes +} + +src_install() { + default + + insinto /etc + newins src/dircolors.hin DIR_COLORS + + if use split-usr ; then + cd "${ED}"/usr/bin || die + dodir /bin + + # Move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then + mv hostname ../../bin/ || die + fi + + if use kill ; then + mv kill ../../bin/ || die + fi + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are + # creating symlinks for these in /usr/bin instead of leaving + # the files there in the first place...) + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + fi +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." + ewarn "You should also re-source your shell settings for LS_COLORS" + ewarn " changes, such as: source /etc/profile" +} diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest index 765abd4ea8df..7ae370cdf63f 100644 --- a/sys-apps/diffutils/Manifest +++ b/sys-apps/diffutils/Manifest @@ -1,4 +1,5 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c -EBUILD diffutils-3.8.ebuild 1103 BLAKE2B cce9888b6c90edd28dd2e12cce849380c49e7cddf806e655ed9fc9c6fa8aa17f6a7a437c7c7563c973f22580613ca5fc7586206bda568f7bcb092c4b0e5f9c3b SHA512 914cb7da0b0fafd6ffa245051727cc2862052aedfd44ecaa38a6cb6d866380e48814070de3827b05752b688d82e3647714c96e8daa14084d84450f3b6a1bd12a +DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5 +EBUILD diffutils-3.8.ebuild 1352 BLAKE2B 76944ad0577d45dd3528ec923b5e69a4647ebb08bfe24c10ff2a8711d37b4acaa13ea8cf71c5c82d81d56ed7e131ce4589996945ae456285ca17026ae9f141d0 SHA512 ae3e2d17b091c5011e69aaff57df191caa711fe02c02acb4f79f746997087595ad17fab87d848544c5d52435878d55fcf42e41f47418f34237b508460fbebcf6 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild index 4cae3d13edc4..df2a985392fb 100644 --- a/sys-apps/diffutils/diffutils-3.8.ebuild +++ b/sys-apps/diffutils/diffutils-3.8.ebuild @@ -1,21 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc +inherit flag-o-matic verify-sig DESCRIPTION="Tools to make diffs and compare files" HOMEPAGE="https://www.gnu.org/software/diffutils/" SRC_URI="mirror://gnu/diffutils/${P}.tar.xz - https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz" + https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz + verify-sig? ( + mirror://gnu/diffutils/${P}.tar.xz.sig + https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig + )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls static" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-diffutils )" PATCHES=( "${FILESDIR}/ppc-musl.patch" ) diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest index 443cdcc3ae62..e78c7233cd39 100644 --- a/sys-apps/dog/Manifest +++ b/sys-apps/dog/Manifest @@ -3,5 +3,5 @@ AUX dog-1.7-64bit-goodness.patch 773 BLAKE2B a8fc3e4eae20f3da5d948f4c2d888c7d5fc AUX dog-1.7-check-ctime.diff 1355 BLAKE2B 0cb2b34eba9e28df58cb9f23daaefcd66ddb55ca6fec9bd12d364489abfd47fb85fc6d9bb0d898226d90e4ec203e28b63292d948682684640c1685fcfd6fc4bb SHA512 8892c0ad357ca53dd00e6402dadd1ce05ae52cf6c8eb9745ef1406ab95bd1357558b94d85e0b8eb3a8de7a209e8be9f9e020cc378804f88b180496b294de8b5b AUX dog-1.7-strfry.patch 287 BLAKE2B f4de25adeca6aa533740293f1087b43dced48302a99854878fc5a0acc0cd8b250897894e0e821a5e15f5985d0b12cf498d731f65ba5a7d42b036bb2856c42cd4 SHA512 a00051d4a190c56d08c4cfd2ebc9cf5201dc945043906b9185547b83c478220675a1f99f1fdc6903b0150ae2942868ab951a650ce0104989c702a268077a2513 DIST dog-1.7.tar.gz 30433 BLAKE2B 0708203c2a18f21185ec3684ff477e7b03b41985ca5a9d56d4ad2b45f8d5496e3c2a7e59b7c968c762f04ec268cc23d40da60957f76358fd9084be4998d7f67e SHA512 852373ba988075a47c60c38da0ff3a344f996e6e149d23e1061d6f8fbb0999f32c975c323944375ba758e5663efa57f62c8ff88d46264f72196ea450eacfa4f5 -EBUILD dog-1.7-r6.ebuild 976 BLAKE2B c1f59c607f8a4049d347d9b94c9dfcb248b20bed0190ff0a437a2f92815083aa251c5314e11f5d0930d495d9f38940b7e665909dc740d355f8373c4880db9327 SHA512 571f0744bb0df9d2775486e87d239a4f6ef6fa057cb23fe5080979decfd695ea9e841cde24ea579a3498e9bb8cf23d4669095c76e3e3aa037169b07c2af346d2 +EBUILD dog-1.7-r6.ebuild 939 BLAKE2B 45e988c89600b6280902b6d55f3b0bc73b884c9cbcc915328569f31cc06c5e092b70bb76d361e814b089369b8444921ff0eb779a497f9db46dbb2cf70e83dbde SHA512 3462d8042459462dadfa7d8973e12e08d2b9cbd188788db58c6b5d8837d98e74b4df5f5734b5a8034b797470f04c3541e25c52d8d958cb8da83aff58a9b6bf96 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild index a01706d9785e..41f3a8dde798 100644 --- a/sys-apps/dog/dog-1.7-r6.ebuild +++ b/sys-apps/dog/dog-1.7-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,8 +6,7 @@ EAPI=6 inherit toolchain-funcs DESCRIPTION="Dog is better than cat" -# the best HOMEPAGE we have. -HOMEPAGE="https://packages.gentoo.org/package/sys-apps/dog" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest index 0012e14a024c..da6537782bb6 100644 --- a/sys-apps/ed/Manifest +++ b/sys-apps/ed/Manifest @@ -1,5 +1,6 @@ DIST ed-1.17.tar.xz 68516 BLAKE2B 975e6547f0062dc980bf4490bbbc98e0ac77fc18b2960e18a4c86a6c9190dbd6e1afb155678a1b7d891dc6cb1c5f5c07612365bbf3ffae15bf7575989e4b67d7 SHA512 ebe755ea7d12a7f54379ad8e03b703e9c0dd9aec26b4a79e5014db4368ab2d2926ae094f2ef1aef90cc9b2d541746a81af472578fa44cdf5bfe78aff5882451d DIST ed-1.18.tar.lz 66019 BLAKE2B 9f2b6f00e65dc8a13dd9eba4dfae5ad1e6e3c3ffe623c8b2cc2db78e221ba140595658fd710e4651165a2475a9ed673c9f230fab64f22a7a9488973b5e227198 SHA512 e5dac94697d63fb90cc17e3e653fa56309e9652cc25b2e98a0e21f1ed41e38c48bc33b5fc746275a59e702d1644d3af88f3d82598b482f7309f4e68aab783286 +DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff00722e03dcd890c5c1d1ccc5d99545a6c132a9ccc61b9f8da8f70a94f514db4a417d8c52128be720481a SHA512 f3df77755ac2b47825102b7c6d1774c8aee3f93e0824cebb6d7ea6cda50c1233673ed4c56c4ed135438e993399685cf45616c1fbeb85b2a8501059abe818908d EBUILD ed-1.17.ebuild 989 BLAKE2B 697a8d5dc80ba44a0d3b2fe6f2187f930d5c5d2100113dcb84e037872a5757884c14a38e566c01491dc55a8a0aed4ce41b7da843279c7e1b3221c7703be739c8 SHA512 227498282c7d3f349617e11e6c809e79c8eb20292fe6dc07ea68a388099d82a50f82ec157c88d5fcb704c5302278d4d001795103af5181e9a39f62566b507869 -EBUILD ed-1.18.ebuild 847 BLAKE2B 3cc1f184157b859a36ddcae2bf6a92dbb801cafb77ffb6d8b4842bd8fecdb3beaf75b5ab7c3e263c92b45133bdfd901043a5d482e7c201d6b96ef6718dad24a4 SHA512 87e46b704b837983fad92a065b6c8c1f6e99ba362ea17bedaec6879ce5a11c28c763403cb03e5347f2b5d5991d9d523188824733653470bda4b441955cb78d00 +EBUILD ed-1.18.ebuild 1184 BLAKE2B 616a2b04980d7e0a19aaede72aa06e70a96132dafd28882234e07e1607f4225e1310cf1420572ac88bbca3e1d1eea4020d6e50216cae181c2aa04c00673318c2 SHA512 39c47f9add453aa298c2533d7333d3e03b141ee41ec98f15ba1c9e0d07dd3a3dfd7fcd21e1297b4d29e1a5c396ce11b75c95440ffa2d124f2ab7d90115c6567a MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/ed/ed-1.18.ebuild b/sys-apps/ed/ed-1.18.ebuild index 701bffec7605..b60804cf143c 100644 --- a/sys-apps/ed/ed-1.18.ebuild +++ b/sys-apps/ed/ed-1.18.ebuild @@ -3,23 +3,31 @@ EAPI="7" -inherit toolchain-funcs unpacker +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc +inherit toolchain-funcs unpacker verify-sig MY_P="${PN}-${PV/_/-}" DESCRIPTION="Your basic line editor" HOMEPAGE="https://www.gnu.org/software/ed/" SRC_URI="mirror://gnu/ed/${P}.tar.lz" +SRC_URI+=" verify-sig? ( mirror://gnu/ed/${P}.tar.lz.sig )" S="${WORKDIR}"/${MY_P} LICENSE="GPL-2+" SLOT="0" -if [[ "${PV}" != *_rc* ]] ; then +if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi BDEPEND="sys-apps/texinfo - $(unpacker_src_uri_depends)" + $(unpacker_src_uri_depends) + verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )" + +src_unpack() { + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig} + unpacker "${DISTDIR}"/${P}.tar.lz +} src_configure() { ./configure \ diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest index 8f38dc16d311..6e4c136da05e 100644 --- a/sys-apps/fakeroot/Manifest +++ b/sys-apps/fakeroot/Manifest @@ -2,7 +2,7 @@ AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c246590 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e DIST fakeroot_1.26.orig.tar.gz 549685 BLAKE2B d9177403d9c2be88c0949c891cde5742a405027714b07ca2c7e72813dba049157c3d994f30b9c634016a74c74745f8391ee51035cbf385ef63364d0a31291d43 SHA512 dad193b283b48a25806c5bcd06d1f5bbd183ccd40a3fc25f3e7bb88fd6579024f958321f8336654348a1d0a547d4ad19ed11aab5ec9441d6ef493ee6e4c78081 DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3a9f191a7cf4be32362e1ba97e438413f04ed644532d3a386a46f3a569bf0104c4f38272e5ff46e3705c17896fef972 SHA512 cd98b8cd1064a5a11c6f25bc1d9cb1fb1bf0787f50772fead301470d1769c08a89a1510402b099af334d9f126cea5d3bd5d73e27fb91b5afc1ceebeb9ec3f926 -EBUILD fakeroot-1.25.3-r1.ebuild 1282 BLAKE2B 917531ad83ac0d1c051e6eb18b0edd1b78c01e3484f1de83d185d4d2c89fb406f270f34fa91b850a12ceb27f889106a9a4b0db4c2b1f037ae3fb803f5373acba SHA512 e6997eef6cef00587fd5e1fcd691646984db30aa377e402233559eeeaa3f359c332e6e68e8c90c03fa54b8ddb3b7f00a89fe7f8729f7035b83f773b7e7468b9c -EBUILD fakeroot-1.26-r1.ebuild 1747 BLAKE2B 720316fc8566a2fd9be24cf67c59b940f09f119a44f396a583338476093389bba4ca2842f4c631e0ecf9c69653dcbe44f58552d0ec092ad92a809af99defef65 SHA512 205bef479946cd001814b68faa3b3039ebf7ecab79615bffed70b21527bc267e67ed07c365fd095f5e377e905c32ea71aa6c6b2caeefb35bc9dfeb9ae7fe64e5 -EBUILD fakeroot-1.27.ebuild 1747 BLAKE2B 079580239f82084c77b93fa3fbb38212fe5dacf86d44220ade5fdee72b3f83ededc49c7d1dabbc48e5636c1bff93618693810e1f353676820cb2be17eba44787 SHA512 b21eb8b503e4499bcbc2d815647d2c966e44acf8fcf7571ad3d84b04262ea9d315a311b540b85a59a6ec75f4d734575d47049ed5426f6d3c8781ba37664fdc12 +EBUILD fakeroot-1.25.3-r1.ebuild 1414 BLAKE2B 91a267692babc8b0abbe427e4134da68568b4cb80394d56137e344279f372b652124d42a6f5ac62ee044588ba676a6d31f11a4d239ef67b6476eb7d3490d47f5 SHA512 64abe5083b325ee134758a0b51e25a3371757523317daffcded913024eec4b702d7c886bff4c7780605ef82d1b6ebdc005949b24780c4f3103a25d1cb9a037a6 +EBUILD fakeroot-1.26-r1.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77 +EBUILD fakeroot-1.27.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e diff --git a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild index 1a91280d8313..1089638e5e2d 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,10 @@ src_configure() { use acl || export ac_cv_search_acl_get_fd=no # bug 759568 use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING + # https://bugs.gentoo.org/834445 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270 + filter-flags -fno-semantic-interposition + econf --disable-static } diff --git a/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild index eaea8a55af70..468f9ec15684 100644 --- a/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,6 +47,10 @@ src_configure() { use acl || export ac_cv_search_acl_get_fd=no # bug 759568 use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING + # https://bugs.gentoo.org/834445 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270 + filter-flags -fno-semantic-interposition + econf --disable-static } diff --git a/sys-apps/fakeroot/fakeroot-1.27.ebuild b/sys-apps/fakeroot/fakeroot-1.27.ebuild index d033244f8182..468f9ec15684 100644 --- a/sys-apps/fakeroot/fakeroot-1.27.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.27.ebuild @@ -47,6 +47,10 @@ src_configure() { use acl || export ac_cv_search_acl_get_fd=no # bug 759568 use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING + # https://bugs.gentoo.org/834445 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270 + filter-flags -fno-semantic-interposition + econf --disable-static } diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest index 9b48477e39b7..c2a9463adb47 100644 --- a/sys-apps/findutils/Manifest +++ b/sys-apps/findutils/Manifest @@ -1,6 +1,7 @@ DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9 +DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc EBUILD findutils-4.8.0-r1.ebuild 1846 BLAKE2B 78cc2bbfc0c05c13bcc4772692d15ebe2e0780cb5a5fd8b5689b10777530e9901e8af14688fac6b135ee57d69e4e9ac4f521ccda6d16c1db0d1679db852e8a75 SHA512 a71c349ea7075efc7c4149b917a84ded5b8e0e400f2373aa0b7fdce817593c7db00efd5670bd3acf82b8d01d77f11092fa54300119c2e1bc2ec0e9d6b2805709 EBUILD findutils-4.8.0.ebuild 1784 BLAKE2B ac28cb4d32588549ae9201d665ed03b84eae7ce20f333fa3b952eb404fdf71d4dfb548c2d41a167c729031c2e051f6f69b0f9d45a87738a3b69a70a97f8c5f5a SHA512 d9d2ec21b79b742f411e8d94ad8c5b605fdb1c0113a7885fd0f10acd562d1a1afbb6fd55e9156bcec7920326593b35c4dcb751eeb90bcd95085e767fb255c9c3 -EBUILD findutils-4.9.0.ebuild 1792 BLAKE2B 1ddd424a8a5f39b43fbb8e765790c6f9564185f7d0be51de72e7765b9b4a1e7e501acffbad273ea2a2826df231a26a1ab6445ea409b1ce7671f1d870ecef906b SHA512 a8526fb1e8eae170f41eca686d7f4e3ff8b62b08f8ee2f8b7cf063a53d0cff2ce8bc3dd8f80abab559e5722ccd1a43e83e2fb3b1fb8c452d3a6e222f2cbee3ae +EBUILD findutils-4.9.0.ebuild 1986 BLAKE2B cb01cfd914e660be19e729f34bad8539905b7c6712c251fb428663b144d27495eaa34232e60080fa29243d13d8fb3dfd7fa3fda561d0de1a638c17f9ff94a2dc SHA512 a4fae26e2962a813b9b906d9a75a50cd73793c2e2ebb0e05956610cd236e80902736d13662a9a74da27e89d1d7899b84e5ad382dc6514c6e83d5771be0cfb627 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2 diff --git a/sys-apps/findutils/findutils-4.9.0.ebuild b/sys-apps/findutils/findutils-4.9.0.ebuild index c57ebc1c2ccf..d973a4fbd790 100644 --- a/sys-apps/findutils/findutils-4.9.0.ebuild +++ b/sys-apps/findutils/findutils-4.9.0.ebuild @@ -4,12 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) - -inherit flag-o-matic python-any-r1 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc +inherit flag-o-matic python-any-r1 verify-sig DESCRIPTION="GNU utilities for finding files" HOMEPAGE="https://www.gnu.org/software/findutils/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" @@ -20,11 +21,9 @@ RESTRICT="!test? ( test )" RDEPEND="selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - nls? ( sys-devel/gettext ) -" + test? ( ${PYTHON_DEPS} )" +BDEPEND="nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-findutils )" pkg_setup() { use test && python-any-r1_pkg_setup diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest index 6f92e6ce8246..9cc824f391a6 100644 --- a/sys-apps/fwupd-efi/Manifest +++ b/sys-apps/fwupd-efi/Manifest @@ -1,5 +1,7 @@ DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de +DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48 EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c +EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 3109f7169d322bddd664356c95b22af57d85457ed232c5504ae1be5a3f045fc8ff084e4e2387ad838eb95b38b4a9aa64f78c483e3847dcb4aece7be7b29d68a4 SHA512 ec5da400eb41424ad363f873285b97f4e5dc9959e86e904b6041fbad20ecaf722a81bae9fe0b1ee149e34d975d27af54e1db181a87449ccaed31b3536e2fbd37 MISC metadata.xml 507 BLAKE2B 247253c7682dae9c6423a8f8eb1d11eddf45f33a506bbda2cf4aae002a1bb17ece2dbe63fc1fc9a43ada46d804a9c0155889e52e7aa15427de267b1a7c94bbb7 SHA512 8ef697c8ff7316545d9aa7d00388072ed754e5add441bd05fe6cd8179b26790a3d08b9f00df14b7cc8a53a43b93714a29ce05f187f7906da86a4b320ab36e9a8 diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild new file mode 100644 index 000000000000..936f5457e1d6 --- /dev/null +++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild @@ -0,0 +1,50 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit meson python-any-r1 toolchain-funcs + +DESCRIPTION="EFI executable for fwupd" +HOMEPAGE="https://fwupd.org" + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git" +else + SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig" + +DEPEND="sys-boot/gnu-efi" + +RDEPEND="!<sys-apps/fwupd-1.6.0" + +src_prepare() { + default + + python_fix_shebang "${S}/efi" +} + +src_configure() { + local emesonargs=( + -Defi-cc="$(tc-getCC)" + -Defi-ld="$(tc-getLD)" + -Defi_sbat_distro_id="gentoo" + -Defi_sbat_distro_summary="Gentoo GNU/Linux" + -Defi_sbat_distro_pkgname="${PN}" + -Defi_sbat_distro_version="${PVR}" + -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}" + ) + + meson_src_configure +} diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index de771355ce18..0873db24d20e 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,8 +1,8 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 -DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31 DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b -EBUILD fwupd-1.7.2-r2.ebuild 4613 BLAKE2B 25a272eeeaefa4189652e3c36e2650e7e63411e1425d9638b881eb4212c9d2ff127a1490d75474cd16da39e4c28a6678c3dd15a82544e276de7fc6c490e82f91 SHA512 fb4d755c895bc592bf9332c1832a7be592eab965d370c82be19a05420b8ecb099e60c75f895680570144f1d6293e21aade92fbb681fe78e2471aee68e903c9af +DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2 EBUILD fwupd-1.7.6.ebuild 4691 BLAKE2B c83b7b98d97fecc4696447cd9988620e041a4868c33484fd838f594fd5ba093cee24b8d4808bc26fa07d221293b6d6a8005df90995deb85ba7e2a496a8ba95e4 SHA512 3341d357d1622e65ef810c0c130e2ca42ae9c908d4b9ef73ebb3715498eb8cc3afb343d140423d4f2b6bc954bbaff9dfd1cd98ce5bef038a4c03aefb79941bb5 +EBUILD fwupd-1.7.7-r1.ebuild 4684 BLAKE2B 5dc38d1d040b856211d56fe82cfd3da57e02313d82ba1d41aee6c3fbe17af91c770e461f4e0b45fec53e86830c4103fcc309f459e29c6b71180d91f1279420f1 SHA512 215c70588d4f4b59b98394af472c0a7e3273ba849fa4917811258ea781dcc4a905912ecc63d9d8f6891cf640317635da654c42366b31b8e46049b573d8aad26c MISC metadata.xml 1432 BLAKE2B 02b0b170e7d8ecd293457ed8e1f9fffe2aecb4bb4e1be91869b638445d98c9e5824baf0ef497fe19aced0c1b80d747e7c41643a159edbaf7bca6f845bb5baa18 SHA512 aa650a07d777ba5a3816f6f3fd6ff6fadea149b29a7c1633acec56149de99c072493965724d33d8a76ac0221bb665ee6bf2ddc35f61967798cedbe02f79bcfbb diff --git a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild index 03e200fc2781..9982065f894a 100644 --- a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild +++ b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) @@ -13,8 +13,8 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( elogind minimal systemd ) dell? ( uefi ) @@ -43,19 +43,17 @@ BDEPEND="$(vala_depend) " COMMON_DEPEND="${PYTHON_DEPS} >=app-arch/gcab-1.0 - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 dev-libs/json-glib - dev-libs/libgpg-error dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] $(python_gen_cond_dep ' dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] ') >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl - virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) @@ -66,6 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS} lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) + sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( @@ -89,6 +88,7 @@ DEPEND=" pkg_setup() { python-single-r1_pkg_setup + vala_setup if use nvme ; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -105,19 +105,20 @@ src_prepare() { sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ -i data/builder/meson.build || die - - vala_src_prepare } src_configure() { local plugins=( + -Dplugin_gpio="true" $(meson_use amt plugin_amt) $(meson_use dell plugin_dell) $(meson_use fastboot plugin_fastboot) $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_uf2) $(meson_use logitech plugin_logitech_bulkcontroller) $(meson_use modemmanager plugin_modem_manager) $(meson_use nvme plugin_nvme) + $(meson_use sqlite) $(meson_use spi plugin_intel_spi) $(meson_use synaptics plugin_synaptics_mst) $(meson_use synaptics plugin_synaptics_rmi) diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest index 3bfe54faac24..0531eeb5b289 100644 --- a/sys-apps/gawk/Manifest +++ b/sys-apps/gawk/Manifest @@ -1,6 +1,7 @@ DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4 DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43 +DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd EBUILD gawk-5.1.0.ebuild 2272 BLAKE2B eefcb6bd789cc7681873db57a83d1a9e1b00f4f2bc2b2d7df67252537f87f99436e0922abfb61ceba1ea21e80090d605df726f23ba17a002501f802c9ba2f06b SHA512 9ed71f1ef8e5178df8332d328fb037c39b8f7017a8bd3020867c1210ba26ca6d7272de26b26b5892b6965c21019403754c34864dc0aa7c0ff124e212abc876cf -EBUILD gawk-5.1.1-r1.ebuild 2423 BLAKE2B 1c8150667590bfe692d638a626e24aab4897fafd8b5f7c39081249bb0038f131b11c9db277783637512c752d4b05ab423053decbca8023e9f868e83871f0cd7b SHA512 56a7e680680702a10ccd5ed48662390498183b165ddfda2834798a448d792b60143dd3a10147958531f96472270f55833878bc45b14cefc6fdc1cc6a4ee61cb8 -EBUILD gawk-5.1.1.ebuild 2280 BLAKE2B 32860987ff3cbb1ba0c6bc7c35432a229f1eff36aff50b2ad42a7d39f33c785f30a9ab53a96315ce6aa63f090b062e23d0a6132362004658f07d70655342fa3a SHA512 f847f241617b0368c06d1af0453160b96a22f2afb29d8ae9df1119416935f110a1e9a0bc0c331bd14ccfe85807e8dbcef53d15e2a2a510fee239a02909cd3d6d +EBUILD gawk-5.1.1-r2.ebuild 2719 BLAKE2B abbcc24655e9210e06df90c77ea575d1b43551a4bc4c971161834510545c5e094dfb95d46320dc9e72df5472d1bb228a7688fa0e9c60648b76e8d57078b2d271 SHA512 bc3dea4c2e5ccb055257daa5574f341a062fffdb3c9210a638a511c5780692ab35ab46cd78b98aabc56166484091b9228d5eafd63a6fa5a253723de1cab264e9 +EBUILD gawk-5.1.1.ebuild 2477 BLAKE2B cf11db4d78fd7567f427f195600435b3a2b335371823504a4d6f5d44ae6c282b1ad5a1ef4775f1805c1fba88a257a4c64733c7e5042e4cdc5236a7e4ca6cab54 SHA512 bf9e799650b61b93e349d861a99a58e2ed170b823e5ca224ac8e800224c235e39abf4e1a5aad9ac5d6c023e60fc467a038047ee21c5fd1dc437c5bb8c9fa7161 MISC metadata.xml 348 BLAKE2B dd212d42a4218147703b0dd20699b3040aa7fa6e214d26b7919e7e547a71d4ba22f827aa952952ad97314f90444fb27dbd79da73988f33084c457e1a358b5d1c SHA512 8a6da25157316d3caf69f2a2f68c93d98ba76e89304237b2df04032db39849349c1911e69037da4d8789d8c284792de1071e7eda66e62f2be5523806c6f13223 diff --git a/sys-apps/gawk/gawk-5.1.1-r1.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild index f4bd1b3e5971..fa1f1f7a15af 100644 --- a/sys-apps/gawk/gawk-5.1.1-r1.ebuild +++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild @@ -3,9 +3,14 @@ EAPI=7 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gawk.asc + +inherit verify-sig + DESCRIPTION="GNU awk pattern-matching language" HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" SRC_URI="mirror://gnu/gawk/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" LICENSE="GPL-2" SLOT="0" @@ -24,6 +29,7 @@ BDEPEND=" >=sys-apps/texinfo-6.7 >=sys-devel/bison-3.5.4 nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gawk ) " src_prepare() { @@ -90,6 +96,9 @@ pkg_postinst() { done if ! [[ -e ${EROOT}/bin/awk ]] ; then + # /bin might not exist yet (stage1) + [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die + ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die fi fi diff --git a/sys-apps/gawk/gawk-5.1.1.ebuild b/sys-apps/gawk/gawk-5.1.1.ebuild index 0d846599ecd1..2a78b349bdc1 100644 --- a/sys-apps/gawk/gawk-5.1.1.ebuild +++ b/sys-apps/gawk/gawk-5.1.1.ebuild @@ -1,11 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gawk.asc +inherit verify-sig + DESCRIPTION="GNU awk pattern-matching language" HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" SRC_URI="mirror://gnu/gawk/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" LICENSE="GPL-2" SLOT="0" @@ -22,6 +26,7 @@ BDEPEND=" >=sys-apps/texinfo-6.7 >=sys-devel/bison-3.5.4 nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gawk ) " src_prepare() { diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index 75427e18942c..4b5b168b5999 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -1,9 +1,8 @@ -AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682 AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5a9b4493032845234cf01b326ad17a12e2ffd2a5e27b5a32b13416dbf11c8224cee1b4a10cf0b0dfd2f95adca7faa88f2d712e8 SHA512 d91ce5ec39ed42cb87ac8a986c12ae79c1fe46340965508edb586a8aaad8e72a4227d88ce8e53d73e17d796ecc547d1c41e626bc6f897ee70badb5d74223a940 -DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331 -EBUILD gptfdisk-1.0.6-r2.ebuild 1290 BLAKE2B d6fde27a06ffcedf0b68b708c7bccff19f8f22f25bc107ac3c1714665040e4f4315b3dfcb9291567ba6232f5e07a7864af3d702ae880441b407a2ac480255fd5 SHA512 ed80ab87a3edbab7a88c5ad9a9dcf3095e0b0af584bef5a437015476805781df6ca62e9e74fb8fd99021c1b9dda45e5627b865e77f04b96b9fe73c8127ae65da +DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3 -EBUILD gptfdisk-1.0.8-r1.ebuild 1232 BLAKE2B c276a6d7f23bf6075a3dc4493008bbb43d2dfefdb128273646e6adb732441687d9e811487e8c77c54e609c9517c90855a0a3eba4550fd9c4aaa34efd81a5dcbd SHA512 51341a4dcfc4fe7738022f821da0c29c25031c6fa39328afeba7313e0e493a934bb9656e46ae64d51a9a5872725b5baf2124517d572f87b24f0ac3275b213841 +EBUILD gptfdisk-1.0.8-r1.ebuild 1226 BLAKE2B a2cf4124d04580e997b3b07bcf0a05386fc5ffdd28a1cf23bcadaf298c2baa85a623fc86f3b7fd1e20b385f136025ec3db4b95ca204d2a103d40ec0856b291e2 SHA512 2d5925cbd3b1c951752526bfae8ab5c2b32f67ca50684255e490b46687ee1e5d301f38bd135c6798a5b50193b512c0a61951e3d59a0bc363cdd7c3402b46f399 +EBUILD gptfdisk-1.0.9.ebuild 1232 BLAKE2B f5e5b583fb8449d46e87be7918e4112fa7d419160140bf4203219b84ef9c92d6fc52d48fe54a3b83dbd3763ae0fb7332a4267b60f13e19c3bba7e6031f462988 SHA512 b6d08bd889289a2a16f2bbe1d01430647c0a9ad246bce6217db91b5fe63d86b171114bc53587ab49017d134481d0633b0999b2489e935c5d1bc0a4d6cd7b7b5d MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch deleted file mode 100644 index e60aa9feeffb..000000000000 --- a/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f063fe08e424c99f133df18bf9dce49c851bcb0a Mon Sep 17 00:00:00 2001 -From: Rod Smith <rodsmith@rodsbooks.com> -Date: Mon, 1 Feb 2021 10:19:50 -0500 -Subject: [PATCH] Fix spurious warnings of problems on MBR disks - ---- - NEWS | 7 +++++++ - gpt.cc | 18 +++++++++++++----- - support.h | 2 +- - 3 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/NEWS b/NEWS -index f74bad0..a7131aa 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,10 @@ -+1.0.7 (?/??/2021): -+------------------ -+ -+- Fixed bug that caused spurious warnings about the partition table -+ header claiming an invalid size of partition entries when reading -+ some MBR disks. -+ - 1.0.6 (1/13/2021): - ------------------ - -diff --git a/gpt.cc b/gpt.cc -index 1b4e10f..842dfb1 100644 ---- a/gpt.cc -+++ b/gpt.cc -@@ -1042,11 +1042,19 @@ int GPTData::LoadHeader(struct GPTHeader *header, DiskIO & disk, uint64_t sector - *crcOk = CheckHeaderCRC(&tempHeader); - - if (tempHeader.sizeOfPartitionEntries != sizeof(GPTPart)) { -- cerr << "Warning: Partition table header claims that the size of partition table\n"; -- cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program "; -- cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n"; -- cerr << "Adjusting accordingly, but partition table may be garbage.\n"; -- tempHeader.sizeOfPartitionEntries = sizeof(GPTPart); -+ // Print the below warning only if the CRC is OK -- but correct the -+ // problem either way. The warning is printed only on a valid CRC -+ // because otherwise this warning will display inappropriately when -+ // reading MBR disks. If the CRC is invalid, then a warning about -+ // that will be shown later, so the user will still know that -+ // something is wrong. -+ if (*crcOk) { -+ cerr << "Warning: Partition table header claims that the size of partition table\n"; -+ cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program "; -+ cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n"; -+ cerr << "Adjusting accordingly, but partition table may be garbage.\n"; -+ } -+ tempHeader.sizeOfPartitionEntries = sizeof(GPTPart); - } - - if (allOK && (numParts != tempHeader.numParts) && *crcOk) { -diff --git a/support.h b/support.h -index d87fe9a..e3e1e12 100644 ---- a/support.h -+++ b/support.h -@@ -8,7 +8,7 @@ - #include <stdlib.h> - #include <string> - --#define GPTFDISK_VERSION "1.0.6" -+#define GPTFDISK_VERSION "1.0.6.1" - - #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) - // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 --- -2.30.1 - diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild index 150948967cf2..245535567ce5 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="ncurses static" # libuuid from util-linux is required. diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild index 2861972f8552..62367d7e3bbc 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="ncurses static" # libuuid from util-linux is required. @@ -27,12 +27,8 @@ DEPEND=" ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}.1-spurious_mbr_warnings.patch" -) src_prepare() { default diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 7755756edaa7..01749c17dd08 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,4 +1,5 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82 -EBUILD grep-3.7.ebuild 1795 BLAKE2B 0c2b50cd25e04eb913ffbc4be8b015ed4fb9ea69dad62a3809b7abb4dce6bd0c06f298749f2628b6c23be3a568c59c3aaf34168990ee8abe855318551ba5cc76 SHA512 e1aeda6a167d9d938a7e5001f9592ac619229f92b8b6b99d28a3d33822a30303a01b2bd6117ea71d435292118632291d512ef78aa86a209879e56c101a46d254 +DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4 +EBUILD grep-3.7.ebuild 1983 BLAKE2B a72a43b9908600ea32d2645ceb8ef0d51e42ca43393fc7b6c9f223332729cd35795c69455979f6ae45219bd59eef9d141ad3de315ccb21fd92352e1cc88edd0b SHA512 5300eadef8a792b4e0b255590f8336c6989c51843d56f4e7a064a68d313371eeef8ecc6ff8fe6c5316ab4c50cb8e2020b0eb8e3984ff8d1b632a25bfc9e0f1c3 MISC metadata.xml 335 BLAKE2B 9348d579c8858b0764c9e6edc144183686945cac2a68eead6e5ad83d364d293292ec6ef97bf87ea5c146048757d080e157bf9edf101177a8854d77305d8a9dae SHA512 3ea8b4569cfadab59ecabcf13c25941f9ad0db6c15b0625760339224aa4c82dc99b102c59c858de20d3ab9399db38f47e23d1b360ff86cfba6ede73b548ea7ff diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild index 2a4b293b29e0..4f07cae885f9 100644 --- a/sys-apps/grep/grep-3.7.ebuild +++ b/sys-apps/grep/grep-3.7.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc +inherit flag-o-matic toolchain-funcs verify-sig DESCRIPTION="GNU regular expression matcher" HOMEPAGE="https://www.gnu.org/software/grep/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" @@ -27,7 +29,7 @@ DEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) -" + verify-sig? ( sec-keys/openpgp-keys-grep )" PATCHES=( "${FILESDIR}/ppc-musl.patch" ) diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest index cbc88e54e23d..33e5ca12c99b 100644 --- a/sys-apps/hw-probe/Manifest +++ b/sys-apps/hw-probe/Manifest @@ -1,6 +1,8 @@ AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326 DIST hw-probe-1.6.2.tar.gz 163183 BLAKE2B f9b8d405e59f7799dd665b62362fe8f2b9fe45491d43249ab61ef0fa5ea4d83671ac0dbeef622c68f7c581eef8cd3aa33e6c8bbd46d5488a9c1f4781c820453d SHA512 8a7bf5254f24cc3a1ca19039a00de312f1400f34eaa0459fbff665221940abf60396e5d9e95b4a021e7f5fb9c54254b8c50d0d0b125fc60a0a7f5c7a57edf68c DIST hw-probe-1.6.3.tar.gz 161938 BLAKE2B b4c43846411452a580ec4ea1743d3779fdfcf74636c62be5d66bbebe087a6355141f73b3da500cc36eba4dfba322ce19931cfd7023b395134b2fad940785cbff SHA512 b9898603b3bc15bc9d26be8511e64a776b51c8bfdfa6b62d5ca550d2663df8a7a2e3f423023ad8b221b0bc81ac413266ecd9e5fed618dc9967994523dcc7dd0a +DIST hw-probe-1.6.4.tar.gz 162317 BLAKE2B 5fc5ddf032c6b2504430349089d95be5310a7ac7752a2b6c3c504240dae6572ee773f8360d6449e9122b20de904a7348a2bdc0af660de44f14cf37b16664ef2a SHA512 c812ebdb23f6b8a4df2f2849a29ecc1307c09f758aeb912face6e899510af69f9dee606fb0ff1807a6de1e89a5f7a8b3259b894cc823b9d25efbf26accf60ac4 EBUILD hw-probe-1.6.2.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07 EBUILD hw-probe-1.6.3.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d +EBUILD hw-probe-1.6.4.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b diff --git a/sys-apps/hw-probe/hw-probe-1.6.4.ebuild b/sys-apps/hw-probe/hw-probe-1.6.4.ebuild new file mode 100644 index 000000000000..89965032f4b0 --- /dev/null +++ b/sys-apps/hw-probe/hw-probe-1.6.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature readme.gentoo-r1 + +DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers" +HOMEPAGE="https://github.com/linuxhw/hw-probe/" +SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + dev-lang/perl + dev-perl/Digest-SHA1 + net-misc/curl + sys-apps/dmidecode + sys-apps/edid-decode + sys-apps/hwinfo + sys-apps/pciutils + sys-apps/smartmontools + sys-apps/usbutils + virtual/perl-Data-Dumper +" + +src_compile() { + :; +} + +src_install() { + default + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "showing Machine Check Exceptions." app-admin/mcelog + optfeature "showing additional I/O statistics." app-admin/sysstat + optfeature "showing display data channel (ddc) information." app-misc/ddcutil + optfeature "showing smart card (reader) information." dev-libs/opensc + optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools + optfeature "showing information of attached scanners." media-gfx/sane-backends + optfeature "showing GPU information provided by MESA." media-libs/mesa + optfeature "showing zeroconf statistics." net-dns/avahi + optfeature "showing HP printer statistics." net-print/hplip + optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill + optfeature "showing additional CPU capabilities." sys-apps/cpuid + optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm + optfeature "showing available I2C sensors." sys-apps/i2c-tools + optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi + optfeature "showing information about tested memory for faults." sys-apps/memtester + optfeature "showing 'Plug & Play' devices." sys-apps/pnputils + optfeature "showing systemd boot process information." sys-apps/systemd + optfeature "showing ACPI statistics and tables." sys-power/iasl + optfeature "showing information about NUMA." sys-process/numactl + optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs + optfeature "showing available Xinput devices." x11-apps/xinput +} diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest index 1bb2f8c102c2..ad9c311a7c67 100644 --- a/sys-apps/ipmiutil/Manifest +++ b/sys-apps/ipmiutil/Manifest @@ -11,4 +11,4 @@ EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c EBUILD ipmiutil-3.1.7.ebuild 1657 BLAKE2B d40ba9d2aa612b8ef9c9e52c8d4c702bda5800f8f6042afd6b7f08e862ffc51247a41cff79c43b3595adb887b5ffc809cdb78536b5eda0d030acab1e4efc6099 SHA512 d5fe935fd756afbfda7af92cb84349693bc9f75855b2030d4218ed6336375459e9a3e70cf6320915f05fa694b55d3c3fa1495b965089d03b68e9815ce632f15b -MISC metadata.xml 338 BLAKE2B 40d7beb740ad95ee34fd1dbbb656c7aaaa6e4e888f9b0509c21f9c0b9707de280b66ac4a77a31093787868d841aa2e04c759f09ea1cb8d82cff6b3c72edda706 SHA512 b821a3135b247648a326fd74cd0cb5a79dafbdc83af0e90530f32b8c31b3da90557349dd635d7a45cfde9b4c48477abdd8459e13f3229d3c62d005dcac97f684 +MISC metadata.xml 395 BLAKE2B bbc505300e1bb4a974b8c5f19c43fe9cbfe4300c31a5174adad799cac0d2507e231845ab8f586ca427538b67ad45012aec660692f1a4a134af4e7615467b0ee0 SHA512 170e9a7718037935d373ad84c37f7c87764e30fdb1c2860fa3021021f91dd94adb2d3acb4adfc5cea8d64a7e612340a2286c5a4748f91ed32d603b9c306f3513 diff --git a/sys-apps/ipmiutil/metadata.xml b/sys-apps/ipmiutil/metadata.xml index 285941150bde..27abaae33ec1 100644 --- a/sys-apps/ipmiutil/metadata.xml +++ b/sys-apps/ipmiutil/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">ipmiutil</remote-id> + <remote-id type="github">arcress0/ipmiutil</remote-id> </upstream> </pkgmetadata> diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 5f581b5ef775..1f3a6750409d 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -1,17 +1,10 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242 -AUX iproute2-5.16.0-fix-ax25.h-include-for-musl.patch 630 BLAKE2B df498b4b81c14e16ec364724671b05d396cc2eb812f77525c0d827a69e84be15d257774654c829e8bdf87b8e541ba777e13a6a59fa0602ce36619853a284e5be SHA512 1947608eacb8298ba4c8ccd11ac0cb43b33654eca5126bd84a934cfaaaef38aee9be80d128419b8cb03937ef5f82c4870d5912a2cf99269479e353d31b53061e AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3 -DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d -DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 -DIST iproute2-5.16.0.tar.xz 862504 BLAKE2B 370068ccb02b0f3cb77b662509279872af676f2bdd03b92a01a227ed08d70d8fd0545667a04250c76dbae92ccec094d8b8749e272eb9a0acaccbe421cea6b1d5 SHA512 11ebe1951c97a072d3374d14149e94e44d2f309ff6b00a3f163dae3e174c156ca802ebeeddead069c01ccc6275a65b4396fda78d67144f80cea69297f655de93 DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d -EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889 -EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e -EBUILD iproute2-5.16.0.ebuild 4988 BLAKE2B 6d39aebec3b18e3521a4f7dd430f71133ce51c9d2667f57bd9f48792e4a5dffb3d943d2d3501a545c1c86068e3b79f1e4ebebbd6d69f48d398a039eda643fe6b SHA512 2c69c4795d6a953c7ff177d7cb6f118d366d19a902b34023c26e82d8ebeb12eae906a39d75dfcbc46e04f383aa97591a5a80f72adaa8a9b60cc457e8cdc098ee EBUILD iproute2-5.17.0.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a diff --git a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch deleted file mode 100644 index 28307131a3db..000000000000 --- a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://marc.info/?l=linux-netdev&m=164206157726666&w=2 - -From: Sam James <sam@gentoo.org> -Date: Thu, 13 Jan 2022 08:05:33 +0000 -Subject: [PATCH] Fix ax25.h include for musl - -ax25.h isn't guaranteed to be avilable in netax25/*; -it's dependent on our choice of libc (it's not available -on musl at least) [0]. - -Let's use the version from linux-headers. - -[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers -Bug: https://bugs.gentoo.org/831102 ---- a/lib/ax25_ntop.c -+++ b/lib/ax25_ntop.c -@@ -2,7 +2,7 @@ - - #include <errno.h> - #include <sys/socket.h> --#include <netax25/ax25.h> -+#include <linux/ax25.h> - - #include "utils.h" - diff --git a/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild deleted file mode 100644 index 81249282d973..000000000000 --- a/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - !minimal? ( net-libs/libmnl:= ) - atm? ( net-dialup/linux-atm ) - berkdb? ( sys-libs/db:= ) - bpf? ( dev-libs/libbpf:= ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf:= ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - libbsd? ( dev-libs/libbsd ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 - #"${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 - ) - fi - - default - - # Fix version if necessary - local versionfile="include/version.h" - if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then - einfo "Fixing version string" - sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ - -i ${versionfile} || die - fi - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - sed -i \ - -e '/^CC :\?=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - # run "configure" script first which will create "config.mk"... - LIBBPF_FORCE="$(usex bpf on off)" \ - econf - - # ...now switch on/off requested features via USE flags - # this is only useful if the test did not set other things, per bug #643722 - cat <<-EOF >> config.mk - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_CAP := $(usex caps y n) - HAVE_MNL := $(usex minimal n y) - HAVE_ELF := $(usex elf y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - HAVE_LIBBSD := $(usex libbsd y n) - EOF -} - -src_compile() { - emake V=1 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - keepdir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/iproute2/iproute2-5.14.0.ebuild b/sys-apps/iproute2/iproute2-5.14.0.ebuild deleted file mode 100644 index 367b3541cbfe..000000000000 --- a/sys-apps/iproute2/iproute2-5.14.0.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - !minimal? ( net-libs/libmnl:= ) - atm? ( net-dialup/linux-atm ) - berkdb? ( sys-libs/db:= ) - bpf? ( dev-libs/libbpf:= ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf:= ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - libbsd? ( dev-libs/libbsd ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 - #"${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch -) - -doecho() { - echo "${@}" - "${@}" || die -} - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 - ) - fi - - default - - # Fix version if necessary - local versionfile="include/version.h" - if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then - einfo "Fixing version string" - sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ - -i ${versionfile} || die - fi - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - sed -i \ - -e '/^CC :\?=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - # run "configure" script first which will create "config.mk"... - # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - doecho ./configure --libbpf_force $(usex bpf on off) - - # ...now switch on/off requested features via USE flags - # this is only useful if the test did not set other things, per bug #643722 - cat <<-EOF >> config.mk - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_CAP := $(usex caps y n) - HAVE_MNL := $(usex minimal n y) - HAVE_ELF := $(usex elf y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - HAVE_LIBBSD := $(usex libbsd y n) - EOF -} - -src_compile() { - emake V=1 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - keepdir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/iproute2/iproute2-5.16.0.ebuild b/sys-apps/iproute2/iproute2-5.16.0.ebuild deleted file mode 100644 index 24d4aea03974..000000000000 --- a/sys-apps/iproute2/iproute2-5.16.0.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - !minimal? ( net-libs/libmnl:= ) - atm? ( net-dialup/linux-atm ) - berkdb? ( sys-libs/db:= ) - bpf? ( dev-libs/libbpf:= ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf:= ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - libbsd? ( dev-libs/libbsd ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 - "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 - #"${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch - "${FILESDIR}"/${PN}-5.16.0-fix-ax25.h-include-for-musl.patch -) - -doecho() { - echo "${@}" - "${@}" || die -} - -src_prepare() { - default - - # Fix version if necessary - local versionfile="include/version.h" - if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then - einfo "Fixing version string" - sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ - -i ${versionfile} || die - fi - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - sed -i \ - -e '/^CC :\?=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null || die - printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null || die - - # run "configure" script first which will create "config.mk"... - # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - doecho ./configure --libbpf_force $(usex bpf on off) - - # ...now switch on/off requested features via USE flags - # this is only useful if the test did not set other things, per bug #643722 - cat <<-EOF >> config.mk - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers, bug #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_CAP := $(usex caps y n) - HAVE_MNL := $(usex minimal n y) - HAVE_ELF := $(usex elf y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, bug #144265, bug #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - HAVE_LIBBSD := $(usex libbsd y n) - EOF -} - -src_compile() { - emake V=1 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - dodir /bin - mv "${ED}"/{s,}bin/ip || die # bug #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. # bug #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - keepdir /var/lib/arpd - # bug #47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 83fe252df229..5b74b432a8ca 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -5,7 +5,7 @@ DIST man-db-2.10.1.tar.xz 1890536 BLAKE2B b052a7006e1d47dfe7b82f82b6e6e47500ca1c DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c EBUILD man-db-2.10.1.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 -EBUILD man-db-2.10.2.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 +EBUILD man-db-2.10.2-r1.ebuild 5099 BLAKE2B a2e368e7a251606c73b503f7ebca4731e48d95f57a2d932cce268e7019d332f7b21ee427270efb29abeba1ea0da744fda906676756738b6edfbb7536ef302576 SHA512 dcfdc38ac4afd98fb828038cda07cc5763a550d3bb819cc55f8ef668e40145ecfad31f3e8cad90b4940cf12e3209f20dcb8164fef37a340d296acbec1a1a8a1f EBUILD man-db-2.9.4-r1.ebuild 5182 BLAKE2B 1c875d760100c08c6188a0933faf7de31036df192b7b9aefed54d2d95aca3d6f736fa99ecced6e72a6b9b7a672a5c6901803fe65265edc0899d82bf0771aecaf SHA512 f9507572028a410b5e01b4fab73552c3ba3e4e944740a16cb964b8fe3d8b4a6b375134cdf77df0e44daa29cbc90584789df74a3a350cd78c3b875873501a7ad0 -EBUILD man-db-9999.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4 +EBUILD man-db-9999.ebuild 5099 BLAKE2B a2e368e7a251606c73b503f7ebca4731e48d95f57a2d932cce268e7019d332f7b21ee427270efb29abeba1ea0da744fda906676756738b6edfbb7536ef302576 SHA512 dcfdc38ac4afd98fb828038cda07cc5763a550d3bb819cc55f8ef668e40145ecfad31f3e8cad90b4940cf12e3209f20dcb8164fef37a340d296acbec1a1a8a1f MISC metadata.xml 343 BLAKE2B bed6b94c3e46bb74275e578a901e0a2706ee2ad1c25e2401f0cb5900bb3c3e8a07a7562e9b074340ed6f4511cd906aa25172122bda3c8e931077d47a14f29db1 SHA512 7244ccbaa5e4e64f67694069f1831ec5b142974b5ca57dcc10f1da62a0c533e4084ae3bb2b51f91fe1f98b52818f3e988ecdf83a52473d87a404b92733498882 diff --git a/sys-apps/man-db/man-db-2.10.2.ebuild b/sys-apps/man-db/man-db-2.10.2-r1.ebuild index 10986291516d..ef05ecd8416f 100644 --- a/sys-apps/man-db/man-db-2.10.2.ebuild +++ b/sys-apps/man-db/man-db-2.10.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit systemd prefix tmpfiles -DESCRIPTION="A man replacement that utilizes berkdb instead of flat files" +DESCRIPTION="A man replacement that utilizes dbm instead of flat files" HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/" if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 @@ -18,13 +18,12 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" +IUSE="+manpager nls +seccomp selinux static-libs zlib" -CDEPEND="!sys-apps/man +CDEPEND=" >=dev-libs/libpipeline-1.5.0 sys-apps/groff - !berkdb? ( sys-libs/gdbm:= ) - berkdb? ( sys-libs/db:= ) + sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )" DEPEND="${CDEPEND}" @@ -117,7 +116,7 @@ src_configure() { $(use_enable static-libs static) $(use_with seccomp libseccomp) - --with-db=$(usex berkdb db gdbm) + --with-db=gdbm ) case ${CHOST} in diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index 10986291516d..ef05ecd8416f 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit systemd prefix tmpfiles -DESCRIPTION="A man replacement that utilizes berkdb instead of flat files" +DESCRIPTION="A man replacement that utilizes dbm instead of flat files" HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/" if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 @@ -18,13 +18,12 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib" +IUSE="+manpager nls +seccomp selinux static-libs zlib" -CDEPEND="!sys-apps/man +CDEPEND=" >=dev-libs/libpipeline-1.5.0 sys-apps/groff - !berkdb? ( sys-libs/gdbm:= ) - berkdb? ( sys-libs/db:= ) + sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )" DEPEND="${CDEPEND}" @@ -117,7 +116,7 @@ src_configure() { $(use_enable static-libs static) $(use_with seccomp libseccomp) - --with-db=$(usex berkdb db gdbm) + --with-db=gdbm ) case ${CHOST} in diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest index 545895b197a5..4ab4433e00d4 100644 --- a/sys-apps/mcstrans/Manifest +++ b/sys-apps/mcstrans/Manifest @@ -1,9 +1,7 @@ AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579 -DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60 -DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1 DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2 -EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78 -EBUILD mcstrans-3.2.ebuild 990 BLAKE2B 5727f7797e09a3d4fd2783fb0386389b9c5d4cb436f3d920ada8d94bc45a4f2645787d7564f95abe39128ddd31763fa67584b2d66156c8eb41525f78d082c8c0 SHA512 c4a5958839c8aab262a8424b2228fa7b503a6cd1d39986de47cad689b241a279f05c7db7551632e767090d8ab36fc065b8400d7ef6a22047d93039a59bc77abf +DIST mcstrans-3.4-rc1.tar.gz 45128 BLAKE2B 90ef74de6db72005b17254a23673edca30c8441155947b0cd11e5a45b376a58f608eca38fc91184e33dd593551de48010bde1962849ad7d6427d310c4e2609e4 SHA512 7889b6b4a22d2b3b900b28fddfb09d32bcc8d4dfacb3ac75253aa812b35578907272b758c4050d52560cdb751cefca5f4bd46c8c2402b47f8833c63134b8e780 EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a -EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed +EBUILD mcstrans-3.4_rc1.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785 +EBUILD mcstrans-9999.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664 diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild deleted file mode 100644 index 5510582a2b53..000000000000 --- a/sys-apps/mcstrans/mcstrans-3.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -MY_RELEASEDATE="20200710" - -MY_P="${P//_/-}" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="SELinux context translation to human readable names" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libsepol-${PV}:= - >=sys-libs/libselinux-${PV}:= - dev-libs/libpcre:= - >=sys-libs/libcap-1.10-r10:=" - -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" -} - -src_compile() { - tc-export CC - default -} - -src_install() { - emake DESTDIR="${D}" install - - rm -rf "${D}/etc/rc.d" || die - - newinitd "${FILESDIR}/mcstransd.init" mcstransd -} diff --git a/sys-apps/mcstrans/mcstrans-3.2.ebuild b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild index 06962f8dcdb1..75563498db4f 100644 --- a/sys-apps/mcstrans/mcstrans-3.2.ebuild +++ b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux context translation to human readable names" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux context translation to human readable names" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:= >=sys-libs/libselinux-${PV}:= - dev-libs/libpcre:= + dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=" RDEPEND="${DEPEND}" diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild index 631d654a0a38..75563498db4f 100644 --- a/sys-apps/mcstrans/mcstrans-9999.ebuild +++ b/sys-apps/mcstrans/mcstrans-9999.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux context translation to human readable names" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux context translation to human readable names" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:= >=sys-libs/libselinux-${PV}:= - dev-libs/libpcre:= + dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=" RDEPEND="${DEPEND}" diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest index a462911aef91..c2058ff454bf 100644 --- a/sys-apps/memtester/Manifest +++ b/sys-apps/memtester/Manifest @@ -1,3 +1,3 @@ DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80 -EBUILD memtester-4.5.1.ebuild 728 BLAKE2B 9d1c8bbc95d6b1c6807916be75a244cf34228d1a35073b92eb4bce54b9c6da8ea9b50b8a65005db67b0ae8d3350aadb67fe8829b8604e2713fa3a7eef5286472 SHA512 2ca0d5f496f430cac3e55f3588fd599ca1eda0600ce3bf94cd291e1357ab0896078f38a730da3eed8ea494e0597005d7171076ea4f791f8dd3e42277264baa6b +EBUILD memtester-4.5.1.ebuild 735 BLAKE2B 8d8de497e7edf64b40c92329f17cdc1524b48b61ffce6c702f508e3f96382576224022157745d970239c279d01e2f64e6e2aa6d12ea7db688cf0c01e9a35ec09 SHA512 7cf1adbfffc2eab84106b48ec9d15f93286179f4c71a289551a4a523a4693caad367ddbf990b6ffca92fd60a94a35b3f1b9de56856e55b58952110bf3e8511c7 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild index 4f984ccad2b2..b2bfe34d2f17 100644 --- a/sys-apps/memtester/memtester-4.5.1.ebuild +++ b/sys-apps/memtester/memtester-4.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86" src_configure() { echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index c599a3f000fd..dbf71d866164 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -2,7 +2,9 @@ AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305 DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff +DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417 EBUILD nvme-cli-1.14.ebuild 844 BLAKE2B b88134580f9f4fb22ffd24bd2e8aca6f7778bc7c68af526e1002963cabe9766f39c69513eac46a7e3426e755e4ba2e1dee651b45ca1ffdd6ae2362d5d5e3a91e SHA512 aa1fecc32da2ac0e456cd73f516e7760a45ccd91fa9b9d4f4fb080e93024c69b5476621a1cbe8d9fcb26292eca6ab79f0c5cd0c35122e2dd70a1f5304c520d26 EBUILD nvme-cli-1.15-r1.ebuild 1283 BLAKE2B f90189f1d7d34d340dc3e9f4ca7a1fa611d32ed0913d43e4d74707b159889b3bda123352454bb051541e1168d9eeb9746607bafaf0894566df4c9c4d8036edeb SHA512 506471a6dfc87c346c9a1bd46c19415f795e0a4b11dd8cc8ff59254929d7a59477d254fbeebea5badf53eb8c72cfda2ac85bdbc4dac4d0ede15f5d619d78b4c2 EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f +EBUILD nvme-cli-2.0.ebuild 830 BLAKE2B 28e4292e92d7863ea0a56936497cf55428c3fc83efa8a9bf7fa6223c09ab46ae917b56c0cf073ee3e655d766a481dd0e63d8244a65787bf53b4935e6d56df2d6 SHA512 87536e85ae720b018679ec0798d1cdd5edd6bad105d8e5a3098efd230dd4a038aee6e4e09edf751c389af6ac0cff0e5c099abe730888f16cea2627a0265ec9a0 MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464 diff --git a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild new file mode 100644 index 000000000000..cc8d7246bc18 --- /dev/null +++ b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson systemd udev + +DESCRIPTION="NVM-Express user space tooling for Linux" +HOMEPAGE="https://github.com/linux-nvme/nvme-cli" +SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz" +RESTRICT="test" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="hugepages +json +uuid" + +RDEPEND=" + sys-libs/libnvme:=[json=,uuid=] + hugepages? ( sys-libs/libhugetlbfs:= ) + json? ( dev-libs/json-c:= ) + uuid? ( sys-apps/util-linux:= )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local unitdir="$(systemd_get_systemunitdir)" + local emesonargs=( + -Dsystemddir=${unitdir%/system} + -Dudevrulesdir=${EPREFIX}$(get_udevdir) + ) + meson_src_configure +} diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 796391b07ec4..502226209104 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,6 +1,6 @@ DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f DIST pkgcore-0.12.9.tar.gz 624918 BLAKE2B 190ccae01862b7e498dabcab5e8716ab0f3ed732eeb0469a0ca39f5e201c75ea19575f49be29a6d36b3acad8d5252528dc5e76444cd21fec25681a9350b93875 SHA512 2e391f9ae2baacaaec025c4b6cd7fd7c7757d7815d8bc62aec0f09e4fdbf7fc99ce832bc2c3ce15013fda860465ca19f27377935dc535a286446e548e08be6cd -EBUILD pkgcore-0.12.10.ebuild 1121 BLAKE2B 88697991a0fceb3feb3a933cccdc8363b121855e73d7bac3c5a402b79bf77b514184248144bcdf777761424ecfb545bb3f00afc3c88cc68d76a36690f7dccd7d SHA512 7dd5d3beadb0a4e884aee7599942bc356dff161a737bd56742cdfeec5e7c3dd3f52480595c428a68ad7d18f73edc49390d4bad26f94dc6c9871516ace6bbf059 +EBUILD pkgcore-0.12.10.ebuild 1120 BLAKE2B b1d653ef353ba355345c6033ab1b2a70ec651d4e6867060259318c7b684302731456ece67ba42367426090fd2e4e8a5c96674c9e198571cea9f83d6eed7e30af SHA512 71c929d71a042a5c574f176c93b892fcdbcfc23a547e3ffca6a7507ce5b859c34e0eb3d51615c1e1373efc890db116a1c48df784f243856af3c97581a2156663 EBUILD pkgcore-0.12.9.ebuild 1119 BLAKE2B a5b776d54396ecd6491bf3db798c1131caa37402331c3968096673d0efabc172469734a04312fc0f8ead1b2a37018d8b03bc69ec05fd9ec792c73dba0db5c9ee SHA512 97aa6863c986cfdbf0a04af429ca774c6e4230c1010aebbc487156d92db4e23e082f5939e05dec83de2eefe83fab4192a7c5293779bcad260e878ba4f038a36d EBUILD pkgcore-9999.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild index 1db71e75e4f3..9f81bcac50ec 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 3c85fdac193c..33b722d7c7ba 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -1,10 +1,8 @@ AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d -DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140 -DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346 DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98 +DIST policycoreutils-3.4-rc1.tar.gz 771240 BLAKE2B 27f730c1f870be9175bef9d8c44ad74f737d5a185d369ceb84c609974423ffea5ce1f8a602af6d25253df963e37c7d2fd5a4cc4877782f6768cfaf5a544c4aa4 SHA512 bbe7b126f07b895d6bea4dfdbc6574a3f8ba08466979f8ed5009b54c68eb0c7f1786d175f52925d0e7e983ca799b846f50112b50c5d6d4edc1b03152593b68c1 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f -EBUILD policycoreutils-3.1-r2.ebuild 4656 BLAKE2B 0c96b8df2ac1e741c0edc0d6974b2017b52fb0ad1fb29fa1efbcd91dafb3aa18b55bebdba7f86c99c4f50b4a48bb44352eb9c11a179d49855f0ed7604e547b87 SHA512 a2d571ac553a57370182857fb51e128335e5ff2976d0b0d11febeb0c9a03fbd08ad0caa9deef0fcd0cce48e03f322c2844a5cb80dde945f4833329962ad19c30 -EBUILD policycoreutils-3.2.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c EBUILD policycoreutils-3.3.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c -EBUILD policycoreutils-9999.ebuild 4513 BLAKE2B 48147879671a41771fbe095581abd215bad539dac9e12a5ec2676c4f19e0169782d08aad86a8c9830247f18b44c2b85268ee533b82baf6340ca38ce8086b14de SHA512 b6a64e4a4a1ea7fc4ca5420b945d3509d2d2caf174ddddcb85f2fb4ca3b1ae90f6d39542d6b6b00ffb6b1c2a085b253a0a7394c63eef7afd2f49c58cd2ff34ca +EBUILD policycoreutils-3.4_rc1.ebuild 4563 BLAKE2B b1f005f3c1fcf15e76a3e8f6e28da3c82bcc9de3f7e9551be1e5f082d76b437584acf11a5324585aa2da3f5562550d384edbb99dbbe9a3ca4aabba3e1d9d354b SHA512 d09ebbfae77df40a5817332bc24529ccc1820faf0c0fdac71b4e0fde41ed2f251460f73e10fca24cc8b5c4c6024786ba1291bbfa76bebc5f8860cebe087635c6 +EBUILD policycoreutils-9999.ebuild 4563 BLAKE2B b1f005f3c1fcf15e76a3e8f6e28da3c82bcc9de3f7e9551be1e5f082d76b437584acf11a5324585aa2da3f5562550d384edbb99dbbe9a3ca4aabba3e1d9d354b SHA512 d09ebbfae77df40a5817332bc24529ccc1820faf0c0fdac71b4e0fde41ed2f251460f73e10fca24cc8b5c4c6024786ba1291bbfa76bebc5f8860cebe087635c6 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild deleted file mode 100644 index eea202ba8299..000000000000 --- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -PYTHON_REQ_USE="xml" - -inherit multilib python-r1 toolchain-funcs bash-completion-r1 - -MY_P="${P//_/-}" - -MY_RELEASEDATE="20200710" -EXTRAS_VER="1.37" -SEMNG_VER="${PV}" -SELNX_VER="${PV}" -SEPOL_VER="${PV}" - -IUSE="audit pam split-usr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DESCRIPTION="SELinux core utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - S1="${WORKDIR}/${MY_P}/${PN}" - S2="${WORKDIR}/policycoreutils-extra" - S="${S1}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz - https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S1="${WORKDIR}/${MY_P}" - S2="${WORKDIR}/policycoreutils-extra" - S="${S1}" -fi - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}] - >=sys-libs/libsepol-${SEPOL_VER}:= - sys-libs/libcap-ng:= - >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) - pam? ( sys-libs/pam:= ) - ${PYTHON_DEPS}" - -# Avoid dependency loop in the cross-compile case, bug #755173 -# (Still exists in native) -BDEPEND="sys-devel/gettext" - -# pax-utils for scanelf used by rlpkg -RDEPEND="${DEPEND} - app-misc/pax-utils" - -PDEPEND="sys-apps/semodule-utils - sys-apps/selinux-python" - -src_unpack() { - # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds - default - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - S="${S1}" - cd "${S}" || die "Failed to switch to ${S}" - if [[ ${PV} != 9999 ]] ; then - # If needed for live ebuilds please use /etc/portage/patches - eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" - fi - - # rlpkg is more useful than fixfiles - sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \ - || die "fixfiles sed 1 failed" - sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \ - || die "fixfiles sed 2 failed" - - eapply_user - - sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror" - - python_copy_sources - # Our extra code is outside the regular directory, so set it to the extra - # directory. We really should optimize this as it is ugly, but the extra - # code is needed for Gentoo at the same time that policycoreutils is present - # (so we cannot use an additional package for now). - S="${S2}" - python_copy_sources -} - -src_compile() { - building() { - emake -C "${BUILD_DIR}" \ - AUDIT_LOG_PRIVS="y" \ - AUDITH="$(usex audit y n)" \ - PAMH="$(usex pam y n)" \ - SESANDBOX="n" \ - CC="$(tc-getCC)" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" - } - S="${S1}" # Regular policycoreutils - python_foreach_impl building - S="${S2}" # Extra set - python_foreach_impl building -} - -src_install() { - # Python scripts are present in many places. There are no extension modules. - installation-policycoreutils() { - einfo "Installing policycoreutils" - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - AUDIT_LOG_PRIVS="y" \ - AUDITH="$(usex audit y n)" \ - PAMH="$(usex pam y n)" \ - SESANDBOX="n" \ - CC="$(tc-getCC)" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - install - python_optimize - } - - installation-extras() { - einfo "Installing policycoreutils-extra" - emake -C "${BUILD_DIR}" \ - DESTDIR="${D}" \ - install - python_optimize - } - - S="${S1}" # policycoreutils - python_foreach_impl installation-policycoreutils - S="${S2}" # extras - python_foreach_impl installation-extras - S="${S1}" # back for later - - # remove redhat-style init script - rm -fR "${D}/etc/rc.d" || die - - # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles - - bashcomp_alias setsebool getsebool - - # location for policy definitions - dodir /var/lib/selinux - keepdir /var/lib/selinux - - # Set version-specific scripts - for pyscript in rlpkg; do - python_replicate_script "${ED}/usr/sbin/${pyscript}" - done -} - -pkg_postinst() { - for POLICY_TYPE in ${POLICY_TYPES} ; do - # There have been some changes to the policy store, rebuilding now. - # https://marc.info/?l=selinux&m=143757277819717&w=2 - einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." - semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" - done -} diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild index 456189b1aac5..91d0f1ac5ab7 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild @@ -2,16 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" EXTRAS_VER="1.37" -IUSE="audit pam split-usr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,20 +18,22 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - S1="${WORKDIR}/${PN}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - KEYWORDS="amd64 arm arm64 ~mips x86" - S1="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index e6ee13c43070..91d0f1ac5ab7 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -2,16 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" EXTRAS_VER="1.37" -IUSE="audit pam split-usr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,20 +18,22 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - S1="${WORKDIR}/${PN}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - S1="${WORKDIR}/${P}" + S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 2415f17b48bf..848d7c388075 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,4 +1,6 @@ +AUX 3.0.30-qa-checks.patch 4865 BLAKE2B c708406feb7c67ebdf2b2c08add80eeaefccf27f106c3fd2336c1c42b2547cf32a609b0b81d501a515e24540c49ca83531ff6b64fc0a5e289de0c9003ac209d7 SHA512 06eda997946d285e4b84a955efb4e88a4cc5e4516cde46d222ece97e92d87f2f52dc186a29115793cbc3f40c6e15a8d0e2fe672928f96ad95cf8bb109cd61b65 AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea +AUX 3.0.30-revert-run-warn.patch 2228 BLAKE2B 9845ed36d9d0e8ca966a711e08bf24d9f308646abd1e1bb5efa8bd2c4545ae1b452349f7b83e57749f41566ef9ef440f2b9111667a44b7898f1a15324f3558d0 SHA512 29834935a3f8e103738e898316a073befb4539aa5bb8d1a913c90e85286b5928ba9d82db1a2293a7f1f776b9ca7aa4ba873909a346f4f705a1285cdd2c420a43 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c DIST portage-3.0.18.tar.xz 971692 BLAKE2B 0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3 SHA512 d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd @@ -17,5 +19,6 @@ EBUILD portage-3.0.20-r6.ebuild 9837 BLAKE2B a4176c20b1e43ef301bbf595a335406130b EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7facc33319c3c743c0e87b503d8f00ca459fec5546f322c6b84291e5e0178b0d76b20806908bfd542983f547e900e0a0a SHA512 86c2b9b9dcdcaa6be5247db802ec230327981d4f3c4e31980e19064621a9287dc9ac9c8e81a94dbc1611857fe847c8989a7f3b7a09db3227092a9297d7f440a7 EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282 EBUILD portage-3.0.30-r1.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43 +EBUILD portage-3.0.30-r2.ebuild 8926 BLAKE2B 96f1c4b40f1489d5a8c0274b9795460c4b3cd9508e8bb44506b98961ebceba1daf4a48008805631075a8d4cc2ca97f17ebf8d0571f71b1a8ba95a8ba9612a0fc SHA512 47328268b12cedcee99ee431f5eda36ab02d790a77bb0bb9658e9248b9b1bb2d3d1a5aa2567be5ae74a8a3ae0666b4d7aa9fed7a74f6113c8333858b9a040b5a EBUILD portage-9999.ebuild 8018 BLAKE2B 9df65587b54a652aa2c404bbb6cc97a96740c5467753858d3a498ddf5990db62ca8ae590a67e21d793297bc02ff61c0eef86ccef0f7a7e135866914acad8e780 SHA512 51307bb4ec176494f4fd4c9d24bf876bc0dc69077ae0fd814e69844a6ef640974ca8b4897358a3f3082baaa8d66287e1910890d381d0b8da5fe888c1ceb4627e MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402 diff --git a/sys-apps/portage/files/3.0.30-qa-checks.patch b/sys-apps/portage/files/3.0.30-qa-checks.patch new file mode 100644 index 000000000000..19290d352f49 --- /dev/null +++ b/sys-apps/portage/files/3.0.30-qa-checks.patch @@ -0,0 +1,137 @@ +Backport a bunch of QA notice changes so tinderboxes etc can pick them up, +given portage.git is currently undergoing a fair bit of refactoring. + +https://github.com/gentoo/portage/commit/7b44116b4a669a49e51e5a495ab62a25229e18e4 +https://github.com/gentoo/portage/commit/8ded447a1d194ad0190a174f7bb330417685d861 +https://github.com/gentoo/portage/commit/23c4a45827fccebb969d5130ccc234ed3d1a9b35 +https://github.com/gentoo/portage/commit/3994939f982f22afbc7aaf3b8eca6680ad85c617 + +From: Sam James <sam@gentoo.org> +Date: Sat, 2 Apr 2022 05:10:31 +0100 +Subject: [PATCH] bin/install-qa-check.d/95empty-dirs: update message for EAPI + 8 + +Portage changed the default for >= EAPI 8 ("newer EAPIs" at the time, not +actually specific to 8) in bfda0d2bd4ba03a4e77f488ec3fd4f9c6c351662 to +enable FEATURES="strict-keepdir". + +Signed-off-by: Sam James <sam@gentoo.org> +Closes: https://github.com/gentoo/portage/pull/802 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/bin/install-qa-check.d/95empty-dirs ++++ b/bin/install-qa-check.d/95empty-dirs +@@ -33,7 +33,7 @@ find_empty_dirs() { + done + eqawarn + eqawarn "If those directories need to be preserved, please make sure to create" +- eqawarn "or mark them for keeping using 'keepdir'. Future versions of Portage" ++ eqawarn "or mark them for keeping using 'keepdir'. Portage for >= EAPI 8 ebuilds" + eqawarn "will strip empty directories from installation image." + fi + } + + + +From: Sam James <sam@gentoo.org> +Date: Sun, 10 Apr 2022 17:51:02 +0100 +Subject: [PATCH] install-qa-check.d/20runtime-directories: warn on /var/tmp + too + +Bug: https://bugs.gentoo.org/493154 +Bug: https://bugs.gentoo.org/837536 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/bin/install-qa-check.d/20runtime-directories ++++ b/bin/install-qa-check.d/20runtime-directories +@@ -1,10 +1,10 @@ + # Check for directories that need to be created at runtime + + runtime_dir_check() { +- # It's ok create these directories, but not to install into them. #493154 ++ # It's ok to create these directories, but not to install into them. #493154 + # TODO: We should add var/lib to this list. + local x f= +- for x in var/cache var/lock var/run run ; do ++ for x in var/cache var/lock var/run var/tmp run ; do + if [[ ! -L ${ED}/${x} && -d ${ED}/${x} ]] ; then + if [[ -z $(find "${ED}/${x}" -prune -empty) ]] ; then + f+=$(cd "${ED}"; find "${x}" -printf ' %p\n') + +From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Date: Mon, 11 Apr 2022 15:46:06 +0200 +Subject: [PATCH] eend: Output QA warning if ebegin has not been called + +The assumption here is that ebegin-eend aren't nested. + +Closes: https://bugs.gentoo.org/835824 +Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Closes: https://github.com/gentoo/portage/pull/807 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/bin/isolated-functions.sh ++++ b/bin/isolated-functions.sh +@@ -339,6 +339,7 @@ ebegin() { + [[ ${RC_ENDCOL} == "yes" ]] && echo >&2 + LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) + LAST_E_CMD="ebegin" ++ EBEGIN_EEND=1 + return 0 + } + +@@ -367,6 +368,11 @@ __eend() { + + eend() { + [[ -n $1 ]] || eqawarn "QA Notice: eend called without first argument" ++ if [[ -v EBEGIN_EEND ]] ; then ++ unset EBEGIN_EEND ++ else ++ eqawarn "QA Notice: eend called without preceding ebegin (phase: ${EBUILD_PHASE})" ++ fi + local retval=${1:-0} + shift + + +From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Date: Tue, 12 Apr 2022 10:59:11 +0200 +Subject: [PATCH] ebegin: Output QA warning if call to eend is missing + +The idea here is to check if EBEGIN_EEND is set after the phase has been +executed. If so, then a call to eend is probably missing. This is under +the assumption that ebegin-eend invocations should be properly paired +within the same phase. + +In ebegin, the EBEGIN_EEND variable is also checked, and, if set, +indicates that ebegin has been called and is missing the closing call to +eend. + +I doubt that this check is perfect, but it seems to work in what little +testing I've done. + +Closes: https://bugs.gentoo.org/835823 +Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Closes: https://github.com/gentoo/portage/pull/811 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/bin/isolated-functions.sh ++++ b/bin/isolated-functions.sh +@@ -339,6 +339,9 @@ ebegin() { + [[ ${RC_ENDCOL} == "yes" ]] && echo >&2 + LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) + LAST_E_CMD="ebegin" ++ if [[ -v EBEGIN_EEND ]] ; then ++ eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${EBUILD_PHASE})" ++ fi + EBEGIN_EEND=1 + return 0 + } +--- a/bin/phase-functions.sh ++++ b/bin/phase-functions.sh +@@ -1088,6 +1088,10 @@ __ebuild_main() { + ;; + esac + ++ if [[ -v EBEGIN_EEND ]] ; then ++ eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${1})" ++ fi ++ + # Save the env only for relevant phases. + if ! has "${1}" clean help info nofetch ; then + umask 002 + diff --git a/sys-apps/portage/files/3.0.30-revert-run-warn.patch b/sys-apps/portage/files/3.0.30-revert-run-warn.patch new file mode 100644 index 000000000000..d5f20421695e --- /dev/null +++ b/sys-apps/portage/files/3.0.30-revert-run-warn.patch @@ -0,0 +1,64 @@ +https://github.com/gentoo/portage/commit/1327fa9f829e8670c65ff35b9b0bda446991f7ed + +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 14 Feb 2022 15:30:18 -0500 +Subject: [PATCH] Revert "lib/_emerge/actions.py: warn on missing /run" + +Portage itself does not need /run to be mounted. +build-docbook-catalog was adjusted to create locks in /etc/xml instead. + +Bug: https://bugs.gentoo.org/832853 +Reverts: 0e9e12aadb889766d61c0561b9723e71542d43e6 +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +Closes: https://github.com/gentoo/portage/pull/788 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/lib/_emerge/actions.py ++++ b/lib/_emerge/actions.py +@@ -3020,25 +3020,17 @@ def validate_ebuild_environment(trees): + check_locale() + + +-def check_mounted_fs(): +- """We need /proc for finding CPU counts and finding other system information. +- We need /run for e.g. lock files in ebuilds.""" +- paths = {"/proc": False, "/run": False} +- +- for path in paths.keys(): +- if platform.system() not in ("Linux",) or os.path.ismount(path): +- paths[path] = True +- continue +- +- msg = "It seems %s is not mounted. Process management may malfunction." % path +- writemsg_level( +- "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), +- level=logging.ERROR, +- noiselevel=-1, +- ) +- +- # Were all of the mounts we were looking for available? +- return all(paths.values()) ++def check_procfs(): ++ procfs_path = "/proc" ++ if platform.system() not in ("Linux",) or os.path.ismount(procfs_path): ++ return os.EX_OK ++ msg = "It seems that %s is not mounted. You have been warned." % procfs_path ++ writemsg_level( ++ "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), ++ level=logging.ERROR, ++ noiselevel=-1, ++ ) ++ return 1 + + + def config_protect_check(trees): +@@ -3516,8 +3508,7 @@ def run_action(emerge_config): + repo_name_check(emerge_config.trees) + repo_name_duplicate_check(emerge_config.trees) + config_protect_check(emerge_config.trees) +- +- check_mounted_fs() ++ check_procfs() + + for mytrees in emerge_config.trees.values(): + mydb = mytrees["porttree"].dbapi + diff --git a/sys-apps/portage/portage-3.0.30-r2.ebuild b/sys-apps/portage/portage-3.0.30-r2.ebuild new file mode 100644 index 000000000000..41d008c12f34 --- /dev/null +++ b/sys-apps/portage/portage-3.0.30-r2.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !<app-admin/logrotate-3.8.0 + !<app-portage/gentoolkit-0.4.6 + !<app-portage/repoman-2.3.10 + !~app-portage/repoman-3.0.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + >=sys-apps/file-5.41 + >=sys-apps/coreutils-6.4 + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + if use native-extensions && tc-is-cross-compiler; then + einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" + fi + + check_extra_config +} + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch" + "${FILESDIR}/3.0.30-revert-run-warn.patch" + "${FILESDIR}/3.0.30-qa-checks.patch" + ) + + distutils-r1_python_prepare_all + + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i lib/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + + einfo "Enabling additional FEATURES for gentoo-dev..." + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + >> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest index 12fe14082577..a52bbbb75dde 100644 --- a/sys-apps/restorecond/Manifest +++ b/sys-apps/restorecond/Manifest @@ -1,9 +1,7 @@ AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6 -DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8 -DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee918bfde8e12dfa73ce99632a8bc1e00d2f3b7cdd9c72179dbb51af1847e8dadd41cdc3ca20e9fb45e61871325029 SHA512 b1437a5d4dffef3463a0f2994f07c98585e9cfbc354db2dc07483fd9b964b079090697a277d2f4fd6bcd8df62f7505962fdca22d700721f6ba71490ace0167a9 DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb -EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c -EBUILD restorecond-3.2.ebuild 1084 BLAKE2B e60456cdcffb87d4cf6fa9f3595d906ffd1b9663c29b5228e779ae1506e4cd02875c57c6452a1a21227e13cc78dde855d35d18aa89b737268b7d8e73340093ac SHA512 4481e3167024db0ad648b815ad770f8a4e47183a33c9b5139cee967f640fc575cd0da0fc0ca485441de2be7f688ed6c034e152a6293606db13ac63b8223c261a +DIST restorecond-3.4-rc1.tar.gz 18961 BLAKE2B 7f5f41f9dd7e776c266818221706f5cfff2fbb3ce99550e4c679a52e1c7694ddf06a8cd686ed80787e2acbf4060bb6cb4c4c15b85eb3ee58355b560f3751e910 SHA512 5d526ceb314719400cfeecb3d28369f62ca8f29223c6eabe847f3565c27b6a7f74ef6f489750b80809df6b3227324c978e4aceca1cb2f4f6a28bcaa03f1f9db9 EBUILD restorecond-3.3.ebuild 1082 BLAKE2B d004337893dc2363a312366a7c4250158f1396e4d54a7b361d2665a51350f0cce3a9ad76002aa5a32fa5369ddc91b015a85d99e7664fc012eacdead1644af9bc SHA512 47fb0c285c427c1ad5551d0786f90000b85420a16ca52dd1416774a1ee93afdf00e4197d6f91fa51248419a693d4cd2b528c3ad18a99cd668eed1fd0eacd1f9a -EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118 +EBUILD restorecond-3.4_rc1.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a +EBUILD restorecond-9999.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664 diff --git a/sys-apps/restorecond/restorecond-3.1.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild deleted file mode 100644 index 7184259428fe..000000000000 --- a/sys-apps/restorecond/restorecond-3.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit systemd toolchain-funcs - -MY_RELEASEDATE="20200710" - -MY_P="${P//_/-}" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND="dev-libs/glib:2 - >=sys-libs/libsepol-${PV}:= - >=sys-libs/libselinux-${PV}:=" - -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror" -} - -src_compile() { - tc-export CC - default -} - -src_install() { - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ - SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ - emake DESTDIR="${D}" install - - rm -rf "${D}/etc/rc.d" || die - - newinitd "${FILESDIR}/restorecond.init" restorecond -} diff --git a/sys-apps/restorecond/restorecond-3.2.ebuild b/sys-apps/restorecond/restorecond-3.4_rc1.ebuild index 600b91f0ad82..92cd1c69200e 100644 --- a/sys-apps/restorecond/restorecond-3.2.ebuild +++ b/sys-apps/restorecond/restorecond-3.4_rc1.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit systemd toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" @@ -21,6 +23,7 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND="dev-libs/glib:2 >=sys-libs/libsepol-${PV}:= @@ -40,9 +43,10 @@ src_compile() { } src_install() { - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ - emake DESTDIR="${D}" install + install rm -rf "${D}/etc/rc.d" || die diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild index f3e66897e8c1..92cd1c69200e 100644 --- a/sys-apps/restorecond/restorecond-9999.ebuild +++ b/sys-apps/restorecond/restorecond-9999.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit systemd toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" @@ -21,6 +23,7 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND="dev-libs/glib:2 >=sys-libs/libsepol-${PV}:= @@ -40,9 +43,10 @@ src_compile() { } src_install() { - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ - emake DESTDIR="${D}" install + install rm -rf "${D}/etc/rc.d" || die diff --git a/sys-apps/rootlesskit/Manifest b/sys-apps/rootlesskit/Manifest index 2a6821b173c2..b18bef4df4cb 100644 --- a/sys-apps/rootlesskit/Manifest +++ b/sys-apps/rootlesskit/Manifest @@ -103,5 +103,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8 DIST rootlesskit-0.14.2.tar.gz 68527 BLAKE2B ceb08c4a1d12916dcf1f54f38de800a0d9ee0a67caaea7bb326c40e05bfeeb9bb1e1c79152d1ebbc648dd0df72251c24897f2d2efbe1e44ef9f22957eb417ebb SHA512 2b8deab3116ac85062020e395d0343b2984da26593d16629119ad0dcb6a4d9177dcc43b50cc839707159c87972530f2fd0e830c6bd54bb8be24a3e7aabf401fd -EBUILD rootlesskit-0.14.2.ebuild 6183 BLAKE2B 5c67c967bc28a769b907b940c9c61272d8f49270cc2e7c87bf538010ad08f73d48c12ee53f13df7c1cd57cd36468d8cad38c52f35fe7d60f5e065baee10d7bf4 SHA512 5ea9a8def1cdade55283c6be3b5b98a8c2a855fb8f8caf4a3239de03067340a06ea45f94a00c63a4eabbe54168717cba0b694b003d440caceae49489a9f968d4 +EBUILD rootlesskit-0.14.2.ebuild 6250 BLAKE2B 0f8ce8ec47ee328da388fbc321590cd2fb062167d8c6e2bc09116ed7192775730f4767b515873d5443532c8c471187c2e142a8e65a10da8f01cc1aded6bd193e SHA512 d45ef70ca35ea13245dbc4e9270f68be51649a458c0d201b493ae125596b0f0e4a95e1f8b0eb47f5718de05b3bc4157f71dd3e9425e1f9f5505884fcc8f28f95 MISC metadata.xml 341 BLAKE2B 9280333a05ba1d222b2c510f1f7be410eb619c9915a6736107831a45177610654a5ee5dc783e3bf25afff050b81742ecbacb660524b3e186364f23b6c6fb6454 SHA512 7c23ba523062e7c7c4265b6b1449a486a321cb10090bafb39aa0ef89c25801735975e0e90af10a57fd9f29afe75570a17f2d750bd21868447dc8cccb58516d0a diff --git a/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild index 6a101ab526a5..1ea385e775e0 100644 --- a/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild +++ b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -120,7 +120,9 @@ LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-rootlesskit )" src_prepare() { sed -e 's:/usr/local/bin:/usr/bin:' -i Makefile || die diff --git a/sys-apps/rtl-entropy/Manifest b/sys-apps/rtl-entropy/Manifest deleted file mode 100644 index cbd3e95708da..000000000000 --- a/sys-apps/rtl-entropy/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST rtl-entropy-0.1.2_p20180118.tar.gz 57495 BLAKE2B f4f1fcaf296594263c70e3221fedd35876d34f4a740332bc95fc3407393db05072507a83cebe5561bfc514d02f2a69f948a09c2e0176acae0a4d262cf478e165 SHA512 b09ccac5594d067c36e44683b1f67dde1255a4ea4e10bbd6b8cdff940158c9bdcf9aa1938a3ecead5a1c254fb641571c2ad6efb04933f9dba08a2f628f3e0ef8 -EBUILD rtl-entropy-0.1.2_p20180118-r1.ebuild 870 BLAKE2B 3b327f2bd8f1ec293c971bd7441148d7f1bb3949954b8a9434801390912abb737292e853d283a12d41aa9a10c47dd846cb41ae4fb49be016dd8eb09434ffa802 SHA512 92a50a7b0a63f57fc44c6aad88c1614322b84f3820a0d4f7dcd8331b6e6ed22b7d2d4b4fb1e93331ff95efc5a6065246752245a10ac2ebd6cdf0936c1b440e0e -MISC metadata.xml 396 BLAKE2B be414e87ac19b731a8a0fa3568fff217847c97d7e92bb39eb724674be4b96073d13fcaf12bd16f929050ec3bdc53a9513be0793ac340b936a14b2a513d609979 SHA512 485d7cdcfd3454ce018d56a2f827c4457554ce7d1504aa7dc72631f9b3f92440052a0ea5165d88c7b3ed2a13a14ac0417a0fbb588e4f167769484f028ff707a3 diff --git a/sys-apps/rtl-entropy/metadata.xml b/sys-apps/rtl-entropy/metadata.xml deleted file mode 100644 index 69a55cffd786..000000000000 --- a/sys-apps/rtl-entropy/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> -<use> - <flag name="bladerf">Build with Nuand BladeRF support</flag> -</use> - <upstream> - <remote-id type="github">pwarren/rtl-entropy</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild b/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild deleted file mode 100644 index af725fddf5f8..000000000000 --- a/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -COMMIT="9f1768c35f6205a73a657cfc9ac7bd9f9a40936c" - -DESCRIPTION="An entropy generator using SDR peripherals, including rtl-sdr and BladeRF" -HOMEPAGE="http://rtl-entropy.org/" -SRC_URI="https://github.com/pwarren/rtl-entropy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -#sadly, rtlsdr support doesn't appear to be optional -IUSE="bladerf" - -RDEPEND=" - dev-libs/openssl:0= - net-wireless/rtl-sdr - sys-libs/libcap - bladerf? ( net-wireless/bladerf:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - cmake-utils_src_prepare - - if ! use bladerf; then - sed -i 's#libbladeRF.h#libbladeRF-totallynotreal.h#' \ - cmake/Modules/FindLibbladeRF.cmake || die - fi -} diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest index 1fb363484893..65506b950e1e 100644 --- a/sys-apps/secilc/Manifest +++ b/sys-apps/secilc/Manifest @@ -1,8 +1,6 @@ -DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b -DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45 DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8 -EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904 -EBUILD secilc-3.2.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4 +DIST secilc-3.4-rc1.tar.gz 181269 BLAKE2B cc0bd0d6016833d64d615fe0f1ef59ab302b15238f10005412d3c2347056fbc5a0e587ac2e18f62f7cb1402a2749c117ac6b50e97df9677a0afc9b2270d9352d SHA512 d99e76c50395fcb20a4c08156b155f7411eab2ce3374899cc3cf6193d95ed3a5b2dae86d18ddfda838e6701aeddedbdb98f8faedeb4506ac5b19c7957763d22c EBUILD secilc-3.3.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4 -EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19 +EBUILD secilc-3.4_rc1.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97 +EBUILD secilc-9999.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81 diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild deleted file mode 100644 index 37dbc1b714b9..000000000000 --- a/sys-apps/secilc/secilc-3.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit toolchain-funcs - -MY_P="${P//_/-}" -MY_RELEASEDATE="20200710" - -SEPOL_VER="${PV}" - -DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER}" -RDEPEND="${DEPEND}" -BDEPEND="app-text/xmlto" - -# tests are not meant to be run outside of the -# full SELinux userland repo -RESTRICT="test" - -src_compile() { - tc-export CC - default -} diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.4_rc1.ebuild index 8058954b003d..13b261011af0 100644 --- a/sys-apps/secilc/secilc-3.2.ebuild +++ b/sys-apps/secilc/secilc-3.4_rc1.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -12,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild index 38dc82e0bcdd..13b261011af0 100644 --- a/sys-apps/secilc/secilc-9999.ebuild +++ b/sys-apps/secilc/secilc-9999.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -12,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index 6f8d4ed04e79..9174f4865c17 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,3 +1,4 @@ DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8 -EBUILD sed-4.8.ebuild 910 BLAKE2B ede8f5f9e1b4722152d6c93792159e3348338d7997ecd3809ac9229dcad48148fac59cfd6dbe1c9a31ef1a79c29914827237000b1680e049afba9112c98effc6 SHA512 fd152088886af788ee5d788bcc5c7dfaa4795d56fe84461a40aadd4379343721c3d8b5396b688544a167989ca412e4c2209d8fb12ff0fed1bb5c4559449083bf +DIST sed-4.8.tar.xz.sig 833 BLAKE2B 8e5b3c69a28ffbfa49ef6f769fbb72c6f1ec14e6e1e0cec3851d15d85e05560a8a74e28e037eefb916b10831b4afbe0e4735d713dc3b90d7d73de7d0b1176d0b SHA512 9b886bdbd18ee2d60608cee3fd2b4193a1b6c3309d887ee05828c14b89b7b515dbf042a9e0ebdd13e6ccfa42e3cd217a408c796d68c4ebedaaa64f795000f095 +EBUILD sed-4.8.ebuild 1095 BLAKE2B 883e52e7bbbdd2cb275bd585c3592718d38eb3c73d4c891762dc8c208feb2a31bda2002b43fd66726ae99aca3965d96413119c8cc9e52c10325d03e1cdf78a9c SHA512 5fbc05e9ff3ebb467298dbff56a63b2da2e3464bb69679e5bebe7daa7e93216b7177749f558590c124784c845af2712fe8af9b3430034fcd058983c207516e64 MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002 diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild index 69f4960ab94f..3ecfbc9df7fd 100644 --- a/sys-apps/sed/sed-4.8.ebuild +++ b/sys-apps/sed/sed-4.8.ebuild @@ -3,11 +3,13 @@ EAPI=7 -inherit flag-o-matic +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc +inherit flag-o-matic verify-sig DESCRIPTION="Super-useful stream editor" HOMEPAGE="http://sed.sourceforge.net/" SRC_URI="mirror://gnu/sed/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )" LICENSE="GPL-3" SLOT="0" @@ -28,7 +30,8 @@ DEPEND="${RDEPEND} selinux? ( sys-libs/libselinux[static-libs(+)] ) ) " -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-sed )" src_configure() { use static && append-ldflags -static diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest index f7b32feb832e..c77229a282fe 100644 --- a/sys-apps/selinux-python/Manifest +++ b/sys-apps/selinux-python/Manifest @@ -1,9 +1,6 @@ -AUX selinux-python-3.2-optional-networkx.patch 9043 BLAKE2B 326638e25813f0183906f112f20b971dc95edd3fa99d8614435f726ab49c97c21b00acb6b999aba762b7077059904e20e7646fc66fbe87c0b5ba628c0977ab8a SHA512 9e00c162fec9e9d716e95f8e4aac519d2f4dbe82b94c6304e47f38820443841c35ac2595a92c9a03b013deb3ad150670aa5bd7976fa1487e0ac7b019a0860dbe -DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49 -DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755 DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3 -EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1 -EBUILD selinux-python-3.2-r1.ebuild 3149 BLAKE2B a828b900d32c908ab7c528f35deb47843746e4c71196f3d9be947df1ffb724b5e1ebb27b00410400152e2bfc293d26b1604a6b74df939fb236c4b2455ed79133 SHA512 b6eb9d5ac518de681df9f22bb3c0eac560152da2b658a662e0e44041024ab7049bb0981af2ab71f87f4e8da814ba0770e7308ce471ba3dbca4870448a96ea276 +DIST selinux-python-3.4-rc1.tar.gz 3597175 BLAKE2B eb5c71b5a946978353dc023a799dd3e4063a8af460887a05dc9e852ef93e5794a4edb4c2fe909602c0bfd7a34d3c3d16b713ace822e610dc3a6c3c34929c3374 SHA512 b67baf60e95a5f7f1764b41e550665231639722e1a039f7f8d6b8eda3f70dd376f9e813fd755e5035018c8719069fc987e89b928c5cf7c9bd447d65af51e7656 EBUILD selinux-python-3.3.ebuild 3087 BLAKE2B ad27bfc49dd0ad01c181ec159aee9bfd4018b13e4a2dd602d6f35e890a6879dd48c91901760e1ae093d28db3d5b4ead2e9ca92ff4d7f728a85a6b08f3f452af6 SHA512 761646c3a71af22ad4ef51abdb282f5733389471389bfee06c08edcdb3b1360b5087adc1f11530c04ef86bbe65bd3ed1b1a9653034550a743f6582a8a9ea9a66 -EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d +EBUILD selinux-python-3.4_rc1.ebuild 3163 BLAKE2B 5d14a809a6d465c019d9e886c9a21444c9aff8f08f7001444b0ffa4b8f6d6967153aa7dbae7babd8eeaf845cc88106ba9bd07478bb208dd4953a4cd0529710d0 SHA512 e6fdba90ad3182e7fccc35a16475c87e2c6eefc934fe141556e8ae3bd9b2a8f7429a680f26b2d053258d4f6502849a09fd328407b0e390a0706a82c9b269ed1c +EBUILD selinux-python-9999.ebuild 3163 BLAKE2B 5d14a809a6d465c019d9e886c9a21444c9aff8f08f7001444b0ffa4b8f6d6967153aa7dbae7babd8eeaf845cc88106ba9bd07478bb208dd4953a4cd0529710d0 SHA512 e6fdba90ad3182e7fccc35a16475c87e2c6eefc934fe141556e8ae3bd9b2a8f7429a680f26b2d053258d4f6502849a09fd328407b0e390a0706a82c9b269ed1c MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304 diff --git a/sys-apps/selinux-python/files/selinux-python-3.2-optional-networkx.patch b/sys-apps/selinux-python/files/selinux-python-3.2-optional-networkx.patch deleted file mode 100644 index a9525ddda939..000000000000 --- a/sys-apps/selinux-python/files/selinux-python-3.2-optional-networkx.patch +++ /dev/null @@ -1,271 +0,0 @@ -Avoid importing networkx which ends up having a Fortran (and other large) -dependencies. - -https://bugs.gentoo.org/809038 -https://github.com/SELinuxProject/selinux/commit/ba23ba068364ab11ff51f52bd1e20e3c63798a62 - -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 25 Aug 2021 11:19:40 +0200 -Subject: [PATCH] python: Import specific modules from setools for less deps -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Import the setools classes needed for Python bindings from specific -setools modules in order to reduce the dependency footprint -of the Python bindings. Importing the top-level module causes all -setools modules to be loaded which includes the modules that require -networkx. - -SELinux packages belong to the group of core system packages on Gentoo -Linux. It is desirable to keep the system set as small as possible, -and the dependency between setools and networkx seems to be the easiest -link to break without major loss of functionality. - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- a/semanage/seobject.py -+++ b/semanage/seobject.py -@@ -31,7 +31,8 @@ - from semanage import * - PROGNAME = "policycoreutils" - import sepolicy --import setools -+from setools.policyrep import SELinuxPolicy -+from setools.typequery import TypeQuery - import ipaddress - - try: -@@ -1339,7 +1340,7 @@ class ibpkeyRecords(semanageRecords): - def __init__(self, args = None): - semanageRecords.__init__(self, args) - try: -- q = setools.TypeQuery(setools.SELinuxPolicy(sepolicy.get_store_policy(self.store)), attrs=["ibpkey_type"]) -+ q = TypeQuery(SELinuxPolicy(sepolicy.get_store_policy(self.store)), attrs=["ibpkey_type"]) - self.valid_types = sorted(str(t) for t in q.results()) - except: - pass -@@ -1599,7 +1600,7 @@ class ibendportRecords(semanageRecords): - def __init__(self, args = None): - semanageRecords.__init__(self, args) - try: -- q = setools.TypeQuery(setools.SELinuxPolicy(sepolicy.get_store_policy(self.store)), attrs=["ibendport_type"]) -+ q = TypeQuery(SELinuxPolicy(sepolicy.get_store_policy(self.store)), attrs=["ibendport_type"]) - self.valid_types = set(str(t) for t in q.results()) - except: - pass ---- a/sepolicy/sepolicy/__init__.py -+++ b/sepolicy/sepolicy/__init__.py -@@ -4,7 +4,6 @@ - - import errno - import selinux --import setools - import glob - import sepolgen.defaults as defaults - import sepolgen.interfaces as interfaces -@@ -13,6 +12,17 @@ - import re - import gzip - -+from setools.boolquery import BoolQuery -+from setools.portconquery import PortconQuery -+from setools.policyrep import SELinuxPolicy -+from setools.objclassquery import ObjClassQuery -+from setools.rbacrulequery import RBACRuleQuery -+from setools.rolequery import RoleQuery -+from setools.terulequery import TERuleQuery -+from setools.typeattrquery import TypeAttributeQuery -+from setools.typequery import TypeQuery -+from setools.userquery import UserQuery -+ - PROGNAME = "policycoreutils" - try: - import gettext -@@ -168,7 +178,7 @@ def policy(policy_file): - global _pol - - try: -- _pol = setools.SELinuxPolicy(policy_file) -+ _pol = SELinuxPolicy(policy_file) - except: - raise ValueError(_("Failed to read %s policy file") % policy_file) - -@@ -188,7 +198,7 @@ def info(setype, name=None): - init_policy() - - if setype == TYPE: -- q = setools.TypeQuery(_pol) -+ q = TypeQuery(_pol) - q.name = name - results = list(q.results()) - -@@ -206,7 +216,7 @@ def info(setype, name=None): - } for x in results) - - elif setype == ROLE: -- q = setools.RoleQuery(_pol) -+ q = RoleQuery(_pol) - if name: - q.name = name - -@@ -217,7 +227,7 @@ def info(setype, name=None): - } for x in q.results()) - - elif setype == ATTRIBUTE: -- q = setools.TypeAttributeQuery(_pol) -+ q = TypeAttributeQuery(_pol) - if name: - q.name = name - -@@ -227,7 +237,7 @@ def info(setype, name=None): - } for x in q.results()) - - elif setype == PORT: -- q = setools.PortconQuery(_pol) -+ q = PortconQuery(_pol) - if name: - ports = [int(i) for i in name.split("-")] - if len(ports) == 2: -@@ -251,7 +261,7 @@ def info(setype, name=None): - } for x in q.results()) - - elif setype == USER: -- q = setools.UserQuery(_pol) -+ q = UserQuery(_pol) - if name: - q.name = name - -@@ -268,7 +278,7 @@ def info(setype, name=None): - } for x in q.results()) - - elif setype == BOOLEAN: -- q = setools.BoolQuery(_pol) -+ q = BoolQuery(_pol) - if name: - q.name = name - -@@ -278,7 +288,7 @@ def info(setype, name=None): - } for x in q.results()) - - elif setype == TCLASS: -- q = setools.ObjClassQuery(_pol) -+ q = ObjClassQuery(_pol) - if name: - q.name = name - -@@ -372,11 +382,11 @@ def search(types, seinfo=None): - tertypes.append(DONTAUDIT) - - if len(tertypes) > 0: -- q = setools.TERuleQuery(_pol, -- ruletype=tertypes, -- source=source, -- target=target, -- tclass=tclass) -+ q = TERuleQuery(_pol, -+ ruletype=tertypes, -+ source=source, -+ target=target, -+ tclass=tclass) - - if PERMS in seinfo: - q.perms = seinfo[PERMS] -@@ -385,11 +395,11 @@ def search(types, seinfo=None): - - if TRANSITION in types: - rtypes = ['type_transition', 'type_change', 'type_member'] -- q = setools.TERuleQuery(_pol, -- ruletype=rtypes, -- source=source, -- target=target, -- tclass=tclass) -+ q = TERuleQuery(_pol, -+ ruletype=rtypes, -+ source=source, -+ target=target, -+ tclass=tclass) - - if PERMS in seinfo: - q.perms = seinfo[PERMS] -@@ -398,11 +408,11 @@ def search(types, seinfo=None): - - if ROLE_ALLOW in types: - ratypes = ['allow'] -- q = setools.RBACRuleQuery(_pol, -- ruletype=ratypes, -- source=source, -- target=target, -- tclass=tclass) -+ q = RBACRuleQuery(_pol, -+ ruletype=ratypes, -+ source=source, -+ target=target, -+ tclass=tclass) - - for r in q.results(): - toret.append({'source': str(r.source), -@@ -720,11 +730,11 @@ def get_all_entrypoints(): - - - def get_entrypoint_types(setype): -- q = setools.TERuleQuery(_pol, -- ruletype=[ALLOW], -- source=setype, -- tclass=["file"], -- perms=["entrypoint"]) -+ q = TERuleQuery(_pol, -+ ruletype=[ALLOW], -+ source=setype, -+ tclass=["file"], -+ perms=["entrypoint"]) - return [str(x.target) for x in q.results() if x.source == setype] - - -@@ -739,10 +749,10 @@ def get_init_transtype(path): - - - def get_init_entrypoint(transtype): -- q = setools.TERuleQuery(_pol, -- ruletype=["type_transition"], -- source="init_t", -- tclass=["process"]) -+ q = TERuleQuery(_pol, -+ ruletype=["type_transition"], -+ source="init_t", -+ tclass=["process"]) - entrypoints = [] - for i in q.results(): - try: -@@ -754,10 +764,10 @@ def get_init_entrypoint(transtype): - return entrypoints - - def get_init_entrypoints_str(): -- q = setools.TERuleQuery(_pol, -- ruletype=["type_transition"], -- source="init_t", -- tclass=["process"]) -+ q = TERuleQuery(_pol, -+ ruletype=["type_transition"], -+ source="init_t", -+ tclass=["process"]) - entrypoints = {} - for i in q.results(): - try: -@@ -837,7 +847,7 @@ def get_all_role_allows(): - return role_allows - role_allows = {} - -- q = setools.RBACRuleQuery(_pol, ruletype=[ALLOW]) -+ q = RBACRuleQuery(_pol, ruletype=[ALLOW]) - for r in q.results(): - src = str(r.source) - tgt = str(r.target) -@@ -923,7 +933,7 @@ def get_all_roles(): - if not _pol: - init_policy() - -- q = setools.RoleQuery(_pol) -+ q = RoleQuery(_pol) - roles = [str(x) for x in q.results() if str(x) != "object_r"] - return roles - diff --git a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild deleted file mode 100644 index cd89ab2c85dc..000000000000 --- a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="xml" - -inherit python-r1 toolchain-funcs - -MY_P="${P//_/-}" - -MY_RELEASEDATE="20200710" -SEPOL_VER="${PV}" -SELNX_VER="${PV}" -SEMNG_VER="${PV}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DESCRIPTION="SELinux core utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN#selinux-}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python] - >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)] - >=sys-libs/libsepol-${SEPOL_VER}:= - >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] - ${PYTHON_DEPS}" - -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" - - python_copy_sources -} - -src_compile() { - building() { - emake -C "${BUILD_DIR}" \ - CC="$(tc-getCC)" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" - } - python_foreach_impl building -} - -src_install() { - installation() { - emake -C "${BUILD_DIR}" \ - DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - install - python_optimize - } - python_foreach_impl installation - - # Set version-specific scripts - for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do - python_replicate_script "${ED}/usr/bin/${pyscript}" - done - for pyscript in semanage; do - python_replicate_script "${ED}/usr/sbin/${pyscript}" - done - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -} diff --git a/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild index e9ba19ba5815..4f4a0a3c95d3 100644 --- a/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild +++ b/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit python-r1 toolchain-funcs -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,12 +18,16 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN#selinux-}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~mips x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=sys-libs/libselinux-${PV}:=[python] >=sys-libs/libsemanage-${PV}:=[python(+)] @@ -39,10 +42,6 @@ BDEPEND=" >=sys-apps/secilc-${PV} )" -PATCHES=( - "${FILESDIR}"/${PN}-3.2-optional-networkx.patch -) - src_prepare() { default sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild index 8e1f90984a8b..4f4a0a3c95d3 100644 --- a/sys-apps/selinux-python/selinux-python-9999.ebuild +++ b/sys-apps/selinux-python/selinux-python-9999.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit python-r1 toolchain-funcs -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,12 +18,16 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN#selinux-}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=sys-libs/libselinux-${PV}:=[python] >=sys-libs/libsemanage-${PV}:=[python(+)] diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest index 3923668d130e..52f79655c5c4 100644 --- a/sys-apps/semodule-utils/Manifest +++ b/sys-apps/semodule-utils/Manifest @@ -1,8 +1,6 @@ -DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157 -DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1 DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc -EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476 -EBUILD semodule-utils-3.2.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8 +DIST semodule-utils-3.4-rc1.tar.gz 14270 BLAKE2B 7a0b5d060fc07ea71b71ccf2eaa6604cdc00afabaef1be8efb62a38bd401cfacd20f36af1a74324c2162b5fcdbcba6a3b3c5d98e33fccba99bc38ddfabd10ff8 SHA512 848354e95fcd6ae6be3e0ff5a32b26d78b2fbd04f463f063db796ff843dab44675eceb670f10c3ee602a6280e885ecc33242b37bb67ef77d467be030ddd4a72c EBUILD semodule-utils-3.3.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8 -EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069 +EBUILD semodule-utils-3.4_rc1.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e +EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5 diff --git a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild deleted file mode 100644 index 21cea74be5de..000000000000 --- a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -MY_RELEASEDATE="20200710" -SEPOL_VER="${PV}" -SELNX_VER="${PV}" - -MY_P="${P//_/-}" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="SELinux policy module utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=" - -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild index 5a5792a677bd..ce9f168c9c89 100644 --- a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild +++ b/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~mips x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux policy module utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" - RDEPEND="${DEPEND}" src_prepare() { diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild index 13fc0d86279e..ce9f168c9c89 100644 --- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild +++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux policy module utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" - RDEPEND="${DEPEND}" src_prepare() { diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest index db8ff447a041..1064003f029c 100644 --- a/sys-apps/sg3_utils/Manifest +++ b/sys-apps/sg3_utils/Manifest @@ -1,6 +1,6 @@ AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47b441de9d34f57944ce99c26710b44cab010c1a5fdf538e97dfbea5714cb2d4ac5c7fd508fb23a5d835f0932ca6fcec22604dd55e46 SHA512 faba667b6cb4b7b1d6e04ddd7e80073cd5e80dd4ec7b2312c599a5c1c44df4b9ba8394354881a4968625450691587ddb42adec004043ab604f923d5fb643a86b DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163 -EBUILD sg3_utils-1.46-r1.ebuild 1076 BLAKE2B cfce21f217dcd43b8c527e241c3a577cfe76fdf8a46f654439a6096f330970e545ba78b6ee91ab12da540125c35eb99d30eed94764bec6cdfc342d53af18c68a SHA512 806355cd5a302570b294af02a8607bfccb577bd4533eb04b3d0145535bb41749524c0e738af1bc44e4ac7763b90b83bce499eacda3e6ff8cfc9a885b446ba511 -EBUILD sg3_utils-1.47.ebuild 1002 BLAKE2B dcb487e43fa63a2d47680e111f8e9814af13c45aa9e3f361de3e096b32a387ba55b7ce09ef5d55b53ca4a0cca665c173221d3316d55f982aa4d0912a5feeb6ee SHA512 bfc1e971d80c67419fbb3bd5afe2160891d1f4c246d8392eb7b9a3f0731d2c7b6d08b3ceb3283f0486fe170c24b65e53c0e27a4fe071a5d8d90fd495b2e13ebb +EBUILD sg3_utils-1.46-r1.ebuild 1078 BLAKE2B e8d173b0636b17a6ef4922f3817ca7250eac4ce241f4103bc75ca39c7a4e2675b10f70672e680bd8d19dfdb8917871a6f46c116ff8585938fe357e83833c1933 SHA512 2b59e7d8e31ec2d5010e2cb822888bde3891f625a46a6951b123c38f39f9978986479688d74986beebbec27230eb27a154c77caad200323ec65733549bcc61dd +EBUILD sg3_utils-1.47.ebuild 1004 BLAKE2B 68be79173ef911951935bb214c250f752f34b59ad4fb8cc27f0d31043488208d59f9b54c1ccbe512745a409aad0518b16b0762c2105f2889c638a59f34995183 SHA512 eb50d4bc2606e38e496d09b5add629aa57515800880a992d25a58caf2b16d13475e59c6a9d554206d4123970d2c41086433c899d5ff8e34a6e2e0a1880d4dfdb MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild index adf5be558150..51068d8dc71a 100644 --- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild +++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" DESCRIPTION="Apps for querying the sg SCSI interface" -HOMEPAGE="http://sg.danny.cz/sg/" +HOMEPAGE="https://sg.danny.cz/sg/" #SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz" +SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" diff --git a/sys-apps/sg3_utils/sg3_utils-1.47.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild index 30882f707434..810a9073c7ac 100644 --- a/sys-apps/sg3_utils/sg3_utils-1.47.ebuild +++ b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Apps for querying the sg SCSI interface" -HOMEPAGE="http://sg.danny.cz/sg/" +HOMEPAGE="https://sg.danny.cz/sg/" #SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz" +SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest index 3d0088936419..b2d956336af8 100644 --- a/sys-apps/smc-sum/Manifest +++ b/sys-apps/smc-sum/Manifest @@ -1,5 +1,5 @@ AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9 AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b -DIST sum_2.7.0_Linux_x86_64_20210903.tar.gz 13796908 BLAKE2B 4ea3e63be33bb94724483db3f5a4476f1f866152f03572e9b32317f7cc3b44b04d91a20965e6a63c7d3c5c6f5b2a4b493f77fef981d4813dfbf5c5dc2684d23a SHA512 d55a0a28a5700179f2acdd51a45be490c841b4ad3e01df30bdb22d02ccc0e24265205b320be2c5feef328e53cc049fb59376afc122707694fd17dd6c35658a9b -EBUILD smc-sum-2.7.0.20210903.ebuild 1513 BLAKE2B aea1f54566faa4560c226713e4c4755b7d59d0115372a53313d8987f8aae555f6bc839105f9bc2bba1433e6a9d54d642b1ac9d45558588ff434e6f25c8bb4c15 SHA512 6d8d988d3de1a3a553b289733dbd4f89ab8324aad5c85ff84218672b5bc63a1804569bfdfd26a16ce4a35af550e86189400b88b7cd2057722f5878dabade3124 +DIST sum_2.8.0_Linux_x86_64_20220126.tar.gz 14852916 BLAKE2B a65243878ec41c05fc8c71f147883fea29517e93ef0e1460a39827a98e1fd9e533be2f4a6cfceed29562ba2d0e798cac64645bbf4d2b23267396d86516277df9 SHA512 4e11a9916b3386229eb5cfc15830bd1ecab7d79cdc3280f4a736b8882554170e6d1579531c441d0966c816e1f9c98d256d7fbb2c0a6e8c03770a1053860a06f5 +EBUILD smc-sum-2.8.0.20220126.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c diff --git a/sys-apps/smc-sum/smc-sum-2.7.0.20210903.ebuild b/sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild index 06d5dbd659a2..e309a7ad7f47 100644 --- a/sys-apps/smc-sum/smc-sum-2.7.0.20210903.ebuild +++ b/sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-mod diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest index 5d1e5eca90a7..3a12fb593ea7 100644 --- a/sys-apps/smcipmitool/Manifest +++ b/sys-apps/smcipmitool/Manifest @@ -1,5 +1,5 @@ AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7 -DIST SMCIPMITool_2.25.0_build.210326_bundleJRE_Linux_x64.tar.gz 120356581 BLAKE2B c3106bcb4d1f3e0cf3197e605b741d88d662824ec7e0aecde1a2b9bc1db0313b1cb6fba4d41b792dbc2f0f6da2cab7eab75ae912b329feaec9e2f601774eca36 SHA512 f0e11c7ca7c46ffda8a37e510e1653d413679b54f19e00d05379b422a37a008c2cae6a7a06c184f73ac0925b73ddb449364bf9178ad8fea4ddc718ebf8425dae -EBUILD smcipmitool-2.25.0.210326-r1.ebuild 1825 BLAKE2B 129358781caf26432b958fc74af65a6c30242e68c9e19ec84c49c0552b9ecc1a8832027221f9d7f6a0f34bcd3f66995db3748b5fb04cd81679088098dae1a4e4 SHA512 7ff07dcd10e613ddaf04a90e20a5de75e658cd658f5e264acc080530969395125a27897d8a8f740f6798b43060a25c0109ca257e30b70e507a22bdac04c3338a +DIST SMCIPMITool_2.26.0_build.220209_bundleJRE_Linux_x64.tar.gz 124144278 BLAKE2B 2b4cc6f6fc315c7c22a271e201044d8e6d6825555f44c787c66941f76e029207ef3e4f216c330e6adeae508194d20c07e5f062e1bb3f19bb5eec45152a161614 SHA512 b39074ed515ef9698630e2b2969178caa68e27448e49636d1daf633c1e4b0f4ff1a30a4074a6c5ed68a960bfd653b5d3294641e1f0d3f8ee9732065337a8b243 +EBUILD smcipmitool-2.26.0.220209.ebuild 1825 BLAKE2B 129358781caf26432b958fc74af65a6c30242e68c9e19ec84c49c0552b9ecc1a8832027221f9d7f6a0f34bcd3f66995db3748b5fb04cd81679088098dae1a4e4 SHA512 7ff07dcd10e613ddaf04a90e20a5de75e658cd658f5e264acc080530969395125a27897d8a8f740f6798b43060a25c0109ca257e30b70e507a22bdac04c3338a MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3 diff --git a/sys-apps/smcipmitool/smcipmitool-2.25.0.210326-r1.ebuild b/sys-apps/smcipmitool/smcipmitool-2.26.0.220209.ebuild index 092ee2dab490..092ee2dab490 100644 --- a/sys-apps/smcipmitool/smcipmitool-2.25.0.210326-r1.ebuild +++ b/sys-apps/smcipmitool/smcipmitool-2.26.0.220209.ebuild diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 96b31eaf1c8f..86e2efe3b92b 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -9,14 +9,9 @@ AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a3 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 -DIST systemd-stable-250.2.tar.gz 11121031 BLAKE2B ddbb33648dbf0442e4258bf23ace04eac6d5ab6a2434537395b900b7bd4113a86199d6d559f8d76dcbede88484240a6593439acdcc7b1801857d13840c389c6c SHA512 2f734c1d1ea98ee3f1beb00689a0d56603cd981aa938bee1655445ddd4af3b2bb6472249fa158741edcb2259ee302b625e124c38b7d2ec00c53760d6b362d5bb -DIST systemd-stable-250.3.tar.gz 11125151 BLAKE2B 659c39994e76f94407dd9079e28fc644981d3475a0ed440b9895e8f201c3ce1fc47aa8c4d599ad85ed89ddfb6ca8e514aee2a739e93640745cf46647f99efe56 SHA512 81847fb088ff271138b1ea318995a2ca2ee5d4c5d839c9dd81f0210d366198049199d59c49b25ef8783df2c6b8dd9fcdf2d916777788b1a6d42deec9da8e9da5 DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0 EBUILD systemd-249.11.ebuild 14749 BLAKE2B 3b6ccb1617acceb9ebd90805aa7e2124be674e235094641013a665b76bf2417f250cb290e96caca6cdfa6704ee179a07057dfb820ce3a57daaecd754427a88d2 SHA512 6aa8d8428824cc8961692075a4ec34d1d5b179fef6b499c381370645259250b8c340dbb4523f4ac1c61241e844ed17c7800fc34ceb51c43fcde62562ddc350d8 EBUILD systemd-249.9.ebuild 14784 BLAKE2B ca86d60cc9890d368c269baa814c55345c05da6781dab850dc11d1ea81304e1d25319af0e3a81690df4fa178a796a54af5789dff4756c65b2bcb326f5f4bd511 SHA512 2c3166d0e8ce969b0117cd4454f7d8f71dcf6f079e7a8890cbe77c56e92e3d28d54e98ca07ed5dc0a391cd9acb0b58ce4869ee98b7d91f36fbdbfac54d01ee7f -EBUILD systemd-250.2.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc -EBUILD systemd-250.3.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc -EBUILD systemd-250.4-r1.ebuild 15294 BLAKE2B c709485d1ae97d77f58a971984e7f3258a0f624b59e11958e1cadfe1991f704ee10d8bc836770f4c98f3dc3714e2c8d9ca65d89015b575bb21b877afa44ddeae SHA512 90468976a753b773f1748821128b034c342da5dcb2646203d51b07ccf726aa0937bfe7c87166e5feee5417ed6b40e81abc534953dbbb1d359fe80b9beb6c85b7 -EBUILD systemd-250.4.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc -EBUILD systemd-9999.ebuild 15249 BLAKE2B e9a1484fa9c39b55f47c680c7a4a53fdd722e4d56d3a496a06875c3782a2ab97d04b7a1475ac0b08ace87dc8d9ba939034e7b22874da110d3a5b8e6dd064265d SHA512 8e820f53362c9c2379196ae8c3bd7bd8801856331ede8ad3877e5a04c9cc2e5145ada108d8d48db09358e2335791550c49a663ae75c900eac9a5b9fe201152cc +EBUILD systemd-250.4-r1.ebuild 15724 BLAKE2B 912db6d83bcb3414ee52ea1a91c80ec01b60ee2d37398b56ee3997d4b629d3f94bc28e45beeb5aeb9e675de7c6ceb32e81a24fa130ce16a08dc46cfa374fa3a9 SHA512 6dd59e22c1fdabed038fb37f3df6f9537eba36309cd858d136531a57c25e7f8699179b821f431571d2a866d0f378989803accd8aacdf7319602ca19531990a33 +EBUILD systemd-9999.ebuild 15683 BLAKE2B d1e7ab5d5835fd03d0fbb9b2826c59fa7fb5e717a81d788de8158f6af5f9a61be0e350232a87cfe70beaa654ea242c57eb8dc5d8e08e2e7e942c1f1515cc653c SHA512 65d25daa67d78c0b18468e5f40790235abb561e58582a861a78a60908923f6ec886e6cff4a9111b7ac8efffcda3139b165d3d9592eaa8ce8cdac00e4a0c88c25 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b diff --git a/sys-apps/systemd/systemd-250.2.ebuild b/sys-apps/systemd/systemd-250.2.ebuild deleted file mode 100644 index 0d675fb07803..000000000000 --- a/sys-apps/systemd/systemd-250.2.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -# Avoid QA warnings -TMPFILES_OPTIONAL=1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode - +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd -" -REQUIRED_USE=" - dns-over-tls? ( || ( gnutls openssl ) ) - homed? ( cryptsetup pam openssl ) - importd? ( curl lzma || ( gcrypt openssl ) ) - policykit? ( !hostnamed-fallback ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-3.6.0:0= ) - http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) - idn? ( net-dns/libidn2:= ) - 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= ) - openssl? ( >=dev-libs/openssl-1.1.0:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - tpm? ( app-crypt/tpm2-tss:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) -" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=acct-group/adm-0-r1 - >=acct-group/wheel-0-r1 - >=acct-group/kmem-0-r1 - >=acct-group/tty-0-r1 - >=acct-group/utmp-0-r1 - >=acct-group/audio-0-r1 - >=acct-group/cdrom-0-r1 - >=acct-group/dialout-0-r1 - >=acct-group/disk-0-r1 - >=acct-group/input-0-r1 - >=acct-group/kvm-0-r1 - >=acct-group/lp-0-r1 - >=acct-group/render-0-r1 - acct-group/sgx - >=acct-group/tape-0-r1 - acct-group/users - >=acct-group/video-0-r1 - >=acct-group/systemd-journal-0-r1 - >=acct-user/root-0-r1 - acct-user/nobody - >=acct-user/systemd-journal-remote-0-r1 - >=acct-user/systemd-coredump-0-r1 - >=acct-user/systemd-network-0-r1 - acct-user/systemd-oom - >=acct-user/systemd-resolve-0-r1 - >=acct-user/systemd-timesync-0-r1 - >=sys-apps/baselayout-2.2 - hostnamed-fallback? ( - acct-group/systemd-hostname - sys-apps/dbus-broker - ) - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( - !sys-apps/openrc[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-apps/hwids[udev] - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-fs/udev-init-scripts-34 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - test? ( - app-text/tree - dev-lang/perl - sys-apps/dbus - ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if kernel_is -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - fi - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # 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-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - $(meson_use split-usr) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - $(meson_native_use_bool acl) - $(meson_native_use_bool apparmor) - $(meson_native_use_bool audit) - $(meson_native_use_bool cryptsetup libcryptsetup) - $(meson_native_use_bool curl libcurl) - $(meson_native_use_bool dns-over-tls dns-over-tls) - $(meson_native_use_bool elfutils) - $(meson_native_use_bool fido2 libfido2) - $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) - $(meson_native_use_bool gnutls) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - $(meson_native_use_bool homed) - $(meson_native_use_bool http microhttpd) - $(meson_native_use_bool idn) - $(meson_native_use_bool importd) - $(meson_native_use_bool importd bzip2) - $(meson_native_use_bool importd zlib) - $(meson_native_use_bool kmod) - $(meson_use lz4) - $(meson_use lzma xz) - $(meson_use zstd) - $(meson_native_use_bool nat libiptc) - $(meson_native_use_bool openssl) - $(meson_use pam) - $(meson_native_use_bool pkcs11 p11kit) - $(meson_native_use_bool pcre pcre2) - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool pwquality) - $(meson_native_use_bool qrcode qrencode) - $(meson_native_use_bool seccomp) - $(meson_native_use_bool selinux) - $(meson_native_use_bool tpm tpm2) - $(meson_native_use_bool test dbus) - $(meson_native_use_bool xkb xkbcommon) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - $(meson_native_true backlight) - $(meson_native_true binfmt) - $(meson_native_true coredump) - $(meson_native_true environment-d) - $(meson_native_true firstboot) - $(meson_native_true hibernate) - $(meson_native_true hostnamed) - $(meson_native_true ldconfig) - $(meson_native_true localed) - $(meson_native_true man) - $(meson_native_true networkd) - $(meson_native_true quotacheck) - $(meson_native_true randomseed) - $(meson_native_true rfkill) - $(meson_native_true sysusers) - $(meson_native_true timedated) - $(meson_native_true timesyncd) - $(meson_native_true tmpfiles) - $(meson_native_true vconsole) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # https://bugs.gentoo.org/761763 - rm -r "${ED}"/usr/lib/sysusers.d || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - keepdir /etc/udev/hwdb.d - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - - if use pam; then - newpamd "${FILESDIR}"/systemd-user.pam systemd-user - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - # workaround for https://github.com/systemd/systemd/issues/13501 - if use hostnamed-fallback; then - # this file requires dbus-broker - insinto /usr/share/dbus-1/system.d/ - doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" - - insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" - doins "${FILESDIR}/00-hostnamed-network-user.conf" - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${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_preinst() { - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. - systemd-hwdb --root="${ROOT}" update - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respected, and ensure consistency - # between OpenRC & systemd - migrate_locale - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - 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-250.3.ebuild b/sys-apps/systemd/systemd-250.3.ebuild deleted file mode 100644 index 0d675fb07803..000000000000 --- a/sys-apps/systemd/systemd-250.3.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -# Avoid QA warnings -TMPFILES_OPTIONAL=1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode - +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd -" -REQUIRED_USE=" - dns-over-tls? ( || ( gnutls openssl ) ) - homed? ( cryptsetup pam openssl ) - importd? ( curl lzma || ( gcrypt openssl ) ) - policykit? ( !hostnamed-fallback ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-3.6.0:0= ) - http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) - idn? ( net-dns/libidn2:= ) - 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= ) - openssl? ( >=dev-libs/openssl-1.1.0:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - tpm? ( app-crypt/tpm2-tss:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) -" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=acct-group/adm-0-r1 - >=acct-group/wheel-0-r1 - >=acct-group/kmem-0-r1 - >=acct-group/tty-0-r1 - >=acct-group/utmp-0-r1 - >=acct-group/audio-0-r1 - >=acct-group/cdrom-0-r1 - >=acct-group/dialout-0-r1 - >=acct-group/disk-0-r1 - >=acct-group/input-0-r1 - >=acct-group/kvm-0-r1 - >=acct-group/lp-0-r1 - >=acct-group/render-0-r1 - acct-group/sgx - >=acct-group/tape-0-r1 - acct-group/users - >=acct-group/video-0-r1 - >=acct-group/systemd-journal-0-r1 - >=acct-user/root-0-r1 - acct-user/nobody - >=acct-user/systemd-journal-remote-0-r1 - >=acct-user/systemd-coredump-0-r1 - >=acct-user/systemd-network-0-r1 - acct-user/systemd-oom - >=acct-user/systemd-resolve-0-r1 - >=acct-user/systemd-timesync-0-r1 - >=sys-apps/baselayout-2.2 - hostnamed-fallback? ( - acct-group/systemd-hostname - sys-apps/dbus-broker - ) - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( - !sys-apps/openrc[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-apps/hwids[udev] - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-fs/udev-init-scripts-34 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - test? ( - app-text/tree - dev-lang/perl - sys-apps/dbus - ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if kernel_is -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - fi - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # 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-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - $(meson_use split-usr) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - $(meson_native_use_bool acl) - $(meson_native_use_bool apparmor) - $(meson_native_use_bool audit) - $(meson_native_use_bool cryptsetup libcryptsetup) - $(meson_native_use_bool curl libcurl) - $(meson_native_use_bool dns-over-tls dns-over-tls) - $(meson_native_use_bool elfutils) - $(meson_native_use_bool fido2 libfido2) - $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) - $(meson_native_use_bool gnutls) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - $(meson_native_use_bool homed) - $(meson_native_use_bool http microhttpd) - $(meson_native_use_bool idn) - $(meson_native_use_bool importd) - $(meson_native_use_bool importd bzip2) - $(meson_native_use_bool importd zlib) - $(meson_native_use_bool kmod) - $(meson_use lz4) - $(meson_use lzma xz) - $(meson_use zstd) - $(meson_native_use_bool nat libiptc) - $(meson_native_use_bool openssl) - $(meson_use pam) - $(meson_native_use_bool pkcs11 p11kit) - $(meson_native_use_bool pcre pcre2) - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool pwquality) - $(meson_native_use_bool qrcode qrencode) - $(meson_native_use_bool seccomp) - $(meson_native_use_bool selinux) - $(meson_native_use_bool tpm tpm2) - $(meson_native_use_bool test dbus) - $(meson_native_use_bool xkb xkbcommon) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - $(meson_native_true backlight) - $(meson_native_true binfmt) - $(meson_native_true coredump) - $(meson_native_true environment-d) - $(meson_native_true firstboot) - $(meson_native_true hibernate) - $(meson_native_true hostnamed) - $(meson_native_true ldconfig) - $(meson_native_true localed) - $(meson_native_true man) - $(meson_native_true networkd) - $(meson_native_true quotacheck) - $(meson_native_true randomseed) - $(meson_native_true rfkill) - $(meson_native_true sysusers) - $(meson_native_true timedated) - $(meson_native_true timesyncd) - $(meson_native_true tmpfiles) - $(meson_native_true vconsole) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # https://bugs.gentoo.org/761763 - rm -r "${ED}"/usr/lib/sysusers.d || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - keepdir /etc/udev/hwdb.d - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - - if use pam; then - newpamd "${FILESDIR}"/systemd-user.pam systemd-user - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - # workaround for https://github.com/systemd/systemd/issues/13501 - if use hostnamed-fallback; then - # this file requires dbus-broker - insinto /usr/share/dbus-1/system.d/ - doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" - - insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" - doins "${FILESDIR}/00-hostnamed-network-user.conf" - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${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_preinst() { - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. - systemd-hwdb --root="${ROOT}" update - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respected, and ensure consistency - # between OpenRC & systemd - migrate_locale - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - 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-250.4-r1.ebuild b/sys-apps/systemd/systemd-250.4-r1.ebuild index 444d748cfd2b..18d7273e17e6 100644 --- a/sys-apps/systemd/systemd-250.4-r1.ebuild +++ b/sys-apps/systemd/systemd-250.4-r1.ebuild @@ -20,7 +20,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86" fi inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript @@ -181,7 +181,7 @@ pkg_pretend() { ewarn "See https://bugs.gentoo.org/674458." fi - local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS + local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS @@ -195,10 +195,16 @@ pkg_pretend() { kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - if kernel_is -lt 5 10 20; then + if kernel_is -ge 5 10 20; then + CONFIG_CHECK+=" ~KCMP" + else CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + fi + + if kernel_is -ge 4 18; then + CONFIG_CHECK+=" ~AUTOFS_FS" else - CONFIG_CHECK+=" ~KCMP" + CONFIG_CHECK+=" ~AUTOFS4_FS" fi if linux_config_exists; then @@ -511,6 +517,14 @@ pkg_postinst() { eerror "systemd again." eerror fi + + if use hostnamed-fallback; then + if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then + ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run." + ewarn "To enable dbus-broker.service run the next command as root:" + ewarn "systemctl enable dbus-broker.service" + fi + fi } pkg_prerm() { diff --git a/sys-apps/systemd/systemd-250.4.ebuild b/sys-apps/systemd/systemd-250.4.ebuild deleted file mode 100644 index 0d675fb07803..000000000000 --- a/sys-apps/systemd/systemd-250.4.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -# Avoid QA warnings -TMPFILES_OPTIONAL=1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -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 cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode - +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd -" -REQUIRED_USE=" - dns-over-tls? ( || ( gnutls openssl ) ) - homed? ( cryptsetup pam openssl ) - importd? ( curl lzma || ( gcrypt openssl ) ) - policykit? ( !hostnamed-fallback ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-3.6.0:0= ) - http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) - idn? ( net-dns/libidn2:= ) - 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= ) - openssl? ( >=dev-libs/openssl-1.1.0:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - tpm? ( app-crypt/tpm2-tss:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) - zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) -" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - >=acct-group/adm-0-r1 - >=acct-group/wheel-0-r1 - >=acct-group/kmem-0-r1 - >=acct-group/tty-0-r1 - >=acct-group/utmp-0-r1 - >=acct-group/audio-0-r1 - >=acct-group/cdrom-0-r1 - >=acct-group/dialout-0-r1 - >=acct-group/disk-0-r1 - >=acct-group/input-0-r1 - >=acct-group/kvm-0-r1 - >=acct-group/lp-0-r1 - >=acct-group/render-0-r1 - acct-group/sgx - >=acct-group/tape-0-r1 - acct-group/users - >=acct-group/video-0-r1 - >=acct-group/systemd-journal-0-r1 - >=acct-user/root-0-r1 - acct-user/nobody - >=acct-user/systemd-journal-remote-0-r1 - >=acct-user/systemd-coredump-0-r1 - >=acct-user/systemd-network-0-r1 - acct-user/systemd-oom - >=acct-user/systemd-resolve-0-r1 - >=acct-user/systemd-timesync-0-r1 - >=sys-apps/baselayout-2.2 - hostnamed-fallback? ( - acct-group/systemd-hostname - sys-apps/dbus-broker - ) - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( - !sys-apps/openrc[sysv-utils(-)] - !sys-apps/sysvinit - ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-apps/hwids[udev] - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-fs/udev-init-scripts-34 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - test? ( - app-text/tree - dev-lang/perl - sys-apps/dbus - ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if kernel_is -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - fi - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # 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-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - $(meson_use split-usr) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - $(meson_native_use_bool acl) - $(meson_native_use_bool apparmor) - $(meson_native_use_bool audit) - $(meson_native_use_bool cryptsetup libcryptsetup) - $(meson_native_use_bool curl libcurl) - $(meson_native_use_bool dns-over-tls dns-over-tls) - $(meson_native_use_bool elfutils) - $(meson_native_use_bool fido2 libfido2) - $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) - $(meson_native_use_bool gnutls) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - $(meson_native_use_bool homed) - $(meson_native_use_bool http microhttpd) - $(meson_native_use_bool idn) - $(meson_native_use_bool importd) - $(meson_native_use_bool importd bzip2) - $(meson_native_use_bool importd zlib) - $(meson_native_use_bool kmod) - $(meson_use lz4) - $(meson_use lzma xz) - $(meson_use zstd) - $(meson_native_use_bool nat libiptc) - $(meson_native_use_bool openssl) - $(meson_use pam) - $(meson_native_use_bool pkcs11 p11kit) - $(meson_native_use_bool pcre pcre2) - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool pwquality) - $(meson_native_use_bool qrcode qrencode) - $(meson_native_use_bool seccomp) - $(meson_native_use_bool selinux) - $(meson_native_use_bool tpm tpm2) - $(meson_native_use_bool test dbus) - $(meson_native_use_bool xkb xkbcommon) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - $(meson_native_true backlight) - $(meson_native_true binfmt) - $(meson_native_true coredump) - $(meson_native_true environment-d) - $(meson_native_true firstboot) - $(meson_native_true hibernate) - $(meson_native_true hostnamed) - $(meson_native_true ldconfig) - $(meson_native_true localed) - $(meson_native_true man) - $(meson_native_true networkd) - $(meson_native_true quotacheck) - $(meson_native_true randomseed) - $(meson_native_true rfkill) - $(meson_native_true sysusers) - $(meson_native_true timedated) - $(meson_native_true timesyncd) - $(meson_native_true tmpfiles) - $(meson_native_true vconsole) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # https://bugs.gentoo.org/761763 - rm -r "${ED}"/usr/lib/sysusers.d || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - keepdir /etc/udev/hwdb.d - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - - if use pam; then - newpamd "${FILESDIR}"/systemd-user.pam systemd-user - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - # workaround for https://github.com/systemd/systemd/issues/13501 - if use hostnamed-fallback; then - # this file requires dbus-broker - insinto /usr/share/dbus-1/system.d/ - doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" - - insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" - doins "${FILESDIR}/00-hostnamed-network-user.conf" - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${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_preinst() { - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. - systemd-hwdb --root="${ROOT}" update - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respected, and ensure consistency - # between OpenRC & systemd - migrate_locale - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - 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 0d675fb07803..f5f763e60f72 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -181,7 +181,7 @@ pkg_pretend() { ewarn "See https://bugs.gentoo.org/674458." fi - local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS + local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS @@ -195,10 +195,16 @@ pkg_pretend() { kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - if kernel_is -lt 5 10 20; then + if kernel_is -ge 5 10 20; then + CONFIG_CHECK+=" ~KCMP" + else CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + fi + + if kernel_is -ge 4 18; then + CONFIG_CHECK+=" ~AUTOFS_FS" else - CONFIG_CHECK+=" ~KCMP" + CONFIG_CHECK+=" ~AUTOFS4_FS" fi if linux_config_exists; then @@ -510,6 +516,14 @@ pkg_postinst() { eerror "systemd again." eerror fi + + if use hostnamed-fallback; then + if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then + ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run." + ewarn "To enable dbus-broker.service run the next command as root:" + ewarn "systemctl enable dbus-broker.service" + fi + fi } pkg_prerm() { diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index ceabf294d03e..a8986dc6a1c1 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -8,10 +8,10 @@ AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825 DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf -DIST sysvinit-3.02.tar.xz 219560 BLAKE2B c68505aab9e257fa3fb4153b4d2a51a7a8ac0137f0ee21174c168b1a1e4f12ea6be53679c484e2ea31904a37cd94fb5d913a9885da6c618acdae566b70bb7fae SHA512 44a43e2faff3a0d3410447ffc9b8b7c66eae1a5cba54c2c4d8518d3b2e5accecc68a280c87dbf6d18f943ae466c3c1e09bc633009207cbd777d371effda30831 -DIST sysvinit-3.02.tar.xz.sig 833 BLAKE2B 07f86211d2ded8afea22df246140cb44ec4a949c2450b1cc9d996b4b582da7767726648595c5f1cf584c31c0c59c4b0915a22cc254fed56bd42ac155b544cbfc SHA512 9b8a2b3e480041ead8bd2b16551fb00e387d823ad196cf60f6938eda5accf33e944b7b530d47bc0bdd90de6766cf8d44050c0c3d95b18c8b76d412d0a6c3121a +DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b +DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4 EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788 EBUILD sysvinit-3.00-r1.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af -EBUILD sysvinit-3.01.ebuild 3851 BLAKE2B 336d2d2c0f6842348e77245e45520f81cd8a47c800c2b67f78bc022e2ddf19ca773ba4607328c341457898ac637799925fd2fae0f01781c95f97bd31b18568b6 SHA512 db6ae417491bbc015efd56f9413b15768ebe7df077f1c44d8169775bbf80d22c83088bc8c7d279b68406dfaa4dafb6aa1d13b8a80c8c1baccd5ba9b6df98a55f -EBUILD sysvinit-3.02-r3.ebuild 4899 BLAKE2B 0be96f4b4648501f7d2a9b401a897bf12decb39309719d46e1647f80f7a60b2722ca962eb17978c6ee26a70b8dbc2a0325c2a4ec93a0968b02ae2714f8aa4f6d SHA512 93810f84e111c18fd1a7fcbe097d13f5049c373b6595ce698d7e3e6e1a3cbb62f3042a32e71ec70ea700aa4a8bbd3acacb56ed24d2cf8147652ea7a6a60847a4 +EBUILD sysvinit-3.01.ebuild 3850 BLAKE2B 227c99b60698d49f94f75fa621e247c38429102289bb371bbf7b0a35c3a7cde552cee3209fbcc7999251b9321a8da206cbd802297699e691a442919cdf1501ab SHA512 d12700092f4adb65015fdd75153e553058ab6e4688cb6dd8a4616ed226740a1f8f60177390053e37f5ed8bbc015b79bc128808ffec6a7b0be1d3816a29456b71 +EBUILD sysvinit-3.03.ebuild 4910 BLAKE2B 6e309c3c4655da8a6715e63767e89c7cc0abdeabee6fb45628c2f826b72d9b0fbec10d4b154e16b4f1b3f28af01d5da5ecd50344775c9253d7b446d47eaf605e SHA512 82cd242ef9904377ccfadb0043ef3f609a872e59c6eb27324b354a895fa7830feff18d40b9de3c618356b722f33bccda152f4f0f2c7432d0001575ca65020c8b MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild index bb9bb332d574..cd394fac2954 100644 --- a/sys-apps/sysvinit/sysvinit-3.01.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.01.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="selinux ibm static" CDEPEND=" diff --git a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild index a1c99e551867..2b673d969000 100644 --- a/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.03.ebuild @@ -34,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-shutdown )" # po4a is for man page translations BDEPEND="nls? ( app-text/po4a ) - verify-sig? ( sec-keys/openpgp-keys-sysvinit )" + verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )" PATCHES=( # bug #80220 diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest index d0691c9d0068..fa25d54ef5c2 100644 --- a/sys-apps/texinfo/Manifest +++ b/sys-apps/texinfo/Manifest @@ -1,6 +1,6 @@ AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9 -DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2 -DIST texinfo-6.8.tar.gz 10119420 BLAKE2B df9dc1698e7bb4f7c97ba4d44b08631502e3f997b91169ae64161b69701fbb0f85c82295ef6867e716a0addfd7c5677e14079645b167bd74933a0153fee92200 SHA512 f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37 -EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 26caf30f52c31e1de0718ae11eee9043910d6d80b81c70797102c3a026c6e767ff68a9f6f055fb67c88019c56af8ed678fed14c5d4ac290d76c2a42fb9adfc38 SHA512 c1e18457082628d892e5b58a3f514a1058b0b53a681da0863f72da6a6120d98dee47104155e84618fbab2e794f6571cc3803c32577b9602ac670ecffe98efa69 -EBUILD texinfo-6.8.ebuild 1671 BLAKE2B 9f28fbfda43a820c042cf30e0140ed1e1318a9f2c68bbaaf53b11a8d4e201734f693d386ecfe6f2df2d73fb87a214ddb0b2a5daa91b8123c55ae368293d9d8e3 SHA512 983bc6fc828021ff627d8e67b3a6c4b45ce93eefc9d3c81be051ced49edb3bcddaeee0380cb284677d3b7552ad4978f9ff3e7d1eee01991c78b0489c0fc4112b +DIST texinfo-6.7.tar.xz 4337984 BLAKE2B 1ec9617b90dac1569f17eaac0cd8611e8e57cb3db6ece1e2f6ff20ee96fee37eb4ff3d83e4830127ccaa469e2d02b598a5af5ede4e586dd4b53d47a2f2278b60 SHA512 da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7 +DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909 +EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 99867e6ddf768ce09331f9db52e2c7940f7f6e59949dbd4f0f66262d9c07f3240914c7510f87c6f94ad6571caf8ab451fa4019bfa78d5dc0d17c09d95c2835f0 SHA512 803c530e4abffedadb084c4e091b3981c0df97e0b2100d21b46c54afe5e022d415605a29854534205561d9209289c43bcb3c3b475e77beb4c15080e5f151d438 +EBUILD texinfo-6.8.ebuild 1671 BLAKE2B dc820949dc468fe56a687fb5301ca1ab8abfd9093a8ee707eba14a5fa64863f2124356990f397f74dbf75c55ae1404084fe078c9ccc254bbcc5395b7cf36cf88 SHA512 770f0999f99b51a497e63fba786dc3e906d789b74c3897ecd1857efb0c39d1c682e19cc3dd40dd77669f3de80b20b1a0f9d98443e785639321edc87a0516a84d MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3 diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild index caa8be913bbc..2a3060bb2484 100644 --- a/sys-apps/texinfo/texinfo-6.7.ebuild +++ b/sys-apps/texinfo/texinfo-6.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: if your package uses the texi2dvi utility, it must depend on the @@ -11,7 +11,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="The GNU info program and utilities" HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild index 97ed7c623600..31c46a3263b5 100644 --- a/sys-apps/texinfo/texinfo-6.8.ebuild +++ b/sys-apps/texinfo/texinfo-6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: if your package uses the texi2dvi utility, it must depend on the @@ -11,7 +11,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="The GNU info program and utilities" HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index 726d16dbafa7..523f6c65a890 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -2,5 +2,5 @@ AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd DIST watchdog-5.16.tar.gz 203910 BLAKE2B 517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2 SHA512 1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd -EBUILD watchdog-5.16.ebuild 902 BLAKE2B e7fa06bd1ff7f3fc58e5ca0ab3b5bb4f52fde8d800b7301193a05e2f31c439dad0c17a129b69c29d753c12654be140f4494417eb3df8f867d15f5f1cacc4d3c8 SHA512 1062fbf8df8d14bf9746a36fd32db6aa8503bbfa18c0da2207f43defec6dd78e65b9fc743b716126b0c5836f1cf4a0d3eca972c6134d361fa4b1ab0699f82335 +EBUILD watchdog-5.16.ebuild 909 BLAKE2B a752b4b31fa65a21a1047e1be00d4cbef44817949e9ca077bdf62bcee34319b5500e10e00f64ac634b7fff0ab3bac88a91c8bd2e6b769964b7b27d43599c8a6f SHA512 d0da86be1ad6c229dc0be3f5f142082388a335a3ec7a8272743768719bc18c96dd8a6b78578a920d0f6ae097b5ce7c6acf769c25a33984b5ea406cb118fe7467 MISC metadata.xml 406 BLAKE2B 8a6d54669265e43ff308b76436932e8e7697ddf42810862bf2f564bc8ef2858ce205007075d33645165c1fb288a0db3ed43bcc68398fef43a13822615ac08a2a SHA512 039fe377ab47618ee42909c5608eae38c76bcc1df867c8f3097f3c230d465b25bd032bb7e7f49b1528cd57b4e0c4fba65c234eaab79b7cb39fbe152768a90a76 diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild b/sys-apps/watchdog/watchdog-5.16.ebuild index a8bd491e861d..9ae30c929351 100644 --- a/sys-apps/watchdog/watchdog-5.16.ebuild +++ b/sys-apps/watchdog/watchdog-5.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="nfs" RDEPEND="nfs? ( net-libs/libtirpc )" |