commit:     bfc4ff320e3f84268d492b8b50c5eed387c17852
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 08:47:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 08:48:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc4ff32

app-misc/ca-certificates: add 20230311.3.89.1

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

 app-misc/ca-certificates/Manifest                  |   1 +
 .../ca-certificates-20230311.3.89.1.ebuild         | 206 +++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/app-misc/ca-certificates/Manifest 
b/app-misc/ca-certificates/Manifest
index b791487bc3a8..0669ca628b02 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -4,5 +4,6 @@ DIST nss-3.83.tar.gz 84844191 BLAKE2B 
f2e26f69450cbd2c94c5efdd959cb19e874bcb63d0
 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-3.89.1.tar.gz 71624456 BLAKE2B 
fca6e09375ba2ce4a6f0bf189cabb9cdb1ba7cb5ebc1a49d47a2d6b509936a60d7f1867f71cdcfa6a81c0cbbf298513981a9b16ac23bbc464c7004bb40b830b4
 SHA512 
aeece4e8bc28113fc53997b29c89d40b4be74fee4f5d27c4e065d2fa6701038442f4eeeb1fcf98befedb03537a5a48a4701fe270f56197da57946529f9fa02dd
 DIST nss-3.89.tar.gz 71617802 BLAKE2B 
92428a635167f311b258411420c8073fafdbadef5b1fc4ff8400e41834fc67a03f2151265d5bbfb64ae53b9a8acb29750352f6c2c83d1cd9a2f89a2139ad34c9
 SHA512 
1db06d4575f2c16d2a0629007981211e714f99c014c0a6256dd33d0caf8c809ba8d5be204d018f9d1cc99b9fcd055ac1fb99b399486ed43c9cf3f55f2747de82
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 
7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d
 SHA512 
1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4

diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild 
b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild
new file mode 100644
index 000000000000..1de788f51cb2
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild
@@ -0,0 +1,206 @@
+# 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 ~arm64-macos 
~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}/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}" >/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 "# $(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} || 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
+}

Reply via email to