Accepting request 503674 from network

- Conditionally install xinetd service only on older releases
  * On current distributions we support the same functionality
    via systemd socket activation

- 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/503674
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vsftpd?expand=0&rev=61

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
+ 

vsftpd.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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
@@ -137,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
@@ -195,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}