From 33ca05c450f3958f77de9f1ac0e9521e06b04e191e06751deb08a7baca36aa55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Jun 2017 22:37:25 +0000 Subject: [PATCH 1/2] Accepting request 503275 from home:dmolkentin:branches:network - Fix build against OpenSSL 1.1. Remove lock on 1.0.x libs adds vsftpd-3.0.3-build-with-openssl-1.1.patch (bsc#1042673) OBS-URL: https://build.opensuse.org/request/show/503275 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=112 --- vsftpd-3.0.3-build-with-openssl-1.1.patch | 13 +++++++++++++ vsftpd.changes | 7 +++++++ vsftpd.spec | 7 ++++--- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 vsftpd-3.0.3-build-with-openssl-1.1.patch diff --git a/vsftpd-3.0.3-build-with-openssl-1.1.patch b/vsftpd-3.0.3-build-with-openssl-1.1.patch new file mode 100644 index 0000000..bb71436 --- /dev/null +++ b/vsftpd-3.0.3-build-with-openssl-1.1.patch @@ -0,0 +1,13 @@ +Index: vsftpd-3.0.3/vsf_findlibs.sh +=================================================================== +--- vsftpd-3.0.3.orig/vsf_findlibs.sh ++++ vsftpd-3.0.3/vsf_findlibs.sh +@@ -72,7 +72,7 @@ locate_library /usr/shlib/librt.so && ec + locate_library /usr/lib/libsendfile.so && echo "-lsendfile"; + + # OpenSSL +-if find_func SSL_library_init ssl.o; then ++if find_func SSL_CTX_new ssl.o; then + echo "-lssl -lcrypto"; + fi + diff --git a/vsftpd.changes b/vsftpd.changes index 761f186..8b20585 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 12 17:57:38 UTC 2017 - daniel.molkentin@suse.com + +- Fix build against OpenSSL 1.1. Remove lock on 1.0.x libs + adds vsftpd-3.0.3-build-with-openssl-1.1.patch + (bsc#1042673) + ------------------------------------------------------------------- Wed May 31 15:02:14 UTC 2017 - psimons@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index b8bc7f2..df8f66c 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -70,15 +70,15 @@ Patch23: vsftpd-ls-memleak.patch #PATCH-FIX-UPSTREAM: bnc#970982 Patch24: vsftpd-3.0.2-wnohang.patch Patch25: vsftpd-3.0.2-fix-chown-uploads.patch +#FIX-FIX-OPENSUSE: bsc#1042673 +Patch26: vsftpd-3.0.3-build-with-openssl-1.1.patch BuildRequires: libcap-devel +BuildRequires: libopenssl-devel BuildRequires: pam-devel Requires: logrotate Requires(pre): shadow %if 0%{?suse_version} >= 1330 Requires(pre): group(nobody) -BuildRequires: libopenssl-1_0_0-devel -%else -BuildRequires: libopenssl-devel %endif Provides: ftp-server BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,6 +125,7 @@ tests. %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %build %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP From 6bfb03fe57c61a942d1ab322287429c4d3af4f5ea3458868c0ac321ec93888cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 14 Jun 2017 11:44:16 +0000 Subject: [PATCH 2/2] - Conditionally install xinetd service only on older releases * On current distributions we support the same functionality via systemd socket activation OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=113 --- vsftpd.changes | 7 +++++++ vsftpd.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/vsftpd.changes b/vsftpd.changes index 8b20585..c4f2b0c 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 14 11:42:26 UTC 2017 - tchvatal@suse.com + +- Conditionally install xinetd service only on older releases + * On current distributions we support the same functionality + via systemd socket activation + ------------------------------------------------------------------- Mon Jun 12 17:57:38 UTC 2017 - daniel.molkentin@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index df8f66c..6f2f3dc 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -138,7 +138,9 @@ mkdir -p %{buildroot}%{_datadir}/empty cp %{SOURCE4} . install -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name} install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf +%if 0%{?suse_version} < 1330 install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name} +%endif install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name} install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -D -m 644 %{name}.conf.5 %{buildroot}/%{_mandir}/man5/%{name}.conf.5 @@ -196,7 +198,9 @@ getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Sec %{_sbindir}/%{name} %{_sbindir}/rc%{name} %dir %{_datadir}/empty +%if 0%{?suse_version} < 1330 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} +%endif %config(noreplace) %{_sysconfdir}/%{name}.conf %config %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}