diff options
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/Manifest.gz | bin | 49905 -> 49908 bytes | |||
| -rw-r--r-- | app-misc/broot/Manifest | 2 | ||||
| -rw-r--r-- | app-misc/broot/broot-1.19.0.ebuild | 2 | ||||
| -rw-r--r-- | app-misc/ca-certificates/Manifest | 2 | ||||
| -rw-r--r-- | app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild | 202 |
5 files changed, 206 insertions, 2 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 92323cf8b718..941202b889f3 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest index 46811f2f8f6f..af97bd44fd92 100644 --- a/app-misc/broot/Manifest +++ b/app-misc/broot/Manifest @@ -392,6 +392,6 @@ DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0 EBUILD broot-1.16.2.ebuild 5688 BLAKE2B ad842e5e38a2c1f37dd950741628ca313bbd32c8b27cd00042070eabb869837b61c9e0cc1459f22784d579d7a07a0d42b1ec83e06446a5d34968393615027188 SHA512 d41b1549907ea1ec7fdc706fb4332b42d32ddcf1f385251b3b491f0866f33671bce2c33e5bba45ea9f855bab823d3a5fbc5d61b769f89d31460ae64dda717b98 EBUILD broot-1.18.0.ebuild 5699 BLAKE2B 019c68003c7bbcea8e5e9873f0ff553df724d14bd54db007ccc78607662d8c9d9cb2f8190f3e12fbb18dc0cec54cf6b0aa63345f03f8563985741fb855d97f85 SHA512 dd2120d6d8b8e8b589629209292fc7879be38589a2c09904bf881a9845173458debaecad3e8abe25601044861bf825771aed6ee73b3b3a512d3906586a296aa7 -EBUILD broot-1.19.0.ebuild 5699 BLAKE2B e8c14bb9026b9dd5e7756565019bab5a61135f01e6c6ed27baceb0e2505ea5ac43225797fccc12062b994e833f0ce2e8bca88dafc3bca5033ea09c5c94718281 SHA512 464ba56d5abbc8c753e56a27f3c68a4fdef45d25ea1e609e7155a27b34c097bc769fab63790857f85a843096f6663ec3862caded2d306bd26422488821b22682 +EBUILD broot-1.19.0.ebuild 5698 BLAKE2B 1ac5db8fb750c4a9f6a8bc2e06a7b4968aaccf4e76917f54f7b5473709688151d902a294bb3a6354c532238bb6baa92c9f6fb842475c1d6a02b381ac8533ba65 SHA512 8e7a19d1884abd3866b26016f89ac681bc0a204ace69e5fb076ab32393150c1b82bd8a1fe15c5c89afa85bce3f897ed2952226e968a24a11e8d2a6f0bb53b81d EBUILD broot-1.20.1.ebuild 6301 BLAKE2B 379e03df40b0e9f0e5108c916c7b32a56a9957bac446b4454dd610fc3efe449149851d1787521a6b19016ed00b9f3bf944ce22e97a8865802e757f248a7c4130 SHA512 9669262a4891ae94f9cc59c74ea9b3120f982466af5af3ee4243315c41a064856873d889ddddcb9c9f9f7478f00fd5930b4650c4cb2a5eabb6d920ed542a9a46 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695 diff --git a/app-misc/broot/broot-1.19.0.ebuild b/app-misc/broot/broot-1.19.0.ebuild index 0348f9ec708d..bd473f05de7a 100644 --- a/app-misc/broot/broot-1.19.0.ebuild +++ b/app-misc/broot/broot-1.19.0.ebuild @@ -263,7 +263,7 @@ SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="X" RDEPEND=" diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index 7f204a20022e..0c93a83165cb 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -4,8 +4,10 @@ DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf91 DIST nss-3.83.tar.gz 84844191 BLAKE2B f2e26f69450cbd2c94c5efdd959cb19e874bcb63d09098406ef49f4997bd04bc0ee4bc285c1c4f0ec461194171342c7d31965ac7bc7eefc284783542dfe853b1 SHA512 550cf1116e39e58041feaa67913f570d791e8153cc0522ba7ae02e27a61e0a4e6a25224be0f25d51a842dc11c70d600263450ebff0a9fdaa2840bafa3fc9ddd5 DIST nss-3.86.tar.gz 71423531 BLAKE2B 36703d99d9616020a165085469be650c2f4ce3e11c2f4f6bd974b1b89f1b9fcfdaa4ffd4d6ee98dabce82e616c170548efa1e51722b524dda8815faccfcf5181 SHA512 c09aeb52d7898617b65a1090cbdd29f6457eff2ebdc61aadb2dbf7b5044eae010ee5eeea729825f1258902936a61a1bff552ee9b26b2f01e5d448bbd8791d1cb DIST nss-3.87.tar.gz 71435408 BLAKE2B 0d69e18b1e2c4ccfc86db8f3afba94d5000e8ab2a4e766eb6f99f13f57d78b62dd711a0f5f70a24378a3cf1e435cc8ecb7e6fbeae18d5db0176660a0ea35dac2 SHA512 4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110 +DIST nss-3.88.1.tar.gz 71607211 BLAKE2B ff84d3153a01519a52e83be5327453d8e6a81e1f62ccd69906b549fe42ec5ebf075b403395a67bc75f3c7f7dd33ef49f3b1f33558652ff75ee87e2970b2e06a4 SHA512 d15289803a4c3caa1b7a8872b761a95b4f571688c8b8ffaf2a1478e032a356fbcf8a9239ebe1777561503329f63dd237384e1d8af9ca70fb48b40e70954b455a DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 EBUILD ca-certificates-20211016.3.83.ebuild 6060 BLAKE2B b853e9a795171455fa308f6c256fc549423bc552e75bbbf3cdbbe7b148fd5d8d313eaf227b9de51048415899a29308a1d557f13c0f79159fe56ba505598af114 SHA512 072876a9f7a2c51d789352d1373a0c232809f2df3d0f8e2ae8dc6346d7fcf84345f065bc6cbe0d29d7802d565583774216ac2e94fadc772e240b010a08cce93a EBUILD ca-certificates-20211016.3.86.ebuild 6060 BLAKE2B b853e9a795171455fa308f6c256fc549423bc552e75bbbf3cdbbe7b148fd5d8d313eaf227b9de51048415899a29308a1d557f13c0f79159fe56ba505598af114 SHA512 072876a9f7a2c51d789352d1373a0c232809f2df3d0f8e2ae8dc6346d7fcf84345f065bc6cbe0d29d7802d565583774216ac2e94fadc772e240b010a08cce93a EBUILD ca-certificates-20211016.3.87-r1.ebuild 6015 BLAKE2B 882c2c4c890041ea32e50534910bfd71cc2a62b442dc542f13074fc7454146d666903e616900b6c2c07e19e36fc47669f943a060124421a16ec41674a11dae96 SHA512 d25cb9c5a1569c694e052e6a5d8175fb2287999e97dd9bf917c1f96a6ec32a1e7998874bd421d04cf913c172db9db482a5065ceac68a2348177eefbe06b73c3a +EBUILD ca-certificates-20211016.3.88.1.ebuild 6015 BLAKE2B 882c2c4c890041ea32e50534910bfd71cc2a62b442dc542f13074fc7454146d666903e616900b6c2c07e19e36fc47669f943a060124421a16ec41674a11dae96 SHA512 d25cb9c5a1569c694e052e6a5d8175fb2287999e97dd9bf917c1f96a6ec32a1e7998874bd421d04cf913c172db9db482a5065ceac68a2348177eefbe06b73c3a MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild new file mode 100644 index 000000000000..d677b0694f11 --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# The Debian ca-certificates package merely takes the CA database as it exists +# in the nss package and repackages it for use by openssl. +# +# The issue with using the compiled debs directly is two fold: +# - they do not update frequently enough for us to rely on them +# - they pull the CA database from nss tip of tree rather than the release +# +# So we take the Debian source tools and combine them with the latest nss +# release to produce (largely) the same end result. The difference is that +# now we know our cert database is kept in sync with nss and, if need be, +# can be sync with nss tip of tree more frequently to respond to bugs. + +# Where possible, bump to stable/LTS releases of NSS for the last part +# of the version (when not using a pure Debian release). + +# When triaging user reports, refer to our wiki for tips: +# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 + +if [[ ${PV} == *.* ]] ; then + # Compile from source ourselves. + PRECOMPILED=false + + DEB_VER=$(ver_cut 1) + NSS_VER=$(ver_cut 2-) + RTM_NAME="NSS_${NSS_VER//./_}_RTM" +else + # Debian precompiled version. + PRECOMPILED=true + inherit unpacker +fi + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="https://packages.debian.org/sid/ca-certificates" +NMU_PR="" +if ${PRECOMPILED} ; then + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" +else + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + cacert? ( + https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch + )" +fi + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt" +IUSE="" +${PRECOMPILED} || IUSE+=" cacert" + +# c_rehash: we run `c_rehash` +# debianutils: we run `run-parts` +CDEPEND=" + sys-apps/debianutils" + +BDEPEND="${CDEPEND}" +if ! ${PRECOMPILED} ; then + BDEPEND+=" ${PYTHON_DEPS}" +fi + +DEPEND="" +if ${PRECOMPILED} ; then + DEPEND+=" !<sys-apps/portage-2.1.10.41" +fi + +RDEPEND="${CDEPEND} + ${DEPEND}" + +S="${WORKDIR}" + +pkg_setup() { + # For the conversion to having it in CONFIG_PROTECT_MASK, + # we need to tell users about it once manually first. + [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \ + || ewarn "You should run update-ca-certificates manually after etc-update" + + if ! ${PRECOMPILED} ; then + python-any-r1_pkg_setup + fi +} + +src_unpack() { + if ! ${PRECOMPILED} ; then + default + # Initial 20200601 deb release had bad naming inside the debian source tarball. + DEB_S="${WORKDIR}/${PN}-${DEB_VER}" + DEB_BAD_S="${WORKDIR}/work" + if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then + mv "${DEB_BAD_S}" "${DEB_S}" + fi + fi + + # Do all the work in the image subdir to avoid conflicting with source + # dirs in ${WORKDIR}. Need to perform everything in the offset #381937 + mkdir -p "image/${EPREFIX}" || die + cd "image/${EPREFIX}" || die + + ${PRECOMPILED} && unpacker_src_unpack +} + +src_prepare() { + cd "image/${EPREFIX}" || die + + if ! ${PRECOMPILED} ; then + mkdir -p usr/sbin || die + cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \ + usr/sbin/ || die + + if use cacert ; then + pushd "${S}"/nss-${NSS_VER} >/dev/null || die + eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch + popd >/dev/null || die + fi + fi + + default + eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch + + pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die + eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch + popd >/dev/null || die + + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') + sed -i \ + -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ + -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ + usr/sbin/update-ca-certificates || die +} + +src_compile() { + cd "image/${EPREFIX}" || die + + if ! ${PRECOMPILED} ; then + local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" + + # Grab the database from the nss sources. + cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die + emake -C "${d}" + + # Now move the files to the same places that the precompiled would. + mkdir -p etc/ssl/certs \ + etc/ca-certificates/update.d \ + "${c}"/mozilla \ + || die + if use cacert ; then + mkdir -p "${c}"/cacert.org || die + mv "${d}"/CA_Cert_Signing_Authority.crt \ + "${c}"/cacert.org/cacert.org_class1.crt || die + mv "${d}"/CAcert_Class_3_Root.crt \ + "${c}"/cacert.org/cacert.org_class3.crt || die + fi + mv "${d}"/*.crt "${c}"/mozilla/ || die + else + mv usr/share/doc/{ca-certificates,${PF}} || die + fi + + ( + echo "# Automatically generated by ${CATEGORY}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${c}" || die + find * -name '*.crt' | LC_ALL=C sort + ) > etc/ca-certificates.conf + + sh usr/sbin/update-ca-certificates --root "${S}/image" || die +} + +src_install() { + cp -pPR image/* "${D}"/ || die + if ! ${PRECOMPILED} ; then + cd ${PN}-${DEB_VER} || die + doman sbin/*.8 + dodoc debian/README.* examples/ca-certificates-local/README + fi + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die + doenvd 98ca-certificates +} + +pkg_postinst() { + if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then + # If the user has local certs, we need to rebuild again + # to include their stuff in the db. + # However it's too overzealous when the user has custom certs in place. + # --fresh is to clean up dangling symlinks + "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" + fi + + if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then + ewarn "Removing the following broken symlinks:" + ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" + fi +} |