This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit 3dee205581c11341df3d5319cac65e6604d5f853 Author: tony mancill <[email protected]> Date: Wed Aug 15 22:45:51 2012 -0700 Imported Debian patch 1.0.10-3 --- debian/changelog | 7 +++++++ debian/patches/libcap_dlopen.diff | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index 508ade7..47e5eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +commons-daemon (1.0.10-3) unstable; urgency=low + + * Team upload. + * Add patch to allow dlopen to locate libcap. (Closes: #685025) + + -- tony mancill <[email protected]> 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. diff --git a/debian/patches/libcap_dlopen.diff b/debian/patches/libcap_dlopen.diff new file mode 100644 index 0000000..e6a7fec --- /dev/null +++ b/debian/patches/libcap_dlopen.diff @@ -0,0 +1,25 @@ +From: tony mancill <[email protected]> +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 + }; diff --git a/debian/patches/series b/debian/patches/series index ea7a3da..57458fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ hppa_support.diff arm_support.diff hurd_support.diff s390x_support.diff +libcap_dlopen.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
