rpm/vsftpd
SHA256
1
0
Fork 0
forked from pool/vsftpd
Code Pull Requests Activity

Accepting request 424074 from home:dimstar:Factory

Browse Source 
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
This commit is contained in:
Peter Simons 2016-08-31 18:18:20 +00:00 committed by Git OBS Bridge
parent 695d541dab
commit d7c40746c4
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vsftpd-2.0.4-lib64.diff
View File

@ -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

6
vsftpd.changes
View File

@ -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