[jss/f17] Resolves Bugzilla Bug #783007 - Un-deprecate previously deprecated methods in JSS 4.2.6 . . . BadPad

[mharmsen]

commit 3adba8c847a5510d22cdfdb021ca899ebbd2adc5
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Fri Mar 30 19:06:41 2012 -0700

    Resolves Bugzilla Bug #783007 - Un-deprecate previously deprecated methods in JSS 4.2.6 . . . BadPaddingException

 jss-undo-BadPaddingException-deprecation.patch |   13 +++++++++++++
 jss.spec                                       |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/jss-undo-BadPaddingException-deprecation.patch b/jss-undo-BadPaddingException-deprecation.patch
new file mode 100644
index 0000000..1b372a7
--- /dev/null
+++ b/jss-undo-BadPaddingException-deprecation.patch
@@ -0,0 +1,13 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java	2004-04-25 08:02:21.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java	2012-03-30 16:17:30.748371000 -0700
+@@ -35,9 +35,6 @@
+  * ***** END LICENSE BLOCK ***** */
+ package org.mozilla.jss.crypto;
+ 
+-/**
+- * @deprecated Use javax.crypto.BadPaddingException.
+- */
+ public class BadPaddingException extends Exception {
+     public BadPaddingException() {
+         super();
diff --git a/jss.spec b/jss.spec
index c5d3b9a..70798b6 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.6
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -43,6 +43,7 @@ Patch18:        jss-wrapInToken.patch
 Patch19:        jss-HSM-manufacturerID.patch
 Patch20:        jss-ECC-Phase2KeyArchivalRecovery.patch
 Patch21:        jss-undo-JCA-deprecations.patch
+Patch22:        jss-undo-BadPaddingException-deprecation.patch
 
 
 %description
@@ -81,6 +82,7 @@ This package contains the API documentation for JSS.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -182,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 30 2012 Matthew Harmsen <mharmsen at redhat.com> - 4.2.6-24
+- Bugzilla Bug #783007 - Un-deprecate previously deprecated methods in
+  JSS 4.2.6 . . . BadPaddingException (mharmsen)
+
 * Tue Mar 20 2012 Christina Fu <cfu at redhat.com> - 4.2.6-23
 - Bugzilla Bug #797351 - JSS - HSM token name was mistaken for manufacturer
   identifier (cfu)