[jenkins-winstone] 02/05: Refreshed the patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins-winstone.

commit edd08c6aeeb0c249655a1071673d585de9c059dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 21 19:03:40 2014 +0200

    Refreshed the patch
---
 debian/changelog                         | 7 +++++++
 debian/patches/java8-compatibility.patch | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c198f9b..bf62d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins-winstone (2.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed java8-compatibility.patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 21 Oct 2014 19:03:34 +0200
+
 jenkins-winstone (2.3-2) unstable; urgency=medium
 
   * Rebuilt with jetty8/ 8.1.16-1 to fix the wrong version of the Servlet API
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
index c1a79e3..27ad105 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -14,12 +14,12 @@ Forwarded: https://github.com/jenkinsci/winstone/pull/15
  import sun.security.x509.X500Name;
  import winstone.cmdline.Option;
  
-@@ -94,20 +93,7 @@
+@@ -93,20 +92,7 @@
                  keystore.load(null);
-                 keystore.setKeyEntry("hudson", key, password, new Certificate[]{cert});
+                 keystore.setKeyEntry("hudson", key, keystorePassword.toCharArray(), new Certificate[]{cert});
              } else {
 -                // use self-signed certificate
--                this.password = "changeit".toCharArray();
+-                this.keystorePassword = "changeit";
 -                System.out.println("Using one-time self-signed certificate");
 -
 -                CertAndKeyGen ckg = new CertAndKeyGen("RSA", "SHA1WithRSA", null);
@@ -31,7 +31,7 @@ Forwarded: https://github.com/jenkinsci/winstone/pull/15
 -
 -                keystore = KeyStore.getInstance("JKS");
 -                keystore.load(null);
--                keystore.setKeyEntry("hudson", privKey, password, new Certificate[]{cert});
+-                keystore.setKeyEntry("hudson", privKey, keystorePassword.toCharArray(), new Certificate[]{cert});
 +                throw new WinstoneException("SSL certificate not found, please specify a keystore or an OpenSSL certificate");
              }
          } catch (GeneralSecurityException e) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-winstone.git