[tomcat6] 01/01: Import Debian patch 6.0.45+dfsg-1~deb7u2

Markus Koschany apo at moszumanska.debian.org
Thu Sep 15 14:38:15 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch wheezy
in repository tomcat6.

commit a1a6279d08a159bb1f06bcbc6c6c4dbed0397b0b
Author: Markus Koschany <apo at debian.org>
Date:   Thu Sep 15 15:41:21 2016 +0200

    Import Debian patch 6.0.45+dfsg-1~deb7u2
---
 debian/changelog          | 173 ++++++++++++++++------------------
 debian/compat             |   2 +-
 debian/control            | 229 +++++++++++++++++++++++-----------------------
 debian/copyright          |   2 +-
 debian/defaults.template  |   2 -
 debian/orig-tar.sh        |   2 +-
 debian/rules              |  58 ++++++------
 debian/tomcat6.cron.daily |  11 +--
 debian/tomcat6.init       |   7 +-
 debian/watch              |   2 +-
 10 files changed, 231 insertions(+), 257 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 560fcbc..28b5fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,104 +1,87 @@
-tomcat6 (6.0.45+dfsg-1) unstable; urgency=medium
+tomcat6 (6.0.45+dfsg-1~deb7u2) wheezy-security; urgency=high
 
   * Team upload.
-  * Imported Upstream version 6.0.45+dfsg.
-    - Remove all prebuilt jar files.
-  * Declare compliance with Debian Policy 3.9.7.
-  * Vcs-fields: Use https.
-  * This update fixes the following security vulnerabilities in the source
-    package. Since src:tomcat6 only builds libservlet2.5-java and
-    documentation, users are not directly affected.
-    - CVE-2015-5174: Directory traversal vulnerability in RequestUtil.java.
-    - CVE-2015-5345: The Mapper component in Apache Tomcat before 6.0.45
-      processes redirects before considering security constraints and Filters.
-    - CVE-2016-0706: Apache Tomcat before 6.0.45 does not place
-      org.apache.catalina.manager.StatusManagerServlet on the
-      org/apache/catalina/core/RestrictedServlets.properties list which allows
-      remote authenticated users to bypass intended SecurityManager
-      restrictions.
-    - CVE-2016-0714: The session-persistence implementation in Apache Tomcat
-      before 6.0.45 mishandles session attributes, which allows remote
-      authenticated users to bypass intended SecurityManager restrictions.
-    - CVE-2016-0763: The setGlobalContext method in
-      org/apache/naming/factory/ResourceLinkFactory.java in Apache Tomcat does
-      not consider whether ResourceLinkFactory.setGlobalContext callers are
-      authorized, which allows remote authenticated users to bypass intended
-      SecurityManager restrictions and read or write to arbitrary application
-      data, or cause a denial of service (application disruption), via a web
-      application that sets a crafted global context.
-    - CVE-2015-5351: The Manager and Host Manager applications in
-      Apache Tomcat establish sessions and send CSRF tokens for arbitrary new
-      requests, which allows remote attackers to bypass a CSRF protection
-      mechanism by using a token.
-
- -- Markus Koschany <apo at debian.org>  Sat, 27 Feb 2016 19:32:00 +0100
-
-tomcat6 (6.0.41-4) unstable; urgency=medium
-
-  * Removed the timstamp from the Javadoc of the Servlet API
-    to make the build reproducible
-
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 06 May 2015 09:35:37 +0200
-
-tomcat6 (6.0.41-3) unstable; urgency=medium
-
-  * Build only the libservlet2.5-java and libservlet2.5-java-doc packages.
-    Tomcat 6 will not be supported in Jessie, but the Servlet API is still
-    useful as a build dependency for other packages.
-  * Standards-Version updated to 3.9.6 (no changes)
-
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 22 Oct 2014 09:48:54 +0200
-
-tomcat6 (6.0.41-2) unstable; urgency=medium
-
-  [ Emmanuel Bourg ]
-  * Updated the version required for libtcnative-1 (>= 1.1.30)
+  * Fix CVE-2016-1240:
+    tomcat6.init: Protect /var/log/tomcat6/catalina.out against symlink
+    attacks and a possible root privilege escalation.
 
