diff --git a/vsftpd.changes b/vsftpd.changes index f200945..60d45b3 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 3 16:44:28 UTC 2022 - Peter Simons + +- Use rpm conditional to build against the proper OpenSSL version + on all distributions. [jsc#PM-3322] + ------------------------------------------------------------------- Tue Feb 1 18:42:41 UTC 2022 - Peter Simons @@ -37,7 +43,7 @@ Tue Feb 1 18:42:41 UTC 2022 - Peter Simons default. Run the command "openssl ciphers -v DEFAULT_SUSE" to see which ciphers this includes. -- Apply "add vsftpd-allow-dev-log-socket.patch" to allow sendto() +- Apply "vsftpd-allow-dev-log-socket.patch" to allow sendto() syscall when /dev/log support is enabled. [bnc#786024] - Apply "vsftpd-enable-sendto-for-prelogin-syslog.patch" to allow diff --git a/vsftpd.spec b/vsftpd.spec index 55e4464..d0c55f3 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -97,7 +97,11 @@ Patch42: use-system-wide-tls-cipher-policy.patch Patch43: vsftpd-allow-dev-log-socket.patch Patch44: vsftpd-enable-sendto-for-prelogin-syslog.patch BuildRequires: libcap-devel -BuildRequires: libopenssl-devel +%if 0%{?suse_version} == 1315 +BuildRequires: libopenssl-1_1-devel >= 1.1.1 +%else +BuildRequires: libopenssl-devel >= 1.1.1 +%endif BuildRequires: pam-devel Requires: logrotate Requires(pre): shadow