diff options
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/Manifest.gz | bin | 50437 -> 50438 bytes | |||
| -rw-r--r-- | app-misc/ca-certificates/Manifest | 6 | ||||
| -rw-r--r-- | app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild (renamed from app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r1.ebuild) | 0 | ||||
| -rw-r--r-- | app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild | 201 | ||||
| -rw-r--r-- | app-misc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch | 12 |
5 files changed, 212 insertions, 7 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex cd7ef37867d2..0e2a8ff3ad88 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index a5ec86b56d11..2d3faf19f8f0 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -1,4 +1,4 @@ -AUX 0001-update-ca-certificates-drop-pointless-dependency-on-.patch 1919 BLAKE2B abea7881d122a66fcf52631333ba2f3bbefc11dcb59a529f918ef83302dc24071f8be7516fc7dc65a9ef3a6e9e03a486a1ce3a5c891c51627f7330d91ada461e SHA512 3c3960a36fbf5284e62c0319094dad753bb66654f1637586d3495b23d50bd526ffd2d79c42b18f21db29a9b70b992b3d6b72dc40a03d6f8abb32c95140c0c579 +AUX 0001-update-ca-certificates-drop-pointless-dependency-on-.patch 1961 BLAKE2B a77e806aa11b6e7f2727e8505c87c57d3c7d2b314552bc90a357c57225c16f34a1061835efe96626ee6e110a4afa10255e5a0a88efa3169e98ca282934c2ad19 SHA512 f949254a5e5b28aa62074dcdc5e340de228abbe0b7c010e243c0f0526b846c5d0ccd06234bacd2c89d6953bf8f4a5d0307adc720e3d65591bd3ab8f6551a9f06 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59 AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763e15f5a3fc3d63513346afcd0e74d7b01fb2e107d874eb314608fa5e2823826bf7adfc0bac83396a0828a8ad9eb680cad6f2034a32280f85e7e4e SHA512 b132682f54451c0a17073135c96153bb0de97496c9c5b1f3c5fe019a2dccf6497e7a88322b2fccec3fb7252100d1c2a9bd9e4e124d8774c6fd369ada0d600c9a AUX ca-certificates-20230311.3.89-no-cryptography.patch 866 BLAKE2B 3ab0ef5d1405c9872eb0b09db697475183d5ee73a33a4196e7c9d8b334724f52e92fb4a4ab0c3ae5c0768274f4f46092a543d7865cc7718c3bf86ac6cd4b2de1 SHA512 4a38362d0577ea1a9f9a5dab02a89ebf8abd7caae0e33f1a6baeb36371eaa8a71cca2ef2543c10f35740efdff53b8089e4cd82031748850338b77755188226a8 @@ -11,6 +11,7 @@ DIST nss-3.90.tar.gz 72211928 BLAKE2B 9518bed4f8ca5f9dd1c3d15e255f9954fabc30762f 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-3.97.tar.gz 76664827 BLAKE2B ede68cf0269edd8ffbe1e90682fb51c202d6298f8bfa5ebbd81e12785e29e6a6611ef3f0feceee73bea4d25ae12f251225649a73d249fdd90af179e07e39f3f6 SHA512 1ad6ac6ff626dc187f42b313c1088ef4b4ac0ee3e156d37824c36e778faa977e8f132302ac00d74aa8f9903e791a0fee6cecb5244d2601e0825cc125b6f33d6a 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 @@ -18,6 +19,7 @@ EBUILD ca-certificates-20230311.3.89.ebuild 6051 BLAKE2B e4eb58350219fa8cb1c851d EBUILD ca-certificates-20230311.3.90.ebuild 6044 BLAKE2B 562bcbd292e2293957a83d02433c8e5ac306071fb06662040ebd6de5caa6a63bc50b65f7801f26891e4690cdc5f79c704d20177583d554c99fa2271b2e927afb SHA512 1951078e7afc99f5ba32725e7350b9f1f855d02a1a467d3703bbfc116b10d08e99f16bfc9e7836fdd50ee1b9df94c66e0a9fc03b4d22bd99e18e2ae04a6c898c EBUILD ca-certificates-20230311.3.93.ebuild 6044 BLAKE2B 589123e7ca56bf4b4e71b96e7cb42b9f0c5e0bb194bfa9886e4e1bbff03a964cf981fca91dcb6c3c35616c9b7c50771227485725b91e2b8019064845a5d69b04 SHA512 ad9ec1708be7f4beb0391a62b87819596809a44c6f579d5c701e98055dec3d18bdad79e53d1e3154937bce7c11bc08e3a64617e294d1f48a026d24081e7f822a EBUILD ca-certificates-20230311.3.95.ebuild 6044 BLAKE2B 589123e7ca56bf4b4e71b96e7cb42b9f0c5e0bb194bfa9886e4e1bbff03a964cf981fca91dcb6c3c35616c9b7c50771227485725b91e2b8019064845a5d69b04 SHA512 ad9ec1708be7f4beb0391a62b87819596809a44c6f579d5c701e98055dec3d18bdad79e53d1e3154937bce7c11bc08e3a64617e294d1f48a026d24081e7f822a -EBUILD ca-certificates-20230311.3.96.1-r1.ebuild 6044 BLAKE2B ec7c3ef6a11b3ac4747340e61bc43114c5fa11158ef5251e1a1436b497f02cdd8898935f0ce13b759180f11928e9b028ec24f084d9f6b8eb0f7ac6837cb9fcc8 SHA512 675fcab32bdfa07fc7978db99cc1204577c1084733cfba66bf104b0f1f2f67e197ce5e971fbebe7481413c6390199b8f9c5c35a2bebb20d465c2d4c3965c7e90 +EBUILD ca-certificates-20230311.3.96.1-r2.ebuild 6044 BLAKE2B ec7c3ef6a11b3ac4747340e61bc43114c5fa11158ef5251e1a1436b497f02cdd8898935f0ce13b759180f11928e9b028ec24f084d9f6b8eb0f7ac6837cb9fcc8 SHA512 675fcab32bdfa07fc7978db99cc1204577c1084733cfba66bf104b0f1f2f67e197ce5e971fbebe7481413c6390199b8f9c5c35a2bebb20d465c2d4c3965c7e90 EBUILD ca-certificates-20230311.3.96.1.ebuild 6052 BLAKE2B 060ee2768b539260a4a0aba2b3cbedcfbd23909d7f723f246de816ddea445e643bbc0d4c15b3af5973819f08e7167db84d0a380dbe879c6a3c2ea3056bc40445 SHA512 4fe59b000bd7e0115816cdf695154aa9a3f81d35def128895670af76b562759d048f6d160460236b97f38eabbaf85a194c36562dfc14e8f826f9b09fab5698f3 +EBUILD ca-certificates-20230311.3.97.ebuild 6041 BLAKE2B c654a7a12d48bcb0228437b5ed46d0649bb804f1ca52311747e9b0fa8683843f3913d92753ae31c667238d26da82406953b60b5f6339d4af00e9fe7c8af7c8d0 SHA512 30d78c52927d9ceb99f9b937c29af917653b4f77020dc381495ccf21d2cff1e7e47484c3557a3814556ad835680de9f55cbb8369fa9d78240fca0c499a2c845c MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild index 677373ebda39..677373ebda39 100644 --- a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r1.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild new file mode 100644 index 000000000000..58f88b4eb1a9 --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2024 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 + +S="${WORKDIR}" + +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" +${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}" + 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 + eapply -p2 "${FILESDIR}"/0001-update-ca-certificates-drop-pointless-dependency-on-.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 +} diff --git a/app-misc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch b/app-misc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch index e64a42808552..bdcb9ce631db 100644 --- a/app-misc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch +++ b/app-misc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch @@ -1,4 +1,4 @@ -From 0d5077f59b12bcf64a0489c884e6715cb98ae4b3 Mon Sep 17 00:00:00 2001 +From c33e85bc2fe61e66e2fa5c2ab0efc4277b7cef5e Mon Sep 17 00:00:00 2001 From: Eli Schwartz <eschwartz93@gmail.com> Date: Mon, 29 Jan 2024 21:54:04 -0500 Subject: [PATCH] update-ca-certificates: drop pointless dependency on external @@ -25,22 +25,24 @@ It's very easy to replace with `printf %s\\n *`, so do so. Even if it wasn't easy to replace with printf, it would be easy to replace with `for x in *; "$x"; done` instead. --- - image/usr/sbin/update-ca-certificates | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + image/usr/sbin/update-ca-certificates | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image/usr/sbin/update-ca-certificates b/image/usr/sbin/update-ca-certificates -index bb5aa54..7abffc9 100755 +index bb5aa54..fbf1ee2 100755 --- a/image/usr/sbin/update-ca-certificates +++ b/image/usr/sbin/update-ca-certificates -@@ -218,7 +218,7 @@ then +@@ -218,8 +218,9 @@ then echo "Running hooks in $HOOKSDIR..." VERBOSE_ARG= [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" - eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook + ( LC_ALL=C; printf %s\\n "$HOOKSDIR"/* ) | while read hook do ++ [ -f "$hook" ] || continue ( cat "$ADDED" cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." + done -- 2.43.0 |