Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ca-certificates/
Date: Tue, 14 Feb 2017 10:35:30
Message-Id: 1487068523.a8d92d04f2e061cff7a40716109c808125c7ccf4.polynomial-c@gentoo
1 commit: a8d92d04f2e061cff7a40716109c808125c7ccf4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 14 10:35:07 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 10:35:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d92d04
7
8 app-misc/ca-certificates: Removed old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-misc/ca-certificates/Manifest | 1 -
13 .../ca-certificates-20161130.3.28.ebuild | 183 ---------------------
14 2 files changed, 184 deletions(-)
15
16 diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
17 index 22a43bbcf1..7bb7adb289 100644
18 --- a/app-misc/ca-certificates/Manifest
19 +++ b/app-misc/ca-certificates/Manifest
20 @@ -5,6 +5,5 @@ DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad
21 DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4
22 DIST nss-3.27.2.tar.gz 7397599 SHA256 dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8 WHIRLPOOL 08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf
23 DIST nss-3.28.1.tar.gz 7451477 SHA256 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad SHA512 f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b WHIRLPOOL e1a6b9886759159294c4d8e47e693a2e790703e368ede18425c9a9130df72ac56a6e717cb794607c7bcfc68c82df9aec8771bc74e729f5bbd70fdcd8ce0fed3b
24 -DIST nss-3.28.tar.gz 7440502 SHA256 c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 SHA512 dd442c6d04edd0507cc49a1e3c2bfaa64555f7cde5cb9e512ccf33f14de458dddbb17efddd83271056ed6e6e32327e6e1b6f6609e1910a05e625b08e6f0965df WHIRLPOOL d013972f18d75e83da03c3903b712ef1094e6b8543c1755ea2b7ed7f6335e39ac20112808c86bb9df74cda4a8c5c1159401ecd05d1d8b07b3ecdca85f7f0ac82
25 DIST nss-3.29.tar.gz 7477439 SHA256 ee19ebfe7b012dedb71f04a55dd06fa26f8dce435e5980531c790bd42673c6fa SHA512 0f4dd026b6b32122d8cafa92fa37199b0678f8fef75e375446eddd0cc6ddda1a796e3222caa8bb01b3633911899394d0cb1e4d392880438f68c8ef7290dcb4fa WHIRLPOOL 5d3243bcc5c78e1b13b463e935bb5f700d0ed32eb22b01ccda17cb475725230f73f3711227a2175add4e96e0353aaf484ff10b0186cf4a453dfa215c24b8147c
26 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
27
28 diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.28.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.28.ebuild
29 deleted file mode 100644
30 index 91c4bc6638..0000000000
31 --- a/app-misc/ca-certificates/ca-certificates-20161130.3.28.ebuild
32 +++ /dev/null
33 @@ -1,183 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -# The Debian ca-certificates package merely takes the CA database as it exists
39 -# in the nss package and repackages it for use by openssl.
40 -#
41 -# The issue with using the compiled debs directly is two fold:
42 -# - they do not update frequently enough for us to rely on them
43 -# - they pull the CA database from nss tip of tree rather than the release
44 -#
45 -# So we take the Debian source tools and combine them with the latest nss
46 -# release to produce (largely) the same end result. The difference is that
47 -# now we know our cert database is kept in sync with nss and, if need be,
48 -# can be sync with nss tip of tree more frequently to respond to bugs.
49 -
50 -# When triaging bugs from users, here's some handy tips:
51 -# - To see what cert is hitting errors, use openssl:
52 -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
53 -# Focus on the errors written to stderr.
54 -#
55 -# - Look at the upstream log as to why certs were added/removed:
56 -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
57 -#
58 -# - If people want to add/remove certs, tell them to file w/mozilla:
59 -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
60 -
61 -EAPI="5"
62 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
63 -
64 -inherit eutils python-any-r1
65 -
66 -if [[ ${PV} == *.* ]] ; then
67 - # Compile from source ourselves.
68 - PRECOMPILED=false
69 - inherit versionator
70 -
71 - DEB_VER=$(get_version_component_range 1)
72 - NSS_VER=$(get_version_component_range 2-)
73 - RTM_NAME="NSS_${NSS_VER//./_}_RTM"
74 -else
75 - # Debian precompiled version.
76 - PRECOMPILED=true
77 - inherit unpacker
78 -fi
79 -
80 -DESCRIPTION="Common CA Certificates PEM files"
81 -HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
82 -NMU_PR=""
83 -if ${PRECOMPILED} ; then
84 - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
85 -else
86 - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
87 - https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
88 - cacert? (
89 - https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
90 - )"
91 -fi
92 -
93 -LICENSE="MPL-1.1"
94 -SLOT="0"
95 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
96 -IUSE="insecure_certs"
97 -${PRECOMPILED} || IUSE+=" cacert"
98 -
99 -DEPEND=""
100 -if ${PRECOMPILED} ; then
101 - DEPEND+=" !<sys-apps/portage-2.1.10.41"
102 -fi
103 -# c_rehash: we run `c_rehash`
104 -# debianutils: we run `run-parts`
105 -RDEPEND="${DEPEND}
106 - app-misc/c_rehash
107 - sys-apps/debianutils"
108 -
109 -if ! ${PRECOMPILED}; then
110 - DEPEND+=" ${PYTHON_DEPS}"
111 -fi
112 -
113 -S=${WORKDIR}
114 -
115 -pkg_setup() {
116 - # For the conversion to having it in CONFIG_PROTECT_MASK,
117 - # we need to tell users about it once manually first.
118 - [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
119 - || ewarn "You should run update-ca-certificates manually after etc-update"
120 -}
121 -
122 -src_unpack() {
123 - ${PRECOMPILED} || default
124 -
125 - # Do all the work in the image subdir to avoid conflicting with source
126 - # dirs in $WORKDIR. Need to perform everything in the offset #381937
127 - mkdir -p "image/${EPREFIX}"
128 - cd "image/${EPREFIX}" || die
129 -
130 - ${PRECOMPILED} && unpacker_src_unpack
131 -}
132 -
133 -src_prepare() {
134 - cd "image/${EPREFIX}" || die
135 - if ! ${PRECOMPILED} ; then
136 - mkdir -p usr/sbin
137 - cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
138 -
139 - if use cacert ; then
140 - pushd "${S}"/nss-${NSS_VER} >/dev/null
141 - epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
142 - popd >/dev/null
143 - fi
144 - fi
145 -
146 - epatch "${FILESDIR}"/${PN}-20150426-root.patch
147 - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
148 - sed -i \
149 - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
150 - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
151 - usr/sbin/update-ca-certificates || die
152 -}
153 -
154 -src_compile() {
155 - cd "image/${EPREFIX}" || die
156 - if ! ${PRECOMPILED} ; then
157 - python_setup
158 - local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
159 - # Grab the database from the nss sources.
160 - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
161 - emake -C "${d}"
162 -
163 - # Now move the files to the same places that the precompiled would.
164 - mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
165 - if use cacert ; then
166 - mkdir -p "${c}"/cacert.org
167 - mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
168 - fi
169 - mv "${d}"/*.crt "${c}"/mozilla/ || die
170 - else
171 - mv usr/share/doc/{ca-certificates,${PF}} || die
172 - fi
173 -
174 - if ! use insecure_certs ; then
175 - # Remove untrusted certs from StartCom and WoSign (bug #598072)
176 - rm "${c}"/mozilla/StartCom* || die
177 - rm "${c}"/mozilla/WoSign* || die
178 - fi
179 -
180 - (
181 - echo "# Automatically generated by ${CATEGORY}/${PF}"
182 - echo "# $(date -u)"
183 - echo "# Do not edit."
184 - cd "${c}"
185 - find * -name '*.crt' | LC_ALL=C sort
186 - ) > etc/ca-certificates.conf
187 -
188 - sh usr/sbin/update-ca-certificates --root "${S}/image" || die
189 -}
190 -
191 -src_install() {
192 - cp -pPR image/* "${D}"/ || die
193 - if ! ${PRECOMPILED} ; then
194 - cd ca-certificates
195 - doman sbin/*.8
196 - dodoc debian/README.* examples/ca-certificates-local/README
197 - fi
198 -
199 - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
200 - doenvd 98ca-certificates
201 -}
202 -
203 -pkg_postinst() {
204 - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
205 - # if the user has local certs, we need to rebuild again
206 - # to include their stuff in the db.
207 - # However it's too overzealous when the user has custom certs in place.
208 - # --fresh is to clean up dangling symlinks
209 - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
210 - fi
211 -
212 - if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
213 - ewarn "Removing the following broken symlinks:"
214 - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
215 - fi
216 -}