[pkg-java] r18205 - in trunk/tomcat-native/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-06-03 13:49:15 +0000 (Tue, 03 Jun 2014)
New Revision: 18205

Modified:
   trunk/tomcat-native/debian/changelog
   trunk/tomcat-native/debian/copyright
   trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
Log:
New upstream release (1.1.30)



Modified: trunk/tomcat-native/debian/changelog
===================================================================
--- trunk/tomcat-native/debian/changelog	2014-06-03 13:35:41 UTC (rev 18204)
+++ trunk/tomcat-native/debian/changelog	2014-06-03 13:49:15 UTC (rev 18205)
@@ -1,6 +1,8 @@
-tomcat-native (1.1.29-2) UNRELEASED; urgency=medium
+tomcat-native (1.1.30-1) unstable; urgency=medium
 
   * Team upload.
+  * New upstream release
+  * Refreshed drop_sslv2_support.diff
   * Updated README.Debian for Tomcat 8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 Jun 2014 15:35:20 +0200

Modified: trunk/tomcat-native/debian/copyright
===================================================================
--- trunk/tomcat-native/debian/copyright	2014-06-03 13:35:41 UTC (rev 18204)
+++ trunk/tomcat-native/debian/copyright	2014-06-03 13:49:15 UTC (rev 18205)
@@ -4,12 +4,12 @@
 Source: http://www.apache.org/dist/tomcat/tomcat-connectors/native/
 
 Files: *
-Copyright: Copyright (C) 2004-2011 The Apache Software Foundation.
+Copyright: 2004-2014, The Apache Software Foundation.
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2008-2009, Michael Koch <konqueror at gmx.de>,
- 2010-2013, Damien Raude-Morvan <drazzib at debian.org>
+           2010-2013, Damien Raude-Morvan <drazzib at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

Modified: trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
===================================================================
--- trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2014-06-03 13:35:41 UTC (rev 18204)
+++ trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2014-06-03 13:49:15 UTC (rev 18205)
@@ -28,7 +28,7 @@
              /* Load Server key and certificate */
 --- a/jni/java/org/apache/tomcat/jni/SSL.java
 +++ b/jni/java/org/apache/tomcat/jni/SSL.java
-@@ -68,7 +68,6 @@
+@@ -67,7 +67,6 @@
       * Define the SSL Protocol options
       */
      public static final int SSL_PROTOCOL_NONE  = 0;
@@ -38,7 +38,7 @@
      public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1);
 --- a/jni/java/org/apache/tomcat/jni/SSLContext.java
 +++ b/jni/java/org/apache/tomcat/jni/SSLContext.java
-@@ -31,9 +31,7 @@
+@@ -29,9 +29,7 @@
       * @param pool The pool to use.
       * @param protocol The SSL protocol to use. It can be one of:
       * <PRE>
@@ -50,7 +50,7 @@
       * </PRE>
 --- a/jni/native/include/ssl_private.h
 +++ b/jni/native/include/ssl_private.h
-@@ -113,10 +113,9 @@
+@@ -114,10 +114,9 @@
   * Define the SSL Protocol options
   */
  #define SSL_PROTOCOL_NONE       (0)