/hg/icedtea6: Remove unapplied/upstreamed patch nss-debug.patch
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Wed May 4 08:49:35 PDT 2011
changeset 45472ac9981b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=45472ac9981b
author: Omair Majid <omajid at redhat.com>
date: Wed May 04 10:11:54 2011 -0400
Remove unapplied/upstreamed patch nss-debug.patch
This patch was pushed upstream some time ago. The patch has not been
applied since changeset e545400a3022. Drop it completely.
diffstat:
ChangeLog | 5 ++++
patches/nss-debug.patch | 54 -------------------------------------------------
2 files changed, 5 insertions(+), 54 deletions(-)
diffs (72 lines):
diff -r b71a752b9762 -r 45472ac9981b ChangeLog
--- a/ChangeLog Wed May 04 10:09:47 2011 -0400
+++ b/ChangeLog Wed May 04 10:11:54 2011 -0400
@@ -1,3 +1,8 @@
+2011-05-04 Omair Majid <omajid at redhat.com>
+
+ * patches/nss-debug.patch: Remove file. It was upstreamed and was not
+ being applied locally.
+
2011-05-04 Denis Lila <dlila at redhat.com>
* Makefile.am: Apply patch.
diff -r b71a752b9762 -r 45472ac9981b patches/nss-debug.patch
--- a/patches/nss-debug.patch Wed May 04 10:09:47 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-diff -r 5b407bce9940 src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Fri Apr 09 01:08:35 2010 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Mon Apr 12 20:55:39 2010 +0100
-@@ -148,6 +148,7 @@
- 0x00000115,
- 0x00000120,
- 0x00000121,
-+ 0x00000130,
- 0x00000150,
- 0x00000160,
- 0x00000170,
-@@ -156,6 +157,7 @@
- 0x00000191,
- 0x000001A0,
- 0x000001A1,
-+ 0x00000200,
- 0x80000000,
- };
- String[] errorMessages = new String[] {
-@@ -234,6 +236,7 @@
- "CKR_WRAPPING_KEY_TYPE_INCONSISTENT",
- "CKR_RANDOM_SEED_NOT_SUPPORTED",
- "CKR_RANDOM_NO_RNG",
-+ "CKR_DOMAIN_PARAMS_INVALID",
- "CKR_BUFFER_TOO_SMALL",
- "CKR_SAVED_STATE_INVALID",
- "CKR_INFORMATION_SENSITIVE",
-@@ -242,6 +245,7 @@
- "CKR_CRYPTOKI_ALREADY_INITIALIZED",
- "CKR_MUTEX_BAD",
- "CKR_MUTEX_NOT_LOCKED",
-+ "CKR_FUNCTION_REJECTED",
- "CKR_VENDOR_DEFINED",
- };
- errorMap = new HashMap<Long,String>();
-diff -r 5b407bce9940 src/share/classes/sun/security/x509/X509Key.java
---- openjdk.orig/jdk/src/share/classes/sun/security/x509/X509Key.java Fri Apr 09 01:08:35 2010 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/x509/X509Key.java Mon Apr 12 20:55:39 2010 +0100
-@@ -171,7 +171,7 @@
- in.data.getUnalignedBitString());
-
- } catch (InvalidKeyException e) {
-- throw new IOException("subject key, " + e.getMessage());
-+ throw new IOException("subject key, " + e.getMessage(), e);
- }
-
- if (in.data.available() != 0)
-@@ -224,7 +224,7 @@
- } catch (NoSuchAlgorithmException e) {
- // Return generic X509Key with opaque key data (see below)
- } catch (InvalidKeySpecException e) {
-- throw new InvalidKeyException(e.getMessage());
-+ throw new InvalidKeyException(e.getMessage(), e);
- }
-
- /*
More information about the distro-pkg-dev
mailing list