From f6c72fe663e00feb6712b1aacb9158ba22fc33eafca2fa644aa66bb7b70361fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Sep 2017 13:02:10 +0000 Subject: [PATCH] - Don't rely on the vsf_findlibs.sh script to figure out the list of libraries the build needs to link. The script is wildly unreliable and it's hard to predict what results it will produce. Also, the results it *does* produce are invisble in the build log. We stumbled across this issue when vsftpd suddendly had build failures on i586 platforms because the script decided to try and link "-lnsl" even though the library was neither installed nor required. - Drop the explicit specification of the LDFLAGS and LINK variables from the call to make. The value of LDFLAGS we passed is the default anyway and giving LINK has no effect since it's not used anywhere in the Makefile. OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=119 --- vsftpd.changes | 14 ++++++++++++++ vsftpd.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index ceb1497..bd2edb7 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -24,6 +24,20 @@ Thu Sep 7 12:24:26 UTC 2017 - psimons@suse.com enabled, and in such cases administrators may wish to raise the limit to match their system's requirements. [bsc#1042137] +- Don't rely on the vsf_findlibs.sh script to figure out the list + of libraries the build needs to link. The script is wildly + unreliable and it's hard to predict what results it will produce. + Also, the results it *does* produce are invisble in the build + log. We stumbled across this issue when vsftpd suddendly had + build failures on i586 platforms because the script decided to + try and link "-lnsl" even though the library was neither + installed nor required. + +- Drop the explicit specification of the LDFLAGS and LINK variables + from the call to make. The value of LDFLAGS we passed is the + default anyway and giving LINK has no effect since it's not used + anywhere in the Makefile. + ------------------------------------------------------------------- Wed Jun 14 11:42:26 UTC 2017 - tchvatal@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index b0f2703..85f921d 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -137,9 +137,9 @@ tests. %build %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP -rm -f dummyinc/sys/capability.h +rm dummyinc/sys/capability.h vsf_findlibs.sh make CFLAGS="%{optflags} -DOPENSSL_NO_SSL_INTERN -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector --param=ssp-buffer-size=4 %{seccomp_opts}" \ - LDFLAGS="-fPIE -pie -Wl,-z,relro -Wl,-z,now" LINK= + LIBS="-lpam -lcap -lssl -lcrypto" %install mkdir -p %{buildroot}%{_datadir}/empty