[pkg-java] r6072 - in trunk/libapache-mod-jk/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Wed Apr 2 21:11:08 UTC 2008
Author: mkoch
Date: 2008-04-02 21:11:07 +0000 (Wed, 02 Apr 2008)
New Revision: 6072
Added:
trunk/libapache-mod-jk/debian/patches/05_bug_451494.dpatch
Removed:
trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.lintian
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/copyright
trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base
trunk/libapache-mod-jk/debian/patches/00list
trunk/libapache-mod-jk/debian/rules
Log:
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 <konqueror at gmx.de> Wed, 02 Apr 2008 23:09:41 +0200
Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/changelog 2008-04-02 21:11:07 UTC (rev 6072)
@@ -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 <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.
Modified: trunk/libapache-mod-jk/debian/copyright
===================================================================
--- trunk/libapache-mod-jk/debian/copyright 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/copyright 2008-04-02 21:11:07 UTC (rev 6072)
@@ -4,9 +4,11 @@
Authors: The Apache Jakarta team
-Copyright:
+Copyright: (c) 2003-2008 Apache Foundation
+License:
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Modified: trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base 2008-04-02 21:11:07 UTC (rev 6072)
@@ -3,7 +3,7 @@
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
Deleted: trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.lintian
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.lintian 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.lintian 2008-04-02 21:11:07 UTC (rev 6072)
@@ -1 +0,0 @@
-libapache-mod-jk-doc: changelog-file-not-compressed
Modified: trunk/libapache-mod-jk/debian/patches/00list
===================================================================
--- trunk/libapache-mod-jk/debian/patches/00list 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/patches/00list 2008-04-02 21:11:07 UTC (rev 6072)
@@ -1,3 +1,4 @@
02_style_xsl
03_jk-runtime-status_default_location.dpatch
04_no-worker-error.dpatch
+05_bug_451494.dpatch
Added: trunk/libapache-mod-jk/debian/patches/05_bug_451494.dpatch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/05_bug_451494.dpatch (rev 0)
+++ trunk/libapache-mod-jk/debian/patches/05_bug_451494.dpatch 2008-04-02 21:11:07 UTC (rev 6072)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## test.dpatch by <konqueror at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixing overrides of JkOptions for virtual hosts.
+
+ at 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) {
Property changes on: trunk/libapache-mod-jk/debian/patches/05_bug_451494.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules 2008-04-02 19:20:44 UTC (rev 6071)
+++ trunk/libapache-mod-jk/debian/rules 2008-04-02 21:11:07 UTC (rev 6072)
@@ -67,9 +67,6 @@
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:
More information about the pkg-java-commits
mailing list