Author: twerner Date: 2009-05-10 17:43:42 +0000 (Sun, 10 May 2009) New Revision: 8255
Added: trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/control trunk/tomcat6/debian/patches/series Log: * Add patch tcnative-ipv6-fix-43327.patch provided by Thierry Carrez. (Closes: #527033) * Change Section: java (from web). * Bump up Standards-Version: 3.8.1 (no changes). * Remove redundant Depends: ant because we depend on ant-optional. Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2009-05-10 16:18:07 UTC (rev 8254) +++ trunk/tomcat6/debian/changelog 2009-05-10 17:43:42 UTC (rev 8255) @@ -1,3 +1,13 @@ +tomcat6 (6.0.18-4) unstable; urgency=low + + * Add patch tcnative-ipv6-fix-43327.patch provided by Thierry Carrez. + (Closes: #527033) + * Change Section: java (from web). + * Bump up Standards-Version: 3.8.1 (no changes). + * Remove redundant Depends: ant because we depend on ant-optional. + + -- Torsten Werner <[email protected]> Sun, 10 May 2009 19:41:40 +0200 + tomcat6 (6.0.18-3) unstable; urgency=low * Remove unneeded dirs and symlinks; thanks to Thierry Carrez. (Closes: Modified: trunk/tomcat6/debian/control =================================================================== --- trunk/tomcat6/debian/control 2009-05-10 16:18:07 UTC (rev 8254) +++ trunk/tomcat6/debian/control 2009-05-10 17:43:42 UTC (rev 8255) @@ -1,16 +1,12 @@ Source: tomcat6 -Section: web +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Paul Cager <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: openjdk-6-jdk, - ant, - ant-optional, - debhelper (>=6), - quilt +Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 6), quilt Build-Depends-Indep: libecj-java -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://tomcat.apache.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat6 Modified: trunk/tomcat6/debian/patches/series =================================================================== --- trunk/tomcat6/debian/patches/series 2009-05-10 16:18:07 UTC (rev 8254) +++ trunk/tomcat6/debian/patches/series 2009-05-10 17:43:42 UTC (rev 8255) @@ -2,3 +2,4 @@ disable-apr-loading.patch deploy-webapps-build-xml.patch use-commons-dbcp.patch +tcnative-ipv6-fix-43327.patch Added: trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch =================================================================== --- trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch (rev 0) +++ trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch 2009-05-10 17:43:42 UTC (rev 8255) @@ -0,0 +1,15 @@ +Index: tomcat6-6.0.18/java/org/apache/tomcat/util/net/AprEndpoint.java +=================================================================== +--- tomcat6-6.0.18.orig/java/org/apache/tomcat/util/net/AprEndpoint.java 2009-02-16 16:05:35.000000000 +0000 ++++ tomcat6-6.0.18/java/org/apache/tomcat/util/net/AprEndpoint.java 2009-02-16 16:06:38.000000000 +0000 +@@ -599,8 +599,8 @@ + long inetAddress = Address.info(addressStr, family, + port, 0, rootPool); + // Create the APR server socket +- serverSock = Socket.create(family, Socket.SOCK_STREAM, +- Socket.APR_PROTO_TCP, rootPool); ++ serverSock = Socket.create(Address.getInfo(inetAddress).family, ++ Socket.SOCK_STREAM, Socket.APR_PROTO_TCP, rootPool); + if (OS.IS_UNIX) { + Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1); + } _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
