This is an automated email from the git hooks/post-receive script. locutusofborg-guest pushed a commit to branch master in repository tomcat7.
commit 28f25d28c6b776d8473d1ec9578c8d8cab05d0a3 Author: Gianfranco Costamagna <[email protected]> Date: Fri Oct 11 14:02:11 2013 +0200 New upstream release, patch refresh --- debian/changelog | 6 +++++ ...-deploy-webapps-target-from-deploy-target.patch | 4 +-- ...-java.security.policy-file-in-catalina.sh.patch | 28 ++++++++++---------- debian/patches/0010-debianize-build-xml.patch | 12 ++++----- .../0011-fix-classpath-lintian-warnings.patch | 10 +++---- ...nt-look-for-build-properties-in-user-home.patch | 2 +- debian/patches/fix-manager-webapp.path | 16 +++++------ 7 files changed, 42 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8fe4bda..ac3e29a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tomcat7 (7.0.45-1) UNRELEASED; urgency=low + + * New upstream release, patch refresh. + + -- Gianfranco Costamagna <[email protected]> Fri, 11 Oct 2013 14:02:10 +0200 + tomcat7 (7.0.42-2) UNRELEASED; urgency=low * Removed -Djava.net.preferIPv4Stack=true diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch index ea0516e..c1f3bf7 100644 --- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch +++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch @@ -8,7 +8,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target --- a/build.xml +++ b/build.xml -@@ -851,7 +851,7 @@ +@@ -909,7 +909,7 @@ </xslt> </target> @@ -17,7 +17,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target description="Default. Builds a working Tomcat instance"> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" -@@ -889,6 +889,10 @@ +@@ -947,6 +947,10 @@ </fileset> </copy> diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch index 8337de7..6e0b95a 100644 --- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch @@ -24,20 +24,20 @@ Forwarded: not-needed -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ @@ -312,7 +312,7 @@ elif [ "$1" = "run" ]; then - eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ -- -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ -+ -Djava.security.policy==\"$CATALINA_BASE/work/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +- -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ @@ -376,7 +376,7 @@ elif [ "$1" = "start" ] ; then - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ -- -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ -+ -Djava.security.policy==\"$CATALINA_BASE/work/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +- -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 5c187e9..b8e5464 100644 --- a/debian/patches/0010-debianize-build-xml.patch +++ b/debian/patches/0010-debianize-build-xml.patch @@ -5,16 +5,16 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -553,7 +553,7 @@ - </copy> - </target> +@@ -575,7 +575,7 @@ + <target name="compile" depends="compile-java6,compile-java7" /> -- <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate"> -+ <target name="compile" depends="build-prepare,compile-prepare"> + <target name="compile-java6" +- depends="build-prepare,download-compile,compile-prepare,validate"> ++ depends="build-prepare,compile-prepare"> <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" -@@ -854,12 +854,14 @@ +@@ -912,12 +912,14 @@ <target name="deploy" depends="package,build-docs,deploy-webapps" description="Default. Builds a working Tomcat instance"> diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch index d29bdad..bc74437 100644 --- a/debian/patches/0011-fix-classpath-lintian-warnings.patch +++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch @@ -5,7 +5,7 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -686,7 +686,8 @@ +@@ -729,7 +729,8 @@ <!-- Jasper Implementation JAR File --> <jarIt jarfile="${jasper.jar}" filesDir="${tomcat.classes}" @@ -15,7 +15,7 @@ Last-Update: 2011-05-16 <!-- Jasper EL Implementation JAR File --> <jarIt jarfile="${jasper-el.jar}" -@@ -694,8 +695,7 @@ +@@ -737,8 +738,7 @@ filesId="files.jasper-el" /> <!-- i18n JARs --> @@ -25,7 +25,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_es.properties" /> </fileset> -@@ -703,9 +703,8 @@ +@@ -746,9 +746,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -37,7 +37,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_fr.properties" /> </fileset> -@@ -713,9 +712,8 @@ +@@ -756,9 +755,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -49,7 +49,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_ja.properties" /> </fileset> -@@ -723,7 +721,7 @@ +@@ -766,7 +764,7 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch index 6b34b4b..ae5b6f5 100644 --- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch +++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch @@ -8,7 +8,7 @@ Subject: 0013-dont-look-for-build-properties-in-user-home --- a/build.xml +++ b/build.xml -@@ -427,7 +427,6 @@ +@@ -448,7 +448,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > diff --git a/debian/patches/fix-manager-webapp.path b/debian/patches/fix-manager-webapp.path index e94ea42..c054370 100644 --- a/debian/patches/fix-manager-webapp.path +++ b/debian/patches/fix-manager-webapp.path @@ -6,8 +6,8 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1128067 Reviewed-By: Gianfranco Costamagna <[email protected]> Last-Update: <2013-08-01> ---- tomcat7-7.0.42.orig/webapps/host-manager/manager.xml -+++ tomcat7-7.0.42/webapps/host-manager/manager.xml +--- a/webapps/host-manager/manager.xml ++++ b/webapps/host-manager/manager.xml @@ -24,7 +24,7 @@ --> @@ -17,9 +17,9 @@ Last-Update: <2013-08-01> privileged="true" antiResourceLocking="false" antiJARLocking="false"> </Context> ---- tomcat7-7.0.42.orig/webapps/docs/manager-howto.xml -+++ tomcat7-7.0.42/webapps/docs/manager-howto.xml -@@ -72,7 +72,7 @@ Manager web application <code>Context</c +--- a/webapps/docs/manager-howto.xml ++++ b/webapps/docs/manager-howto.xml +@@ -72,7 +72,7 @@ example:</p> <pre> <Context privileged="true" antiResourceLocking="false" @@ -28,9 +28,9 @@ Last-Update: <2013-08-01> <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="127\.0\.0\.1" /> </Context> ---- tomcat7-7.0.42.orig/conf/catalina.policy -+++ tomcat7-7.0.42/conf/catalina.policy -@@ -196,14 +196,14 @@ grant { +--- a/conf/catalina.policy ++++ b/conf/catalina.policy +@@ -197,14 +197,14 @@ // - default CATALINA_HOME == CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
