1 |
commit: 23d5e63b9913a727db13c57f82c54697b6f9ed82 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 5 13:48:53 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 5 13:48:53 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d5e63b |
7 |
|
8 |
app-misc/ca-certificates: Bump to version 20161130.3.30.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
app-misc/ca-certificates/Manifest | 1 + |
13 |
.../ca-certificates-20161130.3.30.2.ebuild | 182 +++++++++++++++++++++ |
14 |
2 files changed, 183 insertions(+) |
15 |
|
16 |
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest |
17 |
index 2ae4e245cdf..6a0ca3d13e1 100644 |
18 |
--- a/app-misc/ca-certificates/Manifest |
19 |
+++ b/app-misc/ca-certificates/Manifest |
20 |
@@ -4,5 +4,6 @@ DIST nss-3.27.2.tar.gz 7397599 SHA256 dc8ac8524469d0230274fd13a53fdcd74efe4aa672 |
21 |
DIST nss-3.28.1.tar.gz 7451477 SHA256 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad SHA512 f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b WHIRLPOOL e1a6b9886759159294c4d8e47e693a2e790703e368ede18425c9a9130df72ac56a6e717cb794607c7bcfc68c82df9aec8771bc74e729f5bbd70fdcd8ce0fed3b |
22 |
DIST nss-3.29.3.tar.gz 7479458 SHA256 35ddcc31251ef829994efeee925011aa1414e32be7e388236970255aa3c8e1eb SHA512 eebc479521dc4e64565929620f60bf457875a2b21d7b5dc2b67f4e4279bfb1a814c31a7b17638052cec44ede9fb686a3ff776cd2239271142100e0fd5f769519 WHIRLPOOL 93edf0bd7c0c1751f7b03a8e878cba564e27fede796de3d4f381aa0b86ef8ea9edffd6f57f8a437f48e07f74ddc2cd0b351ca640ea409e3b3a54f7ddb83def22 |
23 |
DIST nss-3.30.1.tar.gz 9501791 SHA256 1fa273a9a18611bfd22ecd61283172a5aa66af7d0783c7018f42d48000be5eb6 SHA512 591c518bc7e8105675678863e1995725982527e138b45e12ad0efd927f5d3eaa2aaa704d335ff46d572c2f7ad8a8f9a38e671c1d5a9f46fe495077ba0522bc51 WHIRLPOOL 40ef67fcb505ed19b8438b77b5b0a147d939863066a24bd15f5afa2e6ea91a40d6aaa43860c6f1f94f37efe417c48f865c344e7ffb5d997e4a92356100a206c1 |
24 |
+DIST nss-3.30.2.tar.gz 9499119 SHA256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500 WHIRLPOOL b1039f227a55ed9ab592b7e1ea0856c8cf91b8d298ef07d9d0f56d1956319b15c12224f023a100d106101c49dafb16e8231680667d2c7d0b8f8b2bbf6ad3ec8e |
25 |
DIST nss-3.30.tar.gz 9500552 SHA256 a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3 WHIRLPOOL bc0a59484010a5771b515dde1440ccca8a63b167d3d8839b3606460fdf9d2dc3ab7d889173c88edb7d685d39ad3614c4cbc66284d0faced47cdcc01a69997d9a |
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.30.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..a72077ebef8 |
31 |
--- /dev/null |
32 |
+++ b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild |
33 |
@@ -0,0 +1,182 @@ |
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="5" |
61 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
62 |
+ |
63 |
+inherit eutils python-any-r1 |
64 |
+ |
65 |
+if [[ ${PV} == *.* ]] ; then |
66 |
+ # Compile from source ourselves. |
67 |
+ PRECOMPILED=false |
68 |
+ inherit versionator |
69 |
+ |
70 |
+ DEB_VER=$(get_version_component_range 1) |
71 |
+ NSS_VER=$(get_version_component_range 2-) |
72 |
+ RTM_NAME="NSS_${NSS_VER//./_}_RTM" |
73 |
+else |
74 |
+ # Debian precompiled version. |
75 |
+ PRECOMPILED=true |
76 |
+ inherit unpacker |
77 |
+fi |
78 |
+ |
79 |
+DESCRIPTION="Common CA Certificates PEM files" |
80 |
+HOMEPAGE="http://packages.debian.org/sid/ca-certificates" |
81 |
+NMU_PR="" |
82 |
+if ${PRECOMPILED} ; then |
83 |
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" |
84 |
+else |
85 |
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz |
86 |
+ https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz |
87 |
+ cacert? ( |
88 |
+ https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch |
89 |
+ )" |
90 |
+fi |
91 |
+ |
92 |
+LICENSE="MPL-1.1" |
93 |
+SLOT="0" |
94 |
+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" |
95 |
+IUSE="insecure_certs" |
96 |
+${PRECOMPILED} || IUSE+=" cacert" |
97 |
+ |
98 |
+DEPEND="" |
99 |
+if ${PRECOMPILED} ; then |
100 |
+ DEPEND+=" !<sys-apps/portage-2.1.10.41" |
101 |
+fi |
102 |
+# c_rehash: we run `c_rehash` |
103 |
+# debianutils: we run `run-parts` |
104 |
+RDEPEND="${DEPEND} |
105 |
+ app-misc/c_rehash |
106 |
+ sys-apps/debianutils" |
107 |
+ |
108 |
+if ! ${PRECOMPILED}; then |
109 |
+ DEPEND+=" ${PYTHON_DEPS}" |
110 |
+fi |
111 |
+ |
112 |
+S=${WORKDIR} |
113 |
+ |
114 |
+pkg_setup() { |
115 |
+ # For the conversion to having it in CONFIG_PROTECT_MASK, |
116 |
+ # we need to tell users about it once manually first. |
117 |
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \ |
118 |
+ || ewarn "You should run update-ca-certificates manually after etc-update" |
119 |
+} |
120 |
+ |
121 |
+src_unpack() { |
122 |
+ ${PRECOMPILED} || default |
123 |
+ |
124 |
+ # Do all the work in the image subdir to avoid conflicting with source |
125 |
+ # dirs in $WORKDIR. Need to perform everything in the offset #381937 |
126 |
+ mkdir -p "image/${EPREFIX}" |
127 |
+ cd "image/${EPREFIX}" || die |
128 |
+ |
129 |
+ ${PRECOMPILED} && unpacker_src_unpack |
130 |
+} |
131 |
+ |
132 |
+src_prepare() { |
133 |
+ cd "image/${EPREFIX}" || die |
134 |
+ if ! ${PRECOMPILED} ; then |
135 |
+ mkdir -p usr/sbin |
136 |
+ cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die |
137 |
+ |
138 |
+ if use cacert ; then |
139 |
+ pushd "${S}"/nss-${NSS_VER} >/dev/null |
140 |
+ epatch "${DISTDIR}"/nss-cacert-class1-class3.patch |
141 |
+ popd >/dev/null |
142 |
+ fi |
143 |
+ fi |
144 |
+ |
145 |
+ epatch "${FILESDIR}"/${PN}-20150426-root.patch |
146 |
+ local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') |
147 |
+ sed -i \ |
148 |
+ -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ |
149 |
+ -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ |
150 |
+ usr/sbin/update-ca-certificates || die |
151 |
+} |
152 |
+ |
153 |
+src_compile() { |
154 |
+ cd "image/${EPREFIX}" || die |
155 |
+ if ! ${PRECOMPILED} ; then |
156 |
+ python_setup |
157 |
+ local d="${S}/${PN}/mozilla" c="usr/share/${PN}" |
158 |
+ # Grab the database from the nss sources. |
159 |
+ cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die |
160 |
+ emake -C "${d}" |
161 |
+ |
162 |
+ # Now move the files to the same places that the precompiled would. |
163 |
+ mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla |
164 |
+ if use cacert ; then |
165 |
+ mkdir -p "${c}"/cacert.org |
166 |
+ mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die |
167 |
+ fi |
168 |
+ mv "${d}"/*.crt "${c}"/mozilla/ || die |
169 |
+ else |
170 |
+ mv usr/share/doc/{ca-certificates,${PF}} || die |
171 |
+ fi |
172 |
+ |
173 |
+ if ! use insecure_certs ; then |
174 |
+ # Remove untrusted certs from StartCom and WoSign (bug #598072) |
175 |
+ rm "${c}"/mozilla/StartCom* || die |
176 |
+ rm "${c}"/mozilla/WoSign* || die |
177 |
+ fi |
178 |
+ |
179 |
+ ( |
180 |
+ echo "# Automatically generated by ${CATEGORY}/${PF}" |
181 |
+ echo "# $(date -u)" |
182 |
+ echo "# Do not edit." |
183 |
+ cd "${c}" |
184 |
+ find * -name '*.crt' | LC_ALL=C sort |
185 |
+ ) > etc/ca-certificates.conf |
186 |
+ |
187 |
+ sh usr/sbin/update-ca-certificates --root "${S}/image" || die |
188 |
+} |
189 |
+ |
190 |
+src_install() { |
191 |
+ cp -pPR image/* "${D}"/ || die |
192 |
+ if ! ${PRECOMPILED} ; then |
193 |
+ cd ca-certificates |
194 |
+ doman sbin/*.8 |
195 |
+ dodoc debian/README.* examples/ca-certificates-local/README |
196 |
+ fi |
197 |
+ |
198 |
+ echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates |
199 |
+ doenvd 98ca-certificates |
200 |
+} |
201 |
+ |
202 |
+pkg_postinst() { |
203 |
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then |
204 |
+ # if the user has local certs, we need to rebuild again |
205 |
+ # to include their stuff in the db. |
206 |
+ # However it's too overzealous when the user has custom certs in place. |
207 |
+ # --fresh is to clean up dangling symlinks |
208 |
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" |
209 |
+ fi |
210 |
+ |
211 |
+ if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then |
212 |
+ ewarn "Removing the following broken symlinks:" |
213 |
+ ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" |
214 |
+ fi |
215 |
+} |