[libapache-mod-jk] 03/05: * Fix issue with socket(2) syscall and SOCK_CLOEXEC flag affecting upgrades from 1.2.26 to 1.2.30. (Closes: #609886).

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to annotated tag debian/1.2.30-1squeeze1
in repository libapache-mod-jk.

commit cb11229f54060ea3b85cbdb7959031864e63b4cf
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Feb 10 22:27:28 2011 +0000

    * Fix issue with socket(2) syscall and SOCK_CLOEXEC flag affecting upgrades from 1.2.26 to 1.2.30. (Closes: #609886).
---
 libapache-mod-jk/debian/changelog                  |  8 +++++++
 .../patches/0005-disable-sock_cloexec-flag.patch   | 26 ++++++++++++++++++++++
 libapache-mod-jk/debian/patches/series             |  1 +
 3 files changed, 35 insertions(+)

diff --git a/libapache-mod-jk/debian/changelog b/libapache-mod-jk/debian/changelog
index 8a26a9e..b3aefe9 100644
--- a/libapache-mod-jk/debian/changelog
+++ b/libapache-mod-jk/debian/changelog
@@ -1,3 +1,11 @@
+libapache-mod-jk (1:1.2.30-1squeeze1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix issue with socket(2) syscall and SOCK_CLOEXEC flag affecting
+    upgrades from 1.2.26 to 1.2.30. (Closes: #609886).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 09 Feb 2011 23:07:41 -0500
+
 libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
 
   * Team upload
diff --git a/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch b/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch
new file mode 100644
index 0000000..0c4bc8e
--- /dev/null
+++ b/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch
@@ -0,0 +1,26 @@
+Description: Disable close on exec flag for socket syscall
+ SOCK_CLOEXEC flag on socket syscalls generates broken JK modules
+ if used with Linux kernels >= 2.6.27.
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/609886
+Last-Update: 2011-02-09
+
+--- libapache-mod-jk-1.2.30.orig/native/configure
++++ libapache-mod-jk-1.2.30/native/configure
+@@ -23025,10 +23025,14 @@ int main(void)
+ #ifndef SOCK_CLOEXEC
+     exit(3);
+ #else
++    /* Recent Linux kernels support SOCK_CLOEXEC flag with socket(2) syscall,
++       if JK modules are built under kernels with SOCK_CLOEXEC support but
++       deployed under kernels without support, the modules just don't work.
++       Better disable this on squeeze and allow its usage on wheezy and beyond.
+     if ((s = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1)
+         exit(2);
+-
+-    exit(0);
++    */
++    exit(3);
+ #endif
+ }
+ 
diff --git a/libapache-mod-jk/debian/patches/series b/libapache-mod-jk/debian/patches/series
index aeec0c5..e2fc5dd 100644
--- a/libapache-mod-jk/debian/patches/series
+++ b/libapache-mod-jk/debian/patches/series
@@ -2,3 +2,4 @@
 0002-debianize-log-directory.patch
 0003-upgrade-info-to-error-message.patch
 0004-update-config.guess-and-config.sub.patch
+0005-disable-sock_cloexec-flag.patch

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