commit: 94cbe41b90f996a6ab429d15e473398dee5a2c7b Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Jul 18 08:21:39 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jul 18 08:24:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94cbe41b
app-misc/ca-certificates: Removed old. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-misc/ca-certificates/Manifest | 3 - .../ca-certificates-20180409.3.37.ebuild | 179 -------------------- .../ca-certificates-20190110.3.42.1.ebuild | 184 --------------------- 3 files changed, 366 deletions(-) diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index 191e3d5659a..e38a2df15b4 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -1,6 +1,3 @@ -DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372 -DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103 -DIST nss-3.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild deleted file mode 100644 index 520f0435104..00000000000 --- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild +++ /dev/null @@ -1,179 +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,3_6,3_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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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` -RDEPEND="${DEPEND} - app-misc/c_rehash - sys-apps/debianutils" - -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}" - cd "image/${EPREFIX}" || die - - ${PRECOMPILED} && unpacker_src_unpack -} - -src_prepare() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - mkdir -p usr/sbin - cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die - - if use cacert ; then - pushd "${S}"/nss-${NSS_VER} >/dev/null - eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch - popd >/dev/null - 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}/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 - if use cacert ; then - mkdir -p "${c}"/cacert.org - 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}" - 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 ca-certificates - 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-20190110.3.42.1.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild deleted file mode 100644 index db441817372..00000000000 --- a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild +++ /dev/null @@ -1,184 +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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` -RDEPEND="${DEPEND} - app-misc/c_rehash - sys-apps/debianutils" - -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 -}
