Don't link with libnsl

This commit is contained in:
Ondřej Lysoněk 2018-02-06 18:17:12 +01:00
parent 37f8d87aad
commit e26d2ceeaa
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,27 @@
From f8663f35d5d150f0533bb052e48306b9a5111d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Tue, 6 Feb 2018 18:04:53 +0100
Subject: [PATCH 50/50] Don't link with libnsl
Don't link with libnsl. It builds just fine without it and
vsf_findlibs.sh enables it only when tcp_wrappers is enabled.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 612994e..0f7411c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
-D_FORTIFY_SOURCE=2 \
#-pedantic -Wconversion
-LIBS = -lnsl -lpam -lcap -ldl -lcrypto
+LIBS = -lpam -lcap -ldl -lcrypto
LINK = -Wl,-s
LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
--
2.14.3

View File

@ -2,7 +2,7 @@
Name: vsftpd
Version: 3.0.3
Release: 18%{?dist}
Release: 19%{?dist}
Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons
@ -25,7 +25,6 @@ BuildRequires: libcap-devel
BuildRequires: openssl-devel
BuildRequires: systemd
BuildRequires: git
BuildRequires: libnsl2-devel
Requires: logrotate
@ -78,6 +77,7 @@ Patch46: 0046-vsftpd.conf-Refer-to-the-man-page-regarding-the-asci.patch
Patch47: 0047-Disable-tcp_wrappers-support.patch
Patch48: 0048-Fix-default-value-of-strict_ssl_read_eof-in-man-page.patch
Patch49: 0049-Add-new-filename-generation-algorithm-for-STOU-comma.patch
Patch50: 0050-Don-t-link-with-libnsl.patch
%description
vsftpd is a Very Secure FTP daemon. It was written completely from
@ -147,6 +147,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
%{_var}/ftp
%changelog
* Tue Feb 06 2018 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-19
- Don't link with libnsl
* Tue Feb 06 2018 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-18
- Add a new config option 'better_stou', which can be used to enable
a better algorithm for generating unique filenames for the STOU command.