commit:     ee9f8fc2db116e0ea59d603f97f94de7690ca95c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 04:48:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 04:48:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9f8fc2

app-misc/ca-certificates: add 20250419.3.112

I've used latest dev-libs/nss as the version scheme is slightly different
for stable right now (because entered 3 digits) and I don't see much
point in worrying about the distinction. Just use latest for now.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/ca-certificates/Manifest                  |   2 +
 .../ca-certificates-20250419.3.112.ebuild          | 200 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/app-misc/ca-certificates/Manifest 
b/app-misc/ca-certificates/Manifest
index 77c3d12321e3..5eee818f96e5 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,5 +1,7 @@
 DIST ca-certificates_20230311.tar.xz 257772 BLAKE2B 
b807a6415126afdc11896efea8e6509d7ad58b26bc8562b276e93176e80bb8b467a5bd2ba948d3dbbeaf0e4477d93f3ea2b99d3186e856fb47d1033cb779d560
 SHA512 
00571bdc87897813fd7dbe024f3a186cfc9f0d4f55e92545a90888c9e5282f99cb8d75b5932c034731b911bf27a9b38fd7d062dd511eb1152acf8b2811490fa7
 DIST ca-certificates_20240203.tar.xz 263276 BLAKE2B 
44d22aa91fe589e2ae67cb32c6594f1252e99d4460969bf7c925e7047178168c8881c2c93d6c63171059239e34aeea73b95f135f6b60a4e2fa61caa1ddfa3c44
 SHA512 
e9d7b5283c2be9425d18eb4a9b54b1fa54db0b9d1bdb28f9c6db7f8b2e03fd93442ac973f9b024b7a148d71ac2789edbc1207c2048ce4be589eb1a5376640670
+DIST ca-certificates_20250419.tar.xz 277504 BLAKE2B 
2a9ccd233c6129dbbb19527ebf7732b89d89d7cda96e427c7f0234e4854eb20fa28d3a16e39c7584de70bf59f70d016c96fe9e6b19026957e6789fde70926a68
 SHA512 
5a66a4aabbc18bce752b9e2d362309812cb685e24c0bb52cbb04cde3284b023034955c0ba8c9a3fa065392ab8372d166e6cb17b82fb336cb485e2b63485e9631
+DIST nss-3.112.tar.gz 76620428 BLAKE2B 
0de17bfe86ac9e752c4f0c5a4f6db217a74e460850bf79d9bf1fc1b1b2279ad80fb8c4591bea0642d23fa532e71fdb8382ae1dbc797a3a14303439d1aa4868a6
 SHA512 
564ae4ded323d7213f224673b0ddc584dcfae71bbdd139310854e547d9ba2877ba45462da49f71ea2fae72caea1cf10fa51d9dfef656a21957256cadc5fa4b35
 DIST nss-3.96.1.tar.gz 76715092 BLAKE2B 
2a9ea65dd89cba82ea10a57887b10109369af81d4c2911c54cfd081a661498ad7f56ad419092539caaa16341045edcc50f5a3c74d87d66094dacbc91226a9d1c
 SHA512 
fe8baefa767b711a108aafdb496a45d15d2296c3bdd0b1e4389c49197d1cf5365872ee41c23b6823285803887c74538d13347af87d64750551e9cbc87a9cb338
 DIST nss-3.97.tar.gz 76664827 BLAKE2B 
ede68cf0269edd8ffbe1e90682fb51c202d6298f8bfa5ebbd81e12785e29e6a6611ef3f0feceee73bea4d25ae12f251225649a73d249fdd90af179e07e39f3f6
 SHA512 
1ad6ac6ff626dc187f42b313c1088ef4b4ac0ee3e156d37824c36e778faa977e8f132302ac00d74aa8f9903e791a0fee6cecb5244d2601e0825cc125b6f33d6a
 DIST nss-3.98.tar.gz 76685475 BLAKE2B 
d382cc65e450b5b7d6b152952a8188822eab5fdbaa0faeefc3f98ef5aa70ed7534abcb7114aaa25c1e49f89dcda7cf75d85957d1a8e5ff964599362757138cb4
 SHA512 
4f335c5c284eff6424745cc15e32037715a915f6f61687ec36a8ffaef0e45d152602a1be275bbb2f14650c7d258d6488430cdcf512b18ba7cb73cd43ac625681

diff --git a/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild 
b/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild
new file mode 100644
index 000000000000..90d3ffb0e54d
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2025 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_{11..14} )
+
+inherit edo 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? (
+                       mirror://gentoo/d1/nss-cacert-class1-class3-r2.patch
+               )
+       "
+fi
+
+S="${WORKDIR}"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+${PRECOMPILED} || IUSE+=" cacert"
+
+BDEPEND="${COMMON_DEPEND}"
+if ! ${PRECOMPILED} ; then
+       BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+if ${PRECOMPILED} ; then
+       DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="
+       ${COMMON_DEPEND}
+       ${DEPEND}
+"
+
+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}" || die
+               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}/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}-20240203.3.98-update-ca-certificates-drop-pointless-dependency.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
+
+       edo sh usr/sbin/update-ca-certificates --sysroot "${S}/image"
+}
+
+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 --sysroot "${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
+}

Reply via email to