1 |
commit: b8e9334d0aa8b6501591cd8da90ec438706f6acb |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 14:39:40 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 2 14:47:58 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e9334d |
7 |
|
8 |
app-misc/ca-certificates: Bump to version 20161102.3.27.2 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
app-misc/ca-certificates/Manifest | 2 + |
13 |
.../ca-certificates-20161102.3.27.2.ebuild | 181 +++++++++++++++++++++ |
14 |
2 files changed, 183 insertions(+) |
15 |
|
16 |
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest |
17 |
index 4085aca..be3266c 100644 |
18 |
--- a/app-misc/ca-certificates/Manifest |
19 |
+++ b/app-misc/ca-certificates/Manifest |
20 |
@@ -1,6 +1,8 @@ |
21 |
DIST ca-certificates_20151214.tar.xz 293672 SHA256 59286e6403f482a24c672e09b810c7d089a73153d4772ff4a66e86053a920525 SHA512 acee5565aa7d1f0cc120a6abb6503e0ac4b4e12f5fd1cb12442ec1374ae1570ec6dc3a8f3a247fad6835a29d96e856f12c664f466e92344db3aa1ae6292a27ac WHIRLPOOL c03d214fb15a791c14f235c58296fb06f1408c98bb78049f58b3ebf7bc1c1cea4662f90a031d86de2548267feacf6a9e3fef957aa44a19e29e9a6ba803aaa3fa |
22 |
DIST ca-certificates_20160104.tar.xz 293632 SHA256 09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd SHA512 4291ba58057b66d56853162b71862832135eab6f444a5e2cf3dd1089495d44624246dc0c540871851fe9aaceb42054516309402525c8f16a88911d3af9c3518a WHIRLPOOL 8a45acdf2c0673156bc546808df5160ebbfc3a85d775cefa8918c5b64ea6ba905e89017689a407a20444f3e550133c2af228f4d4a878670af50d88fc4739edeb |
23 |
+DIST ca-certificates_20161102.tar.xz 298544 SHA256 25384a67e2f1e76495ceeb00abfdbe831033780324128cb1587d09132dd173a5 SHA512 8630cbc15d311b71936901bfa4c1a61d78d4468a7d8d0c492d72afc579679402b99e563cc6f88b0377eb7ebee8dcbad1b090fb0831d610a5b8e5bbdb3d8ce284 WHIRLPOOL 8b92ba4228880bcc7b296e9b1333f695194c31e724a02bafaec97bac838f6c36b20fa052935d256930977e2944ed7450c1e1ab2c95b40c8391dffd766938cea7 |
24 |
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 |
25 |
DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4 |
26 |
DIST nss-3.23.tar.gz 7467001 SHA256 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf SHA512 f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32 WHIRLPOOL 77e22bd7a525c5b10723e1d5fb6db1e9d2efebfcdf9828aa79296f71c441c065201ecda56291f37790333d9b1d1e38fef1391a033382a885b83da31a646d6243 |
27 |
DIST nss-3.27.1.tar.gz 7397737 SHA256 fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b SHA512 b52bc18e42cab78a325a8c4fcf2894ca879cecbb657a852baf460551ed9727f145bc328ebb61a43a1605b457f923a1495707ac4aee27be70220463818ed8db8d WHIRLPOOL 17174b7d43bd82b9e805d653a7ea8b79bc2647a5891806c1cb77e2ac99e40eb64ffee03e105a41c375ba37e26cafeff4bd4bad27c48e94ed388d0215d0545364 |
28 |
+DIST nss-3.27.2.tar.gz 7397599 SHA256 dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 SHA512 699847665e93fd649cb60ce6bc8f849f452779e7232a09bbeb0613f9e6c57bb81948f1ae59cc86648e41a212cda259109850ccd14546d35910deb75f5d2a13b8 WHIRLPOOL 08229d87de1c7020c1d7fc12fb8a2afc4bc9ab9f0208aad12698aba17386fbe9163cb506101c7d4d568409fd99141fb88c0e71fc32cecbc6640a4a8f7a4efabf |
29 |
|
30 |
diff --git a/app-misc/ca-certificates/ca-certificates-20161102.3.27.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161102.3.27.2.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000..0a7bba2 |
33 |
--- /dev/null |
34 |
+++ b/app-misc/ca-certificates/ca-certificates-20161102.3.27.2.ebuild |
35 |
@@ -0,0 +1,181 @@ |
36 |
+# Copyright 1999-2016 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+# $Id$ |
39 |
+ |
40 |
+# The Debian ca-certificates package merely takes the CA database as it exists |
41 |
+# in the nss package and repackages it for use by openssl. |
42 |
+# |
43 |
+# The issue with using the compiled debs directly is two fold: |
44 |
+# - they do not update frequently enough for us to rely on them |
45 |
+# - they pull the CA database from nss tip of tree rather than the release |
46 |
+# |
47 |
+# So we take the Debian source tools and combine them with the latest nss |
48 |
+# release to produce (largely) the same end result. The difference is that |
49 |
+# now we know our cert database is kept in sync with nss and, if need be, |
50 |
+# can be sync with nss tip of tree more frequently to respond to bugs. |
51 |
+ |
52 |
+# When triaging bugs from users, here's some handy tips: |
53 |
+# - To see what cert is hitting errors, use openssl: |
54 |
+# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME |
55 |
+# Focus on the errors written to stderr. |
56 |
+# |
57 |
+# - Look at the upstream log as to why certs were added/removed: |
58 |
+# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt |
59 |
+# |
60 |
+# - If people want to add/remove certs, tell them to file w/mozilla: |
61 |
+# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk |
62 |
+ |
63 |
+EAPI="5" |
64 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
65 |
+ |
66 |
+inherit eutils python-any-r1 |
67 |
+ |
68 |
+if [[ ${PV} == *.* ]] ; then |
69 |
+ # Compile from source ourselves. |
70 |
+ PRECOMPILED=false |
71 |
+ inherit versionator |
72 |
+ |
73 |
+ DEB_VER=$(get_version_component_range 1) |
74 |
+ NSS_VER=$(get_version_component_range 2-) |
75 |
+ RTM_NAME="NSS_${NSS_VER//./_}_RTM" |
76 |
+else |
77 |
+ # Debian precompiled version. |
78 |
+ PRECOMPILED=true |
79 |
+ inherit unpacker |
80 |
+fi |
81 |
+ |
82 |
+DESCRIPTION="Common CA Certificates PEM files" |
83 |
+HOMEPAGE="http://packages.debian.org/sid/ca-certificates" |
84 |
+NMU_PR="" |
85 |
+if ${PRECOMPILED} ; then |
86 |
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" |
87 |
+else |
88 |
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz |
89 |
+ https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz |
90 |
+ cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" |
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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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-3.14.1-add_spi+cacerts_ca_certs.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 |
+} |