Hello community, here is the log from the commit of package vsftpd for openSUSE:Factory checked in at 2019-06-26 16:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vsftpd (Old) and /work/SRC/openSUSE:Factory/.vsftpd.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vsftpd" Wed Jun 26 16:01:55 2019 rev:70 rq:710591 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/vsftpd/vsftpd.changes 2018-11-06 14:03:52.991492450 +0100 +++ /work/SRC/openSUSE:Factory/.vsftpd.new.4615/vsftpd.changes 2019-06-26 16:01:58.439457275 +0200 @@ -1,0 +2,13 @@ +Tue Jun 18 15:37:38 UTC 2019 - Peter Simons <[email protected]> + +- Apply "vsftpd-avoid-bogus-ssl-write.patch" to fix a segmentation + fault that occurred while trying to write to an invalid TLS + context. [bsc#1125951] + +------------------------------------------------------------------- +Wed Jun 12 14:16:40 UTC 2019 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +------------------------------------------------------------------- New: ---- vsftpd-avoid-bogus-ssl-write.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.0IwoMh/_old 2019-06-26 16:01:59.395458598 +0200 +++ /var/tmp/diff_new_pack.0IwoMh/_new 2019-06-26 16:01:59.399458604 +0200 @@ -1,7 +1,7 @@ # # spec file for package vsftpd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -84,6 +84,7 @@ Patch30: vsftpd-3.0.3-address_space_limit.patch Patch31: vsftpd-enable-syscalls-needed-by-sle15.patch Patch32: vsftpd-support-dsa-only-setups.patch +Patch33: vsftpd-avoid-bogus-ssl-write.patch BuildRequires: libcap-devel BuildRequires: libopenssl-devel BuildRequires: pam-devel @@ -99,7 +100,7 @@ Requires(pre): group(nobody) %endif %if %{with_systemd} -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %{?systemd_requires} %else Requires(post): %insserv_prereq @@ -148,6 +149,7 @@ %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 %build %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP ++++++ vsftpd-avoid-bogus-ssl-write.patch ++++++ Index: vsftpd-3.0.2/utility.c =================================================================== --- vsftpd-3.0.2.orig/utility.c +++ vsftpd-3.0.2/utility.c @@ -104,11 +104,13 @@ bug(const char* p_text) { if (s_p_sess->ssl_slave_active) { + /* Write error through ssl_slave process */ priv_sock_send_cmd(s_p_sess->ssl_consumer_fd, PRIV_SOCK_WRITE_USER_RESP); priv_sock_send_buf(s_p_sess->ssl_consumer_fd, text_buffer, text_len); } - else + else if (s_p_sess->p_control_ssl) { + /* From ssl_slave write the message directly */ (void)ssl_write(s_p_sess->p_control_ssl, text_buffer, text_len); } }
