Last commit made on 2013-05-28
Get this branch:
git clone -b ubuntu/raring-updates https://git.launchpad.net/ubuntu/+source/tomcat7
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

f14ad63... by Marc Deslauriers on 2013-05-21

Import patches-unapplied version 7.0.35-1~exp2ubuntu1.1 to ubuntu/raring-security

Imported using git-ubuntu import.

Changelog parent: 58eef8c2e35a56f6516724e2e055a0f29af9375d

New changelog entries:
  * SECURITY UPDATE: information leak via AsyncListeners and
    RuntimeExceptions (LP: #1178645)
    - debian/patches/CVE-2013-2071.patch: catch RuntimeExceptions in
      java/org/apache/catalina/core/AsyncContextImpl.java, added tests to
    - CVE-2013-2071

58eef8c... by James Page on 2013-04-08

Import patches-unapplied version 7.0.35-1~exp2ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 9d6236e36596267ad814163898b092335640ec28

New changelog entries:
  * Fix FTBFS due to expired test certificates (LP: #1166187):
    - d/keystores/*.jks: Newer keystores from upstream 7.0.39.
    - d/rules: Install newer keystores for testing, tidy up after use.
    - d/p/0018-update-test-certificates.patch: Cherry picked fixes from
      upstream VCS to update text based certificates.

9d6236e... by James Page on 2013-02-24

Import patches-unapplied version 7.0.35-1~exp2 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 004ca113abdb63c5e95a1819a1b895ab5af0db0d

New changelog entries:
  * Switch from Commons DBCP to Tomcat JDBC Pool as default connection
    pool implementation (Closes: #701023).

004ca11... by Tony Mancill on 2013-02-03

Import patches-unapplied version 7.0.35-1~exp1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 9763778d1342354108c40e19c91c5deec22d8ea5

New changelog entries:
  * New upstream version 7.0.35
  * Add patch to disable TestCometProcessor.testConnectionClose().
    This test fails consistently (although the Comet processor
    appears to function correctly).
  * Add patch for upstream bug 54440 (JSP compilation)

9763778... by Tony Mancill on 2013-01-02

Import patches-unapplied version 7.0.34-1~exp1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 4732c5459bcdb790a2da6f69ea78f246ff3b4102

New changelog entries:
  * Upload to experimental (Vcs-Git branch is exp/master.)
  * New upstream version 7.0.34
  * remove patches included in the upstream release
    - cve-2012-3439.patch
    - cve-2012-3439-tests.patch
    - 0016-CVE-2012-4431.patch
    - 0017-CVE-2012-3546.patch
  * refresh patches
  * add /usr/lib/jvm/java-7-oracle to JDK search path
    - Thanks to Nuno Afonso. (Closes: #679012)
  * add log compression to logrotate cronjob via defaults file
    - Thanks to Thijs Kinkhorst. (Closes: #696944)
  * add distinct javax poms to install JARs using both Tomcat and javax
    coordinates (Closes: #691773)
  * update catalina.properties to expand ${catalina.home} instead of
    referencing /var/lib/tomcat7 explicitly.
    - Thanks to H.-Dirk Schmidt (Closes: #691865)

4732c54... by Tony Mancill on 2012-12-07

Import patches-unapplied version 7.0.28-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8ae5d4f828f102e4ec3755459b746eef1df461a3

New changelog entries:
  * Acknowledge NMU: 7.0.28-3+nmu1 (Closes: #692440)
    - Thank you to Michael Gilbert.
  * Add patches for the following security issues: (Closes: #695251)
    - CVE-2012-4431, CVE-2012-3546

8ae5d4f... by Michael Gilbert <email address hidden> on 2012-11-18

Import patches-unapplied version 7.0.28-3+nmu1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6db617f6d4b2967901cbf8f293ae8da67370f21d

New changelog entries:
  * Non-maintainer upload.
  * Fix cve-2012-3439: multiple replay attack issues in digest authentication.
    (closes: #692440)

6db617f... by Tony Mancill on 2012-09-27

Import patches-unapplied version 7.0.28-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b7f710dfd16938d59f06b5fcc4afb2cd6437827c

New changelog entries:
  [ Miguel Landaeta ]
  * Fix small typo in README.Debian.
  [ tony mancill ]
  * Use ucf and a template for /etc/logrotate.d/tomcat6 file to avoid
    updating the shipped conffile. (Closes: #688936)

b7f710d... by Tony Mancill on 2012-07-11

Import patches-unapplied version 7.0.28-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c3caf4d3882750aa470d850435f14189482384b7

New changelog entries:
  [ Jakub Adam ]
  * Ensure webapps/examples/WEB-INF/lib exists before files are
    copied there.
  * Fix FTBFS when user home dir doesn't exist (Closes: #680844).
  [ tony mancill ]
  * Fix build to generate postrm from postrm.in (Closes: #681160)

c3caf4d... by Tony Mancill on 2012-06-22

Import patches-unapplied version 7.0.28-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5d4d2799f17c0557b5a6a31db462e81f4b862ff4

New changelog entries:
  [ Miguel Landaeta ]
  * Add Slovak debconf translation (Closes: #677913).
    - Thanks to Ivan Mas├ír.
  [ James Page ]
  * New upstream release.
  * Enable test suite during package build:
    - d/control: Add junit4, libjstl1.1-java and
      libjakarta-taglibs-standard-java to BDI's.
    - d/rules:
      + Add ant/junit4 jars files to build classpath.
      + Target java 1.6 to support test suite exection.
      + Specify location of junit jar file.
      + Install jstl jar files to example webapp during build.
      + Conditionally execute test target if required.
      + Purge jar files from example webapp during clean.
  * Fix JSTL examples in examples web application:
    - d/control: Add dependencies on libjstl1.1-java and
      libjakarta-taglibs-standard-java for tomcat7-examples.
    - d/tomcat7-examples.links: Add links to jstl and standard jar
      files for examples web application.
    - d/context/examples.xml: Allow linking to jar files in examples
  * Fix mapping to javax packages for API jar files:
    - d/maven.[rules,publishedRules]: Ensure all javax.[servlet|el] jar files
      are published to the correct locations in /usr/share/[maven-repo|java].
    - d/libservlet3.0-java.manifest: Update jar file locations for javax
    - d/libservlet3.0-java.links: Provide backwards compatible links for
      deprecated tomcat-*.jar files in /usr/share/java.
  [ tony mancill ]
  * Set DMUA flag.