From d8e7aaf1b90b28ec354e7854abea07d53644e754 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Dec 2023 13:58:21 +0000 Subject: gentoo auto-resync : 21:12:2023 - 13:58:21 --- app-misc/ca-certificates/Manifest | 4 +- .../ca-certificates-20230311.3.93.ebuild | 2 +- .../ca-certificates-20230311.3.96.1.ebuild | 205 +++++++++++++++++++++ 3 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild (limited to 'app-misc/ca-certificates') diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index db630661c4b0..9963cdabc565 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -9,11 +9,13 @@ DIST nss-3.89.tar.gz 71617802 BLAKE2B 92428a635167f311b258411420c8073fafdbadef5b DIST nss-3.90.tar.gz 72211928 BLAKE2B 9518bed4f8ca5f9dd1c3d15e255f9954fabc30762ff6db7e45ab54fd0d7d7a34e2c021ecc76b5dcac97c571914e9af116a8c1361a5f2f055a31db168518a99a7 SHA512 e41f4de73f4971c8f35dffe3926b6845ef12a1ce7e8f3fe682e643ddb791a009d079c1706f66d065333af884726840dbc96d4e44762f9c3e48b8d919c09ae625 DIST nss-3.93.tar.gz 72281331 BLAKE2B 99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f SHA512 d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951 DIST nss-3.95.tar.gz 76571130 BLAKE2B 9d40b09c0c58901781abfad609dd45f44c2f4d1ce9d4f1592748cb64a9eb29b1ac84be54ebb19fa528d8b9fd08911f769a80f72d9e6dbb22e82e5b3581a30af1 SHA512 54567c063fc72bf1a29898bc8cc405e54aa086269021d864b10a3640e6b4ae0d632834db87766257fdb43740d9bc71e362d69cfe6924f5c72a6e1a99a91f8c3a +DIST nss-3.96.1.tar.gz 76715092 BLAKE2B 2a9ea65dd89cba82ea10a57887b10109369af81d4c2911c54cfd081a661498ad7f56ad419092539caaa16341045edcc50f5a3c74d87d66094dacbc91226a9d1c SHA512 fe8baefa767b711a108aafdb496a45d15d2296c3bdd0b1e4389c49197d1cf5365872ee41c23b6823285803887c74538d13347af87d64750551e9cbc87a9cb338 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 EBUILD ca-certificates-20211016.3.88.1.ebuild 5930 BLAKE2B d96c7b080651db27c64c822224e4101ee5ce8af81e6090a377f2fec34b4ce0a78eee89a49f9ebe121687aceb0423d62a93ff2c9fe472e28e358ac314ea06b5d9 SHA512 93672c1b7c7c5e2943ccb6f3d3431135f5951a4feb8b7988c94fbcd2de595f323e46ce83ec39e84c5da53a90c86378ec486344cbaa8e576428135e2bd2f2468a EBUILD ca-certificates-20230311.3.89.1.ebuild 6043 BLAKE2B 074e2370013aa82fe074d02734789429d2a5306b6d84411d5efd8c86d29a27ee3ce71ad4be7479b742c9468c12c2b50a45169adf7da13546d4d18948f78cfef4 SHA512 0cf274f1efc7c2e0db731f1f116bb440b8e9a701a2d2836548b6ec5a86ef15bbb7fc3999cc0ee6e7df554b9ce04d28e007d1e65d8ba7f64d92d4c29f7edbdba3 EBUILD ca-certificates-20230311.3.89.ebuild 6051 BLAKE2B e4eb58350219fa8cb1c851d5d0f7b74f989e29089ed6a72771036e022b393e0e149ee27f22563a209645233c62abf291c91986d5195e58635c8ede0becc981b9 SHA512 0df61de89c58c934e1407fd1fef4de95b28945e4ea2597fdabce94cf2d901c62a80cae6332ae45a6e9dd5b2ae13dfe3dd666c51622756d28ab3b33cb78638394 EBUILD ca-certificates-20230311.3.90.ebuild 6044 BLAKE2B 562bcbd292e2293957a83d02433c8e5ac306071fb06662040ebd6de5caa6a63bc50b65f7801f26891e4690cdc5f79c704d20177583d554c99fa2271b2e927afb SHA512 1951078e7afc99f5ba32725e7350b9f1f855d02a1a467d3703bbfc116b10d08e99f16bfc9e7836fdd50ee1b9df94c66e0a9fc03b4d22bd99e18e2ae04a6c898c -EBUILD ca-certificates-20230311.3.93.ebuild 6052 BLAKE2B 060ee2768b539260a4a0aba2b3cbedcfbd23909d7f723f246de816ddea445e643bbc0d4c15b3af5973819f08e7167db84d0a380dbe879c6a3c2ea3056bc40445 SHA512 4fe59b000bd7e0115816cdf695154aa9a3f81d35def128895670af76b562759d048f6d160460236b97f38eabbaf85a194c36562dfc14e8f826f9b09fab5698f3 +EBUILD ca-certificates-20230311.3.93.ebuild 6048 BLAKE2B abf3fca98c002a7bd4ec28d56f22596bb8ea089fd8006e17e3edcfd0e0864c951b82e9b73eb38d720dc219cf801b2e44ef3166435e029ec561140b6797c70144 SHA512 2060c64d786e90a178401e6d9b8d8ca3a031f36a354fb632b9750e3dd7a777bfd1650ef09c7573d88aceac374c731fbf7529607dbb50d35aba59efa29b60359d EBUILD ca-certificates-20230311.3.95.ebuild 6052 BLAKE2B 060ee2768b539260a4a0aba2b3cbedcfbd23909d7f723f246de816ddea445e643bbc0d4c15b3af5973819f08e7167db84d0a380dbe879c6a3c2ea3056bc40445 SHA512 4fe59b000bd7e0115816cdf695154aa9a3f81d35def128895670af76b562759d048f6d160460236b97f38eabbaf85a194c36562dfc14e8f826f9b09fab5698f3 +EBUILD ca-certificates-20230311.3.96.1.ebuild 6052 BLAKE2B 060ee2768b539260a4a0aba2b3cbedcfbd23909d7f723f246de816ddea445e643bbc0d4c15b3af5973819f08e7167db84d0a380dbe879c6a3c2ea3056bc40445 SHA512 4fe59b000bd7e0115816cdf695154aa9a3f81d35def128895670af76b562759d048f6d160460236b97f38eabbaf85a194c36562dfc14e8f826f9b09fab5698f3 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild index a5a1ffb07bb8..82ed1b62ae7b 100644 --- a/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild @@ -55,7 +55,7 @@ fi LICENSE="MPL-1.1" SLOT="0" -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" +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" IUSE="" ${PRECOMPILED} || IUSE+=" cacert" diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild new file mode 100644 index 000000000000..a5a1ffb07bb8 --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild @@ -0,0 +1,205 @@ +# 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_{10..12} ) + +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +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+=" !/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}" >/dev/null || die + # We patch out the dep on cryptography as it's not particularly useful + # for us. Please see the discussion in bug #821706. Not to be removed lightly! + eapply "${FILESDIR}"/${PN}-20230311.3.89-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}/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 "# 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} || 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 +} -- cgit v1.2.3