-  [ tony mancill ]
-  * Add patch for logfile compression. (Closes: #682955)
-    - Thank you to Thijs Kinkhorst.
-
- -- tony mancill <tmancill at debian.org>  Sun, 24 Aug 2014 13:52:40 -0700
-
-tomcat6 (6.0.41-1) unstable; urgency=medium
-
-  * New upstream release.
-    - Refreshed the patches
-
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 May 2014 10:03:04 +0200
-
-tomcat6 (6.0.39-1) unstable; urgency=medium
-
-  * Team upload.
-  * New upstream release.
-    - Refreshed the patches
-  * Standards-Version updated to 3.9.5 (no changes)
-  * Switch to debhelper level 9
-  * Use XZ compression for the upstream tarball
-  * Use canonical URL for the Vcs-Git field
-
- -- Emmanuel Bourg <ebourg at apache.org>  Mon, 17 Feb 2014 00:02:00 +0100
-
-tomcat6 (6.0.37-1) unstable; urgency=low
+ -- Markus Koschany <apo at debian.org>  Thu, 15 Sep 2016 15:41:21 +0200
 
-  * New upstream release.
-    - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
-      CVE-2012-2733, CVE-2012-3439
-    - Drop 0011-CVE-02012-0022-regression-fix.patch
-    - Drop 0017-eclipse-compiler-update.patch
-  * Freshened remaining patches.
-
- -- tony mancill <tmancill at debian.org>  Sat, 03 Aug 2013 21:50:20 -0700
-
-tomcat6 (6.0.35-7) unstable; urgency=low
+tomcat6 (6.0.45+dfsg-1~deb7u1) wheezy-security; urgency=high
 
   * Team upload.
-  * Fixed the watch file
-  * Fix FTBFS with ecj 3.8 (closes: #717279, #713796) 
-  * Updated the standards version to 3.9.4 - no changes
-  * Updated the Vcs-Git field to the canonical url
-
- -- Stephen Nelson <stephen at eccostudio.com>  Tue, 30 Jul 2013 23:07:18 +0100
+  * The full list of changes between 6.0.35 (the version previously available
+    in Wheezy) and 6.0.45 can be seen in the upstream changelog, which is
+    available online at http://tomcat.apache.org/tomcat-6.0-doc/changelog.html
+  * This update fixes the following security issues:
+    - CVE-2014-0033: prevent remote attackers from conducting session
+      fixation attacks via crafted URLs.
+    - CVE-2014-0119: Fix not properly constraining class loader that accesses
+      the XML parser used with an XSLT stylesheet which allowed remote
+      attackers to read arbitrary files via crafted web applications.
+    - CVE-2014-0099: Fix integer overflow in
+      java/org/apache/tomcat/util/buf/Ascii.java.
+    - CVE-2014-0096: Properly restrict XSLT stylesheets that allowed remote
+      attackers to bypass security-manager restrictions.
+    - CVE-2014-0075: Fix integer overflow in the parseChunkHeader function in
+      java/org/apache/coyote/http11/filters/ChunkedInputFilter.java.
+    - CVE-2013-4590: prevent "Tomcat internals" information leaks.
+    - CVE-2013-4322: prevent remote attackers from doing denial of service
+      attacks.
+    - CVE-2013-4286: reject requests with multiple content-length headers or
+      with a content-length header when chunked encoding is being used.
+    - Avoid CVE-2013-1571 when generating Javadoc.
+  * CVE-2014-0227.patch:
+    - Add error flag to allow subsequent attempts at reading after an error to
+      fail fast.
+  * CVE-2014-0230: Add support for maxSwallowSize.
+  * CVE-2014-7810:
+    - Fix potential BeanELResolver issue when running under a security manager.
+      Some classes may not be accessible but may have accessible interfaces.
+  * CVE-2015-5174: Directory traversal vulnerability in RequestUtil.java.
+  * CVE-2015-5345: The Mapper component in Apache Tomcat before 6.0.45
+    processes redirects before considering security constraints and Filters.
+  * CVE-2016-0706: Apache Tomcat before 6.0.45 does not place
+    org.apache.catalina.manager.StatusManagerServlet on the
+    org/apache/catalina/core/RestrictedServlets.properties list which allows
+    remote authenticated users to bypass intended SecurityManager
+    restrictions.
+  * CVE-2016-0714: The session-persistence implementation in Apache Tomcat
+    before 6.0.45 mishandles session attributes, which allows remote
+    authenticated users to bypass intended SecurityManager restrictions.
+  * CVE-2016-0763: The setGlobalContext method in
+    org/apache/naming/factory/ResourceLinkFactory.java in Apache Tomcat does
+    not consider whether ResourceLinkFactory.setGlobalContext callers are
+    authorized, which allows remote authenticated users to bypass intended
+    SecurityManager restrictions and read or write to arbitrary application
+    data, or cause a denial of service (application disruption), via a web
+    application that sets a crafted global context.
+  * CVE-2015-5351: The Manager and Host Manager applications in
+    Apache Tomcat establish sessions and send CSRF tokens for arbitrary new
+    requests, which allows remote attackers to bypass a CSRF protection
+    mechanism by using a token.
+  * Drop the following patches. Applied upstream.
+    - 0011-CVE-2012-0022-regression-fix.patch
+    - 0012-CVE-2012-3544.patch
+    - 0014-CVE-2012-4534.patch
+    - 0015-CVE-2012-4431.patch
+    - 0016-CVE-2012-3546.patch
+    - 0017-CVE-2013-2067.patch
+    - cve-2012-2733.patch
+    - cve-2012-3439.patch
+    - CVE-2014-0227.patch
+    - CVE-2014-0230.patch
+    - CVE-2014-7810-1.patch
+    - CVE-2014-7810-2.patch
+    - 0011-Fix-for-NoSuchElementException-when-an-attribute-has.patch
+
+ -- Markus Koschany <apo at debian.org>  Wed, 16 Mar 2016 14:08:48 +0100
+
+tomcat6 (6.0.35-6+deb7u1) stable-security; urgency=low
+
+  * CVE-2012-3544, CVE-2013-2067
+
+ -- Moritz Mühlenhoff <jmm at debian.org>  Thu, 18 Jul 2013 00:00:35 +0200
 
 tomcat6 (6.0.35-6) unstable; urgency=high
 
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index 2876bad..bb9e632 100644
--- a/debian/control
+++ b/debian/control
@@ -6,90 +6,89 @@ Uploaders: Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>,
  Damien Raude-Morvan <drazzib at debian.org>,
  Miguel Landaeta <miguel at miguel.cc>,
- tony mancill <tmancill at debian.org>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: default-jdk, ant-optional, debhelper (>= 9), po-debconf
+ tony mancill <tmancill at debian.org>
+Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
 Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
-Standards-Version: 3.9.7
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/tomcat6.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tomcat6.git
+Standards-Version: 3.9.3
 Homepage: http://tomcat.apache.org
+Vcs-Git: git://git.debian.org/git/pkg-java/tomcat6.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat6.git
 
-#Package: tomcat6-common
-#Architecture: all
-#Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends},
-# default-jre-headless | java7-runtime-headless | java7-runtime | java6-runtime-headless | java6-runtime | java5-runtime
-#Description: Servlet and JSP engine -- common files
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains common files needed by the tomcat6 and tomcat6-user
-# packages (Tomcat 6 scripts and libraries).
+Package: tomcat6-common
+Architecture: all
+Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends},
+ default-jre-headless | java7-runtime-headless | java7-runtime | java6-runtime-headless | java6-runtime | java5-runtime
+Description: Servlet and JSP engine -- common files
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains common files needed by the tomcat6 and tomcat6-user
+ packages (Tomcat 6 scripts and libraries). 
 
-#Package: tomcat6
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), ucf,
-# adduser, ${misc:Depends}
-#Recommends: authbind
-#Suggests: tomcat6-docs (>= ${source:Version}),
-# tomcat6-admin (>= ${source:Version}),
-# tomcat6-examples (>= ${source:Version}),
-# tomcat6-user (>= ${source:Version}),
-# libtcnative-1 (>= 1.1.30)
-#Description: Servlet and JSP engine
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains only the startup scripts for the system-wide daemon.
-# No documentation or web applications are included here, please install
-# the tomcat6-docs and tomcat6-examples packages if you want them.
-# Install the authbind package if you need to use Tomcat on ports 1-1023.
-# Install tomcat6-user instead of this package if you don't want Tomcat to
-# start as a service.
+Package: tomcat6
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ucf,
+ adduser, ${misc:Depends}
+Recommends: authbind
+Suggests: tomcat6-docs (>= ${source:Version}),
+ tomcat6-admin (>= ${source:Version}),
+ tomcat6-examples (>= ${source:Version}),
+ tomcat6-user (>= ${source:Version}),
+ libtcnative-1
+Description: Servlet and JSP engine
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains only the startup scripts for the system-wide daemon.
+ No documentation or web applications are included here, please install
+ the tomcat6-docs and tomcat6-examples packages if you want them.
+ Install the authbind package if you need to use Tomcat on ports 1-1023.
+ Install tomcat6-user instead of this package if you don't want Tomcat to
+ start as a service.
 
