[libapache-mod-jk] 43/65: * 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).

[Markus Koschany]

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 d49cbbc7a68c9ecf2f833c97162cab9bbe456505
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon Aug 12 09:11:35 2013 +0000

    * 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).
---
 debian/changelog                                   | 10 ++++++++
 .../0004-corrupted-worker-activation-status.patch  | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ++--
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7cac3b..b80426a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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):
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 3b6be9c..d040b09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-logo.patch
 0002-debianize-log-directory.patch
 0003-upgrade-info-to-error-message.patch
+0004-corrupted-worker-activation-status.patch
diff --git a/debian/rules b/debian/rules
index b6e89fa..51a198b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/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,apache2 --sourcedirectory=native

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git