Hello community, here is the log from the commit of package vsftpd for openSUSE:Factory checked in at 2017-06-15 11:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vsftpd (Old) and /work/SRC/openSUSE:Factory/.vsftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vsftpd" Thu Jun 15 11:18:41 2017 rev:61 rq:503674 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/vsftpd/vsftpd.changes 2017-06-07 09:53:53.803627756 +0200 +++ /work/SRC/openSUSE:Factory/.vsftpd.new/vsftpd.changes 2017-06-15 11:18:42.419113399 +0200 @@ -1,0 +2,14 @@ +Wed Jun 14 11:42:26 UTC 2017 - [email protected] + +- 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 - [email protected] + +- 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) + +------------------------------------------------------------------- New: ---- vsftpd-3.0.3-build-with-openssl-1.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.RIdXrQ/_old 2017-06-15 11:18:44.290848966 +0200 +++ /var/tmp/diff_new_pack.RIdXrQ/_new 2017-06-15 11:18:44.298847836 +0200 @@ -70,15 +70,15 @@ #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 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %build %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP @@ -137,7 +138,9 @@ 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 @@ %{_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} ++++++ vsftpd-3.0.3-build-with-openssl-1.1.patch ++++++ 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
