[libapache-mod-jk] 09/65: libapache-mod-jk (1:1.2.21-1) unstable; urgency=low

[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 26f370aa7dc740a90f466098f8370244a70ec632
Author: Michael Koch <konqueror at gmx.de>
Date:   Sat Apr 14 16:13:52 2007 +0000

    libapache-mod-jk (1:1.2.21-1) unstable; urgency=low
    
      * New upstream release
---
 debian/changelog                                       |  6 ++++++
 .../03_jk-runtime-status_default_location.dpatch       | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7eeebdc..19e790a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/debian/patches/03_jk-runtime-status_default_location.dpatch b/debian/patches/03_jk-runtime-status_default_location.dpatch
index 5977cb7..0f57165 100644
--- a/debian/patches/03_jk-runtime-status_default_location.dpatch
+++ b/debian/patches/03_jk-runtime-status_default_location.dpatch
@@ -8,12 +8,14 @@
 
 --- ./native/apache-2.0/mod_jk.c~	2006-07-08 07:57:31.000000000 +0000
 +++ ./native/apache-2.0/mod_jk.c	2006-10-09 08:19:21.000000000 +0000
-@@ -2342,7 +2342,7 @@
+@@ -109,8 +109,8 @@
+ #include "jk_worker.h"
+ #include "jk_shm.h"
  
- #if !defined(WIN32) && !defined(NETWARE)
-     if (!jk_shm_file) {
--        jk_shm_file = ap_server_root_relative(pconf, "logs/jk-runtime-status");
-+        jk_shm_file = ap_server_root_relative(pconf, "/var/log/apache2/jk-runtime-status");
-         if (jk_shm_file)
-             ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
-                          0, NULL,
+-#define JK_LOG_DEF_FILE             ("logs/mod_jk.log")
+-#define JK_SHM_DEF_FILE             ("logs/jk-runtime-status")
++#define JK_LOG_DEF_FILE             ("/var/log/apache2/mod_jk.log")
++#define JK_SHM_DEF_FILE             ("/var/log/apache2/jk-runtime-status")
+ #define JK_ENV_HTTPS                ("HTTPS")
+ #define JK_ENV_CERTS                ("SSL_CLIENT_CERT")
+ #define JK_ENV_CIPHER               ("SSL_CIPHER")

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