-#Package: tomcat6-user
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
-#Suggests: tomcat6-docs (>= ${source:Version}),
-# tomcat6-admin (>= ${source:Version}),
-# tomcat6-examples (>= ${source:Version}),
-# tomcat6 (>= ${source:Version})
-#Description: Servlet and JSP engine -- tools to create user instances
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains files needed to create a user Tomcat instance.
-# This user Tomcat instance can be started and stopped using the scripts
-# provided in the Tomcat instance directory.
+Package: tomcat6-user
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
+Suggests: tomcat6-docs (>= ${source:Version}),
+ tomcat6-admin (>= ${source:Version}),
+ tomcat6-examples (>= ${source:Version}),
+ tomcat6 (>= ${source:Version})
+Description: Servlet and JSP engine -- tools to create user instances
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains files needed to create a user Tomcat instance.
+ This user Tomcat instance can be started and stopped using the scripts
+ provided in the Tomcat instance directory.
 
-#Package: libtomcat6-java
-#Architecture: all
-#Depends: libecj-java,
-#         libcommons-dbcp-java,
-#         libcommons-pool-java,
-#         libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
-#Suggests: tomcat6 (>= ${source:Version})
-#Conflicts: tomcat6-common (<< 6.0.20-5)
-#Description: Servlet and JSP engine -- core libraries
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the Tomcat core classes which can be used by other
-# Java applications to embed Tomcat.
+Package: libtomcat6-java
+Architecture: all
+Depends: libecj-java,
+         libcommons-dbcp-java,
+         libcommons-pool-java,
+         libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
+Suggests: tomcat6 (>= ${source:Version})
+Conflicts: tomcat6-common (<< 6.0.20-5)
+Description: Servlet and JSP engine -- core libraries
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the Tomcat core classes which can be used by other
+ Java applications to embed Tomcat.
 
-#Package: libservlet2.4-java
-#Section: oldlibs
-#Priority: extra
-#Architecture: all
-#Depends: ${misc:Depends}, libservlet2.5-java
-#Description: Transitional package for libservlet2.5-java
-# This is a transitional package to facilitate upgrading from
-# libservlet2.4-java to libservlet2.5-java, and can be safely
-# removed after the installation is complete.
+Package: libservlet2.4-java
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, libservlet2.5-java
+Description: Transitional package for libservlet2.5-java
+ This is a transitional package to facilitate upgrading from
+ libservlet2.4-java to libservlet2.5-java, and can be safely
+ removed after the installation is complete.
 
 Package: libservlet2.5-java
 Architecture: all
@@ -114,44 +113,44 @@ Description: Servlet 2.5 and JSP 2.1 Java API documentation
  .
  This package contains the documentation for the Java Servlet and JSP library.
 
-#Package: tomcat6-admin
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- admin web applications
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the administrative web interfaces.
+Package: tomcat6-admin
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- admin web applications
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the administrative web interfaces.
 
-#Package: tomcat6-examples
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- example web applications
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the default Tomcat example webapps.
+Package: tomcat6-examples
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- example web applications
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the default Tomcat example webapps.
 
-#Package: tomcat6-docs
-#Section: doc
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- documentation
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the online documentation web application.
+Package: tomcat6-docs
+Section: doc
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- documentation
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the online documentation web application.
 
