[tomcat6] 01/02: Imported Debian patch 6.0.45-1~deb6u1

Markus Koschany apo-guest at moszumanska.debian.org
Sat Feb 27 15:44:10 GMT 2016


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

apo-guest pushed a commit to branch squeeze-security
in repository tomcat6.

commit acc77496e0a2f699ded31fb17c4e1825a942112c
Author: Markus Koschany <apo at debian.org>
Date:   Sat Feb 27 15:47:44 2016 +0100

    Imported Debian patch 6.0.45-1~deb6u1
---
 debian/changelog                                   |  93 ++++++---
 debian/compat                                      |   2 +-
 debian/control                                     | 226 ++++++++++-----------
 debian/rules                                       |  58 +++---
 .../WEB-INF/lib/taglibs-standard-impl-1.2.5.jar    | Bin 0 -> 206430 bytes
 .../WEB-INF/lib/taglibs-standard-spec-1.2.5.jar    | Bin 0 -> 40153 bytes
 6 files changed, 206 insertions(+), 173 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 739af2c..15ac2be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,11 @@
-tomcat6 (6.0.45-1) unstable; urgency=medium
-
-  * Team upload.
-  * Imported Upstream version 6.0.45.
-  * 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.
+tomcat6 (6.0.45-1~deb6u1) squeeze-lts; urgency=high
+
+  * Non-maintainer upload by the Debian LTS team.
+  * Backport version 6.0.45 to Squeeze-LTS.
+    The full list of changes between 6.0.41 (the version previously available
+    in Squeeze-LTS) 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 vulnerabilities:
     - 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.
@@ -15,9 +14,9 @@ tomcat6 (6.0.45-1) unstable; urgency=medium
       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-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
@@ -29,24 +28,58 @@ tomcat6 (6.0.45-1) unstable; urgency=medium
       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 16:12:05 +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
+  * Drop the following patches. They were applied upstream.
+    - 0011-Fix-for-NoSuchElementException-when-an-attribute-has.patch.
+    - CVE-2014-0227.patch.
+    - CVE-2014-0230.patch.
+    - CVE-2014-7810-1.patch.
+    - CVE-2014-7810-2.patch.
+
+ -- Markus Koschany <apo at debian.org>  Sat, 27 Feb 2016 15:47:44 +0100
+
+tomcat6 (6.0.41-2+squeeze7) squeeze-lts; urgency=medium
+
+  * Security upload by the Debian LTS team.
+  * This upload fixes the following issues:
+    - CVE-2014-0227: HTTP request smuggling or DoS by streaming malformed data.
+    - CVE-2014-0230: non-persistent DoS attack by feeding data aborting an
+      upload.
+    - CVE-2014-7810: security manager bypass by using expression language.
+
+ -- Santiago Ruano Rincón <santiagorr at riseup.net>  Thu, 28 May 2015 10:02:27 +0200
+
+tomcat6 (6.0.41-2+squeeze6) squeeze-lts; urgency=medium
+
+  * Security upload by the Debian LTS team.
+  * This update fixes a regression:
+    - Fix for "NoSuchElementException when an attribute has empty string as
+      value." Reported upstream as
+      https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
+
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 16 Jan 2015 21:34:40 +0100
+
+tomcat6 (6.0.41-2+squeeze5) squeeze-lts; urgency=medium
+
+  * Security upload by the Debian LTS team.
+  * The full list of changes between 6.0.35 (the version previously available
+    in squeeze) and 6.0.41 can be see 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-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-2012-3439: various improvements to the DIGEST authenticator.
+  * Thanks to Tony Mancill for doing the vast amount of the work for this
+    update!
+  * Downgrade debian/compat to 8 and reduce build-dependency do debhelper 8
+    to match the squeeze squeeze version
+
+ -- Holger Levsen <holger at debian.org>  Fri, 21 Nov 2014 20:08:38 +0100
 
 tomcat6 (6.0.41-2) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index ec63514..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+8
diff --git a/debian/control b/debian/control
index 2876bad..7ff9b9a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,88 +8,88 @@ Uploaders: Torsten Werner <twerner 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
+Build-Depends: default-jdk, ant-optional, debhelper (>= 8), 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.5
+Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat6.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat6.git
 Homepage: http://tomcat.apache.org
 
-#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 (>= 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-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 +114,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/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/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar b/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
new file mode 100644
index 0000000..9176777
Binary files /dev/null and b/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar differ
diff --git a/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar b/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
new file mode 100644
index 0000000..d547867
Binary files /dev/null and b/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar differ

-- 
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