From d7c40746c47b419e682f3e9a144d3a38ee858bca4ea91e8c8a5a90ddb4e7ef64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2016 18:18:20 +0000 Subject: [PATCH] Accepting request 424074 from home:dimstar:Factory Fix build with libcap, which moved the lib from /lib64 to /usr/lib64 (see Staging:C) OBS-URL: https://build.opensuse.org/request/show/424074 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=104 --- vsftpd-2.0.4-lib64.diff | 16 ++++++++++++---- vsftpd.changes | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/vsftpd-2.0.4-lib64.diff b/vsftpd-2.0.4-lib64.diff index 0a57fec..c86b0e7 100644 --- a/vsftpd-2.0.4-lib64.diff +++ b/vsftpd-2.0.4-lib64.diff @@ -1,8 +1,8 @@ Index: vsf_findlibs.sh =================================================================== ---- vsf_findlibs.sh.orig 2012-04-10 16:09:50.571389404 +0200 -+++ vsf_findlibs.sh 2012-04-10 16:09:53.709496934 +0200 -@@ -14,6 +14,7 @@ +--- vsf_findlibs.sh.orig ++++ vsf_findlibs.sh +@@ -14,6 +14,7 @@ fi # crypt library. if find_func pam_start sysdeputil.o; then locate_library /lib/libpam.so.0 && echo "/lib/libpam.so.0"; @@ -10,7 +10,7 @@ Index: vsf_findlibs.sh locate_library /usr/lib/libpam.so && echo "-lpam"; locate_library /usr/lib64/libpam.so && echo "-lpam"; locate_library /lib/x86_64-linux-gnu/libpam.so.0 && echo "-lpam"; -@@ -23,6 +24,7 @@ +@@ -23,6 +24,7 @@ if find_func pam_start sysdeputil.o; the locate_library /usr/lib/libpam.a && echo "-lpam"; else locate_library /lib/libcrypt.so && echo "-lcrypt"; @@ -18,3 +18,11 @@ Index: vsf_findlibs.sh locate_library /usr/lib/libcrypt.so && echo "-lcrypt"; locate_library /usr/lib64/libcrypt.so && echo "-lcrypt"; locate_library /lib/x86_64-linux-gnu/libcrypt.so && echo "-lcrypt"; +@@ -54,6 +56,7 @@ elif locate_library /lib/libcap.so.2; th + echo "/lib/libcap.so.2"; + else + locate_library /usr/lib/libcap.so && echo "-lcap"; ++ locate_library /usr/lib64/libcap.so && echo "-lcap"; + locate_library /lib/libcap.so && echo "-lcap"; + locate_library /lib64/libcap.so && echo "-lcap"; + fi diff --git a/vsftpd.changes b/vsftpd.changes index b824fcf..8242e36 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 31 17:21:04 UTC 2016 - dimstar@opensuse.org + +- Extend vsftpd-2.0.4-lib64.diff to also find libcap.so.* in + /usr/lib64. + ------------------------------------------------------------------- Fri Aug 5 11:27:39 UTC 2016 - tchvatal@suse.com