* [gentoo-commits] repo/proj/prefix:master commit in: app-misc/ca-certificates/, app-misc/ca-certificates/files/
@ 2020-06-07 12:28 Fabian Groffen
0 siblings, 0 replies; only message in thread
From: Fabian Groffen @ 2020-06-07 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 0ed7f44a1bba9ab2040ca500779b45a0ebae0956
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 12:27:21 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 12:27:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0ed7f44a
app-misc/ca-certificates: use gx86 version
the prefix-stack deps make no sense, we need c_rehash/debianutils in
DEPEND, since src_install runs a script using the tools
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-misc/ca-certificates/Manifest | 5 -
.../ca-certificates-20190110.3.43.ebuild | 188 --------------------
.../ca-certificates-20200601.3.53.ebuild | 195 ---------------------
.../files/ca-certificates-20150426-root.patch | 49 ------
app-misc/ca-certificates/metadata.xml | 14 --
5 files changed, 451 deletions(-)
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
deleted file mode 100644
index e62e401ce0..0000000000
--- a/app-misc/ca-certificates/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
-DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
-DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
-DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
-DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
deleted file mode 100644
index ba46020c55..0000000000
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 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.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit eapi7-ver
-
- 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/~axs/distfiles/nss-cacert-class1-class3.patch
- )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-# no dedicated pkg_* dependencies, bug#660306
-MY_PKGINSTDEPS="
- app-misc/c_rehash
- sys-apps/debianutils"
-RDEPEND="${DEPEND}
- !prefix-stack? ( ${MY_PKGINSTDEPS} )"
-DEPEND+=" prefix-stack? ( ${MY_PKGINSTDEPS} )"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-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"
-}
-
-src_unpack() {
- ${PRECOMPILED} || default
-
- # 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}-${DEB_VER}/sbin/update-ca-certificates \
- usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null || die
- eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
- popd >/dev/null || die
- fi
- fi
-
- default
- eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- -e 's/openssl rehash/c_rehash/' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}-${DEB_VER}/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}"/CAcert_Inc..crt \
- "${c}"/cacert.org/cacert.org_root.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}-${DEB_VER} || die
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- 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/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
deleted file mode 100644
index b5c0c492cd..0000000000
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 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.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit eapi7-ver
-
- 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/~axs/distfiles/nss-cacert-class1-class3.patch
- )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-MY_PKGINSTDEPS="
- app-misc/c_rehash
- sys-apps/debianutils"
-RDEPEND="${DEPEND}
- !prefix-stack? ( ${MY_PKGINSTDEPS} )"
-DEPEND+=" prefix-stack? ( ${MY_PKGINSTDEPS} )"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-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"
-}
-
-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}-${DEB_VER}/sbin/update-ca-certificates \
- usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null || die
- eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
- popd >/dev/null || die
- fi
- fi
-
- default
- eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- -e 's/openssl rehash/c_rehash/' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}-${DEB_VER}/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}"/CAcert_Inc..crt \
- "${c}"/cacert.org/cacert.org_root.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}-${DEB_VER} || die
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- 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/ca-certificates-20150426-root.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
deleted file mode 100644
index 6e41ac39e8..0000000000
--- a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-add a --root option so we can generate with DESTDIR installs
-
---- a/image/usr/sbin/update-ca-certificates
-+++ b/image/usr/sbin/update-ca-certificates
-@@ -30,6 +30,8 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
- ETCCERTSDIR=/etc/ssl/certs
- HOOKSDIR=/etc/ca-certificates/update.d
-+ROOT=""
-+RELPATH=""
-
- while [ $# -gt 0 ];
- do
-@@ -59,13 +61,25 @@ do
- --hooksdir)
- shift
- HOOKSDIR="$1";;
-+ --root|-r)
-+ shift
-+ # Needed as c_rehash wants to read the files directly.
-+ # This gets us from $CERTSCONF to $CERTSDIR.
-+ RELPATH="../../.."
-+ ROOT=$(readlink -f "$1");;
- --help|-h|*)
-- echo "$0: [--verbose] [--fresh]"
-+ echo "$0: [--verbose] [--fresh] [--root <dir>]"
- exit;;
- esac
- shift
- done
-
-+CERTSCONF="$ROOT$CERTSCONF"
-+CERTSDIR="$ROOT$CERTSDIR"
-+LOCALCERTSDIR="$ROOT$LOCALCERTSDIR"
-+ETCCERTSDIR="$ROOT$ETCCERTSDIR"
-+HOOKSDIR="$ROOT$HOOKSDIR"
-+
- if [ ! -s "$CERTSCONF" ]
- then
- fresh=1
-@@ -94,7 +107,7 @@ add() {
- -e 's/,/_/g').pem"
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
- then
-- ln -sf "$CERT" "$PEM"
-+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
- echo "+$PEM" >> "$ADDED"
- fi
- # Add trailing newline to certificate, if it is missing (#635570)
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
deleted file mode 100644
index f4cf8a2a01..0000000000
--- a/app-misc/ca-certificates/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="cacert">
- Include root certificates from CAcert (http://www.cacert.org/) and Software
- in the Public Interest (http://www.spi-inc.org/)
- </flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-07 12:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-07 12:28 [gentoo-commits] repo/proj/prefix:master commit in: app-misc/ca-certificates/, app-misc/ca-certificates/files/ Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox