diff options
Diffstat (limited to 'sys-apps')
18 files changed, 912 insertions, 269 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex c489d2235d26..e09b39774e7a 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index 10d683a15c65..7a19bd14b50a 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,7 +1,4 @@ -AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b41132506f493e1c8b7e0b78ba312ced8f86b62146779e4cff4dcd53bbac613dd5311872cc38532f3ed30630ccbf3be44f45f88 SHA512 322a556e82be3e95dc9baf6964f2b80fd2f70f0d6f275221aa4ff9b8d8370b1a7b1517057a4c034ac5d9153c6bc83cd97f1a5fa3db1873537fbde78130eed1bf -DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b -EBUILD acl-2.3.1-r2.ebuild 1945 BLAKE2B 61a48f7316cc5e4e44aebf85ebfcf5712c37f5bee83bd286cc0a2e45a448ca6cee1bfcd5830fbf83913d8e3aa0fabfbcb8833566929beed0c0aa1919b9d8c168 SHA512 3b1369ffe3c1911589e23479f2680181948675ccb7d545a691119a1a3120fe61688ba5897a15c6401cc89724c0b0942b5e5ae0015674a0180fca69fa9ecd0bc0 EBUILD acl-2.3.2-r1.ebuild 1264 BLAKE2B c1740b78311792604e4d1ca1a17c3d8ce278a29f2b7c0e9340a19ac15e4c41011282a812ef286ef529af3b218b518d7ceb98fbccf50e50773450cb3979090e0f SHA512 be696896a35b7d201f4c17b6d65b0d71837e81666acc830a2be3d9b0ec04bf509168e5d83ee77ec00a6bf08bc270b4354a452fc61a0ccac7bcce52a41dcb99c9 EBUILD acl-2.3.2-r2.ebuild 1160 BLAKE2B aa5e8a209b3ffc16defbd29c965c6609954fa3aa0cfdf994657933307ee071b124fb1326e5ac1577000ae0fac0804fcc5615d18b003b8f6b9245223b11890592 SHA512 60d24599ad5783c644ac0e01c6d6c0a366efa79afab48374788dad013dfa3fd665add657c5e4f8f784fff17db40d21cfd76f64d08d9313689ee7adcf8af4fe03 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78 diff --git a/sys-apps/acl/acl-2.3.1-r2.ebuild b/sys-apps/acl/acl-2.3.1-r2.ebuild deleted file mode 100644 index 9136b3b1f6b6..000000000000 --- a/sys-apps/acl/acl-2.3.1-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript - -DESCRIPTION="Access control list utilities, libraries, and headers" -HOMEPAGE="https://savannah.nongnu.org/projects/acl" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="nls static-libs" - -RDEPEND=" - >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.1-musl-1.2.4-lfs64-fix.patch" -) - -src_prepare() { - default - - # bug #580792 - elibtoolize -} - -multilib_src_configure() { - # Filter out -flto flags as they break getfacl/setfacl binaries - # bug #667372 - filter-lto - - # Broken with FORTIFY_SOURCE=3 - # Our toolchain sets F_S=2 by default w/ >= -O2, so we need - # to unset F_S first, then explicitly set 2, to negate any default - # and anything set by the user if they're choosing 3 (or if they've - # modified GCC to set 3). - # - # Refs: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964 - # https://savannah.nongnu.org/bugs/index.php?62519 - # bug #847280 - if tc-enables-fortify-source ; then - filter-flags -D_FORTIFY_SOURCE=3 - append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - fi - - local myeconfargs=( - --bindir="${EPREFIX}"/bin - $(use_enable static-libs static) - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - $(use_enable nls) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # Tests call native binaries with an LD_PRELOAD wrapper - # bug #772356 - multilib_is_native_abi && default -} - -multilib_src_install() { - default - - # Move shared libs to / - gen_usr_ldscript -a acl -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}" -type f -name "*.la" -delete || die - fi -} diff --git a/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch b/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch deleted file mode 100644 index 3b5d2c6babdc..000000000000 --- a/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -Bug: https://bugs.gentoo.org/905910 -Upstream Bug: https://savannah.nongnu.org/bugs/index.php?64162 - -From a9100afd77fea00b311f114a5a04108283aa681a Mon Sep 17 00:00:00 2001 -From: Violet Purcell <vimproved@inventati.org> -Date: Mon, 8 May 2023 04:17:07 +0000 -Subject: [PATCH] musl 1.2.4 LFS64 removal fixes - ---- - tools/chacl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/chacl.c b/tools/chacl.c -index 525a7ff..8fff875 100644 ---- a/tools/chacl.c -+++ b/tools/chacl.c -@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) - { - int failed = 0; - DIR *dir; -- struct dirent64 *d; -+ struct dirent *d; - char *name; - - if ((dir = opendir(fname)) == NULL) { -@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) - return(0); /* got a file, not an error */ - } - -- while ((d = readdir64(dir)) != NULL) { -+ while ((d = readdir(dir)) != NULL) { - /* skip "." and ".." entries */ - if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) - continue; --- -2.40.1 - diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest index b5ab1b1ceb98..9f293e72858a 100644 --- a/sys-apps/cracklib-words/Manifest +++ b/sys-apps/cracklib-words/Manifest @@ -1,7 +1,5 @@ DIST cracklib-words-2.10.2.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730 DIST cracklib-words-2.10.3.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730 -DIST cracklib-words-2.9.11.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730 EBUILD cracklib-words-2.10.2.ebuild 722 BLAKE2B 9887abcdf72ea2f55b3f938f8bbbb26dbd50dd36af7ea37e4940c3db744054f7cf25534a7ac946db833e072c6150a0942119df5b90696a835298b8c1bbcde821 SHA512 27e68fbb9b6d9420413a45583125504d237a105fe183f78cff9d3cbb2566c7d850859ab50e32d4f76690b00e30355587ad5096f2629d841d42a4c1fea737302d EBUILD cracklib-words-2.10.3.ebuild 722 BLAKE2B 708e74615e2281c3c8a111d321af3fc20ae370d15e13e773ac598529c1646cdf6dba80c4856a9ca7d836af43cc8d4a7fb39f60826b290df227798963e776743a SHA512 7c3c35c7e2b2e801d428012be8caffa1d6ff1da887eecb7205b12f7c006d055343945e52ce8b3a55f46ea9d71e835d58d4301a99c89d18935d84c87160b3e123 -EBUILD cracklib-words-2.9.11.ebuild 722 BLAKE2B b792a4e49da58bbdaaf10cfaba5c5398b16da41e9ae579e15a74dc7fca862419f19219b8b067327fe2b4dd79b81e9662b60c5bef376398ae7838289d22db3430 SHA512 ea2c6aae7e18774802e4f5251f78f9dbc1eea1df2b5fc9e1f46164966104ea336dc961646fa6e43e015d730320ca9ad19548c80023df98c4d4764825c3038b47 MISC metadata.xml 417 BLAKE2B d57320d6e9f27d403b1fbeb93aab3a2ee1773ccbdafb0d56290a767cf0c4b0d12e20c2fd8a12e63bb132fd0ceaa06b7c7e0d6be9d3ab841e0af67164a3006d10 SHA512 e632e2c3f28aee9318c902efdcf62960d8c2420e0bd7beae9b352d51d34a1c3d92a4fceec0daa32c2d11338b38eebdc9ee7d48951abf9f0d2a82dd58dbb74bca diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild deleted file mode 100644 index a7bbe628fb69..000000000000 --- a/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: ideally bump with sys-libs/cracklib -DESCRIPTION="Large set of crack/cracklib dictionaries" -HOMEPAGE="https://github.com/cracklib/cracklib/" -SRC_URI="https://github.com/cracklib/cracklib/releases/download/v${PV}/${P}.xz" -S="${WORKDIR}" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" - -src_install() { - insinto /usr/share/dict - newins ${P} ${PN} -} - -pkg_postinst() { - if [[ -n ${ROOT} ]] && create-cracklib-dict -h >&/dev/null ; then - ebegin "Regenerating cracklib dictionary" - create-cracklib-dict /usr/share/dict/* >/dev/null - eend $? - fi -} diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest index 28dcf59d630b..45026a8b1057 100644 --- a/sys-apps/heirloom-tools/Manifest +++ b/sys-apps/heirloom-tools/Manifest @@ -1,9 +1,12 @@ AUX heirloom-tools-070715-clang.patch 415 BLAKE2B a61a1719a818cacdf2e4edfcb5a2465d39d80aec404a644a9aece3cbdd1e08ec77f9b969624e927b0d953edd83557f62bbc1d7e3ed02ce3e6e0c185e967462ad SHA512 7fb6c22c4df00d01b7fb226bd179e533ebb0a9030f6bd54c2817006538e335f076ab09c0446ca221ecb397e87c369949ab7d795cf733dd2ad43b7bac88fbce5d AUX heirloom-tools-070715-gcc-10.patch 7828 BLAKE2B aa08af9904aa1ef031f7b89fa527dee975295d59534bcb98e5db5ea4affd8c022f988caad8a502c332489fda102d17b7bbc7f6df766d8c515f9a1be984fcf977 SHA512 64b75e38585a24c4c854967b0e21bfedbd23d90218ff524f371c74d94e3d05038b140dda4aa23fdbbce64d99b63b80fa4e9895a3aa902903de75d66ca98dfc54 +AUX heirloom-tools-070715-gcc-15.patch 11696 BLAKE2B e0ab5c5a7131c004cb52beaee7cd46646d3b88feb39b46a9d37c52092a14d94cafdbbc4b8445d84a1dcd6e594f57f6cf20301707b8d09e8644ad2cc44d217094 SHA512 95f4eeb5d4fb719e4296ddf0582719e63c9e470a49ceb67b0ab7f9105c8574bdc1fe1ff1e274fbb930673edff92828c47d70e21a248fa38687e19171c1418baf AUX heirloom-tools-070715-glibc-2.30.patch 376 BLAKE2B 195c37e1d707d05ac85825a51ded198112bd0595d61697c32eed2912a1208c951d5a68ea14a9fcf033aef0a9b7c63ea8efd519d69fd777c81d9bdb8d29a60e28 SHA512 f39a6cc84060e462aa54c2492346b376a42158391bd57c66ee7a5a9922aa8b419ad9bb77f970840cf6b84055500f0f84c3420edd48bbd4ffc49ff747609caceb AUX heirloom-tools-070715-glibc-2.31.patch 964 BLAKE2B c235d9c4d035c19617a1bdd403b325e72e692873ee6615b68349d3d6306394dc6783525e7f08f27399876185102a76643c82fec50e5abb16c597a7e391751b00 SHA512 41f651804735fc0992ac07bd549f9a895cfc35ae4de5ff1580826f71ba3e9b1467a9f694edeb6377a2fd4d59c5223b38cfa435279e510a790e6a37cce3f4b307 AUX heirloom-tools-070715-major.patch 2104 BLAKE2B 88a602e587dc8376e8eb8198308e64a05db642b596e89b8087b30a2d6d16102b18f0b033cce4c1a4711a8ebcbd4a508139a7fb098b1cdcc292ef63d183bbc576 SHA512 7cee022491768031d413a8854a05a34cdbb6061fe30fa8514072efd0056614218e989c3e03fe771ae79a022085460f8bcdbb147fac0dcc6d97ab49703eaa98de +AUX heirloom-tools-070715-make-ordering.patch 1328 BLAKE2B fb5b2e7a638fa449133be92de591bffa2f38b12ca429aa035ca0ae5ea457c066f86f517eb79205ff027ce42ab0ec068837b964507bd303d26223cad5894238d9 SHA512 bd7e82574cf8e89847f0dda9a0dbab398d9cfd1088321f53513e0505718c5ea32b6d071a7049a2e057e0a5f3ddf8c9910903c796d5616ca4f0a26d4a43b61dc9 AUX heirloom-tools-070715-makefile.patch 581 BLAKE2B a74613af222aff0ec7e6e3e1c012bd444a0a1d74e9caa9ac6ee7b3175641f81966527d24dd2d67b88921943579b591e9f2f735bc427f0c8bfa66977078b2d537 SHA512 ab45b3feca27ad855e535ebae77537572b9d1b6b00bd7f973521d477e962691e56ec67ce5d900980b084758643d85db5af790447411374b488f6c440852cdf71 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9 EBUILD heirloom-tools-070715-r6.ebuild 2388 BLAKE2B 220712cb142a2c48ff4e053eac677b571e7a8f7bd9503016758563549edbc318d31e95627785c32ed6fe8ae04830b59be942b43b20d2c9c6f05a5ddceb4e5d69 SHA512 c542d123b2d684a17dda01f41537f50b87105ef024d82df3112914fe5dba1df606fe3d119b668a74610d623462511a34c1846594ce1e84e29a81a00c5d701701 +EBUILD heirloom-tools-070715-r7.ebuild 2461 BLAKE2B c8f734b78aca9538050f056f6cf17914aff09bf3620c8b12f8e905ef5d22b7d930e4456243844331f8b8564fc432f8da0484f75d0174727ad0a061cd5eaed673 SHA512 3a9593847550cb573fbffcecfaa3f1a7cf52e07c9b593f418dcd60a9d21b293a158943b3ac761fdcea75c72bc6d599aa37c0367ddebd3a188bf52286f2508ed9 MISC metadata.xml 246 BLAKE2B b1bc124a7ff0a17a05a04ee3f6f0dd9c223853d17e0a1e71c7c49347ee3934dc3dfc42f34d42a79e71708c79a7281187d520c845b71258efc53ea1551013e755 SHA512 662e39fbe0a4ff2655d605e22e199d974662ce76e7b34e62ac680b6dd716c24c71e39f210d310f228030ff4d1b1fcd140ca39863755c4fe7d2aa33901c85b7aa diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch new file mode 100644 index 000000000000..4d42212d620d --- /dev/null +++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-15.patch @@ -0,0 +1,524 @@ +Port to C99/C23. Correct usage of timeval in utmp, rename reserved keywords +Also cast pointers to pointers to signed chars to unsigned chars +It's that or redo multiple functions from unsigned chars to signed chars +and unsigned chars with implicit cast worked so far. +https://bugs.gentoo.org/919459 +https://bugs.gentoo.org/946205 +--- a/date/date.c ++++ b/date/date.c +@@ -141,6 +141,7 @@ + const char wtmpxfile[] = "/var/log/wtmp"; + time_t newtime; + struct timeval tv; ++ struct timeval before_tv, after_tv; + + memset(&before, 0, sizeof before); + memset(&after, 0, sizeof after); +@@ -150,14 +151,19 @@ + strcpy(after.ut_line, "new time"); + if ((newtime = timeop(op)) == (time_t)-1) + badconv(); +- gettimeofday(&before.ut_tv, NULL); ++ gettimeofday(&before_tv, NULL); ++ before.ut_tv.tv_sec = before_tv.tv_sec; ++ before.ut_tv.tv_usec = before_tv.tv_usec; + tv.tv_sec = newtime; + tv.tv_usec = 0; + if (settimeofday(&tv, NULL) < 0) { + fprintf(stderr, "%s: no permission\n", progname); + exit(1); + } +- gettimeofday(&after.ut_tv, NULL); ++ gettimeofday(&after_tv, NULL); ++ after.ut_tv.tv_sec = after_tv.tv_sec; ++ after.ut_tv.tv_usec = after_tv.tv_usec; ++ + #ifdef __linux__ + system("/sbin/hwclock -w >/dev/null 2>&1"); + #endif /* __linux__ */ +--- a/nawk/main.c ++++ b/nawk/main.c +@@ -168,18 +168,18 @@ + } + /* hold leading name=val arguments until just after BEGIN */ + if (posix && argc > 1 && isclvar(argv[1])) { +- start_delayed = &argv[0]; ++ start_delayed = (unsigned char **)&argv[0]; + do { + argv[0] = argv[1]; + argv++; + } while (--argc > 1 && isclvar(argv[1])); +- after_delayed = &argv[0]; ++ after_delayed = (unsigned char **)&argv[0]; + } + compile_time = 1; + argv[0] = cmdname; /* put prog name at front of arglist */ + dprintf( ("argc=%d, argv[0]=%s\n", argc, argv[0]) ); +- arginit(argc, argv); +- envinit(envp); ++ arginit(argc, (unsigned char **)argv); ++ envinit((unsigned char **)envp); + yyparse(); + if (fs) + *FS = tostring(qstring(fs, '\0')); +--- a/nawk/run.c ++++ b/nawk/run.c +@@ -61,9 +61,9 @@ + Cell *tmps; + + static Cell truecell ={ OBOOL, BTRUE, 0, 0, 1.0, NUM }; +-Cell *true = &truecell; ++Cell *trueval = &truecell; + static Cell falsecell ={ OBOOL, BFALSE, 0, 0, 0.0, NUM }; +-Cell *false = &falsecell; ++Cell *falseval = &falsecell; + static Cell breakcell ={ OJUMP, JBREAK, 0, 0, 0.0, NUM }; + Cell *jbreak = &breakcell; + static Cell contcell ={ OJUMP, JCONT, 0, 0, 0.0, NUM }; +@@ -108,7 +108,7 @@ + register Node *a; + + if (u == NULL) +- return(true); ++ return(trueval); + for (a = u; ; a = a->nnext) { + curnode = a; + if (isvalue(a)) { +@@ -148,7 +148,7 @@ + if (a[0]) { /* BEGIN */ + x = execute(a[0]); + if (isexit(x)) +- return(true); ++ return(trueval); + if (isjump(x)) + error(MM_ERROR, + ":44:Illegal break, continue or next from BEGIN"); +@@ -174,7 +174,7 @@ + if(x != 0) { tempfree(x, ""); } + } + ex1: +- return(true); ++ return(trueval); + } + + struct Frame { +@@ -461,7 +461,7 @@ + + x = execute(a[0]); /* Cell* for symbol table */ + if (!isarr(x)) +- return true; ++ return trueval; + subseplen = strlen((char *)*SUBSEP); + growbuf(&buf, &bufsz, CHUNK, NULL, "delete"); + buf[0] = 0; +@@ -479,7 +479,7 @@ + freeelem(x, buf); + tempfree(x, ""); + free(buf); +- return true; ++ return trueval; + } + + Cell *intest(Node **a, int n) +@@ -511,9 +511,9 @@ + tempfree(ap, ""); + free(buf); + if (k == NULL) +- return(false); ++ return(falseval); + else +- return(true); ++ return(trueval); + } + + +@@ -557,9 +557,9 @@ + x->fval = start; + return x; + } else if ((n == MATCH && i == 1) || (n == NOTMATCH && i == 0)) +- return(true); ++ return(trueval); + else +- return(false); ++ return(falseval); + } + + +@@ -573,22 +573,22 @@ + tempfree(x, ""); + switch (n) { + case BOR: +- if (i) return(true); ++ if (i) return(trueval); + y = execute(a[1]); + i = istrue(y); + tempfree(y, ""); +- if (i) return(true); +- else return(false); ++ if (i) return(trueval); ++ else return(falseval); + case AND: +- if ( !i ) return(false); ++ if ( !i ) return(falseval); + y = execute(a[1]); + i = istrue(y); + tempfree(y, ""); +- if (i) return(true); +- else return(false); ++ if (i) return(trueval); ++ else return(falseval); + case NOT: +- if (i) return(false); +- else return(true); ++ if (i) return(falseval); ++ else return(trueval); + default: /* can't happen */ + error(MM_ERROR, ":55:Unknown boolean operator %d", n); + } +@@ -613,18 +613,18 @@ + tempfree(x, ""); + tempfree(y, ""); + switch (n) { +- case LT: if (i<0) return(true); +- else return(false); +- case LE: if (i<=0) return(true); +- else return(false); +- case NE: if (i!=0) return(true); +- else return(false); +- case EQ: if (i == 0) return(true); +- else return(false); +- case GE: if (i>=0) return(true); +- else return(false); +- case GT: if (i>0) return(true); +- else return(false); ++ case LT: if (i<0) return(trueval); ++ else return(falseval); ++ case LE: if (i<=0) return(trueval); ++ else return(falseval); ++ case NE: if (i!=0) return(trueval); ++ else return(falseval); ++ case EQ: if (i == 0) return(trueval); ++ else return(falseval); ++ case GE: if (i>=0) return(trueval); ++ else return(falseval); ++ case GT: if (i>0) return(trueval); ++ else return(falseval); + default: /* can't happen */ + error(MM_ERROR, ":56:Unknown relational operator %d", n); + } +@@ -944,7 +944,7 @@ + } + free(buf); + } +- return(true); ++ return(trueval); + } + + Cell *arith(Node **a, int n) +@@ -1155,7 +1155,7 @@ + x = execute(a[2]); + return(x); + } +- return(false); ++ return(falseval); + } + + Cell *split(Node **a, int nnn) +@@ -1312,7 +1312,7 @@ + tempfree(x, ""); + x = execute(a[1]); + if (isbreak(x)) { +- x = true; ++ x = trueval; + in_loop--; + return(x); + } +@@ -1334,7 +1334,7 @@ + x = execute(a[0]); + if (isbreak(x)) { + in_loop--; +- return true; ++ return trueval; + } + if (isnext(x) || isexit(x) || isret(x)) { + in_loop--; +@@ -1371,7 +1371,7 @@ + x = execute(a[3]); + if (isbreak(x)) { /* turn off break */ + in_loop--; +- return true; ++ return trueval; + } + if (isnext(x) || isexit(x) || isret(x)) { + in_loop--; +@@ -1405,7 +1405,7 @@ + if (isbreak(x)) { + tempfree(vp, ""); + in_loop--; +- return true; ++ return trueval; + } + if (isnext(x) || isexit(x) || isret(x)) { + tempfree(vp, ""); +@@ -1416,7 +1416,7 @@ + } + } + in_loop--; +- return true; ++ return trueval; + } + + static int closefile(const char *a); +@@ -1552,7 +1552,7 @@ + } + if (a[1] != 0) + fflush(fp); +- return(true); ++ return(trueval); + } + + /*ARGSUSED*/ +@@ -1694,7 +1694,7 @@ + tempfree(y, ""); + } + y = execute(a[2]); /* replacement string */ +- result = false; ++ result = falseval; + if (pmatch(pfa, t)) { + growbuf(&buf, &bufsize, CHUNK, NULL, "sub"); + pb = buf; +@@ -1730,7 +1730,7 @@ + "sub"); + } + setsval(x, buf); +- result = true;; ++ result = trueval;; + free(buf); + } + tempfree(x, ""); +--- a/oawk/awk.def ++++ b/oawk/awk.def +@@ -215,7 +215,7 @@ + #define NPA2 4 + + extern obj (*proctab[])(node **, int); +-extern obj true, false; ++extern obj trueval, falseval; + extern int pairstack[], paircnt; + + #define cantexec(n) (n->ntype == NVALUE) +--- a/oawk/run.c ++++ b/oawk/run.c +@@ -96,8 +96,8 @@ + #define MAXTMP 20 + cell tmps[MAXTMP]; + static cell nullval ={EMPTY,EMPTY,0.0,NUM,0}; +-obj true ={ OBOOL, BTRUE, 0 }; +-obj false ={ OBOOL, BFALSE, 0 }; ++obj trueval ={ OBOOL, BTRUE, 0 }; ++obj falseval ={ OBOOL, BFALSE, 0 }; + + int chrlen(const char *s); + int chrdist(const char *s, const char *end); +@@ -125,7 +125,7 @@ + node *a; + + if (u==(node *)NULL) +- return(true); ++ return(trueval); + for (a = u; ; a = a->nnext) { + if (cantexec(a)) + return(nodetoobj(a)); +@@ -156,7 +156,7 @@ + if (a[0] != NULL) { + x = execute(a[0]); + if (isexit(x)) +- return(true); ++ return(trueval); + if (isjump(x)) + error(FATAL, "unexpected break, continue or next"); + tempfree(x); +@@ -173,7 +173,7 @@ + error(FATAL, "unexpected break, continue or next"); + tempfree(x); + } +- return(true); ++ return(trueval); + } + + /*ARGSUSED*/ +@@ -228,9 +228,9 @@ + tempfree(x); + i = match((struct fa *)a[1], s); + if (n==MATCH && i==1 || n==NOTMATCH && i==0) +- return(true); ++ return(trueval); + else +- return(false); ++ return(falseval); + } + + obj boolop(node **a,int n) +@@ -245,22 +245,22 @@ + default: + error(FATAL, "unknown boolean operator %d", n); + case BOR: +- if (i) return(true); ++ if (i) return(trueval); + y = execute(a[1]); + i = istrue(y); + tempfree(y); +- if (i) return(true); +- else return(false); ++ if (i) return(trueval); ++ else return(falseval); + case AND: +- if ( !i ) return(false); ++ if ( !i ) return(falseval); + y = execute(a[1]); + i = istrue(y); + tempfree(y); +- if (i) return(true); +- else return(false); ++ if (i) return(trueval); ++ else return(falseval); + case NOT: +- if (i) return(false); +- else return(true); ++ if (i) return(falseval); ++ else return(trueval); + } + } + +@@ -283,18 +283,18 @@ + switch (n) { + default: + error(FATAL, "unknown relational operator %d", n); +- case LT: if (i<0) return(true); +- else return(false); +- case LE: if (i<=0) return(true); +- else return(false); +- case NE: if (i!=0) return(true); +- else return(false); +- case EQ: if (i==0) return(true); +- else return(false); +- case GE: if (i>=0) return(true); +- else return(false); +- case GT: if (i>0) return(true); +- else return(false); ++ case LT: if (i<0) return(trueval); ++ else return(falseval); ++ case LE: if (i<=0) return(trueval); ++ else return(falseval); ++ case NE: if (i!=0) return(trueval); ++ else return(falseval); ++ case EQ: if (i==0) return(trueval); ++ else return(falseval); ++ case GE: if (i>=0) return(trueval); ++ else return(falseval); ++ case GT: if (i>0) return(trueval); ++ else return(falseval); + } + } + +@@ -675,7 +675,7 @@ + obj x; + + if (a[0]==nullstat) +- x = true; ++ x = trueval; + else + x = execute(a[0]); + if (istrue(x)) { +@@ -703,7 +703,7 @@ + x = execute(a[2]); + return(x); + } +- return(false); ++ return(falseval); + } + + obj aprintf(node **a,int n) +@@ -714,7 +714,7 @@ + if (a[1]==NULL) { + printf("%s", x.optr->sval); + tempfree(x); +- return(true); ++ return(trueval); + } + redirprint(x.optr->sval, (intptr_t)a[1], a[2]); + return(x); +@@ -823,7 +823,7 @@ + tempfree(x); + x = execute(a[1]); + if (isbreak(x)) { +- x = true; ++ x = trueval; + return(x); + } + if (isnext(x) || isexit(x)) +@@ -845,7 +845,7 @@ + } + x = execute(a[3]); + if (isbreak(x)) { /* turn off break */ +- x = true; ++ x = trueval; + return(x); + } + if (isnext(x) || isexit(x)) +@@ -871,7 +871,7 @@ + setsval(vp, cp->nval); + x = execute(a[2]); + if (isbreak(x)) { +- x = true; ++ x = trueval; + return(x); + } + if (isnext(x) || isexit(x)) +@@ -879,7 +879,7 @@ + tempfree(x); + } + } +- return (true); ++ return (trueval); + } + + obj jump(node **a,int n) +@@ -971,14 +971,14 @@ + } + if (a[1]==nullstat) { + printf("%s", s); +- return(true); ++ return(trueval); + } + redirprint(s, (intptr_t)a[1], a[2]); +- return(false); ++ return(falseval); + } + + /*ARGSUSED*/ +-obj nullproc(node **a, int n) {return(true);} ++obj nullproc(node **a, int n) {return(trueval);} + + obj nodetoobj(node *a) + { +--- a/shl/shl.c ++++ b/shl/shl.c +@@ -322,13 +322,16 @@ + */ + struct passwd *pwd = getpwuid(myuid); + struct utmpx utx; ++ struct timeval tv; + char *id; + + memset(&utx, 0, sizeof utx); + strncpy(utx.ut_line, l->l_line + 5, sizeof utx.ut_line); + strncpy(utx.ut_user, pwd->pw_name, sizeof utx.ut_user); + utx.ut_pid = l->l_pid; +- gettimeofday(&utx.ut_tv, NULL); ++ gettimeofday(&tv, NULL); ++ utx.ut_tv.tv_sec = tv.tv_sec; ++ utx.ut_tv.tv_usec = tv.tv_usec; + if ((id = strrchr(l->l_line, '/')) != NULL) + strncpy(utx.ut_id, id, sizeof utx.ut_id); + switch (action) { diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch new file mode 100644 index 000000000000..64fefef616c2 --- /dev/null +++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-make-ordering.patch @@ -0,0 +1,45 @@ +y.tab.h is side-product of different rule. Explicitly add it to rulesets so +shuffle and friends won't break graph ordering. +config.h and awk.h are just a missing dependency. +https://bugs.gentoo.org/880189 +https://bugs.gentoo.org/896314 +--- a/nawk/Makefile.mk ++++ b/nawk/Makefile.mk +@@ -17,6 +17,8 @@ + (echo '1i'; echo '#include <inttypes.h>'; echo '.'; echo 'w';) | \ + ed -s y.tab.h + ++y.tab.h: awk.g.c ++ + awk.g.2001.c: awk.g.2001.y awk.g.c + $(YACC) awk.g.2001.y + mv -f y.tab.c awk.g.2001.c +--- a/grep/Makefile.mk ++++ b/grep/Makefile.mk +@@ -104,5 +104,5 @@ + svid3.o: grep.h config.h + sus.o: grep.h config.h alloc.h + su3.o: grep.h config.h alloc.h +-ac.o: alloc.h grep.h ++ac.o: alloc.h grep.h config.h + rcomp.o: grep.h config.h alloc.h +--- a/oawk/Makefile.mk ++++ b/oawk/Makefile.mk +@@ -43,7 +43,7 @@ + lib.o: lib.c + $(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c lib.c + +-main.o: main.c ++main.o: main.c awk.h + $(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c main.c + + parse.o: parse.c +@@ -55,7 +55,7 @@ + run.o: run.c + $(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c run.c + +-tran.o: tran.c ++tran.o: tran.c awk.h + $(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IUXRE) $(ICOMMON) $(IWCHAR) -c tran.c + + token.o: token.c diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild new file mode 100644 index 000000000000..02c8bac8437c --- /dev/null +++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r7.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Heirloom toolchest - original Unix tools" +HOMEPAGE="https://heirloom.sourceforge.net/tools.html" +SRC_URI="https://downloads.sourceforge.net/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2" +S="${WORKDIR}/heirloom-${PV}" + +LICENSE="ZLIB BSD BSD-4 CDDL GPL-2+ LGPL-2.1+ LPL-1.02 Info-ZIP public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# slightly broken +RESTRICT="test" + +RDEPEND=" + sys-libs/ncurses:= + sys-libs/zlib + virtual/libcrypt:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/ed + app-alternatives/bc + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-major.patch + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-glibc-2.30.patch + "${FILESDIR}"/${P}-glibc-2.31.patch + "${FILESDIR}"/${P}-gcc-10.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-gcc-15.patch + "${FILESDIR}"/${P}-make-ordering.patch +) + +src_prepare() { + default + sed -i "s:\bar\b:$(tc-getAR):g" libwchar/Makefile.mk || die +} + +src_compile() { + mypaths=( + DEFBIN="${EPREFIX}/usr/lib/${PN}/5bin" + SV3BIN="${EPREFIX}/usr/lib/${PN}/5bin" + S42BIN="${EPREFIX}/usr/lib/${PN}/5bin/s42" + SUSBIN="${EPREFIX}/usr/lib/${PN}/5bin/posix" + SU3BIN="${EPREFIX}/usr/lib/${PN}/5bin/posix2001" + UCBBIN="${EPREFIX}/usr/lib/${PN}/ucb" + CCSBIN="${EPREFIX}/usr/lib/${PN}/ccs/bin" + DEFLIB="${EPREFIX}/usr/lib/${PN}/5lib" + DEFSBIN="${EPREFIX}/usr/lib/${PN}/5bin" + MANDIR="${EPREFIX}/usr/share/man/5man" + DFLDIR="${EPREFIX}/etc/default" + SPELLHIST="/dev/null" + SULOG="${EPREFIX}/var/log/sulog" + ) + + append-cppflags -D_GNU_SOURCE + emake -j1 \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS}" \ + CFLAGS2="${CFLAGS}" \ + CFLAGSS="${CFLAGS}" \ + CFLAGSU="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LCURS="$($(tc-getPKG_CONFIG) --libs ncurses)" \ + LDFLAGS="${LDFLAGS}" \ + LIBZ="-lz" \ + "${mypaths[@]}" +} + +src_install() { + # we don't want to strip here, so use "true" as noop + emake -j1 \ + STRIP="true" \ + ROOT="${D}" \ + "${mypaths[@]}" \ + install + rm -r "${D}/dev" || die + + dodoc CHANGES README + + local DOC_CONTENTS="You may want to adjust your PATH, to enable + using the apps of ${PN} by default. + \\n\\nMan pages are installed in /usr/share/man/5man/. + You may need to set MANPATH to access them." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 5845fa53167c..4cdbc2d68467 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -5,8 +5,10 @@ AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205 DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8 DIST portage-3.0.66.1.tar.bz2 1198196 BLAKE2B 8dbd1bc17c1a9a3530425efa31a27efba39e1ef5f5457b4084875c64f7128453139aea447c25a642c124438e88ef484a43b1838cbd8c03748017571dd18f9921 SHA512 fcd3d4d3dcfdb67cbcdb0f4854860f073b4a9d41dadc97a3e6f890e3c75091aceec5622e97495741622b5c390309f05dec35b9e951d7ee7a78e28a9b3ed2939d DIST portage-3.0.67.tar.bz2 1196776 BLAKE2B 4a9056d388b012a0fa343d6fc50c9c3b455cb3a4d356210accf86c4ff4434a2d8cb4d23c3f58f3e23ab8bb4a4e9ee244bd1ec1203d5f72fa6f0e0a2caa92e757 SHA512 e725a471dcadaac771aa7f910524232e237efbb944d3e175825ad659b5190d631a91d4c188089c278a79b4709d4a8d6a6e53c55524c4b1c8d1c43580506e0d1c +DIST portage-3.0.68.tar.bz2 1198758 BLAKE2B fbe3a14babbe5687d075c7e691027d04e7a34a35c3199c981e176bae365242e1dc7d4122f2d7a385444798b9413c415ca40801825a9dd9c99c3590efca8087e6 SHA512 4ed6d0945ad94ee19260996dd2ba9fa5e013560a50de887eb7e8df87a3649552316cbc62ee8ef9b4a025d9d98fb74e85ee7734b7a8fe7416450b8d6818fdcfab EBUILD portage-3.0.65-r1.ebuild 6776 BLAKE2B 06f1d5e62b178276acf0a4c908697fe337f004fcd8bc8b0855f604ceacd60d37331024115a99dc6b1711c2a67d91f94d29f7a5e278519d8be0fc8a3a93c38367 SHA512 c55d309d9bf3706d3e272f3634dc6c33222074d8dc2f289109631b4f6db24df62fbb355a70c8bdf74f3d76c0a799b262726c92efaea9e7e52fa49e4b175abb20 EBUILD portage-3.0.66.1-r1.ebuild 6401 BLAKE2B 91539d4020cb0b91ed61c1c0f0fa15935cdca80a9326765ab0bb28e4d79edc35e3cac07728979178bc7112010318ae9bafebbc008b94958a9ef5f3243e18bcdb SHA512 8e77a4da3d898f820d8afc9a028a2b3cfebb41e77d2fdae0131f8087ad0794cb2ede27b2bad7a37d4a9d36595d2523e6ec67f70ee96bc6169fada6aff5448c41 EBUILD portage-3.0.67.ebuild 6425 BLAKE2B 726e9d4bf10c75ebc1dbb47ff1aaf6613f68ffb03b3c041dcfc64d68ec3f1092e47a0b55b3709b5f4b2389eb432dabdf7ef865762eefbd50924306747ccfc86f SHA512 d115583ddadacb1d6a2b6469fd2df72b29f8310dead8e91e84d4c54018b5ba10e0918f9aea87b5fc7b97c215fd5b296b7b4f522c1c3bb0a0491766b31f0c8d7a -EBUILD portage-9999.ebuild 6434 BLAKE2B 27f19469609c7d0689a616b20914b3361aea29a04c6ba45d63a2984d5727a2203c20500873b15d8fdb41917a9f392353cfb14145c1bbe47328763c21fd35637b SHA512 7e329db90fe749c62a890bbfeb29b1cbca614119a8a0d9e072243d0aa85a0794fe14308edfaf767daa8c198c41c3307c95104e68a3ed3c92f988888643bcb691 +EBUILD portage-3.0.68.ebuild 6433 BLAKE2B afa25e70693b34882e13ea2e9beffbf3ff820f4d780b6cc125c4930c02bc0fa1e12209b3a54bc9b59a9cd237a56144045d667fad561899542be51472a4bd0e1d SHA512 ff2c0513c6dbeefe619f9adde8873c412b0967142830daead468f17f99681caef3bbd99209f8f7f0031fbcd456d04c6d45cd7dd5a3a232bd7c7bdd4a753619e5 +EBUILD portage-9999.ebuild 6425 BLAKE2B 726e9d4bf10c75ebc1dbb47ff1aaf6613f68ffb03b3c041dcfc64d68ec3f1092e47a0b55b3709b5f4b2389eb432dabdf7ef865762eefbd50924306747ccfc86f SHA512 d115583ddadacb1d6a2b6469fd2df72b29f8310dead8e91e84d4c54018b5ba10e0918f9aea87b5fc7b97c215fd5b296b7b4f522c1c3bb0a0491766b31f0c8d7a MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d diff --git a/sys-apps/portage/portage-3.0.68.ebuild b/sys-apps/portage/portage-3.0.68.ebuild new file mode 100644 index 000000000000..544100bf1bbe --- /dev/null +++ b/sys-apps/portage/portage-3.0.68.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit meson linux-info python-r1 tmpfiles + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/tar-1.27 + >=dev-build/meson-1.3.0-r1 + >=sys-apps/sed-4.0.5 + sys-devel/patch + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) + doc? ( + ~app-text/docbook-xml-dtd-4.4 + app-text/xmlto + ) + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-vcs/git + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +RDEPEND=" + ${PYTHON_DEPS} + acct-user/portage + >=app-arch/tar-1.27 + app-arch/zstd + >=app-misc/pax-utils-0.1.17 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.9 + !build? ( + >=app-admin/eselect-1.2 + app-portage/getuto + >=app-shells/bash-5.0:0 + >=sec-keys/openpgp-keys-gentoo-release-20240703 + >=sys-apps/sed-4.0.5 + rsync-verify? ( + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) +" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 + ) +" + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + check_extra_config +} + +src_prepare() { + default + + if use prefix-guest; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi +} + +src_configure() { + local code_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Dcode-only=${code_only} + -Deprefix="${EPREFIX}" + -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + $(meson_use doc) + $(meson_use apidoc) + $(meson_use gentoo-dev) + $(meson_use ipc) + $(meson_use xattr) + ) + + if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then + emesonargs+=( -Dnative-extensions=true ) + else + emesonargs+=( -Dnative-extensions=false ) + fi + + if use build; then + emesonargs+=( -Drsync-verify=false ) + else + emesonargs+=( $(meson_use rsync-verify) ) + fi + + meson_src_configure + code_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + local EPYTEST_XDIST=1 + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + python_foreach_impl epytest +} + +src_install() { + python_foreach_impl my_src_install + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) + python_replicate_script "${scripts[@]}" +} + +my_src_install() { + local pydirs=( + "${D}$(python_get_sitedir)" + "${ED}/usr/lib/portage/${EPYTHON}" + ) + + meson_src_install + python_fix_shebang "${pydirs[@]}" + python_optimize "${pydirs[@]}" +} + +pkg_preinst() { + if ! use build && [[ -z ${ROOT} ]]; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + env -u BINPKG_FORMAT \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_format || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +} diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 947cf2d6c169..d52445c85f36 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" @@ -124,7 +124,7 @@ my_src_configure() { $(meson_use xattr) ) - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then + if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then emesonargs+=( -Dnative-extensions=true ) else emesonargs+=( -Dnative-extensions=false ) diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index 5f3a189ee067..df262445b3f6 100644 --- a/sys-apps/tcp-wrappers/Manifest +++ b/sys-apps/tcp-wrappers/Manifest @@ -3,5 +3,4 @@ DIST tcp-wrappers-7.6.31-patches.tar.xz 8040 BLAKE2B 03e08afaf52bd8e24161cae8f92 DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac EBUILD tcp-wrappers-7.6.31-r1.ebuild 2659 BLAKE2B d49c893fe2a4603829728e96bce5add3f319cb11c7547d815ae55c9a584919d795f57e35b521d4630d44329e94da9d86de201625981489708b75767cbb8d2fdd SHA512 11638ab1754a235fb161dfeee3e6538338b39f12d7143f0b65b20dfe33e195848749889b373ac48eeb28deeccc12587de086f34a69eb1af6b2d207168757d1bf -EBUILD tcp-wrappers-7.6.31.ebuild 2606 BLAKE2B a1cc7b4e960f64b7daf8b776878bdce46e34334f6ab321344bdfeb37eb9512ae18c3d9fe885f2b2b525c02ac88f406c09b6ae74b5f99aaaf2e98668472914e6f SHA512 e0bc8ac09eb504fe252f75b60f3978a871e6ce8a1b37bb323a18c083b0f23ae8b8763145d16df87233bc047efdbe460d87d9becfc9bdc0323b7f0adf20464e0e MISC metadata.xml 441 BLAKE2B 4387da8847f321871fa326aa52ff72a22c3ef29abb3a1ba06a2bf89d4cb69ed464d05007ca9f647ba3ec4ea23454081e442b67402f4258e61687b7b2c354cb5b SHA512 95f6cd45971b1ef2c47bfc504a84072a0fc95418a5fd0b8a51cdef38359e556caa439b111d381897979c6f82871af343a3134270de21e9e2ffa6ae7cb7949883 diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild deleted file mode 100644 index 8b0be6d3f702..000000000000 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript - -MY_PV=$(ver_cut 1-2) -DEB_PV=$(ver_cut 3) -MY_P="${PN//-/_}_${MY_PV}" - -DESCRIPTION="TCP Wrappers" -HOMEPAGE="http://ftp.porcupine.org/pub/security" -SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz - mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz - https://dev.gentoo.org/~soap/distfiles/${P}-patches.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="tcp_wrappers_license" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ipv6 netgroups selinux" - -DEPEND=" - netgroups? ( net-libs/libnsl:= ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-tcpd ) -" - -PATCHES=( "${WORKDIR}"/gentoo-patches/ ) - -src_prepare() { - # Apply Debian patchset except for the series file which just lists - # the patches - eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series || die) - - default - - multilib_copy_sources -} - -temake() { - append-cppflags "-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED" - - if use ipv6; then - append-cppflags "-DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" - fi - - local myemakeargs=( - REAL_DAEMON_DIR="${EPREFIX}/usr/sbin" - TLI= VSYSLOG= PARANOID= BUGS= - AUTH="-DALWAYS_RFC931" - AUX_OBJ="weak_symbols.o" - DOT="-DAPPEND_DOT" - HOSTNAME="-DALWAYS_HOSTNAME" - NETGROUP=$(usex netgroups -DNETGROUPS "") - STYLE="-DPROCESS_OPTIONS" - LIBS=$(usex netgroups -lnsl "") - LIB="" # disable static-libs - AR="$(tc-getAR)" ARFLAGS=rc - CC="$(tc-getCC)" - RANLIB="$(tc-getRANLIB)" - COPTS="${CFLAGS} ${CPPFLAGS}" - LDFLAGS="${LDFLAGS}" - "$@" - ) - - emake "${myemakeargs[@]}" -} - -multilib_src_configure() { - tc-export AR RANLIB - temake config-check -} - -multilib_src_compile() { - # https://bugs.gentoo.org/728348 - unset STRINGS - temake all -} - -multilib_src_install() { - into /usr - dolib.so shared/libwrap.so* - - insinto /usr/include - doins tcpd.h - - if multilib_is_native_abi; then - gen_usr_ldscript -a wrap - dosbin tcpd tcpdchk tcpdmatch safe_finger try-from - fi -} - -multilib_src_install_all() { - doman *.[358] - dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5 - dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5 - - insinto /etc - newins "${FILESDIR}"/hosts.allow.example hosts.allow - - dodoc BLURB CHANGES DISCLAIMER README* -} - -pkg_preinst() { - # don't clobber people with our default example config - [[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow -} diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest index 807e3ab32593..1f66a1586099 100644 --- a/sys-apps/xdg-desktop-portal/Manifest +++ b/sys-apps/xdg-desktop-portal/Manifest @@ -6,7 +6,7 @@ AUX xdg-desktop-portal-1.20.0-sandbox-disable-failing-tests.patch 648 BLAKE2B a9 AUX xdg-desktop-portal.initd 289 BLAKE2B 50a0a56b43004a903f98cf57caed06786d2f6b1db5f743c1420dd6ac5207a5c785851c38a7f6844cc9536ec9d5d8faad7a927123c201bed8c16ad123fd1de773 SHA512 c2b2b687c3f6e1cbcadf609194c764cdd9bfa72818a5efb25376ddd2ed16e86a7a35ec0a0117569074735e57840c9595a635a9b694364aeaef8076b873b9dafd DIST xdg-desktop-portal-1.18.4.tar.xz 699380 BLAKE2B 969d9359744f26a931d5d86fbdac222b0d55f7942bb8b1ffba67343c88696dbb4c905b122363c5eae5dcac8b55f58d03433acbbca6f7594a16e72e13bc78353a SHA512 482676777e8180752e13ff485acab91de117f4ecf2aefd313a6f596df800f37d7004ee4ba1040009eb69a6efc780efc7dcd7e46b3f59c47bd9f21aef48d346de DIST xdg-desktop-portal-1.20.0.tar.xz 1162932 BLAKE2B 0b6d4615df26a45359be70003f34205a965fb02875e42e613a8526328a304664c530daaaa27d666297726d5fd5cb6f1eb3415e81bae8e0479821078a0549862d SHA512 aac38476b75a841ce12d7b4036830ef4ce3426914bcaf7ee2bb8a3a34e353089ed5c3521b06f7714d5ef8308d1af4e8297e583d363eba94263f3c062ced0063e -EBUILD xdg-desktop-portal-1.18.4-r1.ebuild 3503 BLAKE2B ce66fc66b4616cf51be02c761a653f5002a2aa5ad3eb9a749248a112ffd6bff818a4717dbd38d975b5e6b79e4daec5851c68259814d3a3f2523f1f03d7bf7cff SHA512 5bb6e45fb27bd51288f8f965545a84c3b2150080f9841ec307f4c17c2ef98e8fafb7b8b4ee632eb24e0b7e8fd576b809fb0509e1bf8b4a476ddae2502776be4d -EBUILD xdg-desktop-portal-1.18.4-r2.ebuild 3659 BLAKE2B 15eacfa7c6197b168d0d8435026c1712191e32716d08b756ebf5fc8e595bef78e167f49a4399a395909fdef3cd7bfd6b113c878cbc767e105ffac0d5d7ef910a SHA512 eccbd6251814b39f139ed97bc7c667a4266b164ec1d7341e3d9934d73ecee997f264a5b385915cb170ebf9601c9c0b7a7a6eca62f2a0135cd3300cf98b265730 +EBUILD xdg-desktop-portal-1.18.4-r1.ebuild 3503 BLAKE2B 0e0d576e45bff4e2fe1b58ad7002e15d21614c52a4210500ec8ea0846f50b5ced03680fe6f98474a0b759b53ec635f551ab2b51a4b52caaeb0b1846caddbc12d SHA512 65cc926d8808a3c845d155a19d602d20d266297b8e8816afc577858b7a373d08f6b761f739b3116027e0e4224f9ed2bee71c808d05250d5942beab1473f2decc +EBUILD xdg-desktop-portal-1.18.4-r2.ebuild 3659 BLAKE2B 33b569952cdac4697cb40328e40d63eb6f33c3d47d0cd278dd34dd2cd5b5369a84e615a492844a2bf83a8ff99b55f254b50d4c2969d054e0187e4b9be08b8728 SHA512 89d32986eac1d005273cd680b083bc5f7c9d979f7d1fa464f9ab018e3208ee7247d09297cdc9fc3836e41337f08fcfe1bafa50fdb9092190b97f84d8c8cbad4f EBUILD xdg-desktop-portal-1.20.0-r2.ebuild 3979 BLAKE2B 80e58c5b56b9f69bf6d876a74947cf719e45815166959c56864d3e786c0458f25f99852d40b07555ac77c5f65511ccfca86a2fb60ce7e75e556580ce46de4d72 SHA512 ae6845eeede6da220b1fc567cd99de0bdf98f86f4cb61eae3efc2d0acef7017942f8f624b332391bb310cf341102376aa09f477ec4b69a2c2c3b7cf8fc6a8ac9 MISC metadata.xml 572 BLAKE2B 5d1abb01d74881886beab22900a545b0364cd7b48990577a153bdd1d8125d517b8a26c89382b0ceb9e127e0cbd11d7462d3d74908facb521295314ddf2699723 SHA512 ffaa7cfd28794dd57d1229e5839a28cf5b178c6416cf1817e7e6753c7460c22e96e2997f005b80b574d7f4b49e3a0e5d9f44101258824edb00e328caf449b9d5 diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r1.ebuild index 9c390246c1dd..174cae5ce179 100644 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r1.ebuild +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-any-r1 systemd diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r2.ebuild index 7f8a4eb71334..a339b62da567 100644 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r2.ebuild +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-any-r1 systemd |