[pkg-java] r13284 - in branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-02-10 22:27:28 +0000 (Thu, 10 Feb 2011)
New Revision: 13284

Added:
   branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch
Modified:
   branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/changelog
   branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/series
Log:
* Fix issue with socket(2) syscall and SOCK_CLOEXEC flag affecting upgrades from 1.2.26 to 1.2.30. (Closes: #609886).


Modified: branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/changelog
===================================================================
--- branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/changelog	2011-02-10 22:04:26 UTC (rev 13283)
+++ branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/changelog	2011-02-10 22:27:28 UTC (rev 13284)
@@ -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

Added: branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch
===================================================================
--- branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch	                        (rev 0)
+++ branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/0005-disable-sock_cloexec-flag.patch	2011-02-10 22:27:28 UTC (rev 13284)
@@ -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
+ }
+ 

Modified: branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/series
===================================================================
--- branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/series	2011-02-10 22:04:26 UTC (rev 13283)
+++ branches/libapache-mod-jk/squeeze/libapache-mod-jk/debian/patches/series	2011-02-10 22:27:28 UTC (rev 13284)
@@ -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