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: Thu, 21 Sep 2017 22:26:54
Message-Id: 1506032796.25b4e5b578cdd6c9c562104bda8ef5a7dfc92f80.polynomial-c@gentoo
1 commit: 25b4e5b578cdd6c9c562104bda8ef5a7dfc92f80
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 21 22:15:00 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 21 22:26:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b4e5b5
7
8 app-misc/ca-certificates: Removed old.
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 app-misc/ca-certificates/Manifest | 1 -
13 .../ca-certificates-20161130.3.32.ebuild | 190 ---------------------
14 2 files changed, 191 deletions(-)
15
16 diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
17 index dbb33dec6e1..eaaaa4492b8 100644
18 --- a/app-misc/ca-certificates/Manifest
19 +++ b/app-misc/ca-certificates/Manifest
20 @@ -3,6 +3,5 @@ DIST ca-certificates_20170717.tar.xz 293028 SHA256 e487639b641fa75445174734dd6e9
21 DIST nss-3.30.2.tar.gz 9499119 SHA256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500 WHIRLPOOL b1039f227a55ed9ab592b7e1ea0856c8cf91b8d298ef07d9d0f56d1956319b15c12224f023a100d106101c49dafb16e8231680667d2c7d0b8f8b2bbf6ad3ec8e
22 DIST nss-3.30.tar.gz 9500552 SHA256 a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3 WHIRLPOOL bc0a59484010a5771b515dde1440ccca8a63b167d3d8839b3606460fdf9d2dc3ab7d889173c88edb7d685d39ad3614c4cbc66284d0faced47cdcc01a69997d9a
23 DIST nss-3.32.1.tar.gz 9494609 SHA256 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652 SHA512 b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8 WHIRLPOOL 4c15b4ba85ce10787b9ee541d20a829a99aed5628b59f7e7e3045ec694d6d8a0a83bc730ae4d74148cf7c425f59debfd1574cb1b036c1407d1f9d4896647d9cf
24 -DIST nss-3.32.tar.gz 9493574 SHA256 35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335 SHA512 7a01f81e23ef9649fd26b8423b015f4df5878c94f6ff591727086644b01db3dbc36de4e131cf70a6f84564e46c8decb7c4f7780fca12270eb900de1f8a11ee3c WHIRLPOOL bd1a9a8da509143ba995c2a4aac43df991703c1170e2654a8e762fbaf1b26e4f95f85c9d06db45126247a6d52828060c5283fb9cf1e4328952bc518ee38316c4
25 DIST nss-3.33.tar.gz 9578033 SHA256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 SHA512 82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0 WHIRLPOOL c11129bce97990a41a3118e62d79481fbd38cad51356a6b6c1b0af7efe2f27b3d5d51a8e987287c1cdff77ccee14a3e96d5bbb76e92f9a81b2f50988de250dea
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.32.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.32.ebuild
29 deleted file mode 100644
30 index 1391c06c4ec..00000000000
31 --- a/app-misc/ca-certificates/ca-certificates-20161130.3.32.ebuild
32 +++ /dev/null
33 @@ -1,190 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -# The Debian ca-certificates package merely takes the CA database as it exists
38 -# in the nss package and repackages it for use by openssl.
39 -#
40 -# The issue with using the compiled debs directly is two fold:
41 -# - they do not update frequently enough for us to rely on them
42 -# - they pull the CA database from nss tip of tree rather than the release
43 -#
44 -# So we take the Debian source tools and combine them with the latest nss
45 -# release to produce (largely) the same end result. The difference is that
46 -# now we know our cert database is kept in sync with nss and, if need be,
47 -# can be sync with nss tip of tree more frequently to respond to bugs.
48 -
49 -# When triaging bugs from users, here's some handy tips:
50 -# - To see what cert is hitting errors, use openssl:
51 -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
52 -# Focus on the errors written to stderr.
53 -#
54 -# - Look at the upstream log as to why certs were added/removed:
55 -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
56 -#
57 -# - If people want to add/remove certs, tell them to file w/mozilla:
58 -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
59 -
60 -EAPI=6
61 -
62 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
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 ~x64-cygwin ~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 - default
147 - eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
148 - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
149 - sed -i \
150 - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
151 - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
152 - usr/sbin/update-ca-certificates || die
153 -}
154 -
155 -src_compile() {
156 - cd "image/${EPREFIX}" || die
157 - if ! ${PRECOMPILED} ; then
158 - python_setup
159 - local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
160 - # Grab the database from the nss sources.
161 - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
162 - emake -C "${d}"
163 -
164 - # Now move the files to the same places that the precompiled would.
165 - mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
166 - if use cacert ; then
167 - mkdir -p "${c}"/cacert.org
168 - mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
169 - fi
170 - mv "${d}"/*.crt "${c}"/mozilla/ || die
171 - else
172 - mv usr/share/doc/{ca-certificates,${PF}} || die
173 - fi
174 -
175 - if ! use insecure_certs ; then
176 - elog "To prevent applications relying on system's trusted root certificate store"
177 - elog "from using CAs where at least one major browser vendor Gentoo is following"
178 - elog "has decided to apply trust level restrictions, the following"
179 - elog "certificate(s) were removed:"
180 - # Remove untrusted certs from StartCom and WoSign (bug #598072)
181 - elog "$(find "${c}" -type f \( \
182 - -iname '*startcom*' \
183 - -o -iname '*wosign*' \
184 - \) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
185 - fi
186 -
187 - (
188 - echo "# Automatically generated by ${CATEGORY}/${PF}"
189 - echo "# $(date -u)"
190 - echo "# Do not edit."
191 - cd "${c}"
192 - find * -name '*.crt' | LC_ALL=C sort
193 - ) > etc/ca-certificates.conf
194 -
195 - sh usr/sbin/update-ca-certificates --root "${S}/image" || die
196 -}
197 -
198 -src_install() {
199 - cp -pPR image/* "${D}"/ || die
200 - if ! ${PRECOMPILED} ; then
201 - cd ca-certificates
202 - doman sbin/*.8
203 - dodoc debian/README.* examples/ca-certificates-local/README
204 - fi
205 -
206 - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
207 - doenvd 98ca-certificates
208 -}
209 -
210 -pkg_postinst() {
211 - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
212 - # if the user has local certs, we need to rebuild again
213 - # to include their stuff in the db.
214 - # However it's too overzealous when the user has custom certs in place.
215 - # --fresh is to clean up dangling symlinks
216 - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
217 - fi
218 -
219 - if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
220 - ewarn "Removing the following broken symlinks:"
221 - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
222 - fi
223 -}