Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2014-09-03 18:23:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2014-03-26 16:41:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2014-09-03 20:48:29.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Sep 1 22:04:02 UTC 2014 - andreas.stie...@gmx.de + +- ProFTPD 1.3.5 + * Added support for SHA-256, SHA-512 password hashes to the ftpasswd tool + * New Modules + mod_geoip, mod_log_forensic, mod_rlimit, mod_snmp, mod_dnsbl + * mod_sftp now supports ECC, ECDSA, ECDH + * Improved FIPS support in mod_sftp. + * mod_sftp module now honors the MaxStoreFileSize directive. + * Many new and changed configuration directives +- update proftpd-no_BuildDate.patch + +------------------------------------------------------------------- +Mon Sep 1 19:00:57 UTC 2014 - andreas.stie...@gmx.de + +- proftpd 1.3.4e: + Multiple other backported fix from the 1.3.5 branch. + See http://www.proftpd.org/docs/NEWS-1.3.4e +- The fix for the mod_sftp/mod_sftp_pam memory allocation + (CVE-2013-4359) contained in this release was previously patched + into the package. +- adjust proftpd-no_BuildDate.patch for context changes +- remove proftpd-sftp-kbdint-max-responses-bug3973.patch, upstream + +------------------------------------------------------------------- Old: ---- proftpd-1.3.4d.tar.gz proftpd-1.3.4d.tar.gz.asc proftpd-sftp-kbdint-max-responses-bug3973.patch New: ---- proftpd-1.3.5.tar.gz proftpd-1.3.5.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.by2cy6/_old 2014-09-03 20:48:32.000000000 +0200 +++ /var/tmp/diff_new_pack.by2cy6/_new 2014-09-03 20:48:32.000000000 +0200 @@ -22,7 +22,7 @@ Group: Productivity/Networking/Ftp/Servers # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions -Version: 1.3.4d +Version: 1.3.5 Release: 0 Url: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz @@ -42,14 +42,13 @@ Patch103: %{name}-strip.patch #PATCH-FIX-openSUSE: file-contains-date-and-time Patch104: %{name}-no_BuildDate.patch -# PATCH-FIX-upstream: sftp-kbdint-max-responses-bug3973 -Patch105: %{name}-sftp-kbdint-max-responses-bug3973.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gpg-offline BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel #BuildRequires: libmemcached-devel +BuildRequires: libGeoIP-devel BuildRequires: mysql-devel BuildRequires: ncurses-devel BuildRequires: openldap2-devel @@ -142,8 +141,7 @@ %patch101 %patch102 %patch103 -%patch104 -%patch105 +%patch104 -p1 %build rm contrib/mod_wrap.c @@ -260,7 +258,7 @@ %files -f %{name}.lang %endif %defattr(-,root,root,-) -%doc COPYING CREDITS ChangeLog INSTALL NEWS README* RELEASE_NOTES +%doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES %doc contrib/README.* #%doc contrib/xferstats.holger-preiss* #%doc contrib/ftpasswd contrib/ftpquota @@ -270,6 +268,7 @@ %config(noreplace) %attr(0644,root,ftp) %{_sysconfdir}/%{name}/auth/passwd %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/conf.d %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/%{name}.conf +%{_sysconfdir}/%{name}/PROFTPD-MIB.txt %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} ++++++ proftpd-1.3.4d.tar.gz -> proftpd-1.3.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/proftpd/proftpd-1.3.4d.tar.gz /work/SRC/openSUSE:Factory/.proftpd.new/proftpd-1.3.5.tar.gz differ: char 5, line 1 ++++++ proftpd-no_BuildDate.patch ++++++ --- /var/tmp/diff_new_pack.by2cy6/_old 2014-09-03 20:48:32.000000000 +0200 +++ /var/tmp/diff_new_pack.by2cy6/_new 2014-09-03 20:48:32.000000000 +0200 @@ -1,38 +1,14 @@ -Index: src/main.c +--- + Makefile.in | 14 ++++++-------- + contrib/mod_snmp/db.c | 2 +- + include/version.h | 2 -- + src/main.c | 6 ++---- + 4 files changed, 9 insertions(+), 15 deletions(-) + +Index: proftpd-1.3.5/Makefile.in =================================================================== ---- src/main.c.orig -+++ src/main.c -@@ -2703,8 +2703,8 @@ static void standalone_main(void) { - - init_bindings(); - -- pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s (built %s) standalone mode STARTUP", -- PROFTPD_VERSION_TEXT " " PR_STATUS, BUILD_STAMP); -+ pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP", -+ PROFTPD_VERSION_TEXT " " PR_STATUS); - - pr_pidfile_write(); - daemon_loop(); -@@ -2759,7 +2759,6 @@ static void show_settings(void) { - printf("%s", " Platform: " PR_PLATFORM " [unknown]\n"); - #endif /* !HAVE_UNAME */ - -- printf("%s", " Built: " BUILD_STAMP "\n"); - printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n"); - - printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n"); -@@ -3271,7 +3270,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); - exit(0); -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in +--- proftpd-1.3.5.orig/Makefile.in 2012-10-02 18:10:23.000000000 +0100 ++++ proftpd-1.3.5/Makefile.in 2014-09-01 20:12:57.000000000 +0100 @@ -24,28 +24,26 @@ BUILD_BIN=proftpd$(EXEEXT) ftpcount$(EXE all: $(BUILD_BIN) @@ -68,13 +44,57 @@ @dirs="$(DIRS)"; \ for dir in $$dirs; do \ if [ -d "$$dir" ]; then cd $$dir/ && $(MAKE); fi; \ -Index: include/version.h +Index: proftpd-1.3.5/contrib/mod_snmp/db.c +=================================================================== +--- proftpd-1.3.5.orig/contrib/mod_snmp/db.c 2014-01-27 17:32:16.000000000 +0000 ++++ proftpd-1.3.5/contrib/mod_snmp/db.c 2014-09-01 23:08:18.000000000 +0100 +@@ -1122,7 +1122,7 @@ int snmp_db_get_value(pool *p, unsigned + return 0; + + case SNMP_DB_DAEMON_F_VERSION: +- *str_value = "ProFTPD Version " PROFTPD_VERSION_TEXT " (built at " BUILD_STAMP ")"; ++ *str_value = "ProFTPD Version " PROFTPD_VERSION_TEXT; + *str_valuelen = strlen(*str_value); + + pr_trace_msg(trace_channel, 19, +Index: proftpd-1.3.5/include/version.h =================================================================== ---- include/version.h.orig -+++ include/version.h +--- proftpd-1.3.5.orig/include/version.h 2014-05-15 16:53:13.000000000 +0100 ++++ proftpd-1.3.5/include/version.h 2014-09-01 20:12:57.000000000 +0100 @@ -1,5 +1,3 @@ -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030408 - #define PROFTPD_VERSION_TEXT "1.3.4d" + #define PROFTPD_VERSION_NUMBER 0x0001030505 + #define PROFTPD_VERSION_TEXT "1.3.5" +Index: proftpd-1.3.5/src/main.c +=================================================================== +--- proftpd-1.3.5.orig/src/main.c 2014-01-25 16:34:09.000000000 +0000 ++++ proftpd-1.3.5/src/main.c 2014-09-01 20:12:57.000000000 +0100 +@@ -2382,8 +2382,8 @@ static void standalone_main(void) { + + init_bindings(); + +- pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s (built %s) standalone mode STARTUP", +- PROFTPD_VERSION_TEXT " " PR_STATUS, BUILD_STAMP); ++ pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP", ++ PROFTPD_VERSION_TEXT " " PR_STATUS); + + pr_pidfile_write(); + daemon_loop(); +@@ -2438,7 +2438,6 @@ static void show_settings(void) { + printf("%s", " Platform: " PR_PLATFORM " [unknown]\n"); + #endif /* !HAVE_UNAME */ + +- printf("%s", " Built: " BUILD_STAMP "\n"); + printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n"); + + printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n"); +@@ -2956,7 +2955,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); + exit(0); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
