[libapache-mod-jk] 54/65: Import Debian patch 1:1.2.41-1
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 8 14:14:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libapache-mod-jk.
commit 4cfe5d6afcdd3c54cc33744eaf8428f06311591e
Merge: 5ba6bec d098e89
Author: Markus Koschany <apo at debian.org>
Date: Fri Oct 30 22:33:34 2015 +0100
Import Debian patch 1:1.2.41-1
HOWTO-RELEASE.txt | 14 +-
NOTICE | 2 +-
conf/httpd-jk.conf | 6 +
conf/uriworkermap.properties | 31 +-
conf/workers.properties | 12 +-
conf/workers.properties.minimal | 45 -
debian/changelog | 60 +-
debian/clean | 96 +
debian/control | 38 +-
debian/copyright | 84 +-
debian/libapache2-mod-jk.NEWS | 4 +-
debian/libapache2-mod-jk.README.Debian | 2 +-
debian/libapache2-mod-jk.install | 8 +-
.../0004-corrupted-worker-activation-status.patch | 27 -
debian/patches/CVE-2014-8111.patch | 474 -
debian/patches/fix-privacy-breach.patch | 26 +
debian/patches/series | 3 +-
debian/rules | 15 +-
debian/source.lintian-overrides | 2 -
debian/workers.properties | 4 +-
docs/ajp/ajpv13a.html | 27 +-
docs/ajp/ajpv13ext.html | 6 +-
docs/ajp/printer/ajpv13a.html | 27 +-
docs/ajp/printer/ajpv13ext.html | 6 +-
.../loadbalancers.html | 8 +-
.../printer/loadbalancers.html | 8 +-
.../printer/proxy.html | 42 +-
.../printer/quick.html | 4 +-
.../printer/timeouts.html | 23 +-
.../printer/workers.html | 22 +-
docs/{generic_howto => common_howto}/proxy.html | 42 +-
docs/{generic_howto => common_howto}/quick.html | 4 +-
docs/{generic_howto => common_howto}/timeouts.html | 23 +-
docs/{generic_howto => common_howto}/workers.html | 22 +-
docs/index.html | 164 +-
docs/miscellaneous/changelog.html | 292 +-
docs/miscellaneous/doccontrib.html | 4 +-
docs/miscellaneous/faq.html | 39 +-
docs/miscellaneous/jkstatustasks.html | 4 +-
docs/miscellaneous/printer/changelog.html | 292 +-
docs/miscellaneous/printer/doccontrib.html | 4 +-
docs/miscellaneous/printer/faq.html | 39 +-
docs/miscellaneous/printer/jkstatustasks.html | 4 +-
docs/miscellaneous/printer/reporttools.html | 4 +-
docs/miscellaneous/reporttools.html | 4 +-
docs/news/20041100.html | 4 +-
docs/news/20050101.html | 4 +-
docs/news/20060101.html | 4 +-
docs/news/20070301.html | 4 +-
docs/news/20081001.html | 4 +-
docs/news/20090301.html | 10 +-
docs/news/20100101.html | 4 +-
docs/news/20110701.html | 4 +-
docs/news/20120301.html | 18 +-
docs/news/20140201.html | 36 +
docs/news/20150101.html | 19 +
docs/news/printer/20041100.html | 4 +-
docs/news/printer/20050101.html | 4 +-
docs/news/printer/20060101.html | 4 +-
docs/news/printer/20070301.html | 4 +-
docs/news/printer/20081001.html | 4 +-
docs/news/printer/20090301.html | 10 +-
docs/news/printer/20100101.html | 4 +-
docs/news/printer/20110701.html | 4 +-
docs/news/printer/20120301.html | 18 +-
docs/news/printer/20140201.html | 35 +
docs/news/printer/20150101.html | 18 +
docs/printer/index.html | 164 +-
docs/reference/apache.html | 191 +-
docs/reference/iis.html | 70 +-
docs/reference/printer/apache.html | 191 +-
docs/reference/printer/iis.html | 70 +-
docs/reference/printer/status.html | 15 +-
docs/reference/printer/uriworkermap.html | 21 +-
docs/reference/printer/workers.html | 168 +-
docs/reference/status.html | 15 +-
docs/reference/uriworkermap.html | 21 +-
docs/reference/workers.html | 168 +-
docs/webserver_howto/apache.html | 138 +-
docs/webserver_howto/iis.html | 14 +-
docs/webserver_howto/nes.html | 12 +-
docs/webserver_howto/printer/apache.html | 138 +-
docs/webserver_howto/printer/iis.html | 14 +-
docs/webserver_howto/printer/nes.html | 12 +-
jkstatus/build.xml | 2 +-
.../src/share/org/apache/jk/status/JkBalancer.java | 2 +-
.../org/apache/jk/status/JkBalancerMapping.java | 2 +-
.../org/apache/jk/status/JkBalancerMember.java | 2 +-
.../src/share/org/apache/jk/status/JkResult.java | 2 +-
.../src/share/org/apache/jk/status/JkServer.java | 2 +-
.../src/share/org/apache/jk/status/JkSoftware.java | 2 +-
.../src/share/org/apache/jk/status/JkStatus.java | 2 +-
.../org/apache/jk/status/JkStatusAccessor.java | 2 +-
.../share/org/apache/jk/status/JkStatusParser.java | 2 +-
native/BUILDING.txt | 2 +-
native/Makefile.in | 633 +-
native/STATUS.txt | 8 +-
native/aclocal.m4 | 13780 +++++---
native/apache-1.3/Makefile.apxs.in | 11 +-
native/apache-1.3/Makefile.in | 102 +-
native/apache-1.3/mod_jk.c | 343 +-
native/apache-2.0/Makefile.apxs.in | 11 +-
native/apache-2.0/Makefile.in | 25 +-
native/apache-2.0/mod_jk.c | 348 +-
native/buildconf.sh | 4 +-
native/common/Makefile.in | 3 +-
native/common/config.h.in | 41 +-
native/common/jk_ajp12_worker.c | 35 +-
native/common/jk_ajp13.h | 8 +-
native/common/jk_ajp14.c | 8 +-
native/common/jk_ajp14.h | 8 +-
native/common/jk_ajp14_worker.c | 8 +-
native/common/jk_ajp_common.c | 679 +-
native/common/jk_ajp_common.h | 46 +-
native/common/jk_connect.c | 578 +-
native/common/jk_connect.h | 14 +-
native/common/jk_global.h | 110 +-
native/common/jk_lb_worker.c | 290 +-
native/common/jk_lb_worker.h | 24 +-
native/common/jk_logger.h | 3 +-
native/common/jk_map.c | 159 +-
native/common/jk_map.h | 10 +-
native/common/jk_md5.h | 7 -
native/common/jk_msg_buff.h | 4 +-
native/common/jk_service.h | 33 +-
native/common/jk_shm.c | 141 +-
native/common/jk_shm.h | 77 +-
native/common/jk_status.c | 1380 +-
native/common/jk_uri_worker_map.c | 124 +-
native/common/jk_uri_worker_map.h | 11 +-
native/common/jk_url.c | 180 +
native/common/jk_url.h | 28 +
native/common/jk_util.c | 512 +-
native/common/jk_util.h | 28 +-
native/common/jk_version.h | 4 +-
native/common/jk_worker.c | 58 +-
native/common/jk_worker.h | 4 +-
native/configure | 33318 +++++++------------
native/{configure.in => configure.ac} | 87 +-
native/iis/README | 2 +-
native/iis/installer/bin/README | 2 +-
.../iis/installer/conf/isapi_redirect.properties | 86 +
native/iis/installer/conf/rewrite.properties | 6 +-
native/iis/installer/conf/uriworkermap.properties | 31 +-
.../iis/installer/conf}/workers.properties | 12 +-
.../iis/installer/conf/workers.properties.minimal | 45 -
native/iis/installer/iisfilter.vbs | 4 +-
.../iis/installer/isapi-redirector-win32-msi.ism | 15 +-
native/iis/installer/log/README | 2 +-
native/iis/isapi_redirect.reg | 8 +-
native/iis/jk_isapi_plugin.c | 191 +-
native/netscape/README | 2 +-
native/netscape/jk_nsapi_plugin.c | 6 +-
native/nt_service/jk_nt_service.c | 1233 -
native/nt_service/nt_service.dsp | 199 -
native/scripts/build/unix/compile | 347 +
native/scripts/build/unix/config.guess | 342 +-
native/scripts/build/unix/config.sub | 104 +-
native/scripts/build/unix/install-sh | 551 +-
native/scripts/build/unix/ltmain.sh | 14471 ++++----
native/scripts/build/unix/missing | 450 +-
tools/dist/README.html | 41 +-
tools/dist/binaries/windows/README.html | 10 +-
tools/jkbindist.sh | 12 +-
tools/jkrelease.sh | 2 +-
tools/signfile.sh | 3 +-
xdocs/ajp/ajpv13a.xml | 25 +-
xdocs/ajp/ajpv13ext.xml | 4 +-
xdocs/ajp/project.xml | 35 +-
xdocs/build.xml | 192 +-
.../loadbalancers.xml | 6 +-
xdocs/{generic_howto => common_howto}/project.xml | 35 +-
xdocs/{generic_howto => common_howto}/proxy.xml | 40 +-
xdocs/{generic_howto => common_howto}/quick.xml | 2 +-
xdocs/{generic_howto => common_howto}/timeouts.xml | 21 +-
xdocs/{generic_howto => common_howto}/workers.xml | 20 +-
xdocs/empty.xml | 2 +-
xdocs/index.xml | 162 +-
xdocs/miscellaneous/changelog.xml | 291 +-
xdocs/miscellaneous/doccontrib.xml | 2 +-
xdocs/miscellaneous/faq.xml | 37 +-
xdocs/miscellaneous/jkstatustasks.xml | 2 +-
xdocs/miscellaneous/project.xml | 35 +-
xdocs/miscellaneous/reporttools.xml | 2 +-
xdocs/news/20090301.xml | 6 +-
xdocs/news/20120301.xml | 14 +
xdocs/news/{20120301.xml => 20140201.xml} | 49 +-
xdocs/news/20150101.xml | 50 +
xdocs/news/project.xml | 35 +-
xdocs/project.xml | 36 +-
xdocs/reference/apache.xml | 228 +-
xdocs/reference/iis.xml | 67 +-
xdocs/reference/project.xml | 35 +-
xdocs/reference/status.xml | 11 +-
xdocs/reference/uriworkermap.xml | 17 +-
xdocs/reference/workers.xml | 182 +-
xdocs/style.xsl | 4 +-
xdocs/webserver_howto/apache.xml | 136 +-
xdocs/webserver_howto/iis.xml | 12 +-
xdocs/webserver_howto/nes.xml | 10 +-
xdocs/webserver_howto/project.xml | 35 +-
201 files changed, 37895 insertions(+), 39138 deletions(-)
diff --cc debian/changelog
index f82c5ac,0000000..8a7ba5b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,336 -1,0 +1,366 @@@
- libapache-mod-jk (1:1.2.37-4+deb8u1) jessie-security; urgency=high
++libapache-mod-jk (1:1.2.41-1) unstable; urgency=medium
+
+ * Team upload.
- * Add CVE-2014-8111.patch. (Closes: #783233)
- It was discovered that a JkUnmount rule for a subtree of a previous JkMount
- rule could be ignored. This could allow a remote attacker to potentially
- access a private artifact in a tree that would otherwise not be accessible
- to them.
- - Add option to control handling of multiple adjacent slashes in mount and
- unmount. New default is collapsing the slashes only in unmount. Before
- this change, adjacent slashes were never collapsed, so most mounts and
- unmounts didn't match for URLs with multiple adjacent slashes.
- - Configuration is done via new JkOption for Apache
- (values "CollapseSlashesAll", "CollapseSlashesNone" or
- "CollapseSlashesUnmount").
-
- -- Markus Koschany <apo at gambaru.de> Sat, 23 May 2015 01:16:37 +0200
++ * Imported Upstream version 1.2.41.
++ * Drop README.source. We use regular upstream releases again.
++ * Update get-orig-source target. Use --verbose and --download-current-version
++ flags.
++ * Drop disable-libtool-check.patch. Not required for normal releases.
++ * Vcs-Browser: Use https.
++ * Remove autoconf and automake from Build-Depends again.
++ * Run wrap-and-sort -sa.
++ * Add clean file and ensure libapache-mod-jk can be built twice in a row.
++ * debian/rules: Remove override for dh_auto_clean.
++ * Update debian/copyright for new release.
++
++ -- Markus Koschany <apo at debian.org> Fri, 30 Oct 2015 22:33:34 +0100
++
++libapache-mod-jk (1:1.2.40+svn150520-1) unstable; urgency=high
++
++ * Team upload.
++ * Imported Upstream SVN snapshot version 1.2.40+svn150520.
++ - Fix CVE-2014-8111: (Closes: #783233)
++ Apache Tomcat Connectors (mod_jk) ignored JkUnmount rules for subtrees of
++ previous JkMount rules, which allows remote attackers to access otherwise
++ restricted artifacts via unspecified vectors.
++ * debian/control: Build-Depend on debhelper >= 9.
++ * Remove source.lintian-overrides since we now build-depend on debhelper >=9.
++ * Drop 0004-corrupted-worker-activation-status.patch. Fixed upstream.
++ * debian/rules:
++ - Disable sed command in debian/rules. Apparently not necessary for this
++ release.
++ - Run buildconf.sh before dh_auto_configure step since this is a requirement
++ for building SVN snapshots.
++ - Update dh_auto_clean override. Ensure that the package can be built twice
++ in a row.
++ * debian/control:
++ - Add autoconf to Build-Depends.
++ - Add automake to Build-Depends.
++ - Remove Conflicts and Replaces fields because they are obsolete.
++ * Add disable-libtool-check.patch and fix a FTBFS. We already build-depend on
++ libtool but the script is not smart enough.
++ * Add fix-privacy-breach.patch and fix lintian errors about "privacy breach
++ logo".
++ * Update debian/copyright information. Add missing BSD-3-clause license.
++ * Add README.source.
++
++ -- Markus Koschany <apo at gambaru.de> Thu, 21 May 2015 17:53:24 +0200
+
+libapache-mod-jk (1:1.2.37-4) unstable; urgency=medium
+
+ * Team upload.
+ * Switched to tomcat8 (Closes: #759624)
+ * Standards-Version updated to 3.9.6 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 17 Nov 2014 14:52:23 +0100
+
+libapache-mod-jk (1:1.2.37-3) unstable; urgency=low
+
+ * d/rules: Fix "Hardening CPPFLAGS missing" (Closes: #710809).
+ Thanks to Simon Ruderich for providing patch.
+ * d/patches/0004-corrupted-worker-activation-status.patch:
+ Fix "Worker activation state corrupted when using jkmanager",
+ Thanks to David Gubler for patch (Closes: #711934).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 12 Aug 2013 10:28:44 +0200
+
+libapache-mod-jk (1:1.2.37-2) unstable; urgency=low
+
+ * Re-enable Apache 2.4 transition after wheezy release (Closes: #666851):
+ - d/control: Add Build-Depends apache2-dev and dh-apache2.
+ - d/rules: Call apache2 dh addon.
+ - d/libapache2-mod-jk.{postinst,postrm}: Replace with
+ d/libapache2-mod-jk.apache2.
+ - d/control: Remove explicit Depends on apache2.2-common.
+ * d/control: Bump Standards-Version to 3.9.4: no changes needed.
+ * d/control: Use canonical URL for Vcs-* fields.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 01 Jun 2013 15:14:00 +0200
+
+libapache-mod-jk (1:1.2.37-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 03 Jun 2012 23:09:32 +0200
+
+libapache-mod-jk (1:1.2.36-1) unstable; urgency=low
+
+ * New upstream release.
+ * Revert Apache 2.4 transition (ie. just for wheezy release).
+ * Refresh patches.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 18 May 2012 19:20:50 +0200
+
+libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
+
+ * New upstream release:
+ - d/patches/0004-compiler-hardening.patch: Merged upstream.
+ * d/rules: Just use dh_auto. No need to force using sub-directory as
+ debhelper is doing it for us.
+ * Prepare Apache 2.4 transition (Closes: #666851):
+ - d/control: Add Build-Depends apache2-dev and dh-apache2.
+ - d/rules: Call apache2 dh addon.
+ - d/libapache2-mod-jk.{postinst,postrm}: Replace with
+ d/libapache2-mod-jk.apache2.
+ - d/control: Remove explicit Depends on apache2.2-common.
+ * d/control: Bump Standards-Version to 3.9.3, no changes needed.
+ * d/copyright: Upgrade to copyright-format 1.0.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 04 Apr 2012 22:32:12 +0200
+
+libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
+
+ * Team upload.
+ * Set debian/compat to 9; bump debhelper dependency to 8.1.3.
+ * Modify debian/rules to enable hardening flags
+ and add patches/0004-compiler-hardening.patch (Closes: #656876)
+ * Remove Michael Koch from Uploaders. (Closes: #654045)
+
+ -- tony mancill <tmancill at debian.org> Sat, 04 Feb 2012 07:17:54 +0000
+
+libapache-mod-jk (1:1.2.32-1) unstable; urgency=low
+
+ * New upstream release:
+ - Fix whitespace trimming when parsing attribute lists. LP: #592576.
+ * Add myself in Uploaders.
+ * Include a sensible default configuration in
+ /etc/apache2/mods-available/jk.conf
+ and remove old sample in /usr/share/doc/libapache2-mod-jk/.
+ LP: #118649.
+ * Describe changes in upstream handling of JkMount in global scope
+ vs in VirtualHost scope (in d/README and default configuration).
+ Closes: #460398.
+ * Bump Standards-Version to 3.9.2:
+ - d/control: Add recommended get-orig-source target.
+ * d/watch: Update to new upstream layout.
+ * Refresh patches.
+ * d/copyright: Upgrade to DEP-5 format.
+ * d/README.source: Removed (aka dpatch one)
+ * d/libapache-mod-jk.*: Remove old traces from Apache 1.3
+ (dropped since lenny).
+ * d/rules: Switch to dh7 handling.
+ * d/compat: Switch to debhelper compat level 8.
+ * Replace d/patches/0004 by autotools_dev dh sequence addons.
+ * d/rules: Enable LFS with -D_FILE_OFFSET_BITS=64. Closes: #590075.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+libapache-mod-jk (1:1.2.31-1) unstable; urgency=low
+
+ * Team upload.
+ * Bump debhelper compatibility level to 7.
+ * Bump Standards-Version to 3.9.1. No changes were required.
+ * Remove duplicated control fields in binary packages.
+ * Fix lintian warning about dh_clean -k deprecation.
+ * Update package section to httpd.
+ * Document in NEWS the minimal Linux version needed (>= 2.6.27) to use
+ this module.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Tue, 15 Feb 2011 09:29:23 -0430
+
+libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
+
+ * Team upload
+ * New upstream release
+ * Convert patches to dep3 format.
+ * Switch to source format 3.0.
+ * Remove Stefan (Gybas) and Arnaud from Uploaders list. Thanks to your
+ contribution in the past!
+ * Add Vcs-* headers.
+ * Add missing Depends: ${misc:Depends}.
+ * Update Standards-Version: 3.9.0 (no changes).
+ * Update patch for config.guess and config.sub.
+ * Switch to tomcat6 and default-java in workers.properties. Thanks to
+ Olivier Berger. (Closes: #590078)
+
+ -- Torsten Werner <twerner at debian.org> Sat, 24 Jul 2010 01:04:36 +0200
+
+libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
+
+ * Added debian/patches/05_config_update.dpatch which updates
+ config.{guess|sub} in native/scripts/build/unix/ (Closes: #540392).
+ * debian/control: Let libapache2-mod-jk suggest tomcat6 instead of
+ tomcat5.5.
+ * Added debian/README.source.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 20 Aug 2009 20:04:39 +0200
+
+libapache-mod-jk (1:1.2.28-1) unstable; urgency=low
+
+ * New upstream release.
+ - Removed debian/patches/05_bug_451494.dpatch. Applied upstream.
+ - Removed debian/patches/06_CVE-2008-5519.dpatch. Applied upstream.
+ * Updated Build-Depends to debhelper (>= 5) as 4 is deprecated.
+ * Link /usr/share/common-licenses/Apache-2.0 in debian/copgyright.
+ * Updated Standards-Version to 3.8.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 25 Jul 2009 23:08:41 +0200
+
+libapache-mod-jk (1:1.2.26-2.1) unstable; urgency=high
+
+ * Non-maintainer upload by the security-team.
+ * CVE-2008-5519: Fix information disclosure vulnerability when clients
+ abort connection before sending POST body (closes: #523054).
+
+ -- Stefan Fritsch <sf at debian.org> Sat, 30 May 2009 15:49:20 +0200
+
+libapache-mod-jk (1:1.2.26-2) unstable; urgency=low
+
+ * Apply patch to fix JkOptions handling for virtual hosts. Thanks to
+ Toshihiro Sasajima for the patch, Closes: #451494
+ * Fixed debian/copyright to mention copyright and license properly.
+ * debian/libapache-mod-jk-doc.doc-base: Moved to section
+ System/Administration.
+ * Remove unused lintian override for libapache-mod-jk-doc.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 02 Apr 2008 23:09:41 +0200
+
+libapache-mod-jk (1:1.2.26-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.7.3.
+ * Fixed URL in Homepage field.
+ * Fixed typo in debian/libapache2-mod-jk.NEWS.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 27 Dec 2007 13:04:55 -0100
+
+libapache-mod-jk (1:1.2.25-2) unstable; urgency=low
+
+ * debian/workers.properties: Renamed worker.loadbalancer.balanced_workers to
+ worker.loadbalancer.balance_workers. Closes: #448062.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 25 Oct 2007 21:18:33 +0200
+
+libapache-mod-jk (1:1.2.25-1) unstable; urgency=low
+
+ * New upstream release.
+ * Don't suggest tomcat5 anymore.
+ * Use Homepage: field in debian/control
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 15 Sep 2007 09:07:30 +0200
+
+libapache-mod-jk (1:1.2.23-4) unstable; urgency=low
+
+ * libapache2-mod-jk: Removed Suggests on tomcat4.
+ * libapache-mod-jk-doc: Removed Suggests on libapache-mod-jk.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 5 Jul 2007 13:44:24 +0200
+
+libapache-mod-jk (1:1.2.23-3) unstable; urgency=low
+
+ * Don't build libapache-mod-jk binary package anymore. Closes: #429125.
+ * Removed Wolfgang from Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 24 Jun 2007 18:34:33 -0100
+
+libapache-mod-jk (1:1.2.23-2) unstable; urgency=low
+
+ * Point workers.tomcat_home to /usr/share/tomcat5 and
+ workers.java_home to /usr/lib/jvm/java-gcj.
+ * Generate changelog from changelog.html correctly.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 09 Jun 2007 16:06:13 -0100
+
+libapache-mod-jk (1:1.2.23-1) unstable; urgency=high
+
+ * New upstream release.
+ - Forward unparsed URI to tomcat. Closes: #425836.
+ CVE-2007-1860
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 2 Jun 2007 23:14:13 +0200
+
+libapache-mod-jk (1:1.2.22-1) unstable; urgency=low
+
+ * New upstream release
+ - works when no JkWorkersFile option set (Closes: #419448).
+ * Added debian/patches/04_no-worker-error.dpatch to make the message
+ "Could not find worker" an error and more visible (Closes: #418887).
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 17 Apr 2007 08:12:38 +0200
+
+libapache-mod-jk (1:1.2.21-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 12 Apr 2007 07:21:37 +0000
+
+libapache-mod-jk (1:1.2.18-3) unstable; urgency=medium
+
+ * debian/rules: copy source tree for native part to compile seperately for
+ Apache 2.0 (Closes: #396224, #406636).
+ * Added tomcat5.5 to Depends on tomcat4 | tomcat5 | tomcat5.5.
+ * Updated Standards-Version to 3.7.2.
+ * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 17 Feb 2007 17:10:27 +0100
+
+libapache-mod-jk (1:1.2.18-2) unstable; urgency=low
+
+ * debian/control (Depends): updated to apache2.2-common (closes:
+ #391651), thanks to Philippe Marzouk.
+ * debian/patches/03_jk-runtime-status_default_location.dpatch:
+ added. This change the default location of JkShmFile variable (closes:
+ #362004), thanks to Adrian Bridgett.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 15:41:47 +0200
+
+libapache-mod-jk (1:1.2.18-1) unstable; urgency=low
+
+ * New upstream
+ * debian/watch: added
+ * Added myself to uploaders
+ * debian/rules: modified to revert changes in upstream structure (jk
+ directory does not exist anymore)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Wed, 2 Aug 2006 11:11:03 +0200
+
+libapache-mod-jk (1:1.2.14.1-2) unstable; urgency=low
+
+ * Fixed binary arch only build by splitting
+ arch and indep install targets
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 03 Oct 2005 13:25:14 +0200
+
+libapache-mod-jk (1:1.2.14.1-1) unstable; urgency=low
+
+ * New upstream release (closes: #307331)
+ * Removed cdbs dependency - building only with debhelper
+ * Build Apache2 package (closes: #296345)
+ + debian/control: package libapache2-mod-jk added
+ + debian/control: added apache2-threaded-dev build dependency
+ * Split documentation in own package so it does not ship twice
+ + debian/control: package libapache-mod-jk-doc added
+ + debian/control: xsltproc dependency for building
+ + debian/control: added conflicts/replaces with old libapache-mod-jk
+ * Updated workers.properties
+ * Added example httpd.conf files for Apache 1.3 and 2
+ * Added tomcat5 as alternative to tomcat4 to suggests
+ * Only provide example conf files (for Apache1.3/2) which have to be
+ installed and modified for a specific setup by the user (closes: #321203)
+ * Added conflicts/replaces with libapache2-mod-jk2 and added NEWS.Debian
+ * Registered documentation with doc-base
+ * Added lintian override for changelog html file used in the manual
+ * Updated copyright to new upstream Apache License Version 2.0
+ * Updated Standards-Version to 3.6.2 - no changes
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 6 Sep 2005 14:43:49 +0200
+
+libapache-mod-jk (1:1.2.5-2) unstable; urgency=low
+
+ * Added libtool build dependency (closes: #229395)
+
+ -- Stefan Gybas <sgybas at debian.org> Fri, 30 Jan 2004 17:22:12 +0100
+
+libapache-mod-jk (1:1.2.5-1) unstable; urgency=low
+
+ * New upstream release (libapache-mod-jk was previously built by the tomcat
+ source package)
+ * Updated download location in copyright file
+ * Mention in the long description that this module can talk to a remote
+ Tomcat server so it can go into main
+ * Updated to the new module handling in Apache 1.3.29 and support Apache,
+ Apache-Perl and Apache-SSL
+
+ -- Stefan Gybas <sgybas at debian.org> Sat, 10 Jan 2004 17:18:52 +0100
+
diff --cc debian/clean
index 0000000,0000000..a57244c
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,96 @@@
++conf/jk.conf
++build/docs/images/add.gif
++build/docs/images/code.gif
++build/docs/images/design.gif
++build/docs/images/docs.gif
++build/docs/images/fix.gif
++build/docs/images/jakarta-logo.gif
++build/docs/images/printer.gif
++build/docs/images/tomcat.gif
++build/docs/images/update.gif
++build/docs/images/void.gif
++native/apache-2.0/mod_jk.a
++native/apache-2.0/mod_jk.o
++native/apache-2.0/mod_jk.so
++native/common/.libs/*
++native/apache-2.0/.libs/*
++native/common/*.o
++build/docs/ajp/ajpv13a.html
++build/docs/ajp/ajpv13ext.html
++build/docs/ajp/project.html
++build/docs/build.html
++build/docs/changelog
++build/docs/common_howto/loadbalancers.html
++build/docs/common_howto/project.html
++build/docs/common_howto/proxy.html
++build/docs/common_howto/quick.html
++build/docs/common_howto/timeouts.html
++build/docs/common_howto/workers.html
++build/docs/empty.html
++build/docs/index.html
++build/docs/miscellaneous/changelog.html
++build/docs/miscellaneous/doccontrib.html
++build/docs/miscellaneous/faq.html
++build/docs/miscellaneous/jkstatustasks.html
++build/docs/miscellaneous/project.html
++build/docs/miscellaneous/reporttools.html
++build/docs/news/20041100.html
++build/docs/news/20050101.html
++build/docs/news/20060101.html
++build/docs/news/20070301.html
++build/docs/news/20081001.html
++build/docs/news/20090301.html
++build/docs/news/20100101.html
++build/docs/news/20110701.html
++build/docs/news/20120301.html
++build/docs/news/20140201.html
++build/docs/news/20150101.html
++build/docs/news/project.html
++build/docs/project.html
++build/docs/reference/apache.html
++build/docs/reference/iis.html
++build/docs/reference/project.html
++build/docs/reference/status.html
++build/docs/reference/uriworkermap.html
++build/docs/reference/workers.html
++build/docs/style.css
++build/docs/webserver_howto/apache.html
++build/docs/webserver_howto/iis.html
++build/docs/webserver_howto/nes.html
++build/docs/webserver_howto/project.html
++native/Makefile
++native/apache-1.3/Makefile
++native/apache-1.3/Makefile.apxs
++native/apache-2.0/Makefile
++native/apache-2.0/Makefile.apxs
++native/apache-2.0/mod_jk.la
++native/apache-2.0/mod_jk.lo
++native/common/Makefile
++native/common/config.h
++native/common/jk_ajp12_worker.lo
++native/common/jk_ajp13.lo
++native/common/jk_ajp13_worker.lo
++native/common/jk_ajp14.lo
++native/common/jk_ajp14_worker.lo
++native/common/jk_ajp_common.lo
++native/common/jk_connect.lo
++native/common/jk_context.lo
++native/common/jk_lb_worker.lo
++native/common/jk_map.lo
++native/common/jk_md5.lo
++native/common/jk_msg_buff.lo
++native/common/jk_pool.lo
++native/common/jk_shm.lo
++native/common/jk_sockbuf.lo
++native/common/jk_status.lo
++native/common/jk_types.h
++native/common/jk_uri_worker_map.lo
++native/common/jk_url.lo
++native/common/jk_util.lo
++native/common/jk_worker.lo
++native/common/list.mk
++native/common/stamp-h1
++native/config.log
++native/config.nice
++native/config.status
++native/libtool
diff --cc debian/control
index 36405fd,0000000..831e84d
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,0 +1,49 @@@
+Source: libapache-mod-jk
+Section: httpd
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Damien Raude-Morvan <drazzib at debian.org>
- Build-Depends: apache2-dev,
- autotools-dev,
- debhelper (>= 8.1.3~),
- dh-apache2,
- libtool
- Build-Depends-Indep: lynx, xsltproc
++Uploaders:
++ Damien Raude-Morvan <drazzib at debian.org>
++Build-Depends:
++ apache2-dev,
++ autotools-dev,
++ debhelper (>= 9),
++ dh-apache2,
++ libtool
++Build-Depends-Indep:
++ lynx,
++ xsltproc
+Standards-Version: 3.9.6
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libapache-mod-jk
- Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk
++Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk
+Homepage: http://tomcat.apache.org
+
+Package: libapache2-mod-jk
+Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: libapache-mod-jk-doc, tomcat8
- Conflicts: libapache2-mod-jk2
- Replaces: libapache2-mod-jk2
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
++Suggests:
++ libapache-mod-jk-doc,
++ tomcat8
+Description: Apache 2 connector for the Tomcat Java servlet engine
+ Apache Tomcat is the reference implementation for the Java Servlet and
+ JavaServer Pages (JSP) specification from the Apache Jakarta project.
+ .
+ This package contains an Apache 2 module (mod_jk) to forward requests
+ from Apache to Tomcat using the AJP 1.3 or 1.4 protocol. It can either
+ talk to Tomcat on the local machine or to a remote engine using TCP.
+
+Package: libapache-mod-jk-doc
+Architecture: all
+Section: doc
- Depends: ${misc:Depends}
- Suggests: libapache2-mod-jk
- Conflicts: libapache-mod-jk (<= 1.2.5-2)
- Replaces: libapache-mod-jk (<= 1.2.5-2)
++Depends:
++ ${misc:Depends}
++Suggests:
++ libapache2-mod-jk
+Description: Documentation of libapache2-mod-jk package
+ Documentation and examples of the Apache jk connector for the Tomcat
+ Java servlet engine.
+ .
+ For uptodate documentation about Tomcat connectors please take a look
+ at the home page at http://tomcat.apache.org/connectors-doc/.
diff --cc debian/copyright
index c26ee7a,0000000..0b4c07a
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,18 -1,0 +1,96 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Tomcat JK Connector
+Upstream-Contact: <http://tomcat.apache.org/connectors-doc/>
+Source: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/
+
+Files: *
- Copyright: Copyright (c) 1999-2011 Apache Foundation
++Copyright: Copyright (c) 1999-2015 Apache Foundation
+License: Apache-2.0
+
++Files: native/iis/pcre/*
++Copyright: 1997-2004, University of Cambridge
++License: BSD-3-clause
++
++Files: native/scripts/build/unix/ltmain.sh
++ native/scripts/build/unix/missing
++ native/scripts/build/unix/compile
++ native/aclocal.m4
++Copyright: 1996-2013 Free Software Foundation, Inc.
++License: GPL-2+
++
++Files: native/scripts/build/unix/config.guess
++ native/scripts/build/unix/config.sub
++Copyright: 1992-2014 Free Software Foundation, Inc.
++License: GPL-3+
++
++Files: native/scripts/build/unix/install-sh
++Copyright: 1994, X Consortium
++License: MIT
++ Permission is hereby granted, free of charge, to any person obtaining a copy
++ of this software and associated documentation files (the "Software"), to
++ deal in the Software without restriction, including without limitation the
++ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ sell copies of the Software, and to permit persons to whom the Software is
++ furnished to do so, subject to the following conditions:
++ .
++ The above copyright notice and this permission notice shall be included in
++ all copies or substantial portions of the Software.
++ .
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ .
++ Except as contained in this notice, the name of the X Consortium shall not
++ be used in advertising or otherwise to promote the sale, use or other deal-
++ ings in this Software without prior written authorization from the X Consor-
++ tium.
++
++
+Files: debian/*
+Copyright: 2003, Stefan Gybas <sgybas at debian.org>
- 2009, Michael Koch <konqueror at gmx.de>
- 2011, Damien Raude-Morvan <drazzib at debian.org>
++ 2009, Michael Koch <konqueror at gmx.de>
++ 2011, Damien Raude-Morvan <drazzib at debian.org>
++ 2015, Markus Koschany <apo at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ A complete copy of the Apache License, Version 2.0, can be found in
+ /usr/share/common-licenses/Apache-2.0 on Debian Systems.
++
++License: BSD-3-clause
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are met:
++ .
++ * Redistributions of source code must retain the above copyright notice,
++ this list of conditions and the following disclaimer.
++ .
++ * Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++ .
++ * Neither the name of the University of Cambridge nor the names of its
++ contributors may be used to endorse or promote products derived from
++ this software without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ POSSIBILITY OF SUCH DAMAGE.
++
++License: GPL-2+
++ On Debian systems, the full text of the GNU General Public license 2
++ can be found in the file '/usr/share/common-licenses/GPL-2
++
++License: GPL-3+
++ On Debian systems, the full text of the GNU General Public license 3
++ can be found in the file '/usr/share/common-licenses/GPL-3
diff --cc debian/libapache2-mod-jk.NEWS
index c76356b,0000000..1bdf780
mode 100644,000000..100644
--- a/debian/libapache2-mod-jk.NEWS
+++ b/debian/libapache2-mod-jk.NEWS
@@@ -1,36 -1,0 +1,36 @@@
+libapache2-mod-jk (1:1.2.32-1) unstable; urgency=low
+
+ libapache2-mod-jk now provide a default configuration file for Apache 2.x.
+ This file is located at /etc/apache2/mods-available/jk.conf.
+ Please note, that this configuration will be activated on first installation
+ or when (re-)enabling jk module with "a2enmod jk".
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+libapache2-mod-jk (1:1.2.31-1) unstable; urgency=low
+
+ Since 1.2.31 libapache2-mod-jk is compiled under kernels with support for
+ the SOCK_CLOEXEC flag in socket(2) syscall. Because of this, on Linux
+ systems, libapache-mod-jk only works with kernel versions >= 2.6.27.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sun, 13 Feb 2011 19:17:43 -0430
+
+libapache2-mod-jk (1:1.2.26-1) unstable; urgency=low
+
+ Since 1.2.26, please note that by default no mounts will be inherited from the
+ global scope to any VirtualHost. See JkMountCopy option documentation
+ for more information (and Debian bug #460398).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+libapache2-mod-jk (1:1.2.14.1-1) unstable; urgency=low
+
+ This package replaces the previously libapache2-mod-jk2 package
+ which is now unsupported upstream and therefore removed from
+ the archive.
+
+ Its recommended to switch to this package. Due to building packages
- for Apache 1.3 and 2 the documentation is now packaged separately
- (libapache-mod-jk-doc).
++ for Apache 1.3 and 2 the documentation is now packaged separately
++ (libapache-mod-jk-doc).
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
diff --cc debian/libapache2-mod-jk.README.Debian
index 8cf16b9,0000000..f9c6215
mode 100644,000000..100644
--- a/debian/libapache2-mod-jk.README.Debian
+++ b/debian/libapache2-mod-jk.README.Debian
@@@ -1,23 -1,0 +1,23 @@@
+libapache2-mod-jk for Debian
+----------------------------------
+
+Package works with Apache 2.x HTTP server.
+The documentation can be found in the libapache-mod-jk-doc package.
+
+At install, this module is enabled into existing Apache2 configuration.
+Default configuration is located here :
+ /etc/apache2/mods-available/jk.conf
+
+One default worker named ajp13_worker, which connects to the localhost on
+port 8009, is configured. If you need more workers or want to connect to
+a remote tomcat you have to modify the workers.properties file.
+
+By default, no webapp is mounted so you'll have to edit jk.conf
- to enable, at least, a JkMount directive for you webapp.
++to enable, at least, a JkMount directive for you webapp.
+
+Please pay attention to global scope vs VirtualHost when setting JkMount
+(see #460398) as, by default, no mounts will be inherited from the
+global scope to any VirtualHost. See JkMountCopy option documentation
+for more information.
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
diff --cc debian/libapache2-mod-jk.install
index e982abe,0000000..6ef6e11
mode 100644,000000..100644
--- a/debian/libapache2-mod-jk.install
+++ b/debian/libapache2-mod-jk.install
@@@ -1,4 -1,0 +1,4 @@@
- conf/jk.conf /etc/apache2/mods-available/
- debian/jk.load /etc/apache2/mods-available/
- debian/workers.properties /etc/libapache2-mod-jk/
- native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/
++conf/jk.conf /etc/apache2/mods-available/
++debian/jk.load /etc/apache2/mods-available/
++debian/workers.properties /etc/libapache2-mod-jk/
++native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/
diff --cc debian/patches/fix-privacy-breach.patch
index 0000000,0000000..b423653
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-privacy-breach.patch
@@@ -1,0 -1,0 +1,26 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Thu, 21 May 2015 17:38:34 +0200
++Subject: fix privacy breach
++
++Fix lintian error "privacy breach".
++
++Forwarded: no
++---
++ xdocs/style.xsl | 4 ----
++ 1 file changed, 4 deletions(-)
++
++diff --git a/xdocs/style.xsl b/xdocs/style.xsl
++index fbfdfe5..afbf45d 100644
++--- a/xdocs/style.xsl
+++++ b/xdocs/style.xsl
++@@ -104,10 +104,6 @@
++ </xsl:variable -->
++
++ <xsl:comment>APACHE LOGO</xsl:comment>
++- <a href="http://www.apache.org/">
++- <img src="http://www.apache.org/images/asf-logo.gif"
++- align="right" alt=" :: Apache Software Foundation" border="0"/>
++- </a>
++
++ </xsl:if>
++
diff --cc debian/patches/series
index 62193be,0000000..cb4453d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,4 @@@
+0001-disable-logo.patch
+0002-debianize-log-directory.patch
+0003-upgrade-info-to-error-message.patch
- 0004-corrupted-worker-activation-status.patch
- CVE-2014-8111.patch
++fix-privacy-breach.patch
diff --cc debian/rules
index 51a198b,0000000..ac77a31
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,45 -1,0 +1,32 @@@
+#!/usr/bin/make -f
+
+# Enable LFS, build system doesn't respect CPPFLAGS.
+export DEB_CFLAGS_MAINT_APPEND = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(shell dpkg-buildflags --get CPPFLAGS)
+
+%:
+ dh $@ --with autotools_dev,apache2 --sourcedirectory=native
+
+override_dh_auto_configure:
+ dh_auto_configure -- --with-apxs=/usr/bin/apxs2
- sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native/common/Makefile
+
+override_dh_auto_build:
+ dh_auto_build
+ cp conf/httpd-jk.conf conf/jk.conf
+
- override_dh_auto_clean:
- rm -f conf/jk.conf
- # ac_config_files
- rm -f Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs \
- apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile \
- common/list.mk common/jk_types.h jni/Makefile
- # MAINTAINERCLEANFILES
- rm -f native/config.{status,log,cache}
- rm -f native/apache-2.0/mod_jk.{o,la,lo,a} native/apache-2.0/mod_jk.so*
- rm -f native/common/*.{lo,o}
- rm -rf native/apache-2.0/.libs native/common/.libs
-
+override_dh_auto_install:
+ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages)))
+ cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/
+ cd build/docs && for i in `find . -name '*.xml'`; do xsltproc style.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done
+ cd build/docs && find . -name '*.xml' -exec rm -f {} \;
+ cd build/docs && rm -f style.xsl BUILDING
+ cd build/docs/miscellaneous && lynx -dump -nolist changelog.html > ../changelog
+endif
+
+override_dh_compress:
+ dh_compress -Xchangelog.html
+
+# No check target
+override_dh_auto_test:
+
+get-orig-source:
- uscan --force-download --rename
++ uscan --verbose --download-current-version --force-download
diff --cc debian/workers.properties
index 4ab311f,0000000..1e282f0
mode 100644,000000..100644
--- a/debian/workers.properties
+++ b/debian/workers.properties
@@@ -1,100 -1,0 +1,100 @@@
+# workers.properties -
+#
+# This file is a simplified version of the workers.properties supplied
+# with the upstream sources. The jni inprocess worker (not build in the
+# debian package) section and the ajp12 (deprecated) section are removed.
+#
+# As a general note, the characters $( and ) are used internally to define
+# macros. Do not use them in your own configuration!!!
+#
+# Whenever you see a set of lines such as:
+# x=value
+# y=$(x)\something
+#
+# the final value for y will be value\something
+#
+# Normaly all you will need to do is un-comment and modify the first three
+# properties, i.e. workers.tomcat_home, workers.java_home and ps.
+# Most of the configuration is derived from these.
+#
+# When you are done updating workers.tomcat_home, workers.java_home and ps
+# you should have 3 workers configured:
+#
+# - An ajp13 worker that connects to localhost:8009
+# - A load balancer worker
+#
+#
+
- # OPTIONS ( very important for jni mode )
++# OPTIONS ( very important for jni mode )
+
+#
+# workers.tomcat_home should point to the location where you
+# installed tomcat. This is where you have your conf, webapps and lib
+# directories.
+#
+workers.tomcat_home=/usr/share/tomcat8
+
+#
+# workers.java_home should point to your Java installation. Normally
+# you should have a bin and lib directories beneath it.
+#
+workers.java_home=/usr/lib/jvm/default-java
+
+#
+# You should configure your environment slash... ps=\ on NT and / on UNIX
+# and maybe something different elsewhere.
+#
+ps=/
+
+#
+#------ ADVANCED MODE ------------------------------------------------
+#---------------------------------------------------------------------
+#
+
+#
+#------ worker list ------------------------------------------
+#---------------------------------------------------------------------
+#
+#
+# The workers that your plugins should create and work with
- #
++#
+worker.list=ajp13_worker
+
+#
+#------ ajp13_worker WORKER DEFINITION ------------------------------
+#---------------------------------------------------------------------
+#
+
+#
+# Defining a worker named ajp13_worker and of type ajp13
+# Note that the name and the type do not have to match.
+#
+worker.ajp13_worker.port=8009
+worker.ajp13_worker.host=localhost
+worker.ajp13_worker.type=ajp13
+#
+# Specifies the load balance factor when used with
+# a load balancing worker.
+# Note:
+# ----> lbfactor must be > 0
+# ----> Low lbfactor means less work done by the worker.
+worker.ajp13_worker.lbfactor=1
+
+#
+# Specify the size of the open connection cache.
+#worker.ajp13_worker.cachesize
+
+#
+#------ DEFAULT LOAD BALANCER WORKER DEFINITION ----------------------
+#---------------------------------------------------------------------
+#
+
+#
+# The loadbalancer (type lb) workers perform wighted round-robin
+# load balancing with sticky sessions.
+# Note:
+# ----> If a worker dies, the load balancer will check its state
+# once in a while. Until then all work is redirected to peer
+# workers.
+worker.loadbalancer.type=lb
+worker.loadbalancer.balance_workers=ajp13_worker
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git
More information about the pkg-java-commits
mailing list