diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes index 20e4efa..d0e2eda 100644 --- a/apache-commons-daemon.changes +++ b/apache-commons-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 19 09:13:08 UTC 2012 - mvyskocil@suse.cz + +- fix bnc#771802: jsvc fails to load libcap + ------------------------------------------------------------------- Tue Jul 3 13:28:57 UTC 2012 - dvaleev@suse.com diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 5523cf6..92acca7 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -30,6 +30,7 @@ Patch0: 0001-execve-path-warning.patch Patch1: apache-commons-daemon-JAVA_OS.patch Patch2: apache-commons-daemon-s390x.patch Patch3: apache-commons-daemon-ppc64.patch +Patch4: jsvc-libcap-relative.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ant @@ -79,6 +80,7 @@ The Javadoc Documentation for Commons Daemon. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # remove java binaries from sources rm -rf src/samples/build/ diff --git a/jsvc-libcap-relative.patch b/jsvc-libcap-relative.patch new file mode 100644 index 0000000..36cf066 --- /dev/null +++ b/jsvc-libcap-relative.patch @@ -0,0 +1,20 @@ +Index: commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c +=================================================================== +--- commons-daemon-1.0.10-src.orig/src/native/unix/native/jsvc-unix.c 2012-07-18 16:00:46.791533454 +0200 ++++ commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c 2012-07-18 16:02:14.303529317 +0200 +@@ -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.2", ++ "libcap.so.1", ++ "libcap.so", + NULL + }; +