Package: tomcat7 Version: 7.0.26-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/patches/0012-java7-compat.patch: Added compatibility patch to support compilation with openjdk-7 as default-jdk (LP: #889002). * d/default_root/index.html: Fixup instructions for enabling manager web application access (LP: #910368). Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPop08AAoJEL/srsug59jDz5cP/0nCyVSyYjChEetEr7lRRK3k OSsfcsyzSGeXDGCsffTSyXDKutwn7IwO9XygaGITDhZYndCVp+HnljfgA8L4Uwii 3gV5PnEj5pgVTvTnO5Yb+BKE+9YgYA2pOUOZyHNtE1MWZBaUEXw0Zf0xfOmu6Ck+ brJHVR/h0+zXRl4TvWZB18FUILpLdLQA+QkdzWDZYpq0F7oxIcI6eVSFxSqBFUfu dW6NFOwIHyTqhjDSvdS2gPLCrnwrenPe2Htb/6pzdDuR+QxMAbTC6eHB4flQkwej cpzJyb9aa0OBRJy7HXvQji/pHc3dOLkfkFc59Qb5ZVp2BCeRs/QB55USWNvdwUaH fmaMMSgnKIxVVnPHBBKFoJ0incogXzC1QsHEO5OZnechBUddudOcROnkfPA8CptM 9xLeKxh1azJnMrY3I9YN4hhRvmP6PWJx7XPMNQtANrQEIg8wkz7uEchFCa8VrHFj 2Pqvrho72RdNM717ogXjoKoG/5I5SisDkb++zafOFo0qpll+ijdjpSkWrKdRrecA F7LAIrugY4ssgmSbIpcSXbpkJCovwoJ8vuepvITcxY+Cqj4ghDx/Dl5WCj4ytNm1 v/pJFQqMJv0zf92mzarNx2gWtBe9XR2eL77rJu87phpnM7LWQg+SIGnChbseMd/h AgLG6FI7hR4byXEBJMre =WmsE -----END PGP SIGNATURE-----
diff -Nru tomcat7-7.0.26/debian/changelog tomcat7-7.0.26/debian/changelog diff -Nru tomcat7-7.0.26/debian/control tomcat7-7.0.26/debian/control --- tomcat7-7.0.26/debian/control 2012-04-27 05:48:04.000000000 +0100 +++ tomcat7-7.0.26/debian/control 2012-05-03 14:46:34.000000000 +0100 @@ -1,7 +1,8 @@ Source: tomcat7 Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: James Page <james.p...@ubuntu.com>, Miguel Landaeta <mig...@miguel.cc>, tony mancill <tmanc...@debian.org>, Jakub Adam <jakub.a...@ktknet.cz> diff -Nru tomcat7-7.0.26/debian/default_root/index.html tomcat7-7.0.26/debian/default_root/index.html --- tomcat7-7.0.26/debian/default_root/index.html 2012-04-27 05:48:04.000000000 +0100 +++ tomcat7-7.0.26/debian/default_root/index.html 2012-05-03 14:57:47.000000000 +0100 @@ -23,7 +23,7 @@ <p><b>tomcat7-admin</b>: This package installs two web applications that can help managing this Tomcat instance. Once installed, you can access the <a href="manager/html">manager webapp</a> and the <a href="host-manager/html">host-manager webapp</a>.<p> -<p>NOTE: For security reasons, using the manager webapp is restricted to users with role "manager". The host-manager webapp is restricted to users with role "admin". Users are defined in <code>/etc/tomcat7/tomcat-users.xml</code>.</p> +<p>NOTE: For security reasons, using the manager webapp is restricted to users with role "manager-gui". The host-manager webapp is restricted to users with role "admin-gui". Users are defined in <code>/etc/tomcat7/tomcat-users.xml</code>.</p> </body> </html> diff -Nru tomcat7-7.0.26/debian/patches/0012-java7-compat.patch tomcat7-7.0.26/debian/patches/0012-java7-compat.patch --- tomcat7-7.0.26/debian/patches/0012-java7-compat.patch 1970-01-01 01:00:00.000000000 +0100 +++ tomcat7-7.0.26/debian/patches/0012-java7-compat.patch 2012-05-03 14:42:28.000000000 +0100 @@ -0,0 +1,27 @@ +Description: Compatibility patch to support compilation of tomcat7 + using openjdk-7 +Author: James Page <james.p...@ubuntu.com> +Forwarded: not-needed + +Index: tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java +=================================================================== +--- tomcat7-7.0.26.orig/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java 2012-05-03 14:41:45.741927187 +0100 ++++ tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java 2012-05-03 14:42:25.730122612 +0100 +@@ -28,6 +28,8 @@ + import org.apache.juli.logging.Log; + import org.apache.juli.logging.LogFactory; + ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + + /** + * A DataSource that can be instantiated through IoC and implements the DataSource interface +@@ -153,5 +155,7 @@ + } + } + +- ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } diff -Nru tomcat7-7.0.26/debian/patches/series tomcat7-7.0.26/debian/patches/series --- tomcat7-7.0.26/debian/patches/series 2012-04-27 05:48:04.000000000 +0100 +++ tomcat7-7.0.26/debian/patches/series 2012-05-03 14:27:11.000000000 +0100 @@ -7,3 +7,4 @@ 0009-Use-java.security.policy-file-in-catalina.sh.patch 0010-debianize-build-xml.patch 0011-fix-classpath-lintian-warnings.patch +0012-java7-compat.patch
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.