1 |
commit: 4beb99a672364b8957101988e555a9a3d34cb4ab |
2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 5 14:17:52 2017 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 5 14:17:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4beb99a6 |
7 |
|
8 |
dev-libs/nss: sync with main tree |
9 |
|
10 |
dev-libs/nss/Manifest | 2 +- |
11 |
dev-libs/nss/files/nss-3.21-pem-werror.patch | 141 --------------------- |
12 |
.../nss/{nss-3.29.ebuild => nss-3.30.2-r1.ebuild} | 10 +- |
13 |
3 files changed, 7 insertions(+), 146 deletions(-) |
14 |
|
15 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
16 |
index 29bf830..6ac0b96 100644 |
17 |
--- a/dev-libs/nss/Manifest |
18 |
+++ b/dev-libs/nss/Manifest |
19 |
@@ -1,3 +1,3 @@ |
20 |
-DIST nss-3.29.tar.gz 7477439 SHA256 ee19ebfe7b012dedb71f04a55dd06fa26f8dce435e5980531c790bd42673c6fa SHA512 0f4dd026b6b32122d8cafa92fa37199b0678f8fef75e375446eddd0cc6ddda1a796e3222caa8bb01b3633911899394d0cb1e4d392880438f68c8ef7290dcb4fa WHIRLPOOL 5d3243bcc5c78e1b13b463e935bb5f700d0ed32eb22b01ccda17cb475725230f73f3711227a2175add4e96e0353aaf484ff10b0186cf4a453dfa215c24b8147c |
21 |
+DIST nss-3.30.2.tar.gz 9499119 SHA256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500 WHIRLPOOL b1039f227a55ed9ab592b7e1ea0856c8cf91b8d298ef07d9d0f56d1956319b15c12224f023a100d106101c49dafb16e8231680667d2c7d0b8f8b2bbf6ad3ec8e |
22 |
DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700 |
23 |
DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836 |
24 |
|
25 |
diff --git a/dev-libs/nss/files/nss-3.21-pem-werror.patch b/dev-libs/nss/files/nss-3.21-pem-werror.patch |
26 |
deleted file mode 100644 |
27 |
index 5a984ae..0000000 |
28 |
--- a/dev-libs/nss/files/nss-3.21-pem-werror.patch |
29 |
+++ /dev/null |
30 |
@@ -1,141 +0,0 @@ |
31 |
---- nss/lib/ckfw/pem/ckpem.h |
32 |
-+++ nss/lib/ckfw/pem/ckpem.h |
33 |
-@@ -233,6 +233,9 @@ struct pemLOWKEYPrivateKeyStr { |
34 |
- }; |
35 |
- typedef struct pemLOWKEYPrivateKeyStr pemLOWKEYPrivateKey; |
36 |
- |
37 |
-+/* NOTE: Discrepancy with the the way callers use of the return value as a count |
38 |
-+ * Fix this when we sync. up with the cleanup work being done at nss-pem project. |
39 |
-+ */ |
40 |
- SECStatus ReadDERFromFile(SECItem ***derlist, char *filename, PRBool ascii, int *cipher, char **ivstring, PRBool certsonly); |
41 |
- const NSSItem * pem_FetchAttribute ( pemInternalObject *io, CK_ATTRIBUTE_TYPE type); |
42 |
- void pem_PopulateModulusExponent(pemInternalObject *io); |
43 |
---- nss/lib/ckfw/pem/pinst.c |
44 |
-+++ nss/lib/ckfw/pem/pinst.c |
45 |
-@@ -472,7 +472,9 @@ AddCertificate(char *certfile, char *key |
46 |
- char *ivstring = NULL; |
47 |
- int cipher; |
48 |
- |
49 |
-- nobjs = ReadDERFromFile(&objs, certfile, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); |
50 |
-+ /* TODO: Fix discrepancy between our usage of the return value as |
51 |
-+ * as an int (a count) and the declaration as a SECStatus. */ |
52 |
-+ nobjs = (int) ReadDERFromFile(&objs, certfile, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); |
53 |
- if (nobjs <= 0) { |
54 |
- nss_ZFreeIf(objs); |
55 |
- return CKR_GENERAL_ERROR; |
56 |
-@@ -515,8 +517,10 @@ AddCertificate(char *certfile, char *key |
57 |
- if (keyfile) { /* add the private key */ |
58 |
- SECItem **keyobjs = NULL; |
59 |
- int kobjs = 0; |
60 |
-+ /* TODO: Fix discrepancy between our usage of the return value as |
61 |
-+ * as an int and the declaration as a SECStatus. */ |
62 |
- kobjs = |
63 |
-- ReadDERFromFile(&keyobjs, keyfile, PR_TRUE, &cipher, |
64 |
-+ (int) ReadDERFromFile(&keyobjs, keyfile, PR_TRUE, &cipher, |
65 |
- &ivstring, PR_FALSE); |
66 |
- if (kobjs < 1) { |
67 |
- error = CKR_GENERAL_ERROR; |
68 |
---- nss/lib/ckfw/pem/pobject.c |
69 |
-+++ nss/lib/ckfw/pem/pobject.c |
70 |
-@@ -630,6 +630,11 @@ pem_DestroyInternalObject |
71 |
- if (io->u.key.ivstring) |
72 |
- free(io->u.key.ivstring); |
73 |
- break; |
74 |
-+ case pemAll: |
75 |
-+ /* pemAll is not used, keep the compiler happy |
76 |
-+ * TODO: investigate a proper solution |
77 |
-+ */ |
78 |
-+ return; |
79 |
- } |
80 |
- |
81 |
- if (NULL != gobj) |
82 |
-@@ -1044,7 +1049,9 @@ pem_CreateObject |
83 |
- int nobjs = 0; |
84 |
- int i; |
85 |
- int objid; |
86 |
-+#if 0 |
87 |
- pemToken *token; |
88 |
-+#endif |
89 |
- int cipher; |
90 |
- char *ivstring = NULL; |
91 |
- pemInternalObject *listObj = NULL; |
92 |
-@@ -1073,7 +1080,9 @@ pem_CreateObject |
93 |
- } |
94 |
- slotID = nssCKFWSlot_GetSlotID(fwSlot); |
95 |
- |
96 |
-+#if 0 |
97 |
- token = (pemToken *) mdToken->etc; |
98 |
-+#endif |
99 |
- |
100 |
- /* |
101 |
- * only create keys and certs. |
102 |
-@@ -1114,7 +1123,11 @@ pem_CreateObject |
103 |
- } |
104 |
- |
105 |
- if (objClass == CKO_CERTIFICATE) { |
106 |
-- nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); |
107 |
-+ /* TODO: Fix discrepancy between our usage of the return value as |
108 |
-+ * as an int and the declaration as a SECStatus. Typecasting as a |
109 |
-+ * temporary workaround. |
110 |
-+ */ |
111 |
-+ nobjs = (int) ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); |
112 |
- if (nobjs < 1) |
113 |
- goto loser; |
114 |
- |
115 |
---- nss/lib/ckfw/pem/rsawrapr.c |
116 |
-+++ nss/lib/ckfw/pem/rsawrapr.c |
117 |
-@@ -93,6 +93,8 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey |
118 |
- return 0; |
119 |
- } |
120 |
- |
121 |
-+/* unused functions */ |
122 |
-+#if 0 |
123 |
- static SHA1Context *SHA1_CloneContext(SHA1Context * original) |
124 |
- { |
125 |
- SHA1Context *clone = NULL; |
126 |
-@@ -215,6 +217,7 @@ oaep_xor_with_h2(unsigned char *salt, un |
127 |
- |
128 |
- return SECSuccess; |
129 |
- } |
130 |
-+#endif /* unused functions */ |
131 |
- |
132 |
- /* |
133 |
- * Format one block of data for public/private key encryption using |
134 |
---- nss/lib/ckfw/pem/util.c |
135 |
-+++ nss/lib/ckfw/pem/util.c |
136 |
-@@ -131,7 +131,8 @@ static SECStatus FileToItem(SECItem * ds |
137 |
- return SECFailure; |
138 |
- } |
139 |
- |
140 |
--int |
141 |
-+/* FIX: Returns a SECStatus yet callers take result as a count */ |
142 |
-+SECStatus |
143 |
- ReadDERFromFile(SECItem *** derlist, char *filename, PRBool ascii, |
144 |
- int *cipher, char **ivstring, PRBool certsonly) |
145 |
- { |
146 |
-@@ -237,7 +238,12 @@ ReadDERFromFile(SECItem *** derlist, cha |
147 |
- goto loser; |
148 |
- } |
149 |
- if ((certsonly && !key) || (!certsonly && key)) { |
150 |
-+ error = CKR_OK; |
151 |
- PUT_Object(der, error); |
152 |
-+ if (error != CKR_OK) { |
153 |
-+ free(der); |
154 |
-+ goto loser; |
155 |
-+ } |
156 |
- } else { |
157 |
- free(der->data); |
158 |
- free(der); |
159 |
-@@ -255,7 +261,12 @@ ReadDERFromFile(SECItem *** derlist, cha |
160 |
- } |
161 |
- |
162 |
- /* NOTE: This code path has never been tested. */ |
163 |
-+ error = CKR_OK; |
164 |
- PUT_Object(der, error); |
165 |
-+ if (error != CKR_OK) { |
166 |
-+ free(der); |
167 |
-+ goto loser; |
168 |
-+ } |
169 |
- } |
170 |
- |
171 |
- nss_ZFreeIf(filedata.data); |
172 |
|
173 |
diff --git a/dev-libs/nss/nss-3.29.ebuild b/dev-libs/nss/nss-3.30.2-r1.ebuild |
174 |
similarity index 97% |
175 |
rename from dev-libs/nss/nss-3.29.ebuild |
176 |
rename to dev-libs/nss/nss-3.30.2-r1.ebuild |
177 |
index cd05f8a..3d6f566 100644 |
178 |
--- a/dev-libs/nss/nss-3.29.ebuild |
179 |
+++ b/dev-libs/nss/nss-3.30.2-r1.ebuild |
180 |
@@ -1,4 +1,4 @@ |
181 |
-# Copyright 1999-2016 Gentoo Foundation |
182 |
+# Copyright 1999-2017 Gentoo Foundation |
183 |
# Distributed under the terms of the GNU General Public License v2 |
184 |
|
185 |
EAPI=6 |
186 |
@@ -256,8 +256,10 @@ multilib_src_install() { |
187 |
|
188 |
dodir /usr/$(get_libdir) |
189 |
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" |
190 |
- cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
191 |
- cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
192 |
+ local i |
193 |
+ for i in crmf freebl nssb nssckfw ; do |
194 |
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
195 |
+ done |
196 |
|
197 |
# Install nss-config and pkgconfig file |
198 |
dodir /usr/bin |
199 |
@@ -274,7 +276,7 @@ multilib_src_install() { |
200 |
|
201 |
# all the include files |
202 |
insinto /usr/include/nss |
203 |
- doins public/nss/*.h |
204 |
+ doins public/nss/*.{h,api} |
205 |
insinto /usr/include/nss/private |
206 |
doins private/nss/{blapi,alghmac}.h |