[tomcat7] 02/02: New upstream release, fixing CVE-2014-0050, patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Wed Feb 19 13:42:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository tomcat7.
commit d37d2aca50b71e71bb54436ebe7267aa124c9520
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Feb 19 14:41:18 2014 +0100
New upstream release, fixing CVE-2014-0050, patch refresh
---
debian/changelog | 8 ++++++++
.../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
.../0009-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++---
debian/patches/0010-debianize-build-xml.patch | 4 ++--
debian/patches/0011-fix-classpath-lintian-warnings.patch | 10 +++++-----
.../0013-dont-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0017-use-jdbc-pool-default.patch | 6 +++---
debian/patches/0018-fix-manager-webapp.patch | 8 ++++----
debian/patches/0019-add-distribution-to-error-page.patch | 2 +-
9 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b6111c9..b9ae025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.52-1) UNRELEASED; urgency=low
+
+ * Team upload.
+ * New upstream release.
+ - Addresses security issue: CVE-2014-0050
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 19 Feb 2014 14:09:48 +0100
+
tomcat7 (7.0.50-1) unstable; urgency=medium
* New upstream release.
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 2497ede..7dd632b 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
-@@ -910,7 +910,7 @@
+@@ -934,7 +934,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"
-@@ -948,6 +948,10 @@
+@@ -972,6 +972,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 6e0b95a..e6036b7 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
@@ -14,7 +14,7 @@ Forwarded: not-needed
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
-@@ -285,7 +285,7 @@ if [ "$1" = "debug" ] ; then
+@@ -283,7 +283,7 @@ if [ "$1" = "debug" ] ; then
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
-Djava.security.manager \
@@ -23,7 +23,7 @@ Forwarded: not-needed
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -312,7 +312,7 @@ elif [ "$1" = "run" ]; then
+@@ -310,7 +310,7 @@ elif [ "$1" = "run" ]; then
eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-Djava.security.manager \
@@ -32,7 +32,7 @@ Forwarded: not-needed
-Dcatalina.base="\"$CATALINA_BASE\"" \
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-@@ -376,7 +376,7 @@ elif [ "$1" = "start" ] ; then
+@@ -374,7 +374,7 @@ elif [ "$1" = "start" ] ; then
eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-Djava.security.manager \
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index b5bee16..3995096 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-05-16
--- a/build.xml
+++ b/build.xml
-@@ -576,7 +576,7 @@
+@@ -595,7 +595,7 @@
<target name="compile" depends="compile-java6,compile-java7" />
<target name="compile-java6"
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -913,12 +913,14 @@
+@@ -937,12 +937,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 a49afa9..dae8362 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
-@@ -730,7 +730,8 @@
+@@ -754,7 +754,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}"
-@@ -738,8 +739,7 @@
+@@ -762,8 +763,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>
-@@ -747,9 +747,8 @@
+@@ -771,9 +771,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>
-@@ -757,9 +756,8 @@
+@@ -781,9 +780,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>
-@@ -767,7 +765,7 @@
+@@ -791,7 +789,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 895849c..a4f0905 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
-@@ -449,7 +449,6 @@
+@@ -469,7 +469,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index 16c996b..4ff6390 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/java/org/apache/naming/factory/Constants.java
+++ b/java/org/apache/naming/factory/Constants.java
-@@ -49,7 +49,7 @@ public final class Constants {
+@@ -49,7 +49,7 @@
Package + ".HandlerFactory";
public static final String DBCP_DATASOURCE_FACTORY =
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Package + ".OpenEjbFactory";
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
-@@ -581,7 +581,7 @@
+@@ -579,7 +579,7 @@
<property name="javax.sql.DataSource.Factory">
<p>The class name of the factory to use to create resources of type
<code>javax.sql.DataSource</code>. If not specified the default of
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
</property>
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
-@@ -684,7 +684,7 @@ conn.close();
+@@ -685,7 +685,7 @@ conn.close();
<p>The configuration properties for Tomcat's standard data source
resource factory
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index 8875f5e..39f4e3c 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -8,10 +8,10 @@ Last-Update: <2013-08-01>
--- a/webapps/host-manager/manager.xml
+++ b/webapps/host-manager/manager.xml
-@@ -24,7 +24,7 @@
- -->
-
+@@ -20,7 +20,7 @@
+ Context configuration file for the Tomcat Manager Web App
+ -->
-<Context docBase="${catalina.home}/webapps/manager"
+<Context docBase="${catalina.home}/../tomcat7-admin/manager"
privileged="true" antiResourceLocking="false" antiJARLocking="false">
@@ -30,7 +30,7 @@ Last-Update: <2013-08-01>
</Context>
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
-@@ -201,14 +201,14 @@
+@@ -199,14 +199,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
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index 685a145..d91135a 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -13,7 +13,7 @@
--- a/build.xml 2013-11-18 16:24:56.000000000 +0000
+++ b/build.xml 2013-11-18 16:38:33.094386103 +0000
-@@ -198,6 +198,7 @@
+@@ -220,6 +220,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list