diff options
Diffstat (limited to 'sys-libs')
40 files changed, 349 insertions, 1276 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex 4388b55dfb6f..4434e3d840ff 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 410988ae6af5..5b347c08d5f8 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -13,7 +13,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD compiler-rt-sanitizers-10.0.1-r1.ebuild 4513 BLAKE2B daa067db497d6548d10041d7a2e99aca314c0b8c136e045d799f1205df135c04af2bce717e0fa281b67a6ef6bbf95fad014d1ae354eada02b2c79884af8e7576 SHA512 3579b322368ca2f350d2d373f6addc871aa8046d80dfead13d90a6564f288f35244bd5957b96d743356af7aa9560e3ca8ebb5863eea7c835fd8648e8b0fb4d8e EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 30bbe8f96289a6a4e66367728d74c3cd4631a11273dd0b2a597251c9742205577d4561c92ca9ba15d1afa7a58cb049441828b09b1d77ab1bee4d4cc6227d2673 SHA512 6755070c159402442b3e02ab21a9415313ddf82c6c54bd0a171b987c155bd85f6d0882d4146d02695fc4c157892106b9d1678235f92c28d7fe86fe8e9bb9486e EBUILD compiler-rt-sanitizers-12.0.0.ebuild 6081 BLAKE2B 7b72248427b99b3210a6aaab4d2d335c66d113bd3b473f16e660396009d1e1444241748d40b2d91851433754227fce0a893132dc668d43c7a8e962ddb83cd635 SHA512 ad69ec8901fa6273498b2b249d87c7546deeb7c294a8625fb3568faad9edaa2dd55443c00686ce18008201fecc3cba120e6282c2cec056db87af4440c920e293 -EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5957 BLAKE2B ca70b1bcb71e5219a95cb27cead388818395c6b2f55cb775e3007be1c2c92cfeebf08718aefe27a0410bc623fd4b923d50fa9bd92f9e7b1614669d8809d5e11b SHA512 dd6c020c00eb22177c1db9a38ca15f016e91bd675a7a1832c972643f1d8317d1c29149ac0bfa78d41aa12cd69d58fc54c966af0d9b2852d7dad8e9959d6e9c02 +EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5956 BLAKE2B e128aa4a849f72741774f3bbe81eda4f0c0d817bb3e40ddb560f26d184b38184905b7152012cb3144da10612d05ee87312c33e03259950971755e26250455565 SHA512 b93880806436c8a89e8089682a1147e8b2a39f9bee5599671e43c82028fb24b83db6a450b8c297130098c871d7658d2d909560f2fd592141defc0fad9a950c66 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea EBUILD compiler-rt-sanitizers-13.0.0_rc1.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea EBUILD compiler-rt-sanitizers-13.0.0_rc2.ebuild 5937 BLAKE2B 34e03d52dbf84889dee002c954abf963e47d3ac4392f162543635f10b14d031ab9cde767968a200e669a31f7aa4dced6a4e3f22d3a7fdaa2fc6109a7761a80eb SHA512 cf22df030b72296bcffad9b741d85ea031ff2b941ea540b4021928797f3f3667929cb586b4389f93aee3c063151e72f6ac14d2dcaea27c71e68272beac3d68a0 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild index dd24d7b58862..008848644459 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+clang test elibc_glibc" # base targets IUSE+=" +libfuzzer +memprof +profile +xray" diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest index 8ac49ddaa454..94f5cf01a8e8 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -13,7 +13,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD compiler-rt-10.0.1.ebuild 2782 BLAKE2B cdc7937f616e86c3394d1cc68eeea05f3eebdcac051ca48e477d3a2cb765be1d616159f72a2b77ac21a0c2a4ebf1cc79f9d9cd23a2a1c7b26a4a252142c3af21 SHA512 4380bb10112f745e0034d36be105a1b4df159f34adafdd2b24157dc3652881ab8792e7758555ce167f59e2c3360b5d36b5d4f8d456df44fa5ee754f3c310677a EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da EBUILD compiler-rt-12.0.0.ebuild 3541 BLAKE2B 0d5581a8a0f45d6843d3aca9ff184bb447e886e7e41faee2e4ebebb2154cfb2138ffa04be73eb6f76c60f7bbd65a8589649c64c60612037221c646535f04b7b5 SHA512 fa67b1e4105f9aa3bfa95c95a24c8bfeade28c521d4c69b0c08d8e8c469a06d62eb3a2b8c97175806922bd319ece1e016437c693baaab50646ec650f7aecd46e -EBUILD compiler-rt-12.0.1.ebuild 3543 BLAKE2B 712b9ac026db2cb651ca4ce885e9a13d09ac72a048cfc9c795365309734b5cba35d6797e6027e04b4178b84bd73d62026d7cb212096c78e11f59e6b14b4c53c0 SHA512 b9ce661a62aad0f40a31ec9f0256558e02ce121e35a823891b7c2b4c23b340b4a27ec441ed4a8b650993436d4677acee920bfff4eb6e19ad0306fa62ec332566 +EBUILD compiler-rt-12.0.1.ebuild 3542 BLAKE2B b212317036a421d939bc6bacef0c754d8a845c83903ee1f3dc113062511c37d0bf0a7bb40186574a0b78b8f3fb7e691ce06f0bc776448ed69f994434b27d3bd9 SHA512 0e2fe80e350070dff6c33708e78bb3b85562fa61e3af6fa67e55fd52e933cd22a5879a52ab05549a4b9c8689f8eb2f47b4e235fbda3b6bc4552d0ea204ad983c EBUILD compiler-rt-13.0.0.9999.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb EBUILD compiler-rt-13.0.0_rc1.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb EBUILD compiler-rt-13.0.0_rc2.ebuild 3506 BLAKE2B 87f936697597bb9614737e138af66a6757b05809006282f09c48835cccc67b10fa1a213acdce787a1b97bf151222d51656c67ae0a501f186576c53a8ec0e3064 SHA512 7a5597c06699cff29a9c5dafa01e63a9f5906def630f9c442b24e275ba9f47b31ee9efd598db32bb3a8484d4cb645ead385ae308f0c345c05ebfec7911a42525 diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild index ab455e9a4d17..730dffb8dd30 100644 --- a/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+clang test" RESTRICT="!test? ( test ) !clang? ( test )" diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest index dfe8dc68e960..ffab61934f1f 100644 --- a/sys-libs/gdbm/Manifest +++ b/sys-libs/gdbm/Manifest @@ -1,8 +1,10 @@ AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52 +AUX gdbm-1.20-uclibc-types.patch 397 BLAKE2B 35357a83086cb3028dad05622d66d0500e94796441de167260475c9159d4a67c1730d7e2db1a4686c3cc757d678c5a0eb7061d61bb43403319cb074f3a0d74bb SHA512 10e2bd4c6d4055df067e63c9d3e2fc6837bfd58f44d4e6ffa827272cbe95fe33b59db7791c44510a26f0131f8b58e19e514402f687418eb30d810c45deffe505 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495 DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b +DIST gdbm-1.21-gettext-ac.patch.gz 7142 BLAKE2B 1cb4eed1dbea047e115b13831ab2c6af9b639c48324c83b60ee926e7731a4b59fb779aaea8508d12fd5e5d64328464768a153135a555c1783086e4d1e981d86f SHA512 714dc008b5d5a5882f13c8bfc889e04a0b2c142a06ffe479f3ba3b21e8d6f08f579d1b111237ad9e1987d9aae27f67b4689aa3cd664c2adadb1bb856497ed3f8 DIST gdbm-1.21.tar.gz 1005982 BLAKE2B 1f9b04507601b9660a9a81edc29e9b7c0d9adececf21e372670bcf1acf3d0551d858af3e7cf9202b460691cc851ca6dfcc5014ae28161b06f31c9442d3a9fe96 SHA512 b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43 EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69 -EBUILD gdbm-1.20.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69 -EBUILD gdbm-1.21.ebuild 1324 BLAKE2B 77e8e86bf88a87d704be53ce285af647b99d890270e5c52a30aa068f32ac35b65e77ffad715568b8285415d3eb78d2b22f8bbdb78310d080dc77c5293e73a4dc SHA512 2a8b8ea03dfa2ea968ae315076906db407c0b7edd955f8909bf07771a2238d9abc175db380c585cc171c9f034bdc65827de0e774affb4ed4f25e6e32b48114a9 +EBUILD gdbm-1.20.ebuild 1381 BLAKE2B 230dad65e7f400ba7afcaf99c641eb2129410fd7c520665515e0732c61485ad4cc30990ad1cefafaab1817c50ebd29c167487ecbe04e71311dd86d0c9d677907 SHA512 ddb05fa235a592c9e358920cd2822d5773b81e9219af10c8d336aad86b76e07e0deb858760922c82288a791d853de1d4adedde982f6670d2183e169e416cffcd +EBUILD gdbm-1.21.ebuild 1358 BLAKE2B 9a315c2ea0cdb2bcc47b6d84c01b4a777e285ba9a05bc9c9f0bc45b54af8284ed1b105cc9f9c2d2e3cef7a0c1709d8f5da99abf429c094fdcc74542e52209341 SHA512 67c5bea17da109a18928146ef3e4dfdde2669b9429c9c6c729c17fa312547c02afc492083ddaf94b6a553303db965d572607a8a63d2204f81695f32e02496258 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169 diff --git a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch new file mode 100644 index 000000000000..448ce9fbbddc --- /dev/null +++ b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/808480 + +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 7 Jul 2021 09:36:22 +0300 +Subject: Fix https://puszcza.gnu.org.ua/bugs/?515 + +* src/gdbm.h.in: Include sys/types.h +--- a/src/gdbm.h.in ++++ b/src/gdbm.h.in +@@ -30,6 +30,7 @@ + # define _GDBM_H_ + + # include <stdio.h> ++# include <sys/types.h> + + /* GDBM C++ support */ + # if defined(__cplusplus) || defined(c_plusplus) diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.20.ebuild index a6fc57b2a1d8..1658e3a497be 100644 --- a/sys-libs/gdbm/gdbm-1.20.ebuild +++ b/sys-libs/gdbm/gdbm-1.20.ebuild @@ -20,7 +20,8 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838 + "${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838 + "${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480 ) src_prepare() { diff --git a/sys-libs/gdbm/gdbm-1.21.ebuild b/sys-libs/gdbm/gdbm-1.21.ebuild index 36ea91f14e6d..6f0257fa15b7 100644 --- a/sys-libs/gdbm/gdbm-1.21.ebuild +++ b/sys-libs/gdbm/gdbm-1.21.ebuild @@ -3,11 +3,13 @@ EAPI=7 -inherit autotools multilib-minimal +inherit multilib-minimal DESCRIPTION="Standard GNU database libraries" HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" +SRC_URI="mirror://gnu/gdbm/${P}.tar.gz + https://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.21-gettext-ac.patch.gz +" LICENSE="GPL-3" SLOT="0/6" # libgdbm.so version @@ -20,14 +22,9 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838 + "${WORKDIR}"/${PN}-1.21-gettext-ac.patch #696838 #811303 ) -src_prepare() { - default - eautoreconf -} - multilib_src_configure() { # gdbm doesn't appear to use either of these libraries export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index f9100ccfb607..b4b93e75ee4c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -39,6 +39,6 @@ EBUILD glibc-2.33-r1.ebuild 45233 BLAKE2B 881f8eebb4c7e4e78760b92bd6cb64de2372ab EBUILD glibc-2.33-r6.ebuild 46610 BLAKE2B 94d2206661329a3ac7d57e41b6a868ede219b17611ba871a663fd26305eaf7b75e809649435ac2792076a8e40b7fc90b67150532a9b6ee2b7d97aa4af69f21d8 SHA512 b41acdca2bee62c009f4c4b4884f44819cce557ea6c6a6680b5391cc993625a47c04fb3f620a1084e71db36b5a2a252b2c683fbbd01e67fa3950b4ae30a67599 EBUILD glibc-2.33-r7.ebuild 46610 BLAKE2B 4081d213d820c4d4e27e6d017b293712dd6054c93ad1cc4386c958ee971413836e387e0b292a68792e6526bd87d96baf3f7a3991edd5a44ba33dfae5186e3b85 SHA512 f5838889a23f9e58fb58fe8b274d85bef96dadffd790a467820391fdb68a1e8e5c054b63412db68113ef866974a33413c2bbe1342d1bf3e8b30f9d94c406737b EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086 -EBUILD glibc-2.34.ebuild 46846 BLAKE2B dfa1c80d30a0a840a60595294f5febd542fc681813793090a042033f109ffd708950b5278af0b300cbe3ceb75cd3f61af172a10e50236397724d0fc7e76afcbe SHA512 bf35f5ea5dc8c79522e783ede7780fa8f127959db96cec91d68a8495e25035870e26aef16fc3749d401ad9071d35a3bfb4172ff8429822e56971a58095644776 -EBUILD glibc-9999.ebuild 46844 BLAKE2B f509268bfe2452c28f5e75565ef2c704251452dc090ae9c0f1c01a37bafa450f65dae6b4a19b6fe968cc3eb9ae1dfd272c7f776001dc0999e5c60158caa6545a SHA512 27fde2de8f1aa15de4e6df6a7d04c416832628cf7420267485a624e2f6cffb9a7f464cb34e0ed2de78c69ff1a4f99951756cf7d6389dec4ca3ed4e05c7c972db +EBUILD glibc-2.34.ebuild 47168 BLAKE2B 5f1d4950661951003170cfbdf1a9ee3dd239f8b75bae8916d0b2a98fb3307d9fae7de1820fb4c9c1fc7e02b4e37701d81c13f36d709d32f38ab7c7bd96c4e28b SHA512 ece3b79074d643cd916d45ebc2c1381e7803713c59f7062048d4fa73fef62c33fd0ff8bf5f24f8d0acc29f53ff124d78e729ea6ad9ece4596d4696b20de2d14b +EBUILD glibc-9999.ebuild 47168 BLAKE2B 5f1d4950661951003170cfbdf1a9ee3dd239f8b75bae8916d0b2a98fb3307d9fae7de1820fb4c9c1fc7e02b4e37701d81c13f36d709d32f38ab7c7bd96c4e28b SHA512 ece3b79074d643cd916d45ebc2c1381e7803713c59f7062048d4fa73fef62c33fd0ff8bf5f24f8d0acc29f53ff124d78e729ea6ad9ece4596d4696b20de2d14b MISC metadata.xml 1555 BLAKE2B cd1b5628741b49eff04f3dabb74aaaa6e55278ae9d31f977cb061c9d0e07a4968a8a3a3e520fe9dcdd4e1a24d2ca8d6fdf9dfc66d82e39b64134cb592d84ac05 SHA512 d35b50037619a6d8cf2f4257b51fa3cb5fce4c3929d6cd5f94c8f3efc70391045b08e24941330539801fc249a7ccd690b461d7b99f494d8f33879c423cb29256 diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild index cacddc9065e8..459c54eacc93 100644 --- a/sys-libs/glibc/glibc-2.34.ebuild +++ b/sys-libs/glibc/glibc-2.34.ebuild @@ -3,6 +3,9 @@ EAPI=7 +# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc +# Please read & adapt the page as necessary if obsolete. + PYTHON_COMPAT=( python3_{7,8,9,10} ) TMPFILES_OPTIONAL=1 @@ -45,6 +48,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" +# Minimum pax-utils version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_PAX_UTILS_VER="1.3.3" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -98,7 +104,7 @@ fi BDEPEND=" ${PYTHON_DEPS} - >=app-misc/pax-utils-1.3.3 + >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( @@ -130,7 +136,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/grep virtual/awk sys-apps/gentoo-functions - !<app-misc/pax-utils-1.3.3 + !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} !<net-misc/openssh-8.1_p1-r2 " diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 564367df0b9d..459c54eacc93 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -3,6 +3,9 @@ EAPI=7 +# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc +# Please read & adapt the page as necessary if obsolete. + PYTHON_COMPAT=( python3_{7,8,9,10} ) TMPFILES_OPTIONAL=1 @@ -17,8 +20,8 @@ SLOT="2.2" EMULTILIB_PKG="true" # Gentoo patchset (ignored for live ebuilds) -PATCH_VER=16 -PATCH_DEV=slyfox +PATCH_VER=2 +PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -45,6 +48,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" +# Minimum pax-utils version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_PAX_UTILS_VER="1.3.3" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -98,7 +104,7 @@ fi BDEPEND=" ${PYTHON_DEPS} - >=app-misc/pax-utils-1.3.3 + >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( @@ -130,7 +136,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/grep virtual/awk sys-apps/gentoo-functions - !<app-misc/pax-utils-1.3.3 + !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} !<net-misc/openssh-8.1_p1-r2 " diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index f28a52f23bdd..27839de9e0e0 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -4,6 +4,6 @@ DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f4 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164 -EBUILD ldb-2.3.0-r1.ebuild 2940 BLAKE2B 7b5550613dde7a61a2d2a983b73367132aae60d2716ebe9010565ab0454beab69551467aa53daa6dc184e967e6f8f5457ef41d142725f525bc40175ba24bedbb SHA512 c7d6bdd76fc2b8d435307fe771207d518c3897c757e7f0503a1540999476b2376c7204733ecb5ac3807c25e353969394b1fff34b3ce001d3981b4f636ae078e9 +EBUILD ldb-2.3.0-r1.ebuild 2940 BLAKE2B dba1ae6ec790b727daf4c0879b1cc7199c91b19f4c3c3eb79bc67af1033121ae16ecfbd150e32a2b0359ac9b8bcec9621293143936642dd2cee9811cbbfe7947 SHA512 20f84168ff48765067c0217ff158afe19c2b399e7713e601d55d6c5377cd3b813ca3a1cfc2dba46835b163eb235704bca38a2643f19b8aaeeb8149143f4945f1 EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95 diff --git a/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.0-r1.ebuild index 3cc503e81bbe..4fe02c1a60c9 100644 --- a/sys-libs/ldb/ldb-2.3.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.3.0-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] ldap? ( net-nds/openldap ) diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 3ae15582791f..e79b886311cc 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -2,15 +2,9 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80 -AUX libcap-2.50-build-system-fixes.patch 6687 BLAKE2B d46b6f0734a5acd930248b29c17850447d87f4e554b4d3e79cb35d978b17552e84e27e036c3b0c4ae6573f94e9e7033a9264b646d61dc8c441c04bc6d9b12af8 SHA512 0fd3b5463dcbbaca41d7c1099be7dd370945408f3763dad68d128a650cbf62c23c653a971b07ed4cdc1b56d425caeec3775b91912635c6a2539534bd20e00756 -AUX libcap-2.52-build-system-fixes.patch 7320 BLAKE2B 7b7de195e7cec61b395e9cbf1d8b41195079fb2b0742db2e6a53380de3e43ee038aac092b3fd69bea0906fc668abd67673a11699323c2003b4a9583ba472b59d SHA512 db569516789792020f975591a553bd4b7ca205a9bbbae6adb245fe719377f78335dcabe7ec987d5729da1052083a972ce725ecb263d990cec169a2960584e55a -AUX libcap-2.55-build-system-fixes.patch 9929 BLAKE2B c58e07556b97692079ba5bce3dec300e34313f67925a952cd542ca94bcee925acf28e85a89959bcabf8fe4ae75ea9f4fb0393a60631e1e196d6e88c14762da5b SHA512 4493da01af31eb51907b413b4110d293737bf55b1df716bbc6b51decbcb8811bbc71290cb2c46eef2ebacfd237fe8c4c830880af6e6582327e3b056384f0dd74 +AUX libcap-2.56-build-system-fixes.patch 6367 BLAKE2B 3625df48d4444071d710406a78599bab9b25d2fc1b0fe0b722053690b7ac99e62a1d66ef3597678752dab506680425b0c47fed386c1b83b86e13e357f0408157 SHA512 560f54b2018602ba9c39938ea7623ee363eca9c0f11467a38292f074a0e53b9cd0f38724cdcc952d759c0da0952199627aabc1d253da0aecb1c2301f595bf714 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 -DIST libcap-2.51.tar.xz 145440 BLAKE2B 9f004e28891fbbb3552016e2e9250eab38935b6b40ad9e808a64ab07eecb52c5fa9032caed0baab719df8afe9aeec98403d10b05336bebe15a50b64020e5afc2 SHA512 3b4a97ef864a2ce2f87056ebc282223b0c71ca71c539744dc629ffe7905ca5fdde937ca70c34ec84406fe54863d39abf32775818a5e5a6fdf3069706b1723a88 -DIST libcap-2.52.tar.xz 158720 BLAKE2B 0696ae00a485df019f5441efe1d71676ddf294f1116e7fc3f352ad0595f9d4830f2e4fac1f98353016de36a4866f9d018f53419970ccd114c6df0faa556bcea3 SHA512 95d9e0f81fd955c42a0f299163a4402f00e9e7a2b392dfbabe613abea4babba2730576e76c9b612665a0bb8bd88aa98bf28ea3eb5582b5c06cd1137594a59893 -DIST libcap-2.55.tar.xz 166164 BLAKE2B 75136d228c6b42086698aea79e774bed37d43aa0692154026708ddd27275fc611a702dafd0ad76b16b32d8006f863f7ca3aff1f645c74f1649ad5ae9b77db47c SHA512 b7c682b45800d96a86d12489855f643e8166849606e50ffae45da143790304858d677fe0d19067a9e09f5fa711548aee4bd7a6fda662a87ea2cc35c9455e8a2c +DIST libcap-2.56.tar.xz 167056 BLAKE2B 97d1cf6196bcbcb48e335f810385ca2b36e7c3e234a1f99172fe00419ecc4af7337f208e107f012e5ffd46c1b6207a9d4515f3a677a924dd26ed8a699a080a5a SHA512 8a5c6c99458b0996c9599e00648e99e53b222ddf429535c475099c1af02796331b864fbfae767c16cfb7f2899cf0beaf74095e26a52988361ea1400f012f30c8 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b -EBUILD libcap-2.51-r1.ebuild 2135 BLAKE2B 57512b05627f25da7f0f5f0d4c666033d10314f3616ce0c948e1e1efdb830e258db3fc84c09e07f738a98557045901033504392a7108143ce935dab9b2019f56 SHA512 c995e678606e6c344bcf81c628590566044d7b8f36088d1672cfda880a80ee16d6c2b611cc816d93bd8b2af7d263eaa4030668b46fe6ec585e31faab8cb77852 -EBUILD libcap-2.52-r1.ebuild 2078 BLAKE2B 40292480d5d4b12d8656b2a8957ba1f8e1196d48292673f0f7e1d72283867afd7e45cba1c128a342fef2b21346eef2f073df75104a37effccf488ba2e38b7cc8 SHA512 d34a442320a909d2f1051cbb0582ff8b60adcd6e909c4acac7e1cb3da1996f1253a4853aedd07dd0a8d62bc38d668670be063a6180bc656fa716730c9ad2634d -EBUILD libcap-2.55-r1.ebuild 2078 BLAKE2B dec9f825d21ee748bc0be0d7eb08eb8bcdc99c6abb97f9b2a21d16ae197d05b2f4e0e9c9ab3ac214c26ffc62393a513b4c81f0a05cded9e0d05240e455f778b4 SHA512 690790a04ffc0958d11d17c594f261d992b932bd544e3f38b7354bf59318b37e37bf5418429dbd2a0d230a83fb5786330d4aab6d7df01f5785a497ca2a2693aa -MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1 +EBUILD libcap-2.56.ebuild 2215 BLAKE2B 2538bc88c4f445d7eada3e0b3fdde720d95d03cf4bb56b8cf29d94061fbdf742f5ab951e08eed276f541de38ef0640276a83802bc7a86eed7537b84f00b0d23d SHA512 4eb915980141d110bd8c706e080a9190854f0d1e203185254a34433245197867fda31c70fa90d495cc866bc0b4ab23af0742879871b53240eca98da8a0b66621 +MISC metadata.xml 437 BLAKE2B a79e7188d2d5a0edbbc306c9b2ef8d2f9cb93f6528298b6b25c70e7a335f73ff756424a02e993085d0c1172dcff497dcb295c5538fb92566520d72671fb41cdb SHA512 714b7b51395fc82d6a45a1476066654cb2aa7463b4ff9ad9e5636068305e29db790192034600382015e2dc06064d3e81d69bb0bb92ebbfee2bb525f9a52b8e12 diff --git a/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch deleted file mode 100644 index 45b24421c8a9..000000000000 --- a/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 1f2465ec2b9dccd9823a54938722dc4e5edb8105 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 4 Nov 2020 22:46:20 +0100 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> - -Forward ported from libcap-2.24 to libcap-2.25 -Forward ported from libcap-2.25 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.29 -Forward ported from libcap-2.29 to libcap-2.33 -Forward ported from libcap-2.33 to libcap-2.34 -Forward ported from libcap-2.34 to libcap-2.37 -Forward ported from libcap-2.37 to libcap-2.39 -Forward ported from libcap-2.39 to libcap-2.42 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 -Forward ported from libcap-2.45 to libcap-2.48 -Forward ported from libcap-2.48 to libcap-2.50 - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - Make.Rules | 10 ++++++---- - Makefile | 1 - - libcap/Makefile | 7 ++++--- - pam_cap/Makefile | 8 +++++--- - progs/Makefile | 4 ++-- - tests/Makefile | 6 ++++-- - 6 files changed, 21 insertions(+), 15 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 98284e2..a797347 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,7 +52,6 @@ GOMAJOR=1 - # Compilation specifics - - KERNEL_HEADERS := $(topdir)/libcap/include/uapi --IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - - CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -@@ -60,7 +59,7 @@ COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) -+BUILD_CFLAGS ?= $(CFLAGS) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib - DEBUG = -g #-DDEBUG -@@ -76,10 +75,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) - - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - --SYSTEM_HEADERS = /usr/include -+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, -diff --git a/Makefile b/Makefile -index bfc2089..2b06c9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) - $(MAKE) -C go $@ - rm -f cap/go.sum - endif -- $(MAKE) -C tests $@ - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ - $(MAKE) -C kdebug $@ -diff --git a/libcap/Makefile b/libcap/Makefile -index 9563d88..4b42f01 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -25,6 +25,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -66,7 +67,7 @@ libpsx.pc: libpsx.pc.in - $< >$@ - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -105,10 +106,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h - $(CC) $(CFLAGS) $(IPATH) $< -o $@ -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index 56604fd..2da4674 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -3,6 +3,8 @@ - topdir=$(shell pwd)/.. - include ../Make.Rules - -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testlink - -@@ -16,16 +18,16 @@ install: all - # written (and you know why it fails), email me and explain why. Thanks! - - pam_cap.so: pam_cap.o -- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) -+ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - test_pam_cap: test_pam_cap.c pam_cap.c - $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) - - test: pam_cap.so - make testlink -diff --git a/progs/Makefile b/progs/Makefile -index 289186e..313dc4d 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -diff --git a/tests/Makefile b/tests/Makefile -index 3a917c4..07eb2d5 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -63,13 +65,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - uns_test: uns_test.c $(DEPS) --- -2.32.0.rc1 - diff --git a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch deleted file mode 100644 index 2d6b441c485d..000000000000 --- a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 0e977b8595d4e8690bd3f3a816c9ec407dca5ba6 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 4 Nov 2020 22:46:20 +0100 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> - -Forward ported from libcap-2.24 to libcap-2.25 -Forward ported from libcap-2.25 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.29 -Forward ported from libcap-2.29 to libcap-2.33 -Forward ported from libcap-2.33 to libcap-2.34 -Forward ported from libcap-2.34 to libcap-2.37 -Forward ported from libcap-2.37 to libcap-2.39 -Forward ported from libcap-2.39 to libcap-2.42 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 -Forward ported from libcap-2.45 to libcap-2.48 -Forward ported from libcap-2.48 to libcap-2.50 -Forward ported from libcap-2.50 to libcap-2.52 - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - Make.Rules | 10 ++++++---- - Makefile | 1 - - libcap/Makefile | 7 ++++--- - pam_cap/Makefile | 10 ++++++---- - progs/Makefile | 4 ++-- - tests/Makefile | 6 ++++-- - 6 files changed, 22 insertions(+), 16 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 8f7906c..fea4c78 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,18 +52,13 @@ GOMAJOR=1 - # Compilation specifics - - KERNEL_HEADERS := $(topdir)/libcap/include/uapi --IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - --CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) --AR := $(CROSS_COMPILE)ar --RANLIB := $(CROSS_COMPILE)ranlib --OBJCOPY := $(CROSS_COMPILE)objcopy -+BUILD_CFLAGS ?= $(CFLAGS) - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -77,10 +72,13 @@ - - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - --SYSTEM_HEADERS = /usr/include -+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, -diff --git a/Makefile b/Makefile -index 984d502..a917238 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) - $(MAKE) -C go $@ - rm -f cap/go.sum - endif -- $(MAKE) -C tests $@ - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ - $(MAKE) -C kdebug $@ -diff --git a/libcap/Makefile b/libcap/Makefile -index 47cf8f4..5125ffb 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -32,6 +32,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -73,7 +74,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in - $< >$@ - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -125,10 +126,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h $(CAPOBJS) - $(CC) $(CFLAGS) $(IPATH) $< $(CAPOBJS) -o $@ -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index a4c4891..a15feae 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -3,6 +3,8 @@ - topdir=$(shell pwd)/.. - include ../Make.Rules - -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testlink - -@@ -19,13 +21,13 @@ install: all - $(MAKE) -C ../libcap loader.txt - - execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt -- $(CC) $(CFLAGS) $(IPATH) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ - - pam_cap.so: pam_cap.o execable.o -- $(LD) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start -+ $(LD) $(CFLAGS) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - ../libcap/libcap.a: - $(MAKE) -C ../libcap libcap.a -@@ -34,7 +36,7 @@ test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a - $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) - - test: testlink test_pam_cap pam_cap.so - $(MAKE) testlink -diff --git a/progs/Makefile b/progs/Makefile -index 3e82862..dba7e8f 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static -diff --git a/tests/Makefile b/tests/Makefile -index 3a917c4..07eb2d5 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -63,13 +65,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - uns_test: uns_test.c $(DEPS) --- -2.32.0 - diff --git a/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch deleted file mode 100644 index 501649c272d0..000000000000 --- a/sys-libs/libcap/files/libcap-2.55-build-system-fixes.patch +++ /dev/null @@ -1,241 +0,0 @@ -From abedd3c42100a636ae14a5c860ee2ed236af66ab Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Mon, 30 Aug 2021 07:04:15 +0100 -Subject: [PATCH] Build system fixes - -Summary: -- Respect tool choices: CC/AR/OBJCOPY/RANLIB -- Respect *FLAGS: CFLAGS/CPPFLAGS -- Use existing make process to spawn new jobs -- Only build tests conditionally (when we're going to run them) - -Much smaller version of patches from before thanks -to upstream incorporating some of our changes. - -See < 2.55 patches for some more context/history; the -original patch was from Mike Frysinger <vapier@gentoo.org> -and was forward-ported by Lars Wendler <polynomial-c@gentoo.org>. - -Bug: https://bugs.gentoo.org/808807 (given this is where discussion occurred) -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214085 -Signed-off-by: Sam James <sam@gentoo.org> ---- a/Make.Rules -+++ b/Make.Rules -@@ -64,24 +64,20 @@ KERNEL_HEADERS := $(topdir)/libcap/include/uapi - LIBCAP_INCLUDES = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - --CC := $(CROSS_COMPILE)gcc - LD=$(CC) -Wl,-x -shared - SUDO := sudo - COPTS ?= -O2 --CFLAGS ?= $(COPTS) $(DEFINES) -+CFLAGS ?= $(COPTS) - LDFLAGS ?= #-g --CPPFLAGS += $(LIBCAP_INCLUDES) -+CPPFLAGS += $(LIBCAP_INCLUDES) $(DEFINES) - - BUILD_CC ?= $(CC) - BUILD_LD ?= $(BUILD_CC) -Wl,-x -shared - BUILD_COPTS ?= $(COPTS) --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) -+BUILD_CFLAGS ?= $(CFLAGS) - BUILD_LDFLAGS ?= $(LDFLAGS) - BUILD_CPPFLAGS += $(LIBCAP_INCLUDES) - --AR := $(CROSS_COMPILE)ar --RANLIB := $(CROSS_COMPILE)ranlib --OBJCOPY := $(CROSS_COMPILE)objcopy - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -95,7 +91,8 @@ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - - SYSTEM_HEADERS = /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) - $(MAKE) -C go $@ - rm -f cap/go.sum - endif -- $(MAKE) -C tests $@ - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ - $(MAKE) -C kdebug $@ ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -111,7 +111,7 @@ loader.txt: empty - $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - $(CAPLIBNAME) $(MAJCAPLIBNAME) $(MINCAPLIBNAME): $(CAPOBJS) $(CAPMAGICOBJ) - $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJCAPLIBNAME) -o $(MINCAPLIBNAME) $^ $(MAGIC) -@@ -119,22 +119,22 @@ $(CAPLIBNAME) $(MAJCAPLIBNAME) $(MINCAPLIBNAME): $(CAPOBJS) $(CAPMAGICOBJ) - ln -sf $(MAJCAPLIBNAME) $(CAPLIBNAME) - - psx_magic.o: execable.h execable.c loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(PSXTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(PSXTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_syscall.h $(PSXMAGICOBJ) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $(PSXOBJS) $(PSXMAGICOBJ) $(MAGIC) $(PSXLINKFLAGS) -+ $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJPSXLIBNAME) -o $(MINPSXLIBNAME) $(PSXOBJS) $(PSXMAGICOBJ) $(MAGIC) $(PSXLINKFLAGS) - ln -sf $(MINPSXLIBNAME) $(MAJPSXLIBNAME) - ln -sf $(MAJPSXLIBNAME) $(PSXLIBNAME) - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h $(CAPOBJS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< $(CAPOBJS) -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(CAPOBJS) -o $@ - - libcapsotest: $(CAPLIBNAME) - ./$(CAPLIBNAME) ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -17,10 +17,10 @@ install: all - $(MAKE) -C ../libcap loader.txt - - execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt -- $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) -c execable.c -o $@ - - pam_cap.so: pam_cap.o execable.o pam_cap_linkopts -- cat pam_cap_linkopts | xargs -e $(LD) -o $@ pam_cap.o execable.o $(LIBCAPLIB) $(LDFLAGS) -+ cat pam_cap_linkopts | xargs -e $(LD) $(LDFLAGS) -o $@ pam_cap.o execable.o $(LIBCAPLIB) - - # Some distributions force link everything at compile time, and don't - # take advantage of libpam's dlopen runtime options to resolve ill -@@ -51,21 +51,21 @@ pam_cap_linkopts: lazylink.so - ./lazylink.so || echo "-lpam" >> $@ - - lazylink.so: lazylink.c ../libcap/execable.h ../libcap/loader.txt -- $(LD) -o $@ $(CFLAGS) $(CPPFLAGS) lazylink.c -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) -Wl,-e,__so_start -+ $(LD) -o $@ $(CFLAGS) $(CPPFLAGS) -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) lazylink.c -Wl,-e,__so_start - endif - endif - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - ../libcap/libcap.a: - $(MAKE) -C ../libcap libcap.a - - test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a -- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) - - test: testlink test_pam_cap pam_cap.so - $(MAKE) testlink ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -22,16 +22,16 @@ DEPS = ../libcap/libcap.a - endif - - ../libcap/libcap.a: -- make -C ../libcap libcap.a -+ $(MAKE) -C ../libcap libcap.a - - ../libcap/libcap.so: -- make -C ../libcap libcap.so -+ $(MAKE) -C ../libcap libcap.so - - $(BUILD): %: %.o $(DEPS) -- $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(LIBCAPLIB) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -@@ -49,10 +49,10 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh - diff -u capshdoc.h $@ || (rm $@ ; exit 1) - - capsh: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) - - tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) --static -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CAPSH_SHELL) -o $@ $< $(LIBCAPLIB) --static - - uns_test: ../tests/uns_test.c - $(MAKE) -C ../tests uns_test ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -66,17 +66,17 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) - - # privileged - uns_test: uns_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) - - run_uns_test: uns_test - echo exit | $(SUDO) ./uns_test -@@ -88,13 +88,13 @@ run_libcap_psx_launch_test: libcap_psx_launch_test ../progs/tcapsh-static - $(SUDO) ./libcap_psx_launch_test - - libcap_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) - - # This varies only slightly from the above insofar as it currently - # only links in the pthreads fork support. TODO() we need to change - # the source to do something interesting with pthreads. - libcap_psx_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) -DWITH_PTHREADS $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DWITH_PTHREADS $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) - - - # This test demonstrates that libpsx is needed to secure multithreaded -@@ -109,12 +109,12 @@ exploit.o: exploit.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - - exploit: exploit.o $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) -lpthread $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) -lpthread - - # Note, for some reason, the order of libraries is important to avoid - # the exploit working for dynamic linking. - noexploit: exploit.o $(DEPS) -- $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LIBCAPLIB) - - # This one runs in a chroot with no shared library files. - noop: noop.c diff --git a/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch new file mode 100644 index 000000000000..572bde97e2c2 --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.56-build-system-fixes.patch @@ -0,0 +1,239 @@ +From 3249c2696468bc82ec45f4fcabddc390473a45da Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 4 Sep 2021 10:39:34 +0200 +Subject: [PATCH 1/3] Build system fixes + +Summary: +- Always keep $(WARNINGS) when overriding CFLAGS + +Signed-off-by: Andrew G. Morgan <morgan@kernel.org> +--- + Make.Rules | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Make.Rules b/Make.Rules +index 3eeb098..00f2a03 100644 +--- a/Make.Rules ++++ b/Make.Rules +@@ -78,10 +78,11 @@ OBJCOPY := $(CROSS_COMPILE)objcopy + + DEBUG = # -g -DDEBUG + WARNINGS=-Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align \ +- -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \ ++ -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \ + -Winline -Wshadow + COPTS ?= -O2 +-CFLAGS ?= $(COPTS) $(WARNINGS) $(DEBUG) ++CFLAGS ?= $(COPTS) $(DEBUG) ++CFLAGS += $(WARNINGS) + CPPFLAGS += -Dlinux $(DEFINES) $(LIBCAP_INCLUDES) + LDFLAGS ?= # -g + +-- +2.33.0 + + +From 99799844ad9272d43892881d1090369e6032aec2 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" <morgan@kernel.org> +Date: Sat, 4 Sep 2021 11:42:24 -0700 +Subject: [PATCH 2/3] Don't build the tests/binaries until we want to run them + +Signed-off-by: Andrew G. Morgan <morgan@kernel.org> +--- + tests/Makefile | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index dd78432..ecb7d1b 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -8,12 +8,10 @@ include ../Make.Rules + # + + all: +- $(MAKE) libcap_launch_test uns_test +-ifeq ($(PTHREADS),yes) +- $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test +-endif ++ @echo leave test building to test target + +-install: all ++install: ++ @echo nothing to install from tests + + ifeq ($(DYNAMIC),yes) + LINKEXTRA=-Wl,-rpath,../libcap +-- +2.33.0 + + +From 5ef14d07420c299ecd8de96928a5d1ce1e232df3 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" <morgan@kernel.org> +Date: Sat, 4 Sep 2021 14:05:11 -0700 +Subject: [PATCH 3/3] Refactor top level Makefile to reduce redundant building + +Make build a bit quicker for folk that don't want to run tests. + +Signed-off-by: Andrew G. Morgan <morgan@kernel.org> +--- + Makefile | 28 +++++----------------------- + doc/Makefile | 6 ++++++ + go/Makefile | 5 +++-- + libcap/Makefile | 3 +++ + pam_cap/Makefile | 2 +- + progs/Makefile | 5 +++-- + 6 files changed, 21 insertions(+), 28 deletions(-) + +diff --git a/Makefile b/Makefile +index 1c195dd..9ee11c8 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ include Make.Rules + # flags + # + +-all install clean: %: %-here ++all test sudotest install clean: %: %-here + $(MAKE) -C libcap $@ + ifneq ($(PAM_CAP),no) + $(MAKE) -C pam_cap $@ +@@ -20,10 +20,13 @@ endif + $(MAKE) -C tests $@ + $(MAKE) -C progs $@ + $(MAKE) -C doc $@ +- $(MAKE) -C kdebug $@ + + all-here: + ++test-here: ++ ++sudotest-here: ++ + install-here: + + clean-here: +@@ -41,30 +44,9 @@ distclean: clean + release: distclean + cd .. && ln -s libcap libcap-$(VERSION).$(MINOR) && tar cvf libcap-$(VERSION).$(MINOR).tar --exclude patches libcap-$(VERSION).$(MINOR)/* && rm libcap-$(VERSION).$(MINOR) + +-test: all +- $(MAKE) -C libcap $@ +- $(MAKE) -C tests $@ +-ifneq ($(PAM_CAP),no) +- $(MAKE) -C pam_cap $@ +-endif +-ifeq ($(GOLANG),yes) +- $(MAKE) -C go $@ +-endif +- $(MAKE) -C progs $@ +- + ktest: all + $(MAKE) -C kdebug test + +-sudotest: all +- $(MAKE) -C tests $@ +-ifneq ($(PAM_CAP),no) +- $(MAKE) -C pam_cap $@ +-endif +-ifeq ($(GOLANG),yes) +- $(MAKE) -C go $@ +-endif +- $(MAKE) -C progs $@ +- + distcheck: + ./distcheck.sh + $(MAKE) DYNAMIC=no COPTS="-D_FORTIFY_SOURCE=2 -O1 -g" clean test +diff --git a/doc/Makefile b/doc/Makefile +index e2802dc..9614180 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -32,6 +32,12 @@ MANS = $(MAN1S) $(MAN3S) $(MAN8S) + + all: $(MANS) + ++test: ++ @echo no doc tests available ++ ++sudotest: ++ @echo no doc sudotests available ++ + .PHONY: html + html: + mkdir -p html +diff --git a/go/Makefile b/go/Makefile +index 5af5321..2b2061b 100644 +--- a/go/Makefile ++++ b/go/Makefile +@@ -14,8 +14,9 @@ IMPORTDIR=kernel.org/pub/linux/libs/security/libcap + PKGDIR=pkg/$(GOOSARCH)/$(IMPORTDIR) + + DEPS=../libcap/libcap.a ../libcap/libpsx.a ++TESTS=compare-cap try-launching psx-signals + +-all: PSXGOPACKAGE CAPGOPACKAGE web setid gowns captree compare-cap try-launching psx-signals ++all: PSXGOPACKAGE CAPGOPACKAGE web setid gowns captree + + $(DEPS): + $(MAKE) -C ../libcap all +@@ -93,7 +94,7 @@ endif + b210613: b210613.go CAPGOPACKAGE + CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -mod=vendor $< + +-test: all ++test: all $(TESTS) + CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/psx + CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) test -mod=vendor $(IMPORTDIR)/cap + LD_LIBRARY_PATH=../libcap ./compare-cap +diff --git a/libcap/Makefile b/libcap/Makefile +index 4b96a0c..84340f2 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -148,6 +148,9 @@ ifeq ($(PTHREADS),yes) + endif + endif + ++sudotest: ++ @echo no sudotests for libcap ++ + install: install-static + ifeq ($(SHARED),yes) + $(MAKE) install-shared +diff --git a/pam_cap/Makefile b/pam_cap/Makefile +index b245307..a000978 100644 +--- a/pam_cap/Makefile ++++ b/pam_cap/Makefile +@@ -72,7 +72,7 @@ test: testlink test_pam_cap pam_cap.so + LD_LIBRARY_PATH=../libcap ./pam_cap.so --help + @echo "module can be run as an executable!" + +-sudotest: test test_pam_cap ++sudotest: test_pam_cap + $(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./capability.conf + $(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./sudotest.conf + $(SUDO) ./test_pam_cap alpha 0x0 0x0 0x0 config=./capability.conf +diff --git a/progs/Makefile b/progs/Makefile +index 2f887c8..e2bd7fe 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -42,7 +42,8 @@ ifeq ($(RAISE_SETFCAP),yes) + $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap + endif + +-test: $(PROGS) capsh ++test: ++ @echo "no program tests without privilege, try 'make sudotest'" + + capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh + ./mkcapshdoc.sh > $@ +@@ -60,7 +61,7 @@ uns_test: ../tests/uns_test.c + $(MAKE) -C ../tests uns_test + cp ../tests/uns_test . + +-sudotest: test tcapsh-static uns_test ++sudotest: tcapsh-static uns_test + $(SUDO) $(LDPATH) ./quicktest.sh + + clean: +-- +2.33.0 + diff --git a/sys-libs/libcap/libcap-2.52-r1.ebuild b/sys-libs/libcap/libcap-2.52-r1.ebuild deleted file mode 100644 index 7a79484719d5..000000000000 --- a/sys-libs/libcap/libcap-2.52-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs pam usr-ldscript - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://sites.google.com/site/fullycapable/" -SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="pam static-libs" - -# While the build system optionally uses gperf, we don't DEPEND on it because -# the build automatically falls back when it's unavailable. #604802 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.52-build-system-fixes.patch - "${FILESDIR}"/${PN}-2.38-no_perl.patch - "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.21-include.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -run_emake() { - local args=( - exec_prefix="${EPREFIX}" - lib_prefix="${EPREFIX}/usr" - lib="$(get_libdir)" - prefix="${EPREFIX}/usr" - PAM_CAP="$(usex pam yes no)" - DYNAMIC=yes - GOLANG=no - ) - emake "${args[@]}" "$@" -} - -src_configure() { - tc-export AR CC OBJCOPY RANLIB - tc-export_build_env BUILD_CC - multilib-minimal_src_configure -} - -multilib_src_compile() { - run_emake -} - -multilib_src_install() { - # no configure, needs explicit install line #444724#c3 - run_emake DESTDIR="${D}" install - - gen_usr_ldscript -a cap - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die - fi - - if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then - rm -r "${ED}"/usr/$(get_libdir)/security || die - fi - - if use pam ; then - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - fi -} - -multilib_src_install_all() { - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sys-libs/libcap/libcap-2.55-r1.ebuild b/sys-libs/libcap/libcap-2.55-r1.ebuild deleted file mode 100644 index 0f5cb32668e0..000000000000 --- a/sys-libs/libcap/libcap-2.55-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs pam usr-ldscript - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://sites.google.com/site/fullycapable/" -SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="pam static-libs" - -# While the build system optionally uses gperf, we don't DEPEND on it because -# the build automatically falls back when it's unavailable. #604802 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.55-build-system-fixes.patch - "${FILESDIR}"/${PN}-2.38-no_perl.patch - "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.21-include.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -run_emake() { - local args=( - exec_prefix="${EPREFIX}" - lib_prefix="${EPREFIX}/usr" - lib="$(get_libdir)" - prefix="${EPREFIX}/usr" - PAM_CAP="$(usex pam yes no)" - DYNAMIC=yes - GOLANG=no - ) - emake "${args[@]}" "$@" -} - -src_configure() { - tc-export AR CC OBJCOPY RANLIB - tc-export_build_env BUILD_CC - multilib-minimal_src_configure -} - -multilib_src_compile() { - run_emake -} - -multilib_src_install() { - # no configure, needs explicit install line #444724#c3 - run_emake DESTDIR="${D}" install - - gen_usr_ldscript -a cap - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die - fi - - if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then - rm -r "${ED}"/usr/$(get_libdir)/security || die - fi - - if use pam ; then - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - fi -} - -multilib_src_install_all() { - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sys-libs/libcap/libcap-2.51-r1.ebuild b/sys-libs/libcap/libcap-2.56.ebuild index c4a5075d066b..0298367e4475 100644 --- a/sys-libs/libcap/libcap-2.51-r1.ebuild +++ b/sys-libs/libcap/libcap-2.56.ebuild @@ -13,24 +13,24 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P} LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="pam static-libs" +IUSE="pam static-libs tools" # While the build system optionally uses gperf, we don't DEPEND on it because # the build automatically falls back when it's unavailable. #604802 PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" DEPEND="${PDEPEND} sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" +BDEPEND="tools? ( dev-lang/go )" PATCHES=( - "${FILESDIR}"/${PN}-2.50-build-system-fixes.patch + # backport, remove on bump + "${FILESDIR}"/${PN}-2.56-build-system-fixes.patch "${FILESDIR}"/${PN}-2.38-no_perl.patch "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.21-include.patch ) +QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS + src_prepare() { default multilib_copy_sources @@ -38,22 +38,22 @@ src_prepare() { run_emake() { local args=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + OBJCOPY="$(tc-getOBJCOPY)" + RANLIB="$(tc-getRANLIB)" exec_prefix="${EPREFIX}" lib_prefix="${EPREFIX}/usr" lib="$(get_libdir)" prefix="${EPREFIX}/usr" PAM_CAP="$(usex pam yes no)" DYNAMIC=yes - GOLANG=no - CC="$(tc-getCC)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" + GOLANG="$(multilib_native_usex tools yes no)" ) emake "${args[@]}" "$@" } src_configure() { - tc-export AR CC RANLIB tc-export_build_env BUILD_CC multilib-minimal_src_configure } @@ -62,6 +62,10 @@ multilib_src_compile() { run_emake } +multilib_src_test() { + run_emake test +} + multilib_src_install() { # no configure, needs explicit install line #444724#c3 run_emake DESTDIR="${D}" install @@ -72,9 +76,8 @@ multilib_src_install() { rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die fi - if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then - rm -r "${ED}"/usr/$(get_libdir)/security || die - fi + # install pam plugins ourselves + rm -rf "${ED}"/usr/$(get_libdir)/security || die if use pam ; then dopammod pam_cap/pam_cap.so diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml index d10107478bd7..c00b296dee90 100644 --- a/sys-libs/libcap/metadata.xml +++ b/sys-libs/libcap/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:libcap:libcap</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="tools">Install captree, which requires <pkg>dev-lang/go</pkg></flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:libcap:libcap</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 9800e565e2e1..5d8dce452199 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -13,7 +13,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD libcxx-10.0.1.ebuild 5796 BLAKE2B c3c1e4d49ad96de1338998d35b0495ba2aa448db3558988bbbc9e5d4603d3d2ded354b1c04b186b0134be930edd72c931240ac3a068744e72e18087fc1550160 SHA512 7fbae29d2658305ddac7854a96e353ccf1901fcc6b1c15370d7a69a602f41b7d9f1afdd91018ea5be949955b3f8f1424903b5bac13d840e8f8c72ffcf7d7d34d EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62 EBUILD libcxx-12.0.0.ebuild 6950 BLAKE2B 44bdf31592a101724f3a45f41856e68ae2522a9f63cbb1b29d9eecc370fc6e1eb25ba435f9bf06c2faf14107abc3dd0df85f2dbb3cca29c7ca48f7ed5f2deb62 SHA512 9fc4ca41655c5a677ae6a52210943dd00246b080a11d17175f184c956c286915836cfe850716efd91c3c74d0e4b56dc1258d524d4aac9cb787c46c8a4e6e57aa -EBUILD libcxx-12.0.1.ebuild 6703 BLAKE2B 22768e6a6a4fdf0c78da96d0c20d47c71961a545a64d6817056a904ec70e55db7bb1c29f6841bb39516383f35e95c5f1808eec50379cfb7cafa61ff3f8db108b SHA512 955ed1b3ca5b6d27d00ab3d1836f4ca23293beccc049153545b3b3da563b470e3d8d438a1cb91edce00b5be95c5a3c1362e3eefaf85db7f30cc69d8a29efd3f6 +EBUILD libcxx-12.0.1.ebuild 6702 BLAKE2B 995017dacb9ddaa8912596f949a846a169ad5327f92d8c3f6951f3d49aa6e2d9a91a7a54ca7883a965665bb8f1fc18e7d09e50d13dea0c5cebf1d67e59f2f895 SHA512 3bfe6251bb5ce2350a0e97f118dbcfa081c5c844701daadf5feb49cb249046e662a1a0d9179d0b5b4225498e890ebff8a452736ffbf489e94ee744c19b197836 EBUILD libcxx-13.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba EBUILD libcxx-13.0.0_rc1.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba EBUILD libcxx-13.0.0_rc2.ebuild 6707 BLAKE2B eb89434560fbef10b03b3c88022c3237d2934103bc16f5fa431ef8f5ddb216f92fab1f9281b6a86854607875364b8c9f3638a1d7747e8f0395c44c7bdecbc35a SHA512 acc4019dc57bec18e888991c43e43409ed58bea85c6cc3c088db7c587fdd5f1b39c581b6bfbff08117ec7f9e176cd657479f3f0daf247baa55719ab3bb094f60 diff --git a/sys-libs/libcxx/libcxx-12.0.1.ebuild b/sys-libs/libcxx/libcxx-12.0.1.ebuild index 99b2c61fd2b8..4932f65e8afe 100644 --- a/sys-libs/libcxx/libcxx-12.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos" IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 78d164dc917a..282f9922a428 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -7,7 +7,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3 EBUILD libcxxabi-12.0.0.ebuild 3542 BLAKE2B b64bd260671e5109a31ac3f779f46720ea2972d5da3e5d4b0293453be3e8ab209a1bca2a459c160271fa4cfa39cba968b6faaab1cd12667dd3822bfc0633266f SHA512 8b1874aa691d2aec5f149625d9865f23ef4ba181d8d805852a9cfa22bb7649872183d94f047a3406d2bd9135127e854a477eb8b31281ff7ce2f7a120888fe04f -EBUILD libcxxabi-12.0.1.ebuild 3546 BLAKE2B 1975a7acd224df87f5e6b705b7588f75493e90d09ec8d078516a270b5afa7ef1c89a54a3e4172a5f27605d9dd90c57a5ffd1898b4026c0a19b06ed5902443d7c SHA512 4903ef1c6a71d41d7174ebef0c1f3b9b7122c59e862919589a1f3bc5de10c6785d4403a41789cbbce33328743377b2fac8a85e207d73e1c99492ebf41ab12a50 +EBUILD libcxxabi-12.0.1.ebuild 3545 BLAKE2B c4d8bbda9e902b5e5c08271b18d9455bf16b3b008bcc6175ccd8e732174e766fbb025bdcbae02eae3e845c24519d0bb02fd603c553bd2b63c135ca0a294324fd SHA512 9dfc1cf94506176346b3ef222552a0ad0eacbd315af6b6b7ffe639db5e50f5fb447e4caacdec4e5464f59422955f2deafedca35de264707062cb84dac2799418 EBUILD libcxxabi-13.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725 EBUILD libcxxabi-13.0.0_rc1.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725 EBUILD libcxxabi-13.0.0_rc2.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild index efc23d05bba2..9a1ad3c988df 100644 --- a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos" IUSE="+libunwind static-libs test elibc_musl" RESTRICT="!test? ( test )" diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index ed539a38a06b..16447b7261ae 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -9,7 +9,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591 EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d16092aa5e58b5c38197461a0b4ca5967ec161140b2a63835a0cfa601eb31fc08cbaa492088269808d6d803c7a47a SHA512 23a429ded341114ea3c4282b974520146ea0734e01b5863c837d119517b39365b537126091f5efcf752ca7860bccf0e0e2d763b507e903321532db87bcd42b79 EBUILD libomp-12.0.0.ebuild 2947 BLAKE2B b8ad55a9462099224e7a15c781d0ef10b5b408749878496d7813e638cc21c789914f16143ab307bf5f6c42300f5b31145ddf650147c16915e6407469431e30a7 SHA512 69e37474b659a8f05af8ef0a725a6f99911882364ccca279e3179d2bf89bed603067bf760f0c430a9184d95208d41c7f418a023eae534013f2765de98d73ea57 -EBUILD libomp-12.0.1.ebuild 2972 BLAKE2B 7864989b48b85abf2b1ce9bb2485234fb55f2da3250db1d691e53f9229bf2eb04ec53bc5248f557a17b1e2c4f0b45e20684cda5d458d9e5d570d2b577e5ac50f SHA512 399cdb4f287a707e262105139b290d9ab1b2b41f94512d6239e680194f0e5b2a1228d9701e5c162ef7ddcb97fefb0987eab1cca4cb8b86fc32c795dbeda5d209 +EBUILD libomp-12.0.1.ebuild 2971 BLAKE2B 48d906b0fef3cfc10a7201200aa512f85686c873385f04270d1b4c6a1261e1d4d1b12a6c973236129a9096cd229281e2b5aa20887c0207c619cc2f6274345c75 SHA512 1240f16f36aa3ff6a645891e8b6aa611a79f24d5e81a2397a42dac73de5388f43b9f5bfa1cab860f9e573f9bfd6dc45ece4a252551f91d4fcbfdab1bc8bf10c2 EBUILD libomp-13.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296 EBUILD libomp-13.0.0_rc1.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296 EBUILD libomp-13.0.0_rc2.ebuild 2911 BLAKE2B 712b391fe08a877bc01a2b2a3e6606464a836e68aaf4854c1e96e08b284a3133c821c2792c8371fbdf50d318a0ccf64aec288540c0c8c80626c742c3a4f9a3cf SHA512 e75efe9194a78a7789370fa2654aca1e87b38f771f3bdefdbdc6d4e4ba915e65cd4d5661e93c7b1877f4a5f605a4e2a2999b19f163849b394831e615ff66fd78 diff --git a/sys-libs/libomp/libomp-12.0.1.ebuild b/sys-libs/libomp/libomp-12.0.1.ebuild index c9bea8e17293..6c7386c3c276 100644 --- a/sys-libs/libomp/libomp-12.0.1.ebuild +++ b/sys-libs/libomp/libomp-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" IUSE="cuda hwloc kernel_linux offload ompt test" # CUDA works only with the x86_64 ABI REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index 24499179f697..26ea88b5979b 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,7 +1,7 @@ AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac -EBUILD libseccomp-2.5.1-r1.ebuild 2303 BLAKE2B 0da46f7fc0ce16eb85bb87d2c4da9ac9e2231d707e48879fa50aefb5833d69befac9b4f19a4d13082a54be5150af022b2a64b80939c5eb999bf28c63f878ea55 SHA512 b7158aed2857274a423b72e16bc2fe72d25b2ebf3cba4682edbded0c2052c5d372b9ab16fc64512a7a040b20b9c7b2925a8ab963ab701593cd0405c4dd05e11a +EBUILD libseccomp-2.5.1-r1.ebuild 2302 BLAKE2B 55ab868787cc1df434e1340362384fe2d5118b0a06600972cc4fb708893290e81299cb398d9579df5cc322ef8ae9a2affc1bd64927509a888f7e65b387832ef3 SHA512 62efeb4fbba2af04bb0cf96494b2e3c07f4937fd67727bec0e1e65afa80620aa863218ef2448f3f1e76c0263df5f43c7bce8bd6a7352a8e6a38ed5e3b55de86a EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B af2f16371d2053acc196f25e655e9ffc839114de5f3283128db57c36a04c528085502970b01cadf9434537c9e6a7d7dd869ef879cff321e352b0caea59b5962b SHA512 9b256b7f42bb28697edbd44613718c152d0f6bb4a6072748ecf873ce7ed4f44def744a465efbcdd6dd29f599a57ec3f13fe68b09357d92ac82525c798dbe4a74 EBUILD libseccomp-2.5.2.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b EBUILD libseccomp-9999.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b diff --git a/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild index da71d4c5707b..acc2906dbaef 100644 --- a/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 5c595dd4ebc3..d132e04b24b5 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -7,7 +7,7 @@ DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f71 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1 EBUILD llvm-libunwind-12.0.0.ebuild 3657 BLAKE2B 4370cc5e2c1d423a7ab3bb3ed6c208d02e785c89d6d5159c5f6f967591dadf6a49602b34f6e94a66e3c8700b3cab273140aeeaabf941eac49c03cf0926470b7e SHA512 0d0aaadc05b8beca6e692b9b6325e426a4c29186b45376d1501cde2c1ee66f69ab5b60b2f148188f7ae708908a200395a51b02920a62c755101176b035aafd2d -EBUILD llvm-libunwind-12.0.1.ebuild 3661 BLAKE2B afe1ac798786ab4d666e7af78d853bbd0c8a5f8385e189436227a6283f4f2cedffbd98572d2fd441ef65b955da121fcbf6a58250b7079e5875555fc8ea5cbc1c SHA512 85c47c9ce6eba843c19b93e81bd3765d1a9ed2524b9052ea2b83511514aa509a81b90957c98514c8103f3df95db1c1394125533632a6a354b9b3f454123f4615 +EBUILD llvm-libunwind-12.0.1.ebuild 3660 BLAKE2B 8e434b1c8dfec9a488d7b69b8fd014b65b1ee1c462bf21ba4953680f161c233ddf297a7b28c6882942b7148fb17e5ae6c68da0d9e13d6b92d727faa3c82b0017 SHA512 7e2c7022387a91f696d14c54ae9f209355cb5d6800e08b6577f79976191cd99fb44e61b661901c73a560a7ec601d51155efafc3fc85e481cad79571f746bd8f5 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382 EBUILD llvm-libunwind-13.0.0_rc1.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382 EBUILD llvm-libunwind-13.0.0_rc2.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild index a1da7f398e2e..08f10724089d 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 16fecd7242d7..8089551ecf73 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -6,11 +6,8 @@ AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6 AUX ncurses-6.2-no_user_ldflags_in_libs.patch 1254 BLAKE2B ccc2cd660bf102b61118f0ca170d079454b47a2eee41f9fb1e2b82dc241233adeb1481221fc25ce15b8c101cab200e5eefffde4ff0fbf102d8acf16fe222c40c SHA512 17e365302c683b7fc59b4ed870738b8ab487b9cc1e074d9629e1963120b6ea69b4c3b47b42c80524630d56e1b27519c6f8451397ae892ad759d1d0f019057418 AUX ncurses-6.2_p20210123-cppflags-cross.patch 1246 BLAKE2B f2e6d5b3f106639435f1901f0a43aaf9ab1cfcc2c295f13cd51120f13bb09ee4e6863aee3e6036b175479235ba8804622ad1ad4e4f181e9ca7ac67ae98ff13f1 SHA512 89a1471bc1dec666a593819b15d778d061fb370fc9786251b0546535cebf46b7ff61579937e64bf35cd15e4b8493e49c74625fb9686bb003935eef017cf449da -AUX ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch 1262 BLAKE2B 06de969e051fc167729318162500b529a0da243501e33c9cd915f5a853c78445147a6cee22b06e9577fd5821ec0820c05a908933fc9de64b672fdcaf60a74e08 SHA512 09f340e8359ea361e639af7d62f747e59e55b8a186724f6c833dd4a3067046d5b82400069900b7a3b8ca51bdee976e4eb550ad246cd843f85331d331db18e2f0 DIST ncurses-6.2-20210619-patch.sh.bz2 836967 BLAKE2B f210bf25c33f11d67e54a6f416aae75f0a976880ea543408780fd3a8dc992ee8d9999bf15c925c79504be0f30ade4bbfaed763abedd2b2d6b35de65b353a6314 SHA512 b8392bf6c0b7570766ae31a043df311660201265dfe3e2e49425b1e2aa08c72030b5f5b6c7871532897596262c88a7192e3ff2adfdc618f1b9c13c22c373eeb3 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d -DIST ncurses-6.2_p20210123.patch.xz 519076 BLAKE2B 790ca80f0b7cdba2e75e3ace91e7f40a740594bdcb19930f64a5aaad8ba041f9ee6057e0a856050e5ef54f79ffe21f23897477dd186790fce9f8192d6149e8fc SHA512 f0d4ef317157472400f183e9ba65102e342e996c4f1d99924ece72305064c3d8616668bb2c81c6113b4bd145b1589844f8c948e6424d4372939752364bed6141 EBUILD ncurses-6.2-r1.ebuild 10019 BLAKE2B 1dab9c2dfb96a3ee7af19c3e72c5cfaac44abbabf2193dcc9e5db801d76185b770938fe3ba01033e9b14ccecc139fc20a51c6528eafc13983f1bbe09f73f51ec SHA512 50c87e06dccda4d4837373e726839526f9500c6a406e3d985699c5c90500c47dbdbf60358affd6e491116d235ebf214c71f741046ae938c884e42144ca224b83 -EBUILD ncurses-6.2_p20210123.ebuild 10132 BLAKE2B 51a9717dcd8e5436fad19c7f1d0101a256a8a456829ab6b7fc50b8716fa23295d0d575677db0b1a389a46546bd878a6b13794a21f00477a40773574411189e8a SHA512 8f602f257a36ef8926397b31d6f73b89a7c9c599cce55f3b598f05cbfcd8457a320cc63d6d9648d1d6d26d2fa3c24d9e0df59a9494a0c232fed521d6d492b047 EBUILD ncurses-6.2_p20210619.ebuild 9914 BLAKE2B 62941b88a59b253d98ae26d432f8ad6b0c25cb76f0f55eff77e973deab3ac8fa9af4253edd8061b34882cca59c56895dc84d9a86177143d15e666adf94bdc8c5 SHA512 f2c1d42242bc348c1eb461a37cfdb98253c64657aaf732b1af3b59e40c2290d59c1b1695557620696019cfa79b4621cb0ba253a7c831b5d9f965d27c382ef2a0 MISC metadata.xml 784 BLAKE2B d195c69ac7dd1ac9b3e9d547e677f0c54ebb7f17ae2d480349bee487753f407091b94228d11ef44b901fc6a5f18cd27e4bf0cf55d16d405db9307d3199ce54a1 SHA512 83e7b30880f244e3756b357628b726832a5e02bce6225255ebe5710014e52914b2b9c87542ff5f3a6f93b547c1d029053ebda8cee5322a2e2ef6fbaa34eb11e1 diff --git a/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch b/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch deleted file mode 100644 index fde03f1d56f4..000000000000 --- a/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6af3253a91d8844f16924a77349f162060e038fa Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Thu, 13 Feb 2020 11:51:09 +0100 -Subject: [PATCH] Don't bleed user LDFLAGS into Libs - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - misc/gen-pkgconfig.in | 2 +- - misc/ncurses-config.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in -index 5a71ab02..9fa2e0a1 100644 ---- a/misc/gen-pkgconfig.in -+++ b/misc/gen-pkgconfig.in -@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then - fi - - lib_flags= --for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@ -+for opt in -L$libdir @LIBS@ - do - case $opt in - -l*) # LIBS is handled specially below -diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in -index eae39a51..a25e2787 100644 ---- a/misc/ncurses-config.in -+++ b/misc/ncurses-config.in -@@ -101,7 +101,7 @@ fi - # There is no portable way to find the list of standard library directories. - # Require a POSIX shell anyway, to keep this simple. - lib_flags= --for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ $LIBS -+for opt in -L$libdir $LIBS - do - case $opt in - -specs*) # ignore linker specs-files which were used to build library --- -2.30.0 - diff --git a/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild b/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild deleted file mode 100644 index a5e5c7d2fea9..000000000000 --- a/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript - -MY_PV="${PV:0:3}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="console display library" -HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -if [[ "${PV}" == *_p* ]] ; then - #SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2 - # https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2" - SRC_URI+=" https://dev.gentoo.org/~polynomial-c/dist/${P}.patch.xz" -fi - -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="0/6" -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="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" -RESTRICT="!test? ( test )" - -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# berkdb? ( sys-libs/db )" -# Block the older ncurses that installed all files w/SLOT=5. #557472 -RDEPEND="${DEPEND} - !<=sys-libs/ncurses-5.9-r4:5 - !<sys-libs/slang-2.3.2_pre23 - !<x11-terms/rxvt-unicode-9.06-r3 - !<x11-terms/st-0.6-r1" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-5.7-nongnu.patch" - "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 - "${FILESDIR}/${PN}-6.0-pkg-config.patch" - "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 - "${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" #601426 - "${FILESDIR}/${PN}-6.2_p20210123-no_user_ldflags_in_libs.patch" -) - -src_prepare() { - if [[ "${PV}" == *_p* ]] ; then - #eapply "${WORKDIR}"/${P/_p/-}-patch.sh - eapply "${WORKDIR}/${P}.patch" - fi - default -} - -src_configure() { - unset TERMINFO #115036 - tc-export_build_env BUILD_{CC,CPP} - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 - - # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 - # Order matters here -- we want unicode/thread versions to come last so that the - # binaries in /usr/bin support both wide and narrow. - # The naming is also important as we use these directly with filenames and when - # checking configure flags. - NCURSES_TARGETS=( - ncurses - $(usex unicode 'ncursesw' '') - $(usex threads 'ncursest' '') - $(use unicode && usex threads 'ncursestw' '') - ) - - # When installing ncurses, we have to use a compatible version of tic. - # This comes up when cross-compiling, doing multilib builds, upgrading, - # or installing for the first time. Build a local copy of tic whenever - # the host version isn't available. #249363 #557598 - if ! has_version -b "~sys-libs/${P}:0" ; then - local lbuildflags="-static" - - # some toolchains don't quite support static linking - local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" - case ${CHOST} in - *-darwin*) dbuildflags= ;; - *-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;; - esac - echo "int main() {}" | \ - $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ - || lbuildflags="${dbuildflags}" - - # We can't re-use the multilib BUILD_DIR because we run outside of it. - BUILD_DIR="${WORKDIR}" \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ - do_configure cross --without-shared --with-normal - fi - multilib-minimal_src_configure -} - -multilib_src_configure() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_configure "${t}" - done -} - -do_configure() { - local target=$1 - shift - - mkdir "${BUILD_DIR}/${target}" || die - cd "${BUILD_DIR}/${target}" || die - - local conf=( - # We need the basic terminfo files in /etc, bug #37026. We will - # add '--with-terminfo-dirs' and then populate /etc/terminfo in - # src_install() ... - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" - - # Disabled until #245417 is sorted out. - #$(use_with berkdb hashed-db) - - # Enable installation of .pc files. - --enable-pc-files - # This path is used to control where the .pc files are installed. - --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" - - # Now the rest of the various standard flags. - --with-shared - --without-hashed-db - $(use_with ada) - $(use_with cxx) - $(use_with cxx cxx-binding) - --with-cxx-shared - $(use_with debug) - $(use_with profile) - # The configure script uses ldd to parse the linked output which - # is flaky for cross-compiling/multilib/ldd versions/etc... - $(use_with gpm gpm libgpm.so.1) - # Required for building on mingw-w64, and possibly other windows - # platforms, bug #639670 - $(use_enable kernel_Winnt term-driver) - --disable-termcap - --enable-symlinks - --with-rcs-ids - --with-manpage-format=normal - --enable-const - --enable-colorfgbg - --enable-hard-tabs - --enable-echo - $(use_enable !ada warnings) - $(use_with debug assertions) - $(use_enable !debug leaks) - $(use_with debug expanded) - $(use_with !debug macros) - $(multilib_native_with progs) - $(use_with test tests) - $(use_with trace) - $(use_with tinfo termlib) - --disable-stripping - --disable-pkg-ldflags - ) - - if [[ ${target} == ncurses*w ]] ; then - conf+=( --enable-widec ) - else - conf+=( --disable-widec ) - fi - if [[ ${target} == ncursest* ]] ; then - conf+=( --with-{pthread,reentrant} ) - else - conf+=( --without-{pthread,reentrant} ) - fi - # Make sure each variant goes in a unique location. - if [[ ${target} == "ncurses" ]] ; then - # "ncurses" variant goes into "${EPREFIX}"/usr/include - # It is needed on Prefix because the configure script appends - # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. - conf+=( --enable-overwrite ) - else - conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) - fi - # See comments in src_configure. - if [[ ${target} != "cross" ]] ; then - local cross_path="${WORKDIR}/cross" - [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" - fi - - # Force bash until upstream rebuilds the configure script with a newer - # version of autotools. #545532 - #CONFIG_SHELL=${EPREFIX}/bin/bash \ - ECONF_SOURCE="${S}" \ - econf "${conf[@]}" "$@" -} - -src_compile() { - # See comments in src_configure. - if ! has_version -b "~sys-libs/${P}:0" ; then - # We could possibly merge these two branches but opting to be - # conservative when merging some of the Prefix changes. - - if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then - # We make 'tic$(x)' here, for Cygwin having x=".exe". - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs all PROGS='tic$(x)' - else - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi - fi - - multilib-minimal_src_compile -} - -multilib_src_compile() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_compile "${t}" - done -} - -do_compile() { - local target=$1 - shift - - cd "${BUILD_DIR}/${target}" || die - - # A little hack to fix parallel builds ... they break when - # generating sources so if we generate the sources first (in - # non-parallel), we can then build the rest of the package - # in parallel. This is not really a perf hit since the source - # generation is quite small. - emake -j1 sources - # For some reason, sources depends on pc-files which depends on - # compiled libraries which depends on sources which ... - # Manually delete the pc-files file so the install step will - # create the .pc files we want. - rm -f misc/pc-files || die - emake "$@" -} - -multilib_src_install() { - local target - for target in "${NCURSES_TARGETS[@]}" ; do - emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install - done - - # Move main libraries into /. - if multilib_is_native_abi ; then - gen_usr_ldscript -a \ - "${NCURSES_TARGETS[@]}" \ - $(use tinfo && usex unicode 'tinfow' '') \ - $(usev tinfo) - fi - if ! tc-is-static-only ; then - # Provide a link for -lcurses. - ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die - fi - # don't delete '*.dll.a', needed for linking #631468 - if ! use static-libs; then - find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die - fi - - # Build fails to create this ... - # -FIXME- - # Ugly hackaround for riscv having two parts libdir (#689240) - # Replace this hack with an official solution once we have one... - # -FIXME- - dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \ - /usr/$(get_libdir)/terminfo -} - -multilib_src_install_all() { -# if ! use berkdb ; then - # We need the basic terminfo files in /etc for embedded/recovery. #37026 - einfo "Installing basic terminfo files in /etc..." - local terms=( - # Dumb/simple values that show up when using the in-kernel VT. - ansi console dumb linux - vt{52,100,102,200,220} - # [u]rxvt users used to be pretty common. Probably should drop this - # since upstream is dead and people are moving away from it. - rxvt{,-unicode}{,-256color} - # xterm users are common, as is terminals re-using/spoofing it. - xterm xterm-{,256}color - # screen is common (and reused by tmux). - screen{,-256color} - screen.xterm-256color - ) - local x - for x in "${terms[@]}"; do - local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) - local basedir=$(basename "$(dirname "${termfile}")") - - if [[ -n ${termfile} ]] ; then - dodir "/etc/terminfo/${basedir}" - mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die - dosym "../../../../etc/terminfo/${basedir}/${x}" \ - "/usr/share/terminfo/${basedir}/${x}" - fi - done -# fi - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses - - use minimal && rm -r "${ED}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - - cd "${S}" || die - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - if use doc ; then - docinto html - dodoc -r doc/html/ - fi -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 -} diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest index e519fc3e6306..cbc04c05e7f9 100644 --- a/sys-libs/pam/Manifest +++ b/sys-libs/pam/Manifest @@ -4,7 +4,7 @@ DIST Linux-PAM-1.5.2-docs.tar.xz 443276 BLAKE2B eb0376022bd17d472cfbb7d757acd9a7 DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64a33fcf714a1957ff41112fbb6dce0be8e9773afc82458a04d54bf146a0c26117d7170521fecdc0c98184cef5f4f SHA512 fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144 DIST pam-1.5.1_p20210622.tar.gz 783068 BLAKE2B c8f13c2ccef73ad367d4fac9a7d1d0d3f3d0e4f1c8eea877d2ab467411cf17cc32c6c9c89e98d94090481d7d7746723175031ba8713a8fb0c3e1976e2854e58b SHA512 5b7a84b9de2d0b0c39cb33e9b8d24aeedca670b998536d74dc497eb7af31cb1f3157f196a01712c4ae273634b51ddad2062f207534b35b1d1a1e790816c8dc1b DIST pam-doc-1.5.1_p20210610.tar.xz 62308 BLAKE2B b3311e704ddc840b7fd28ea7764e8a0d3fdf508e2e37405acbfa26462a188c480859b3b21bd4a4b4acea70928e68650c216e8fb2d2b6f11ba33f54c6692cf3a2 SHA512 89b88f8ebf0c46f6b25dc0c5f39383ecbef0b12d6ffab388d92026066ee986f9068819cdbf38baaa1e341cd6cc84b1e8d3ad02db121aaf0ddad27e4e6efe26e7 -EBUILD pam-1.5.1-r1.ebuild 3642 BLAKE2B d42900ad5877de6e5262cd89ff2d7fb700189a4698f343f068f29446ec8ef5cb7eb2c34bb544a7b0ef4f40c69654104ed4e8381048a94674bfe2309a63083b28 SHA512 e48d09f8b056a27833688fd156411c37ccd0ed9ffd8ada84abd19702f09477382d9c6f1e21f9e8cd2d2dce36d5205a4ebff7c528779ab2366c6daa6d602b221c -EBUILD pam-1.5.1_p20210622-r1.ebuild 3513 BLAKE2B 851e7af59ea6639f6bf96e55490f93ba3a30485f1672068b955411ee1cf2d9a2c969fb85eb512e7333e3c50b7d87d1eef9a45d962e4e562f9eb5d0e3dbc76ab8 SHA512 decd3387f4a3292e24ec05028e6e656f852e33f6e32694a0471c4608e2a3e8b51c26a41b02028404612ea08d1ec9da0a9566188c1c3e387be9e4e12efdce60d0 -EBUILD pam-1.5.2.ebuild 3437 BLAKE2B a95e01003ab14b7f07675f2c54520651a5eb17b11d5974d0888c7dcf2ddc7ae0570da11c87426e649605ccc14a685b0e8ea4fed526651995bd52cfdcfadc187e SHA512 a21058c873b1802be8a14c6c1f77e8c25d262f78abafb350bb7f50dc02bde0a67ef3b3308a4c6d8e204328362a349d77f6b93880b579de9b42637c045758d591 +EBUILD pam-1.5.1-r1.ebuild 3735 BLAKE2B fc8117f4944953f158801b726d47f054c31eec241878de7d8ec88dc483653d27c57ddbbeccc0c4b2be4d5b08c639f1de3ef81ca9193470ed5ed83fd40470f8f2 SHA512 805f9d2e9f5b77456f1ad03a3caf35feee6cf193eaa123288ad5d7981fb8a967a62a7cf771dcc93d658ead4f20992bd3901983d7cdebe753701bc34ce115e80d +EBUILD pam-1.5.1_p20210622-r1.ebuild 3606 BLAKE2B a7e90212959cad24b0422e5b1b884973f70d5626cfc1fcd6f907211afa47046ea76075aa72706fc0c1c13dc4b02325961ad8a195b614f8d0ae7a7f66318c9f6b SHA512 9806f6584615743dc1c34ff4a5179a0a7070693e067b081585dea4210445d8f15695a2f5ae34d7595e87d20bc8dfa7d1c085d00248dad7e600ac9d9d759c2862 +EBUILD pam-1.5.2.ebuild 3530 BLAKE2B 77fc1e28dbc42a7b8b88e3d164d29c41668a6317e31dac0ef86f045bc21f454965a98a8389d9f41b84a623c42cd63a0fee0fbc7fa22f6c33935f217055035efb SHA512 f2568902707ce78f3385a301dc8b3bc04ae1b2f334e5a70f99941405b3d6e25ead0855211f2bd9c3a4696935d0626a9900dcf3d70fefbb53191d013888670a75 MISC metadata.xml 753 BLAKE2B 67c57ffe354542e68522d2f6bd2bd870d696cef99ac2c09f0999f09efba94d32f99d656b39c928c72ec5967571ed04e6501d43a6bd8c1272736f83a368721830 SHA512 f060d149e8d70bdd788e2d6bf6f466e66ba1786afb80640642e7c3871de30b019d8154b192c6a3b886cb75a6828b6fb587de7cb8a57462cbb5f8a312cc7344a4 diff --git a/sys-libs/pam/pam-1.5.1-r1.ebuild b/sys-libs/pam/pam-1.5.1-r1.ebuild index 4c80313a2c4a..61fbf74ec472 100644 --- a/sys-libs/pam/pam-1.5.1-r1.ebuild +++ b/sys-libs/pam/pam-1.5.1-r1.ebuild @@ -5,6 +5,10 @@ EAPI=7 MY_P="Linux-${PN^^}-${PV}" +# Avoid QA warnings +# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 +TMPFILES_OPTIONAL=1 + inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" diff --git a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild index eb86011b17d1..bbc95832d99a 100644 --- a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild +++ b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild @@ -3,6 +3,10 @@ EAPI=7 +# Avoid QA warnings +# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 +TMPFILES_OPTIONAL=1 + inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal GIT_COMMIT="fe1307512fb8892b5ceb3d884c793af8dbd4c16a" diff --git a/sys-libs/pam/pam-1.5.2.ebuild b/sys-libs/pam/pam-1.5.2.ebuild index 04f3304c5059..12fb3126d89c 100644 --- a/sys-libs/pam/pam-1.5.2.ebuild +++ b/sys-libs/pam/pam-1.5.2.ebuild @@ -5,6 +5,10 @@ EAPI=7 MY_P="Linux-${PN^^}-${PV}" +# Avoid QA warnings +# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 +TMPFILES_OPTIONAL=1 + inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" |