-#Package: tomcat6-extras
-#Architecture: all
-#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- additional components
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains additional ("extra") component libraries.
-# (Currently only catalina-jmx-remote.jar.)
+Package: tomcat6-extras
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- additional components
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains additional ("extra") component libraries.
+ (Currently only catalina-jmx-remote.jar.)
diff --git a/debian/copyright b/debian/copyright
index c9cb78a..12448db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ on Tomcat 5.5 and initial packaging by David Pashley <david at davidpashley.com>.
 It was downloaded from http://tomcat.apache.org
 
 Copyright: 
-  Copyright (C) 2000-2014, The Apache Software Foundation.
+  Copyright (C) 2000-2007 Apache Software Foundation.
   Copyright (C) International Business Machines Corporation 2002
 
 Authors:
diff --git a/debian/defaults.template b/debian/defaults.template
index 3ef3280..416312c 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -33,8 +33,6 @@ JAVA_OPTS="-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC"
 
 # Number of days to keep logfiles in /var/log/tomcat6. Default is 14 days.
 #LOGFILE_DAYS=14
-# Whether to compress logfiles older than today's
-#LOGFILE_COMPRESS=1
 
 # Location of the JVM temporary directory
 # WARNING: This directory will be destroyed and recreated at every startup !
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 22b8732..0dea910 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,7 +6,7 @@ DIR=tomcat6-$VERSION
 TAG=$(echo TOMCAT_$VERSION | sed -e 's/\./_/g')
 
 svn export http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/$TAG $DIR
-tar -c -J -f $TAR --exclude 'standard.jar' --exclude 'jstl.jar' $DIR
+tar -c -z -f $TAR --exclude 'standard.jar' --exclude 'jstl.jar' $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'
diff --git a/debian/rules b/debian/rules
index 864c3a4..8162d37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ build-stamp:
 	$(ANT_INVOKE) deploy-webapps
 	$(ANT_INVOKE) -buildfile extras.xml jmx-remote
 	javadoc -subpackages "javax.servlet" -d "output/api" \
-		-sourcepath "java" -author -version -breakiterator -notimestamp \
+		-sourcepath "java" -author -version -breakiterator \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
 		-bottom "Copyright © 2000-2008 Apache Software Foundation. All Rights Reserved."
 	touch build-stamp
@@ -79,7 +79,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	#dh_installman -ptomcat6-user debian/tomcat6-instance-create.1
+	dh_installman -ptomcat6-user debian/tomcat6-instance-create.1
 	dh_installexamples
 	dh_installinit --error-handler=true -- defaults 92 08
 	dh_installdebconf
