Author: nthykier-guest Date: 2009-11-29 16:51:07 +0000 (Sun, 29 Nov 2009) New Revision: 11169
Added: trunk/tomcat6/debian/patches/jsp-api-OSGi.patch trunk/tomcat6/debian/patches/servlet-api-OSGi.patch Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/control trunk/tomcat6/debian/patches/series trunk/tomcat6/debian/tomcat6.init Log: tomcat6 (6.0.20-8) UNRELEASED; urgency=low * Corrected some spelling mistakes in debian/control. (Closes: #557377, #557378) * Changed the default value for JVM_TMP in the init script to avoid a security problem. * Added patches to install the OSGi metadata in some of the jars. (Closes: #558176) -- Niels Thykier <ni...@thykier.net> Sat, 28 Nov 2009 17:51:49 +0100 Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2009-11-29 16:20:39 UTC (rev 11168) +++ trunk/tomcat6/debian/changelog 2009-11-29 16:51:07 UTC (rev 11169) @@ -1,3 +1,14 @@ +tomcat6 (6.0.20-8) UNRELEASED; urgency=low + + * Corrected some spelling mistakes in debian/control. + (Closes: #557377, #557378) + * Changed the default value for JVM_TMP in the init script + to avoid a security problem. + * Added patches to install the OSGi metadata in some of the jars. + (Closes: #558176) + + -- Niels Thykier <ni...@thykier.net> Sat, 28 Nov 2009 17:51:49 +0100 + tomcat6 (6.0.20-7) unstable; urgency=low * New patch fix_context_name.patch: Modified: trunk/tomcat6/debian/control =================================================================== --- trunk/tomcat6/debian/control 2009-11-29 16:20:39 UTC (rev 11168) +++ trunk/tomcat6/debian/control 2009-11-29 16:51:07 UTC (rev 11169) @@ -3,7 +3,8 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Paul Cager <paul-deb...@home.paulcager.org>, Torsten Werner <twer...@debian.org>, - Ludovic Claude <ludovic.cla...@laposte.net>, Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org> + Ludovic Claude <ludovic.cla...@laposte.net>, Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org>, + Niels Thykier <ni...@thykier.net> Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 7), quilt Build-Depends-Indep: maven-repo-helper, libecj-java Standards-Version: 3.8.3 @@ -79,7 +80,7 @@ server environment for Java code to run. Tomcat 6 is the reference implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . - This packages contains the Java Servlet and JSP library. + This package contains the Java Servlet and JSP library. Package: libservlet2.5-java-doc Section: doc @@ -91,7 +92,7 @@ server environment for Java code to run. Tomcat 6 is the reference implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . - This packages contains the documentation for the Java Servlet and JSP library. + This package contains the documentation for the Java Servlet and JSP library. Package: tomcat6-admin Architecture: all Added: trunk/tomcat6/debian/patches/jsp-api-OSGi.patch =================================================================== --- trunk/tomcat6/debian/patches/jsp-api-OSGi.patch (rev 0) +++ trunk/tomcat6/debian/patches/jsp-api-OSGi.patch 2009-11-29 16:51:07 UTC (rev 11169) @@ -0,0 +1,20 @@ +Description: Adds OSGi metadata needed by eclipse. + +--- a/res/jsp-api.jar.manifest 2009-11-25 11:11:59.369284527 +0100 ++++ a/res/jsp-api.jar.manifest 2009-11-25 11:12:37.922284170 +0100 +@@ -9,3 +9,15 @@ + Implementation-Vendor: Apache Software Foundation + X-Compile-Source-JDK: @source.jdk@ + X-Compile-Target-JDK: @target.jdk@ ++Import-Package: javax.servlet; version=2.5,javax.servlet.http; version ++ =2.5,javax.servlet.resources; version=2.5 ++Bundle-ManifestVersion: 2 ++Export-Package: javax.servlet.jsp; version=2.1,javax.servlet.jsp.el; v ++ ersion=2.1,javax.servlet.jsp.resources; version=2.1,javax.servlet.jsp ++ .tagext; version=2.1 ++Bundle-Version: 2.0.1.v200806031605 ++Bundle-SymbolicName: javax.servlet.jsp ++Bundle-Name: Java Server Pages API Bundle ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation Modified: trunk/tomcat6/debian/patches/series =================================================================== --- trunk/tomcat6/debian/patches/series 2009-11-29 16:20:39 UTC (rev 11168) +++ trunk/tomcat6/debian/patches/series 2009-11-29 16:51:07 UTC (rev 11169) @@ -4,3 +4,5 @@ use-commons-dbcp.patch var_loaders.patch fix_context_name.patch +servlet-api-OSGi.patch +jsp-api-OSGi.patch Added: trunk/tomcat6/debian/patches/servlet-api-OSGi.patch =================================================================== --- trunk/tomcat6/debian/patches/servlet-api-OSGi.patch (rev 0) +++ trunk/tomcat6/debian/patches/servlet-api-OSGi.patch 2009-11-29 16:51:07 UTC (rev 11169) @@ -0,0 +1,17 @@ +Description: Adds OSGi metadata needed by eclipse. + +--- a/res/servlet-api.jar.manifest 2009-11-25 11:05:45.854282997 +0100 ++++ b/res/servlet-api.jar.manifest 2009-11-25 11:09:51.062283823 +0100 +@@ -9,3 +9,12 @@ + Implementation-Vendor: Apache Software Foundation + X-Compile-Source-JDK: @source.jdk@ + X-Compile-Target-JDK: @target.jdk@ ++Bundle-ManifestVersion: 2 ++Export-Package: javax.servlet;version="2.5",javax.servlet.http;version ++ ="2.5",javax.servlet.resources;version="2.5" ++Bundle-Version: 2.5.0.v200806031605 ++Bundle-SymbolicName: javax.servlet ++Bundle-Name: Servlet API Bundle ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation Modified: trunk/tomcat6/debian/tomcat6.init =================================================================== --- trunk/tomcat6/debian/tomcat6.init 2009-11-29 16:20:39 UTC (rev 11168) +++ trunk/tomcat6/debian/tomcat6.init 2009-11-29 16:51:07 UTC (rev 11169) @@ -27,7 +27,7 @@ DAEMON=/usr/bin/jsvc CATALINA_HOME=/usr/share/$NAME DEFAULT=/etc/default/$NAME -JVM_TMP=/tmp/tomcat6-temp +JVM_TMP=/var/cache/$NAME if [ `id -u` -ne 0 ]; then echo "You need root privileges to run this script" _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits