[pkg-java] r16273 - in trunk/commons-daemon/debian: . patches

[Tony Mancill]

Author: tmancill
Date: 2012-08-16 06:11:10 +0000 (Thu, 16 Aug 2012)
New Revision: 16273

Added:
   trunk/commons-daemon/debian/patches/libcap_dlopen.diff
Modified:
   trunk/commons-daemon/debian/changelog
   trunk/commons-daemon/debian/patches/series
Log:
add patch for #685025

Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog	2012-08-15 02:11:31 UTC (rev 16272)
+++ trunk/commons-daemon/debian/changelog	2012-08-16 06:11:10 UTC (rev 16273)
@@ -1,3 +1,10 @@
+commons-daemon (1.0.10-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add patch to allow dlopen to locate libcap. (Closes: #685025)
+
+ -- tony mancill <tmancill at debian.org>  Wed, 15 Aug 2012 22:45:51 -0700
+
 commons-daemon (1.0.10-2) unstable; urgency=low
 
   * d/control: Really drop Michael from Uploaders list.

Added: trunk/commons-daemon/debian/patches/libcap_dlopen.diff
===================================================================
--- trunk/commons-daemon/debian/patches/libcap_dlopen.diff	                        (rev 0)
+++ trunk/commons-daemon/debian/patches/libcap_dlopen.diff	2012-08-16 06:11:10 UTC (rev 16273)
@@ -0,0 +1,25 @@
+From: tony mancill <tmancill at debian.org>
+Description: jsvc fails to load libcap.so.2 from /lib64 (or multiarch)
+Bug: https://issues.apache.org/jira/browse/DAEMON-246
+Bug-Debian: http://bugs.debian.org/685025
+Origin: upstream, https://issues.apache.org/jira/secure/attachment/12517413/patch.txt
+Forwarded: not-needed
+Author: Emily Middleton
+=========================================================================
+--- a/src/native/unix/native/jsvc-unix.c	2012-03-07 13:46:57.946756436 +0000
++++ b/src/native/unix/native/jsvc-unix.c	2012-03-07 13:37:12.068505335 +0000
+@@ -247,12 +247,9 @@
+ static fd_cap_set_proc fp_cap_set_proc;
+ 
+ static const char *libcap_locs[] = {
+-    "/lib/libcap.so.2",
+-    "/lib/libcap.so.1",
+-    "/lib/libcap.so",
+-    "/usr/lib/libcap.so.2",
+-    "/usr/lib/libcap.so.1",
+-    "/usr/lib/libcap.so",
++    "libcap.so",
++    "libcap.so.2",
++    "libcap.so.1",
+     NULL
+ };

Modified: trunk/commons-daemon/debian/patches/series
===================================================================
--- trunk/commons-daemon/debian/patches/series	2012-08-15 02:11:31 UTC (rev 16272)
+++ trunk/commons-daemon/debian/patches/series	2012-08-16 06:11:10 UTC (rev 16273)
@@ -6,3 +6,4 @@
 arm_support.diff
 hurd_support.diff
 s390x_support.diff
+libcap_dlopen.diff