Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jss/files: jss-4.3-secitem.patch jss-4.3-cflags.patch
Date: Wed, 05 Jun 2013 09:30:21
Message-Id: 20130605093015.4C7E42171D@flycatcher.gentoo.org
1 tomwij 13/06/05 09:30:15
2
3 Added: jss-4.3-secitem.patch jss-4.3-cflags.patch
4 Log:
5 Revision bump to 4.3-r1. EAPI 5. Fix Java environment, see bug #472198. Fix use of CFLAGS, see bug #428188. Possibly bug #463582 is fixed as a side effect.
6
7 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
8
9 Revision Changes Path
10 1.1 dev-java/jss/files/jss-4.3-secitem.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/files/jss-4.3-secitem.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/files/jss-4.3-secitem.patch?rev=1.1&content-type=text/plain
14
15 Index: jss-4.3-secitem.patch
16 ===================================================================
17 --- a/security/jss/org/mozilla/jss/CryptoManager.c 2008-05-22 06:28:09.000000000 +0200
18 +++ b/security/jss/org/mozilla/jss/CryptoManager.c 2013-06-05 11:09:58.649080012 +0200
19 @@ -35,7 +35,7 @@
20 * ***** END LICENSE BLOCK ***** */
21 #include "_jni/org_mozilla_jss_CryptoManager.h"
22
23 -#include <secitem.h>
24 +#include <nss/secitem.h>
25 #include <secmod.h>
26 #include <cert.h>
27 #include <certt.h>
28 --- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2003-12-19 20:36:30.000000000 +0100
29 +++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2013-06-05 11:09:58.585746684 +0200
30 @@ -36,7 +36,7 @@
31
32 #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
33 #include <nspr.h>
34 -#include <secitem.h>
35 +#include <nss/secitem.h>
36 #include <jss_exceptions.h>
37 #include <jssutil.h>
38 #include <pk11func.h>
39 --- a/security/jss/org/mozilla/jss/crypto/PQGParams.c 2004-04-25 17:02:21.000000000 +0200
40 +++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c 2013-06-05 11:09:58.589080017 +0200
41 @@ -39,7 +39,7 @@
42 #include <nspr.h>
43
44 #include <plarena.h>
45 -#include <secitem.h>
46 +#include <nss/secitem.h>
47 #include <secoidt.h>
48 #include <keyt.h> /* for PQGParams */
49 #include <pk11pqg.h>
50 --- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2002-01-08 20:38:46.000000000 +0100
51 +++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2013-06-05 11:09:58.585746684 +0200
52 @@ -36,7 +36,7 @@
53
54 #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
55 #include <nspr.h>
56 -#include <secitem.h>
57 +#include <nss/secitem.h>
58 #include <pk11sdr.h>
59 #include <jss_exceptions.h>
60 #include <jssutil.h>
61 --- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2004-04-25 17:02:22.000000000 +0200
62 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2013-06-05 11:09:58.632413347 +0200
63 @@ -40,7 +40,7 @@
64 #include <plarena.h>
65 #include <seccomon.h>
66 #include <pk11func.h>
67 -#include <secitem.h>
68 +#include <nss/secitem.h>
69
70 /* JSS includes */
71 #include <java_ids.h>
72 --- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2006-02-23 02:21:42.000000000 +0100
73 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2013-06-05 11:09:58.595746684 +0200
74 @@ -40,7 +40,7 @@
75 #include <pk11pqg.h>
76 #include <nspr.h>
77 #include <key.h>
78 -#include <secitem.h>
79 +#include <nss/secitem.h>
80
81 #include <jssutil.h>
82 #include <pk11util.h>
83 --- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2006-02-23 02:21:42.000000000 +0100
84 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2013-06-05 11:09:58.629080014 +0200
85 @@ -40,7 +40,7 @@
86 #include <plarena.h>
87 #include <seccomon.h>
88 #include <pk11func.h>
89 -#include <secitem.h>
90 +#include <nss/secitem.h>
91 #include <keyt.h>
92
93 /* JSS includes */
94 --- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2004-04-25 17:02:22.000000000 +0200
95 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2013-06-05 11:09:58.609080016 +0200
96 @@ -40,7 +40,7 @@
97 #include <plarena.h>
98 #include <seccomon.h>
99 #include <pk11func.h>
100 -#include <secitem.h>
101 +#include <nss/secitem.h>
102
103 /* JSS includes */
104 #include <java_ids.h>
105 --- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2006-04-25 03:26:42.000000000 +0200
106 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2013-06-05 11:09:58.609080016 +0200
107 @@ -43,7 +43,7 @@
108 #include <secerr.h>
109 #include <nspr.h>
110 #include <key.h>
111 -#include <secitem.h>
112 +#include <nss/secitem.h>
113
114 #include <jss_bigint.h>
115 #include <jssutil.h>
116 --- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2004-04-25 17:02:22.000000000 +0200
117 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2013-06-05 11:09:58.605746683 +0200
118 @@ -35,7 +35,7 @@
119 * ***** END LICENSE BLOCK ***** */
120
121 #include <nspr.h>
122 -#include <secitem.h>
123 +#include <nss/secitem.h>
124 #include <secoidt.h>
125 #include <secmodt.h>
126 #include <pk11func.h>
127 --- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2007-11-10 01:37:57.000000000 +0100
128 +++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2013-06-05 11:09:58.622413348 +0200
129 @@ -53,7 +53,7 @@
130 #include <jss_bigint.h>
131 #include <Algorithm.h>
132
133 -#include <secitem.h>
134 +#include <nss/secitem.h>
135 #include "java_ids.h"
136
137 #include "pk11util.h"
138 --- a/security/jss/org/mozilla/jss/ssl/callbacks.c 2004-09-03 20:32:03.000000000 +0200
139 +++ b/security/jss/org/mozilla/jss/ssl/callbacks.c 2013-06-05 11:09:58.565746686 +0200
140 @@ -39,7 +39,7 @@
141 #include <nspr.h>
142 #include <java_ids.h>
143 #include <jss_exceptions.h>
144 -#include <secitem.h>
145 +#include <nss/secitem.h>
146 #include <jssutil.h>
147 #include <certt.h>
148 #include <keythi.h>
149 --- a/security/jss/org/mozilla/jss/util/jssutil.c 2004-04-25 17:02:29.000000000 +0200
150 +++ b/security/jss/org/mozilla/jss/util/jssutil.c 2013-06-05 11:09:58.579080018 +0200
151 @@ -38,7 +38,7 @@
152 #include <nspr.h>
153 #include <plstr.h>
154 #include <seccomon.h>
155 -#include <secitem.h>
156 +#include <nss/secitem.h>
157 #include "jssutil.h"
158 #include "jss_bigint.h"
159 #include "jss_exceptions.h"
160 --- a/security/jss/org/mozilla/jss/util/jssutil.h 2004-04-25 17:02:29.000000000 +0200
161 +++ b/security/jss/org/mozilla/jss/util/jssutil.h 2013-06-05 11:09:49.829080794 +0200
162 @@ -39,7 +39,7 @@
163 /* Need to include these first.
164 * #include <nspr.h>
165 * #include <jni.h>
166 - * #include <secitem.h>
167 + * #include <nss/secitem.h>
168 */
169
170 PR_BEGIN_EXTERN_C
171
172
173
174 1.1 dev-java/jss/files/jss-4.3-cflags.patch
175
176 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/files/jss-4.3-cflags.patch?rev=1.1&view=markup
177 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/files/jss-4.3-cflags.patch?rev=1.1&content-type=text/plain
178
179 Index: jss-4.3-cflags.patch
180 ===================================================================
181 --- security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200
182 +++ security/coreconf/command.mk.b 2013-06-05 11:15:31.092383902 +0200
183 @@ -45,7 +45,7 @@
184 CCF = $(CC) $(CFLAGS)
185 LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
186 LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
187 -CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
188 +CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
189 $(XCFLAGS)
190 PERL = perl
191 RANLIB = echo
Report Message
Find on MARC Find on Google Groups