[libapache-mod-jk] 53/65: Import Debian patch 1:1.2.37-4+deb8u1
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 8 14:14:48 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 5ba6bec76a25085dd4d434c0021e7ce5d5498473
Author: Markus Koschany <apo at gambaru.de>
Date: Sat May 23 01:16:37 2015 +0200
Import Debian patch 1:1.2.37-4+deb8u1
---
debian/changelog | 40 +++++++++++++++++++---
debian/control | 15 ++++----
debian/libapache2-mod-jk.apache2 | 2 ++
debian/libapache2-mod-jk.postinst | 24 -------------
debian/libapache2-mod-jk.prerm | 22 ------------
.../0004-corrupted-worker-activation-status.patch | 27 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 ++--
debian/workers.properties | 2 +-
9 files changed, 78 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 14251a4..f82c5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libapache-mod-jk (1:1.2.37-1+deb7u1) wheezy-security; urgency=high
+libapache-mod-jk (1:1.2.37-4+deb8u1) jessie-security; urgency=high
* Team upload.
* Add CVE-2014-8111.patch. (Closes: #783233)
@@ -10,10 +10,42 @@ libapache-mod-jk (1:1.2.37-1+deb7u1) wheezy-security; urgency=high
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").
+ - Configuration is done via new JkOption for Apache
+ (values "CollapseSlashesAll", "CollapseSlashesNone" or
+ "CollapseSlashesUnmount").
- -- Markus Koschany <apo at gambaru.de> Sat, 23 May 2015 23:33:30 +0200
+ -- Markus Koschany <apo at gambaru.de> Sat, 23 May 2015 01:16:37 +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
diff --git a/debian/control b/debian/control
index 397575b..36405fd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,21 @@ 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-threaded-dev,
+Build-Depends: apache2-dev,
autotools-dev,
debhelper (>= 8.1.3~),
+ dh-apache2,
libtool
Build-Depends-Indep: lynx, xsltproc
-Standards-Version: 3.9.3
-Homepage: http://tomcat.apache.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-mod-jk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
+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
+Homepage: http://tomcat.apache.org
Package: libapache2-mod-jk
Architecture: any
-Depends: apache2.2-common, ${misc:Depends}, ${shlibs:Depends}
-Suggests: libapache-mod-jk-doc, tomcat6
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: libapache-mod-jk-doc, tomcat8
Conflicts: libapache2-mod-jk2
Replaces: libapache2-mod-jk2
Description: Apache 2 connector for the Tomcat Java servlet engine
diff --git a/debian/libapache2-mod-jk.apache2 b/debian/libapache2-mod-jk.apache2
new file mode 100644
index 0000000..ed1996e
--- /dev/null
+++ b/debian/libapache2-mod-jk.apache2
@@ -0,0 +1,2 @@
+mod native/apache-2.0/mod_jk.so
+mod debian/jk.load
diff --git a/debian/libapache2-mod-jk.postinst b/debian/libapache2-mod-jk.postinst
deleted file mode 100644
index c2d5bc9..0000000
--- a/debian/libapache2-mod-jk.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-case "$1" in
- configure)
-
- # Only activate jk if this is not an upgrade
- if [ -z "$2" ]; then
- a2enmod jk || true
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/libapache2-mod-jk.prerm b/debian/libapache2-mod-jk.prerm
deleted file mode 100644
index 2f7c53b..0000000
--- a/debian/libapache2-mod-jk.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-case "$1" in
- upgrade|failed-upgrade)
- # Nothing to do here
- ;;
-
- deconfigure|remove)
- # Disable jk if this is not an upgrade
- a2dismod jk || true
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/patches/0004-corrupted-worker-activation-status.patch b/debian/patches/0004-corrupted-worker-activation-status.patch
new file mode 100644
index 0000000..38348d7
--- /dev/null
+++ b/debian/patches/0004-corrupted-worker-activation-status.patch
@@ -0,0 +1,27 @@
+Description: Worker activation state corrupted when using jkmanager
+ We use jkmanager to selectively disable (DIS state) workers to do
+ rolling releases. This worked fine in Squeeze (mod_jk 1.2.30),
+ but does not work properly anymore in Wheezy (mod_jk 1.2.37). The
+ effect is: When I set a worker to disabled, it flips back and forth
+ between disabled an active, and the load on the worker does not
+ decrease as it should. Same with stopped. Happens on multiple
+ Apache servers independently.
+ .
+ The following change from the upcoming 1.2.38 release fixes the
+ problem at least for our setup.
+ .
+ <URL:http://tomcat.10.x6.nabble.com/mod-jk-worker-activation-not-working-anymore-in-1-2-37-td4999956.html>
+Author: David Gubler <dg at doodle.com>
+Last-Update: 2013-08-12
+Bug: http://bugs.debian.org/cgi-bin/711934
+--- a/native/common/jk_status.c
++++ b/native/common/jk_status.c
+@@ -3647,7 +3647,7 @@
+ }
+ }
+ if (sync_needed == JK_TRUE) {
+- wr->sequence = 0;
++ wr->sequence = -1;
+ if (!rc)
+ rc = 3;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5f2aa5c..62193be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
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
diff --git a/debian/rules b/debian/rules
index b3e295d..51a198b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
-# Enable LFS
-CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(shell dpkg-buildflags --get CFLAGS)
+# 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 --sourcedirectory=native
+ dh $@ --with autotools_dev,apache2 --sourcedirectory=native
override_dh_auto_configure:
dh_auto_configure -- --with-apxs=/usr/bin/apxs2
diff --git a/debian/workers.properties b/debian/workers.properties
index 91ba7f2..4ab311f 100644
--- a/debian/workers.properties
+++ b/debian/workers.properties
@@ -32,7 +32,7 @@
# installed tomcat. This is where you have your conf, webapps and lib
# directories.
#
-workers.tomcat_home=/usr/share/tomcat6
+workers.tomcat_home=/usr/share/tomcat8
#
# workers.java_home should point to your Java installation. Normally
--
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