diff --git a/vsftpd-2.0.6-libcap2-fix.diff b/vsftpd-2.0.6-libcap2-fix.diff new file mode 100644 index 0000000..a252e12 --- /dev/null +++ b/vsftpd-2.0.6-libcap2-fix.diff @@ -0,0 +1,15 @@ +--- vsf_findlibs.sh-dist 2008-05-02 09:44:39.000000000 +0200 ++++ vsf_findlibs.sh 2008-05-02 09:46:35.000000000 +0200 +@@ -45,9 +45,10 @@ + locate_library /usr/lib/libsec.sl && echo "-lsec"; + + # Look for libcap (capabilities) +-locate_library /lib/libcap.so.1 && echo "/lib/libcap.so.1"; +-locate_library /lib64/libcap.so.1 && echo "/lib64/libcap.so.1"; ++# locate_library /lib/libcap.so.1 && echo "/lib/libcap.so.1"; ++# locate_library /lib64/libcap.so.1 && echo "/lib64/libcap.so.1"; + locate_library /usr/lib/libcap.so && echo "-lcap"; ++locate_library /usr/lib64/libcap.so && echo "-lcap"; + + # Solaris needs this for nanosleep().. + locate_library /lib/libposix4.so && echo "-lposix4"; diff --git a/vsftpd.changes b/vsftpd.changes index c691c24..e87964d 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 10:08:03 CEST 2008 - tiwai@suse.de + +- fix the link with libcap2 + ------------------------------------------------------------------- Wed Apr 30 11:58:17 CEST 2008 - hvogel@suse.de diff --git a/vsftpd.spec b/vsftpd.spec index 57047a0..2f49b17 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -19,7 +19,7 @@ BuildRequires: libcap BuildRequires: libcap-devel %endif Version: 2.0.6 -Release: 15 +Release: 18 Summary: Very Secure FTP Daemon - Written from Scratch License: GPL v2 or later Group: Productivity/Networking/Ftp/Servers @@ -40,6 +40,7 @@ Patch5: %name-2.0.4-dmapi.patch Patch6: %name-2.0.5-vuser.patch Patch7: %name-2.0.5-enable-debuginfo.patch Patch8: %name-2.0.5-utf8-log-names.patch +Patch9: %name-2.0.6-libcap2-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq /usr/sbin/useradd @@ -72,6 +73,7 @@ Authors: %patch6 %patch7 %patch8 -p1 +%patch9 %build rm -f dummyinc/sys/capability.h @@ -127,6 +129,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %changelog +* Fri May 02 2008 tiwai@suse.de +- fix the link with libcap2 * Wed Apr 30 2008 hvogel@suse.de - Make the unpriv bits run as ftpsecure and not as nobody [bnc#384776]