@@ -90,30 +90,30 @@ binary-indep: build install
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/el-api.pom
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/jsp-api.pom
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
-	#mh_installpoms -plibtomcat6-java
-	#for i in $(T_MAVENIZED_JARS); do \
-	#	mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
-	#mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom \
-	#	$(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
-	#mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom \
-	#	$(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
-	#mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
-	#for i in $(T_JARS); do \
-	#	mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
-	#	dh_install -plibtomcat6-java \
-	#		$(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
-	#	dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
-	#		usr/share/java/$$i.jar && \
-	#	dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
-	#		usr/share/tomcat6/lib/$$i.jar; done
-	#for i in $(T_EXTRAS_JARS); do \
-	#	mv output/extras/$$i.jar output/extras/$$i-$(T_VER).jar && \
-	#	dh_install -plibtomcat6-java \
-	#		output/extras/$$i-$(T_VER).jar usr/share/java && \
-	#	dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
-	#		usr/share/java/$$i.jar && \
-	#	dh_link -ptomcat6-extras usr/share/java/$$i-$(T_VER).jar \
-	#		usr/share/tomcat6/lib/$$i.jar; done
+	mh_installpoms -plibtomcat6-java
+	for i in $(T_MAVENIZED_JARS); do \
+		mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
+	mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom \
+		$(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
+	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom \
+		$(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
+	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
+	for i in $(T_JARS); do \
+		mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
+		dh_install -plibtomcat6-java \
+			$(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
+		dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
+			usr/share/java/$$i.jar && \
+		dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
+			usr/share/tomcat6/lib/$$i.jar; done
+	for i in $(T_EXTRAS_JARS); do \
+		mv output/extras/$$i.jar output/extras/$$i-$(T_VER).jar && \
+		dh_install -plibtomcat6-java \
+			output/extras/$$i-$(T_VER).jar usr/share/java && \
+		dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
+			usr/share/java/$$i.jar && \
+		dh_link -ptomcat6-extras usr/share/java/$$i-$(T_VER).jar \
+			usr/share/tomcat6/lib/$$i.jar; done
 	dh_install --exclude=.bat --exclude=Thumbs.db
 	dh_link
 	mh_installpoms -plibservlet2.5-java
@@ -123,9 +123,9 @@ binary-indep: build install
 	rm -r debian/poms
 	rm -rf debian/tomcat6/usr/share/tomcat6/webapps/default_root/.svn \
 		debian/tomcat6/usr/share/tomcat6/webapps/default_root/META-INF/.svn
-	#chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
-	#chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
-	#chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
+	chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
+	chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
+	chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff --git a/debian/tomcat6.cron.daily b/debian/tomcat6.cron.daily
index a585050..016018c 100644
--- a/debian/tomcat6.cron.daily
+++ b/debian/tomcat6.cron.daily
@@ -2,14 +2,11 @@
 
 NAME=tomcat6
 DEFAULT=/etc/default/$NAME
-LOGEXT=log
 
 # The following variables can be overwritten in $DEFAULT
 
 # Default for number of days to keep old log files in /var/log/tomcatN/
 LOGFILE_DAYS=14
-# Whether to compress logfiles older than today's
-LOGFILE_COMPRESS=1
 
 # End of variables that can be overwritten in $DEFAULT
 
@@ -19,12 +16,6 @@ if [ -f "$DEFAULT" ]; then
 fi
 
 if [ -d /var/log/$NAME ]; then
-	if [ $LOGFILE_COMPRESS = 1 ]; then
-		find /var/log/$NAME/ -name \*.$LOGEXT -daystart -mtime +0 -print0 \
-			| xargs --no-run-if-empty -0 gzip -9
-		LOGEXT=log.gz
-	fi
-
-	find /var/log/$NAME/ -name \*.$LOGEXT -mtime +$LOGFILE_DAYS -print0 \
+	find /var/log/$NAME/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \
 		| xargs --no-run-if-empty -0 rm --
 fi
diff --git a/debian/tomcat6.init b/debian/tomcat6.init
index c121552..bf06d18 100644
--- a/debian/tomcat6.init
+++ b/debian/tomcat6.init
@@ -170,8 +170,11 @@ catalina_sh() {
 
 	# Run the catalina.sh script as a daemon
 	set +e
-	touch "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
-	chown $TOMCAT6_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
+	if [ ! -f "$CATALINA_BASE"/logs/catalina.out ]; then
+		install -o $TOMCAT6_USER -g adm -m 644 /dev/null "$CATALINA_BASE"/logs/catalina.out
+	fi
+	install -o $TOMCAT6_USER -g adm -m 644 /dev/null "$CATALINA_PID"
+
 	start-stop-daemon --start -b -u "$TOMCAT6_USER" -g "$TOMCAT6_GROUP" \
 		-c "$TOMCAT6_USER" -d "$CATALINA_TMPDIR" -p "$CATALINA_PID" \
 		-x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
diff --git a/debian/watch b/debian/watch
index a9b6a7b..740c410 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,uversionmangle=s/_/./g \
+opts=uversionmangle=s/_/./g \
   http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/ TOMCAT_([0-9_]*[0-9])/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git



More information about the pkg-java-commits mailing list