forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-misc/ca-certificates: drop pointless dependency on debianutils
It is used internally by the debian script update-ca-certificates, because on Debian, debianutils is "essential". But on Gentoo it is not, and this is the only package that is essentially unavoidable and drags it in. There is also kernel packages, but that is potentially avoidable... Patch out the script to use a trivial bash construct which is even shorter than shelling out to an external program, and allows dropping this dependency. Signed-off-by: Eli Schwartz <[email protected]> Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
02c6e8f
commit 6e6ccaf
Showing
2 changed files
with
247 additions
and
0 deletions.
There are no files selected for viewing
201 changes: 201 additions & 0 deletions
201
app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r1.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
||
| 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" | ||
|
|
||
| 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 | ||
| 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 | ||
| } |
46 changes: 46 additions & 0 deletions
46
...isc/ca-certificates/files/0001-update-ca-certificates-drop-pointless-dependency-on-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From 0d5077f59b12bcf64a0489c884e6715cb98ae4b3 Mon Sep 17 00:00:00 2001 | ||
| From: Eli Schwartz <[email protected]> | ||
| Date: Mon, 29 Jan 2024 21:54:04 -0500 | ||
| Subject: [PATCH] update-ca-certificates: drop pointless dependency on external | ||
| run-parts | ||
|
|
||
| This external program belongs to debianutils and hence is used | ||
| internally by the update-ca-certificates script synced from Debian. | ||
|
|
||
| It has a couple utilities: | ||
| - it sorts files in a directory with LC_ALL=C | ||
| - it runs each of them in turn | ||
| - it can print them instead of running them | ||
|
|
||
| Here, it's used for sorting and printing the scripts to run. They need | ||
| to each accept some stdin, so run-parts cannot actually be used for | ||
| dispatch. But this functionality works fine directly from a shell, so | ||
| the additional dependency honestly seems frivolous. In particular, this | ||
| is the only reason why all Debian systems have debianutils installed, | ||
| through openssl. (This is in contrast to Debian, where debianutils is | ||
| part of the essential system set and provides a vastly greater number of | ||
| programs than the ones Gentoo repackages.) | ||
|
|
||
| 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(-) | ||
|
|
||
| diff --git a/image/usr/sbin/update-ca-certificates b/image/usr/sbin/update-ca-certificates | ||
| index bb5aa54..7abffc9 100755 | ||
| --- a/image/usr/sbin/update-ca-certificates | ||
| +++ b/image/usr/sbin/update-ca-certificates | ||
| @@ -218,7 +218,7 @@ 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 | ||
| ( cat "$ADDED" | ||
| cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." | ||
| -- | ||
| 2.43.0 | ||
|
|