Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2018-07-18 22:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Wed Jul 18 22:53:31 2018 rev:31 rq:621886 version:1.3.5e Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2017-07-21 22:50:42.317674287 +0200 +++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2018-07-18 22:53:41.715009585 +0200 @@ -1,0 +2,15 @@ +Tue Jul 10 11:57:58 UTC 2018 - [email protected] + +- update to 1.3.5e + * Fixed SFTP issue with [email protected] digest/MAC. + * Fixed regression with mod_sftp rekeying. + * Backported fix for "AllowChrootSymlinks off" checking each component + for symlinks (CVE-2017-7418). +- remove obsolete patch + * proftpd-AllowChrootSymlinks.patch (now included) +- rebase patches + * proftpd-dist.patch + * proftpd-no_BuildDate.patch + * proftpd_include-in-limit-section.patch + +------------------------------------------------------------------- Old: ---- proftpd-1.3.5d.tar.gz proftpd-1.3.5d.tar.gz.asc proftpd-AllowChrootSymlinks.patch New: ---- proftpd-1.3.5e.tar.gz proftpd-1.3.5e.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.qQs1U9/_old 2018-07-18 22:53:42.719006256 +0200 +++ /var/tmp/diff_new_pack.qQs1U9/_new 2018-07-18 22:53:42.719006256 +0200 @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,9 +20,9 @@ Summary: Highly configurable GPL-licensed FTP server software # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Ftp/Servers -Version: 1.3.5d +Version: 1.3.5e Release: 0 Url: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz @@ -35,10 +35,6 @@ Source16: %{name}-tls.template Source17: %{name}-limit.template Source18: %{name}-ssl.README -#PATCH-FIX-UPSTREAM (CVE-2017-7418): -# AllowChrootSymlinks not enforced by replacing a path component with a symbolic link -### github commit: ecff21e0d0e84f35c299ef91d7fda088e516d4ed -Patch0: %{name}-AllowChrootSymlinks.patch #PATCH-FIX-openSUSE: pam, logrotate, xinet Patch100: %{name}-dist.patch #PATCH-FIX-openSUSE: provide a useful default config @@ -53,6 +49,7 @@ Patch105: %{name}_include-in-limit-section.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: gpg-offline +BuildRequires: fdupes BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -148,7 +145,6 @@ #gpg_verify %{S:1} %setup -q rm README.AIX -%patch0 -p1 # %patch100 %patch101 @@ -210,12 +206,14 @@ install -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} # systemd need to create a tmp dir: /run/proftpd -install -D -m 0644 %{S:14} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf +install -D -m 0644 %{S:14} %{buildroot}%{_tmpfilesdir}/%{name}.conf %else #SysVinit install -D -m 0755 %{S:11} %{buildroot}/%{_sysconfdir}/init.d/%{name} ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name} %endif +%fdupes -s %{buildroot}%{_sysconfdir}/%{name} + %find_lang %{name} %pre @@ -233,7 +231,7 @@ %post %if 0%{?has_systemd} %service_add_post %{name}.service -/usr/bin/systemd-tmpfiles --create %{name}.conf || : +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf || : %else %{fillup_and_insserv -f proftpd} install -d %{_localstatedir}/run/%{name} @@ -266,8 +264,6 @@ %defattr(-,root,root) %doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES %doc contrib/README.* -#%doc contrib/xferstats.holger-preiss* -#%doc contrib/ftpasswd contrib/ftpquota %doc sample-configurations/*.conf %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/ %dir %attr(0750,ftp,ftp) %{_sysconfdir}/%{name}/auth/ @@ -278,14 +274,14 @@ %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/includes/ %config %{_sysconfdir}/%{name}/includes/limit.template %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/%{name}.conf -%{_sysconfdir}/%{name}/PROFTPD-MIB.txt +%config %{_sysconfdir}/%{name}/PROFTPD-MIB.txt %dir %attr(0700,ftp,ftp) %{_sysconfdir}/%{name}/ssl/ %config %{_sysconfdir}/%{name}/ssl/README %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/%{name}/blacklist.dat %config(noreplace) %{_sysconfdir}/%{name}/dhparams.pem -%dir %attr(0750,ftp,ftp) %{_localstatedir}/log/%{name} +%dir %attr(0750,root,root) %{_localstatedir}/log/%{name} %{_sbindir}/* %{_mandir}/man?/* %dir %attr(0755,root,root) %{_libdir}/%{name}/ @@ -297,7 +293,7 @@ %exclude %{_libdir}/%{name}/mod_sql_sqlite.so %if 0%{?has_systemd} %{_unitdir}/%{name}.service -%{_prefix}/lib/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %ghost %dir /run/%{name} %else %{_sysconfdir}/init.d/%{name} ++++++ proftpd-1.3.5d.tar.gz -> proftpd-1.3.5e.tar.gz ++++++ /work/SRC/openSUSE:Factory/proftpd/proftpd-1.3.5d.tar.gz /work/SRC/openSUSE:Factory/.proftpd.new/proftpd-1.3.5e.tar.gz differ: char 15, line 1 ++++++ proftpd-dist.patch ++++++ --- /var/tmp/diff_new_pack.qQs1U9/_old 2018-07-18 22:53:42.759006123 +0200 +++ /var/tmp/diff_new_pack.qQs1U9/_new 2018-07-18 22:53:42.759006123 +0200 @@ -41,7 +41,7 @@ sharedscripts postrotate - test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || : -+ /etc/init.d/proftpd reload ++ /usr/sbin/rcproftpd reload + #/etc/init.d/xinetd reload endscript } ++++++ proftpd-no_BuildDate.patch ++++++ --- /var/tmp/diff_new_pack.qQs1U9/_old 2018-07-18 22:53:42.779006057 +0200 +++ /var/tmp/diff_new_pack.qQs1U9/_new 2018-07-18 22:53:42.783006044 +0200 @@ -65,8 +65,8 @@ -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030510 - #define PROFTPD_VERSION_TEXT "1.3.5d" + #define PROFTPD_VERSION_NUMBER 0x0001030511 + #define PROFTPD_VERSION_TEXT "1.3.5e" Index: src/main.c =================================================================== --- src/main.c.orig ++++++ proftpd_include-in-limit-section.patch ++++++ --- /var/tmp/diff_new_pack.qQs1U9/_old 2018-07-18 22:53:42.851005818 +0200 +++ /var/tmp/diff_new_pack.qQs1U9/_new 2018-07-18 22:53:42.851005818 +0200 @@ -2,7 +2,7 @@ =================================================================== --- RELEASE_NOTES.orig +++ RELEASE_NOTES -@@ -12,6 +12,16 @@ ChangeLog files. +@@ -20,6 +20,16 @@ ChangeLog files. + Fixed regression where all normal FTP users were handled as anonymous users.
