Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2019-05-27 08:38:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Mon May 27 08:38:07 2019 rev:32 rq:705245 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2018-07-18 22:53:41.715009585 +0200 +++ /work/SRC/openSUSE:Factory/.proftpd.new.5148/proftpd.changes 2019-05-27 08:38:12.287075198 +0200 @@ -1,0 +2,66 @@ +Tue Mar 26 11:35:53 UTC 2019 - Jan Engelhardt <[email protected]> + +- Fix the Factory build: select the appropriate OpenSSL version + to build with. + +------------------------------------------------------------------- +Wed Mar 20 18:46:47 UTC 2019 - Jan Engelhardt <[email protected]> + +- Reduce hard dependency on systemd to only that which is + necessary for building and installation. +- Modernize RPM macro use (%make_install, %tmpfiles_create). +- Strip emphasis from description and trim other platform mentions. + +------------------------------------------------------------------- +Wed Jul 11 08:05:29 UTC 2018 - [email protected] + +- update to 1.3.6 + * Support for using Redis for caching, logging; see the doc/howto/Redis.html + documentation. + * Fixed mod_sql_postgres SSL support (Issue #415). + * Support building against LibreSSL instead of OpenSSL (Issue #361). + * Better support on AIX for login restraictions (Bug #4285). + * TimeoutLogin (and other timeouts) were not working properly for SFTP + connections (Bug#4299). + * Handling of the SIGILL and SIGINT signals, by the daemon process, now causes + the child processes to be terminated as well (Issue #461). + * RPM .spec file naming changed to conform to Fedora guidelines. + * Fix for "AllowChrootSymlinks off" checking each component for symlinks + (CVE-2017-7418). + -New Modules: + * mod_redis, mod_tls_redis, mod_wrap2_redis + With Redis now supported as a caching mechanism, similar to Memcache, + there are now Redis-using modules: mod_redis (for configuring the Redis + connection information), mod_tls_redis (for caching SSL sessions and + OCSP information using Redis), and mod_wrap2_redis (for using ACLs stored + in Redis). + -Changed Modules: + * mod_ban + The mod_ban module's BanCache directive can now use Redis-based caching; + see doc/contrib/mod_ban.html#BanCache. + -New Configuration Directives + * SQLPasswordArgon2, SQLPasswordScrypt + The key lengths for Argon2 and Scrypt-based passwords are now configurable + via these new directives; previously, the key length had been hardcoded + to be 32 bytes, which is not interoperable with all other implementations + (Issue #454). + -Changed Configuration Directives + * AllowChrootSymlinks + When "AllowChrootSymlinks off" was used, only the last portion of the + DefaultRoot path would be checked to see if it was a symlink. Now, + each component of the DefaultRoot path will be checked to see if it is + a symlink when "AllowChrootSymlinks off" is used. + * Include + The Include directive can now be used within a <Limit> section, e.g.: + <Limit LOGIN> + Include /path/to/allowed.txt + DenyAll + </Limit> + -API Changes + * A new JSON API has been added, for use by third-party modules. +- remove obsolete proftpd_include-in-limit-section.patch +- rebase patches + * proftpd-ftpasswd.patch + * proftpd-no_BuildDate.patch + +------------------------------------------------------------------- Old: ---- proftpd-1.3.5e.tar.gz proftpd-1.3.5e.tar.gz.asc proftpd_include-in-limit-section.patch New: ---- proftpd-1.3.6.tar.gz proftpd-1.3.6.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.DYVWrX/_old 2019-05-27 08:38:13.839074594 +0200 +++ /var/tmp/diff_new_pack.DYVWrX/_new 2019-05-27 08:38:13.839074594 +0200 @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# 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 @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: proftpd -Summary: Highly configurable GPL-licensed FTP server software +Summary: 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-or-later Group: Productivity/Networking/Ftp/Servers -Version: 1.3.5e +Version: 1.3.6 Release: 0 Url: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz @@ -45,8 +45,6 @@ Patch103: %{name}-strip.patch #PATCH-FIX-openSUSE: file-contains-date-and-time Patch104: %{name}-no_BuildDate.patch -#PATCH-Feature-back-port: include-in-limit-section -Patch105: %{name}_include-in-limit-section.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: gpg-offline BuildRequires: fdupes @@ -58,12 +56,12 @@ BuildRequires: mysql-devel BuildRequires: ncurses-devel BuildRequires: openldap2-devel -BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: postgresql-devel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel +BuildRequires: pkgconfig(libssl) < 1.1 Requires: logrotate %if 0%{?lang_package:1} > 0 @@ -71,17 +69,16 @@ %endif %if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%{?systemd_requires} +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} %define has_systemd 1 %else Requires(pre): %insserv_prereq %endif %description -ProFTPD is a highly configurable FTP daemon for Unix and Unix-like -operating systems. See the README.ports file for more details about -the platforms on which ProFTPD in known or thought to build and run. +ProFTPD is a configurable FTP daemon for Unix and Unix-like +operating systems. %{?lang_package} @@ -151,7 +148,6 @@ %patch102 %patch103 %patch104 -%patch105 %build rm contrib/mod_wrap.c @@ -184,7 +180,7 @@ make %{?_smp_mflags} %install -%makeinstall INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn` +%make_install INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn` install -D -m 0644 contrib/dist/rpm/ftp.pamd %{buildroot}/%{_sysconfdir}/pam.d/%{name} install -D -m 0644 contrib/dist/rpm/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # @@ -231,7 +227,7 @@ %post %if 0%{?has_systemd} %service_add_post %{name}.service -%tmpfiles_create %{_tmpfilesdir}/%{name}.conf || : +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %else %{fillup_and_insserv -f proftpd} install -d %{_localstatedir}/run/%{name} ++++++ proftpd-1.3.5e.tar.gz -> proftpd-1.3.6.tar.gz ++++++ /work/SRC/openSUSE:Factory/proftpd/proftpd-1.3.5e.tar.gz /work/SRC/openSUSE:Factory/.proftpd.new.5148/proftpd-1.3.6.tar.gz differ: char 12, line 1 ++++++ proftpd-ftpasswd.patch ++++++ --- /var/tmp/diff_new_pack.DYVWrX/_old 2019-05-27 08:38:13.899074570 +0200 +++ /var/tmp/diff_new_pack.DYVWrX/_new 2019-05-27 08:38:13.899074570 +0200 @@ -2,7 +2,7 @@ =================================================================== --- contrib/ftpasswd.orig +++ contrib/ftpasswd -@@ -34,8 +34,8 @@ use Getopt::Long; +@@ -32,8 +32,8 @@ use Getopt::Long; $Getopt::Long::auto_abbrev = 0; my $program = basename($0); @@ -13,7 +13,7 @@ my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; -@@ -1074,6 +1074,46 @@ usage: $program [--help] [--hash|--group +@@ -1109,6 +1109,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. ++++++ proftpd-no_BuildDate.patch ++++++ --- /var/tmp/diff_new_pack.DYVWrX/_old 2019-05-27 08:38:13.919074562 +0200 +++ /var/tmp/diff_new_pack.DYVWrX/_new 2019-05-27 08:38:13.919074562 +0200 @@ -65,13 +65,13 @@ -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030511 - #define PROFTPD_VERSION_TEXT "1.3.5e" + #define PROFTPD_VERSION_NUMBER 0x0001030605 + #define PROFTPD_VERSION_TEXT "1.3.6" Index: src/main.c =================================================================== --- src/main.c.orig +++ src/main.c -@@ -2435,8 +2435,8 @@ static void standalone_main(void) { +@@ -1883,8 +1883,8 @@ static void standalone_main(void) { init_bindings(); @@ -80,9 +80,9 @@ + pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP", + PROFTPD_VERSION_TEXT " " PR_STATUS); - pr_pidfile_write(); - daemon_loop(); -@@ -2491,7 +2491,6 @@ static void show_settings(void) { + if (pr_pidfile_write() < 0) { + fprintf(stderr, "error opening PidFile '%s': %s\n", pr_pidfile_get(), +@@ -1944,7 +1944,6 @@ static void show_settings(void) { printf("%s", " Platform: " PR_PLATFORM " [unknown]\n"); #endif /* !HAVE_UNAME */ @@ -90,11 +90,11 @@ printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n"); printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n"); -@@ -3009,7 +3008,6 @@ int main(int argc, char *argv[], char ** +@@ -2523,7 +2522,6 @@ int main(int argc, char *argv[], char ** printf("ProFTPD Version: %s", PROFTPD_VERSION_TEXT " " PR_STATUS "\n"); printf(" Scoreboard Version: %08x\n", PR_SCOREBOARD_VERSION); - printf(" Built: %s\n\n", BUILD_STAMP); - modules_list(PR_MODULES_LIST_FL_SHOW_VERSION); + modules_list2(NULL, PR_MODULES_LIST_FL_SHOW_VERSION); exit(0);
