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 3b01be916d1fa4696be026866a32df2eba8f20a1 Author: Michael Koch <[email protected]> Date: Wed Apr 2 21:11:07 2008 +0000 libapache-mod-jk (1:1.2.26-3) 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 <[email protected]> Wed, 02 Apr 2008 23:09:41 +0200 --- debian/changelog | 11 +++++++++++ debian/copyright | 4 +++- debian/libapache-mod-jk-doc.doc-base | 2 +- debian/libapache-mod-jk-doc.lintian | 1 - debian/patches/00list | 1 + debian/patches/05_bug_451494.dpatch | 24 ++++++++++++++++++++++++ debian/rules | 3 --- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7094b68..f69e495 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libapache-mod-jk (1:1.2.26-3) 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 <[email protected]> Wed, 02 Apr 2008 23:09:41 +0200 + libapache-mod-jk (1:1.2.26-1) unstable; urgency=low * New upstream release. diff --git a/debian/copyright b/debian/copyright index 68448da..9efa241 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,9 @@ http://www.apache.de/dist/jakarta/tomcat-connectors/jk/. Authors: The Apache Jakarta team -Copyright: +Copyright: (c) 2003-2008 Apache Foundation + +License: Apache License diff --git a/debian/libapache-mod-jk-doc.doc-base b/debian/libapache-mod-jk-doc.doc-base index e6ccbeb..d185db7 100644 --- a/debian/libapache-mod-jk-doc.doc-base +++ b/debian/libapache-mod-jk-doc.doc-base @@ -3,7 +3,7 @@ Title: The Apache Jakarta Tomcat Connector Author: The Apache Jakarta team Abstract: This manual contains general documentation and configuration information of the Apache Tomcat connector for Apache 1.3 and 2.0 -Section: Web +Section: System/Administration Format: HTML Index: /usr/share/doc/libapache-mod-jk-doc/index.html diff --git a/debian/libapache-mod-jk-doc.lintian b/debian/libapache-mod-jk-doc.lintian deleted file mode 100644 index e4051a9..0000000 --- a/debian/libapache-mod-jk-doc.lintian +++ /dev/null @@ -1 +0,0 @@ -libapache-mod-jk-doc: changelog-file-not-compressed diff --git a/debian/patches/00list b/debian/patches/00list index 03dd388..eae964f 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ 02_style_xsl 03_jk-runtime-status_default_location.dpatch 04_no-worker-error.dpatch +05_bug_451494.dpatch diff --git a/debian/patches/05_bug_451494.dpatch b/debian/patches/05_bug_451494.dpatch new file mode 100755 index 0000000..1faa731 --- /dev/null +++ b/debian/patches/05_bug_451494.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## test.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixing overrides of JkOptions for virtual hosts. + +@DPATCH@ +diff -urNad libapache-mod-jk-1.2.26~/native/apache-2.0/mod_jk.c libapache-mod-jk-1.2.26/native/apache-2.0/mod_jk.c +--- libapache-mod-jk-1.2.26~/native/apache-2.0/mod_jk.c 2008-04-02 22:07:03.000000000 +0200 ++++ libapache-mod-jk-1.2.26/native/apache-2.0/mod_jk.c 2008-04-02 22:13:43.000000000 +0200 +@@ -2526,7 +2526,12 @@ + if (!overrides->key_size_indicator) + overrides->key_size_indicator = base->key_size_indicator; + +- overrides->options |= (base->options & ~base->exclude_options); ++/* Don't simply accumulate bits in the JK_OPT_FWDURIMASK region, */ ++/* because those are multi-bit values. */ ++ if (overrides->options & JK_OPT_FWDURIMASK) ++ overrides->options |= (base->options & ~base->exclude_options) & ~JK_OPT_FWDURIMASK; ++ else ++ overrides->options |= (base->options & ~base->exclude_options); + + if (base->envvars) { + if (overrides->envvars && overrides->envvars_has_own) { diff --git a/debian/rules b/debian/rules index 1b0e71f..24a94d6 100755 --- a/debian/rules +++ b/debian/rules @@ -67,9 +67,6 @@ install-indep: dh_testroot dh_clean -k -i dh_installdirs -i - # install lintian overrides as we have a changelog.html used in the manual - install -d $(CURDIR)/debian/libapache-mod-jk-doc/usr/share/lintian/overrides/ - install -m 644 $(CURDIR)/debian/libapache-mod-jk-doc.lintian $(CURDIR)/debian/libapache-mod-jk-doc/usr/share/lintian/overrides/libapache-mod-jk-doc dh_install -i install-arch: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
