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

Damien Raude-Morvan drazzib at alioth.debian.org
Fri Mar 2 18:55:24 UTC 2012 

Author: drazzib
Date: 2012-03-02 18:55:24 +0000 (Fri, 02 Mar 2012)
New Revision: 15809

Modified:
   trunk/tomcat-native/debian/changelog
   trunk/tomcat-native/debian/control
   trunk/tomcat-native/debian/copyright
   trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
   trunk/tomcat-native/debian/rules
Log:
* New upstream release.
* d/control: Build-Depends on dpkg-dev (>= 1.16.1~) for hardening
  flags
* d/rules: Enable hardening build.
* d/copyright: Use copyright-format 1.0.
* d/control: Bump Standards-Version to 3.9.3: no changes needed.

Modified: trunk/tomcat-native/debian/changelog
===================================================================
--- trunk/tomcat-native/debian/changelog	2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/changelog	2012-03-02 18:55:24 UTC (rev 15809)
@@ -1,10 +1,19 @@
-tomcat-native (1.1.22-2) UNRELEASED; urgency=low
+tomcat-native (1.1.23-1) unstable; urgency=low
 
+  [ tony mancill ]
   * Team upload.
   * Remove Michael Koch from Uploaders (Closes: #654135)
 
- -- tony mancill <tmancill at debian.org>  Mon, 09 Jan 2012 09:09:25 -0800
+  [ Damien Raude-Morvan ]
+  * New upstream release.
+  * d/control: Build-Depends on dpkg-dev (>= 1.16.1~) for hardening
+    flags
+  * d/rules: Enable hardening build.
+  * d/copyright: Use copyright-format 1.0.
+  * d/control: Bump Standards-Version to 3.9.3: no changes needed.
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Mar 2012 19:51:58 +0100
+
 tomcat-native (1.1.22-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/tomcat-native/debian/control
===================================================================
--- trunk/tomcat-native/debian/control	2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/control	2012-03-02 18:55:24 UTC (rev 15809)
@@ -3,24 +3,29 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, libapr1-dev, libssl-dev
-Standards-Version: 3.9.2
+Build-Depends: cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               dpkg-dev (>= 1.16.1~),
+               libapr1-dev,
+               libssl-dev
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat-native/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat-native/
 Homepage: http://tomcat.apache.org/native-doc/
 
 Package: libtcnative-1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Tomcat native library using the apache portable runtime
  Tomcat can use the Apache Portable Runtime to provide superior scalability,
- performance, and better integration with native server technologies. 
+ performance, and better integration with native server technologies.
  The Apache Portable Runtime is a highly portable library that is at the
  heart of Apache HTTP Server 2.x. APR has many uses, including access to
  advanced IO functionality (such as sendfile, epoll and OpenSSL), OS level
  functionality (random number generation, system status, etc), and native
  process handling (shared memory, NT pipes and Unix sockets).
- .     
+ .
  These features allows making Tomcat a general purpose webserver, will
  enable much better integration with other native web technologies, and
  overall make Java much more viable as a full fledged webserver platform

Modified: trunk/tomcat-native/debian/copyright
===================================================================
--- trunk/tomcat-native/debian/copyright	2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/copyright	2012-03-02 18:55:24 UTC (rev 15809)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Tomcat Native Library
 Upstream-Contact: <http://tomcat.apache.org/native-doc/>
 Source: http://www.apache.org/dist/tomcat/tomcat-connectors/native/
@@ -15,4 +15,3 @@
 License: Apache-2.0
   A complete copy of the Apache License, Version 2.0, can be found in
   /usr/share/common-licenses/Apache-2.0 on Debian Systems.
-

Modified: trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
===================================================================
--- trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2012-03-02 18:55:24 UTC (rev 15809)
@@ -4,8 +4,6 @@
 Last-Update: 2011-08-12
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622141
 Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=51056
-Index: b/jni/examples/org/apache/tomcat/jni/SSL.properties
-===================================================================
 --- a/jni/examples/org/apache/tomcat/jni/SSL.properties
 +++ b/jni/examples/org/apache/tomcat/jni/SSL.properties
 @@ -18,5 +18,5 @@
@@ -17,8 +15,6 @@
 \ No newline at end of file
 +server.ciphers=ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
 +server.verify=none
-Index: b/jni/examples/org/apache/tomcat/jni/SSLServer.java
-===================================================================
 --- a/jni/examples/org/apache/tomcat/jni/SSLServer.java
 +++ b/jni/examples/org/apache/tomcat/jni/SSLServer.java
 @@ -70,7 +70,7 @@
@@ -30,8 +26,6 @@
              /* List the ciphers that the client is permitted to negotiate. */
              SSLContext.setCipherSuite(serverCtx, serverCiphers);
              /* Load Server key and certificate */
-Index: b/jni/java/org/apache/tomcat/jni/SSL.java
-===================================================================
 --- a/jni/java/org/apache/tomcat/jni/SSL.java
 +++ b/jni/java/org/apache/tomcat/jni/SSL.java
 @@ -70,10 +70,9 @@
@@ -46,8 +40,6 @@
  
      /*
       * Define the SSL verify levels
-Index: b/jni/java/org/apache/tomcat/jni/SSLContext.java
-===================================================================
 --- a/jni/java/org/apache/tomcat/jni/SSLContext.java
 +++ b/jni/java/org/apache/tomcat/jni/SSLContext.java
 @@ -31,9 +31,7 @@
@@ -60,11 +52,9 @@
       * SSL_PROTOCOL_TLSV1
       * SSL_PROTOCOL_ALL
       * </PRE>
-Index: b/jni/native/include/ssl_private.h
-===================================================================
 --- 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)
@@ -76,8 +66,6 @@
  
  #define SSL_MODE_CLIENT         (0)
  #define SSL_MODE_SERVER         (1)
-Index: b/jni/native/src/sslcontext.c
-===================================================================
 --- a/jni/native/src/sslcontext.c
 +++ b/jni/native/src/sslcontext.c
 @@ -72,6 +72,7 @@

Modified: trunk/tomcat-native/debian/rules
===================================================================
--- trunk/tomcat-native/debian/rules	2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/rules	2012-03-02 18:55:24 UTC (rev 15809)
@@ -3,6 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_SRCDIR := jni/native
 
 DEB_CONFIGURE_SCRIPT_ENV := JAVA_HOME=/usr/lib/jvm/default-java

More information about the pkg-java-commits mailing list