diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-23 23:59:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-23 23:59:27 +0100 |
commit | e3f21c8aff8a76afe3423721c437a088e9232840 (patch) | |
tree | fde2c1906a9787adec106c5d6b708cd60de02c60 /app-shells | |
parent | 1f00990debeffd0052c194989d0a02baac23eb96 (diff) |
gentoo auto-resync : 23:04:2024 - 23:59:26
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/Manifest.gz | bin | 10646 -> 10644 bytes | |||
-rw-r--r-- | app-shells/bash/Manifest | 15 | ||||
-rw-r--r-- | app-shells/bash/bash-5.1_p16-r6.ebuild | 4 | ||||
-rw-r--r-- | app-shells/bash/bash-5.1_p16-r7.ebuild | 4 | ||||
-rw-r--r-- | app-shells/bash/bash-5.1_p16-r8.ebuild | 4 | ||||
-rw-r--r-- | app-shells/bash/bash-5.2_p26-r1.ebuild | 6 | ||||
-rw-r--r-- | app-shells/bash/bash-5.2_p26.ebuild | 6 | ||||
-rw-r--r-- | app-shells/bash/bash-5.3_alpha.ebuild | 399 | ||||
-rw-r--r-- | app-shells/bash/bash-9999.ebuild | 44 |
9 files changed, 456 insertions, 26 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex 2321c96cbc0d..484c3fdd7973 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index d0b415c9b748..76c143e5258d 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -38,6 +38,8 @@ DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef788 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7 DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9 SHA512 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258 +DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42 SHA512 52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e +DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589 SHA512 c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399 @@ -450,10 +452,11 @@ EBUILD bash-4.2_p53.ebuild 5157 BLAKE2B 1a58f67c384b6ae781e48ddc2fb131086a23b449 EBUILD bash-4.3_p48-r2.ebuild 6358 BLAKE2B 532802911ced386ccff0594e5eee739d0d5ebba7e0bf89c431e2769ca7b2dc48f77787f12bcb327f9d394d3bd80680889968c3708ff9f7e64615347fcfd521f5 SHA512 62ed893e23d65d17d0f83d812e616511b4ff2d69a52e6bffb3ed421bb339d18a213a2f1da0239b108e3e81cf0b2f61b4e0cf535964f40dc4577d0cff226fd9bd EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d2524545f38a9eb793cd8b9d30ed5cb4ae11078cd7bc940fe3cda3f62797ed53de5ab82f726219c054cdc8779a011a8ea9 SHA512 9b9d12e1408944d18c698b0be9940618c059599138f10b20ed55dc69131aac900e3cae0e0b79a55e77d075f6a03c2970b6d22250afe5c7912c652800fe9a30ef EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae -EBUILD bash-5.1_p16-r6.ebuild 8844 BLAKE2B 11fffeaad92d1f30c0818232f3f2a79b7066dd95abdf949b17f3568bea4fb03dadd21cd888eae5f6f5400280747c0214824183b6619d60fa41683332d677865c SHA512 315896706efe51bd7305768217eb30363dbb1154efd460d3780b464ebcc49931aac5ee1e3142d9bd1fa007982e0c389cd68f66049882507ba9c31d2b9d639740 -EBUILD bash-5.1_p16-r7.ebuild 8906 BLAKE2B 5db7108b49a5dd2366aa3d06a35433fb82f6d5ee61134d277a2e811bfeaa5ba92b3192b33c211d0d26aed0e380d95670df396d6672635f6c335d77fbca06ec4c SHA512 415ce1a83da7784cc3543da6bbd01c8f07b82a4b6bdb24bcfc7518a402830d3c12788f5b911ed52ad6441b4a6b4928de4c1eb06bc3d0cf3a7e57fa34bbd889f9 -EBUILD bash-5.1_p16-r8.ebuild 10018 BLAKE2B 172af72af7ab1bb48a94991131c7567f33b31cc4ac322e6caa0d6013f0f1e5709322377537d5918c314a8c38979202849ef1133e8b00d67f9068ea7333af9b39 SHA512 ab1ccefe265c956ffff038b839daabd8f0303bb3b07d165c3260026f896808be6a9153a5ead7bdde28e49ec66fc8811ab5528720aa5cd9b86c45d0e0ba7fa3bc -EBUILD bash-5.2_p26-r1.ebuild 11878 BLAKE2B dc6dd8f0fabaef5b3b67456e273e148047b250cad2a10c45fceb3bbd31ddbe957fcd531402e9677c48936b62658a507e353bf51c0e2d813324288c1957d9bfac SHA512 2f2c72689be5453ca8179bf71bb87e0e5281c7932afc8c437a1e233d9caf43a9d34a2097f0b0c3052cbeac3e9b7dff7e8fe3625e6f2e5f1749c02092a623a8da -EBUILD bash-5.2_p26.ebuild 10766 BLAKE2B 9ba3f7d2cf9cf217c3632ce940bb21f7af94ab7fa9a6e5a90a73d3cdb82d0102fa624a786465f0b22c018d76542c740aace840ec8cdea663f071565e9deabf05 SHA512 2668927ab8ac0a0ea4b271efa87a56d2ecc61eb4827c12e0a361c6c17f0e7fae8035df6735e2b7327ab59caea08ac08d5ed5eb4e460a9998274234481f8e9573 -EBUILD bash-9999.ebuild 10533 BLAKE2B 71b66f51269d4810aedd89aa6371762fcece77ebd2e4e3de6f1139e73b15aad166c7802a755249b26502eb65ca707c9e54c5c5ef620fa590fbe9333c28b8730b SHA512 5235dc057c497b3aed582217a4d0ecf244240f8c005db4a448aa5877fbe0a6ad2fc5ccc9f96436f380020b9ee899c3543c4c2cf71fda6f3f893e4a6008ecd90d +EBUILD bash-5.1_p16-r6.ebuild 8848 BLAKE2B 994e869b63c30c5a02c61a9f6f0a25137bba2582187163e0b72ecfcf46aa439527516c6e6b503b289dc8b78a3d5353c57d719c997a8587cf758d57e8f9241a98 SHA512 0fdf7410c8ac01ccd0c7638ca50365b734e99fe41056576101fe8ef0f27714e9f39a296ad97342289331730eb988e693b0dba56dc279c0d259758434d178a2a1 +EBUILD bash-5.1_p16-r7.ebuild 8910 BLAKE2B 433123c1a486162fc2b04513ff112d6b063cf9c2dcf133563ce86bd876a922ec5efd829c096829f13e00e6fcf40608654a7206402a4bc17538ac1d66ee5e510b SHA512 fa4a8cf4b9fb32407f9ae1e5a9ccfeaa28ee6f946dcd62d2ffca80a54e11b83a08412879c3affffb7a684430848e7dfbf9b847da943a1431e5f463fbbb8d3801 +EBUILD bash-5.1_p16-r8.ebuild 10022 BLAKE2B b0355d509dee82c19b6f8c7361f022608b835e50e9f415da91f42b3c3dd52ad780192e4b72a292553df5b63cf70315aee13ee081987cf6bfd7d8bb2af4abb165 SHA512 594fd22cab7864f5ce3fbb55d7615432f7f1b4d7cdc142e59ae2f8f9ed190a1f4d0f6cfdfbcf49b61afb26ea77163a8a1b87fae95cf8280169aee51e4d1def9d +EBUILD bash-5.2_p26-r1.ebuild 11882 BLAKE2B e3cbc8d0c8a6e54b8a9da113fb81713cb06ed38a64175ed0dc50cdad4fb04e844847e967b22603c36a6096e5570bc6f792b13769938404845fc63bee269feaad SHA512 cd2bb29f3b3e27cf89863f17b26c10a00f0added9d4c277e2c1e24ebda46230a4f17ee2fbceb6c10a181803cffa0c7cb2b44c1ab4cc2335f3e1fbd1f9183cf22 +EBUILD bash-5.2_p26.ebuild 10770 BLAKE2B 051adeaa0222babb768474508b47932dfca26f3600f1adb640e60b1839efc36fe8c327eee0e9de8183d6e8a7e980bf1db2d71ea47d6b9f158dcfd24ebb2a6e55 SHA512 013dfc231bde39ae25ed2bb94faa2b04eb9f8234234e4492ef091edb33a64ad0471e162d3d15dc98eb155f32cc0330a596e9efd7f0066eaf8585d421fd730c64 +EBUILD bash-5.3_alpha.ebuild 11748 BLAKE2B b4bc34087a54f5f76e1118fa68896157b8a4c57936418de913d408ba3f8eb7e539f20444855501092f76b877045bb454a0d20100be56cc2354b77c75040adc94 SHA512 e2cdb0204e62447af33df206603d65fe55cf8d33964e2ff16668488702857ee44373da96c8cd5ea52b6b0ed92974505f2b72dc1bd28be2a09d1ca9e823377fdd +EBUILD bash-9999.ebuild 11748 BLAKE2B b4bc34087a54f5f76e1118fa68896157b8a4c57936418de913d408ba3f8eb7e539f20444855501092f76b877045bb454a0d20100be56cc2354b77c75040adc94 SHA512 e2cdb0204e62447af33df206603d65fe55cf8d33964e2ff16668488702857ee44373da96c8cd5ea52b6b0ed92974505f2b72dc1bd28be2a09d1ca9e823377fdd MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d diff --git a/app-shells/bash/bash-5.1_p16-r6.ebuild b/app-shells/bash/bash-5.1_p16-r6.ebuild index 4553ec952476..7af661f690f8 100644 --- a/app-shells/bash/bash-5.1_p16-r6.ebuild +++ b/app-shells/bash/bash-5.1_p16-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,7 +60,7 @@ if is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done diff --git a/app-shells/bash/bash-5.1_p16-r7.ebuild b/app-shells/bash/bash-5.1_p16-r7.ebuild index 26db8787ba76..aca10522e9cb 100644 --- a/app-shells/bash/bash-5.1_p16-r7.ebuild +++ b/app-shells/bash/bash-5.1_p16-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,7 +60,7 @@ if is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done diff --git a/app-shells/bash/bash-5.1_p16-r8.ebuild b/app-shells/bash/bash-5.1_p16-r8.ebuild index 97f08a41017e..41b73878797e 100644 --- a/app-shells/bash/bash-5.1_p16-r8.ebuild +++ b/app-shells/bash/bash-5.1_p16-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,7 +60,7 @@ if is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done diff --git a/app-shells/bash/bash-5.2_p26-r1.ebuild b/app-shells/bash/bash-5.2_p26-r1.ebuild index 0db88e2a73fd..0e803fa5048c 100644 --- a/app-shells/bash/bash-5.2_p26-r1.ebuild +++ b/app-shells/bash/bash-5.2_p26-r1.ebuild @@ -65,7 +65,7 @@ elif is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0" if is_release ; then @@ -104,8 +106,6 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-chetramey ) " -S="${WORKDIR}/${MY_P}" - # EAPI 8 tries to append it but it doesn't exist here QA_CONFIGURE_OPTIONS="--disable-static" diff --git a/app-shells/bash/bash-5.2_p26.ebuild b/app-shells/bash/bash-5.2_p26.ebuild index 1bee48a4a941..e961ca5b7193 100644 --- a/app-shells/bash/bash-5.2_p26.ebuild +++ b/app-shells/bash/bash-5.2_p26.ebuild @@ -65,7 +65,7 @@ elif is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0" if is_release ; then @@ -104,8 +106,6 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-chetramey ) " -S="${WORKDIR}/${MY_P}" - # EAPI 8 tries to append it but it doesn't exist here QA_CONFIGURE_OPTIONS="--disable-static" diff --git a/app-shells/bash/bash-5.3_alpha.ebuild b/app-shells/bash/bash-5.3_alpha.ebuild new file mode 100644 index 000000000000..036e48751a1f --- /dev/null +++ b/app-shells/bash/bash-5.3_alpha.ebuild @@ -0,0 +1,399 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc +inherit flag-o-matic toolchain-funcs prefix verify-sig + +# Uncomment if we have a patchset +#GENTOO_PATCH_DEV="sam" +#GENTOO_PATCH_VER="${PV}" + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +MY_PATCHES=() + +is_release() { + case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +[[ ${PV} != *_p* ]] && PLEVEL=0 + +# The version of readline this bash normally ships with. +# Note: right now, we don't use the system copy of readline for bash for non-releases. +READLINE_VER="8.3_alpha" + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then + SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )" + + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + + patch_url= + my_patch_index= + + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) + done + + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + fi +else + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )" +fi + +if [[ -n ${GENTOO_PATCH_VER} ]] ; then + SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +if is_release ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" + +DEPEND=" + >=sys-libs/ncurses-5.2-r2:= + nls? ( virtual/libintl ) +" +if is_release ; then + DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )" +fi +RDEPEND=" + ${DEPEND} +" +# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011) +BDEPEND=" + pgo? ( dev-util/gperf ) + verify-sig? ( sec-keys/openpgp-keys-chetramey ) +" + +# EAPI 8 tries to append it but it doesn't exist here +QA_CONFIGURE_OPTIONS="--disable-static" + +PATCHES=( + #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ + + # Patches from Chet sent to bash-bug ml + "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch +) + +pkg_setup() { + # bug #7332 + if is-flag -malign-double ; then + eerror "Detected bad CFLAGS '-malign-double'. Do not use this" + eerror "as it breaks LFS (struct stat64) on x86." + die "remove -malign-double from your CFLAGS mr ricer" + fi + + if use bashlogger ; then + ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." + ewarn "This will log ALL output you enter into the shell, you have been warned." + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig} + + local patch + for patch in "${MY_PATCHES[@]}" ; do + verify-sig_verify_detached ${patch}{,.sig} + done + fi + + unpack ${MY_P}.tar.gz + + if [[ -n ${GENTOO_PATCH_VER} ]] ; then + unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz + fi + fi +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + + # Clean out local libs so we know we use system ones w/releases. + if is_release ; then + rm -rf lib/{readline,termcap}/* || die + touch lib/{readline,termcap}/Makefile.in || die # for config.status + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die + fi + + # Prefixify hardcoded path names. No-op for non-prefix. + hprefixify pathnames.h.in + + # Avoid regenerating docs after patches, bug #407985 + sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die + touch -r . doc/* || die + + # Sometimes hangs (more noticeable w/ pgo), bug #907403. + rm tests/run-jobs || die + + eapply -p0 "${PATCHES[@]}" + eapply_user +} + +src_configure() { + # Upstream only test with Bison and require GNUisms like YYEOF and + # YYERRCODE. The former at least may be in POSIX soon: + # https://www.austingroupbugs.net/view.php?id=1269. + # configure warns on use of non-Bison but doesn't abort. The result + # may misbehave at runtime. + unset YACC + + # wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported + # upstream to Chet by email. + filter-lto + + local myconf=( + --disable-profiling + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses. For the most part, ncurses + # is here because readline needs it. But bash itself calls + # ncurses in one or two small places :(. + --with-curses + + $(use_enable mem-scramble) + $(use_enable net net-redirections) + $(use_enable readline) + $(use_enable readline bang-history) + $(use_enable readline history) + $(use_with afs) + $(use_with mem-scramble bash-malloc) + ) + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ + -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ + -DNON_INTERACTIVE_LOGIN_SHELLS \ + -DSSH_SOURCE_BASHRC \ + $(use bashlogger && echo -DSYSLOG_HISTORY) + + # Don't even think about building this statically without + # reading bug #7714 first. If you still build it statically, + # don't come crying to us with bugs ;). + #use static && export LDFLAGS="${LDFLAGS} -static" + use nls || myconf+=( --disable-nls ) + + if is_release ; then + # Historically, we always used the builtin readline, but since + # our handling of SONAME upgrades has gotten much more stable + # in the PM (and the readline ebuild itself preserves the old + # libs during upgrades), linking against the system copy should + # be safe. + # Exact cached version here doesn't really matter as long as it + # is at least what's in the DEPEND up above. + export ac_cv_rl_version=${READLINE_VER%%_*} + + # Use system readline only with released versions. + myconf+=( --with-installed-readline=. ) + fi + + if use plugins ; then + append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash + else + # Disable the plugins logic by hand since bash doesn't + # provide a way of doing it. + export ac_cv_func_dl{close,open,sym}=no \ + ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no + + sed -i \ + -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ + configure || die + fi + + # bug #444070 + tc-export AR + + econf "${myconf[@]}" +} + +src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others + + # Build Bash and run its tests to generate profiles. + if use pgo ; then + # Used in test suite. + unset A + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + if tc-is-clang; then + llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + fi + + # Rebuild Bash using the profiling data we just generated. + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others + fi +} + +src_test() { + # Used in test suite. + unset A + + default +} + +src_install() { + local d f + + default + + dodir /bin + mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die + dosym bash /bin/rbash + + insinto /etc/bash + doins "${FILESDIR}"/bash_logout + newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc + + insinto /etc/bash/bashrc.d + doins "${FILESDIR}"/bashrc.d/*.bash + + insinto /etc/skel + for f in bash{_logout,_profile,rc} ; do + newins "${FILESDIR}"/dot-${f} .${f} + done + + local sed_args=( + -e 's:#GNU#@::' + -e '/#@/d' + ) + + if ! use readline ; then + # bug #432338 + sed_args+=( + -e '/^shopt -s histappend/s:^:#:' + -e 's:use_color=true:use_color=false:' + ) + fi + + sed -i \ + "${sed_args[@]}" \ + "${ED}"/etc/skel/.bashrc \ + "${ED}"/etc/bash/bashrc || die + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') + + insinto /usr/include/bash-plugins + doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,startup-files} ; do + exeinto /usr/share/doc/${PF}/${d} + docinto ${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + dodoc ${f} + fi + done + done + fi + + # Install bash_builtins.1 and rbash.1 + emake -C doc DESTDIR="${D}" install_builtins + sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die + doman "${T}"/rbash.1 + + newdoc CWRU/changelog ChangeLog + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then + mkdir -p "${EROOT}"/etc/bash + mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ + fi +} + +pkg_postinst() { + local old_ver + + # If /bin/sh does not exist, provide it + if [[ ! -e ${EROOT}/bin/sh ]] ; then + ln -sf bash "${EROOT}"/bin/sh + fi + + read -r old_ver <<<"${REPLACING_VERSIONS}" + if [[ ! $old_ver ]] ; then + : + elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then + return + elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then + return + fi + + einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash." + einfo "" + einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the" + einfo "characteristics of the operating environment, this array may contain commands" + einfo "to set the window and pane title. Users that choose to customise this variable" + einfo "in ~/.bashrc are advised to append their commands, using the following syntax." + einfo "" + einfo "PROMPT_COMMAND+=('custom command goes here')" + einfo "" + einfo "Alternatively, users that wish to opt out of Gentoo's window title setting" + einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it" + einfo "as desired. Previously, there was no formally supported method of opting out." +} diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild index dc26c74b8f9d..036e48751a1f 100644 --- a/app-shells/bash/bash-9999.ebuild +++ b/app-shells/bash/bash-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ is_release() { # The version of readline this bash normally ships with. # Note: right now, we don't use the system copy of readline for bash for non-releases. -READLINE_VER="8.2_p1" +READLINE_VER="8.3_alpha" DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git" @@ -65,7 +65,7 @@ elif is_release ; then # Add in the mirror URL too. SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )" MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done @@ -81,6 +81,8 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0" if is_release ; then @@ -100,13 +102,10 @@ RDEPEND=" " # We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011) BDEPEND=" - sys-devel/bison pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) " -S="${WORKDIR}/${MY_P}" - # EAPI 8 tries to append it but it doesn't exist here QA_CONFIGURE_OPTIONS="--disable-static" @@ -185,6 +184,10 @@ src_configure() { # may misbehave at runtime. unset YACC + # wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported + # upstream to Chet by email. + filter-lto + local myconf=( --disable-profiling @@ -298,9 +301,10 @@ src_install() { insinto /etc/bash doins "${FILESDIR}"/bash_logout - doins "$(prefixify_ro "${FILESDIR}"/bashrc)" + newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc - keepdir /etc/bash/bashrc.d + insinto /etc/bash/bashrc.d + doins "${FILESDIR}"/bashrc.d/*.bash insinto /etc/skel for f in bash{_logout,_profile,rc} ; do @@ -364,8 +368,32 @@ pkg_preinst() { } pkg_postinst() { + local old_ver + # If /bin/sh does not exist, provide it if [[ ! -e ${EROOT}/bin/sh ]] ; then ln -sf bash "${EROOT}"/bin/sh fi + + read -r old_ver <<<"${REPLACING_VERSIONS}" + if [[ ! $old_ver ]] ; then + : + elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then + return + elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then + return + fi + + einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash." + einfo "" + einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the" + einfo "characteristics of the operating environment, this array may contain commands" + einfo "to set the window and pane title. Users that choose to customise this variable" + einfo "in ~/.bashrc are advised to append their commands, using the following syntax." + einfo "" + einfo "PROMPT_COMMAND+=('custom command goes here')" + einfo "" + einfo "Alternatively, users that wish to opt out of Gentoo's window title setting" + einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it" + einfo "as desired. Previously, there was no formally supported method of opting out." } |