Hello community, here is the log from the commit of package pure-ftpd for openSUSE:Leap:15.2 checked in at 2020-05-11 08:38:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/pure-ftpd (Old) and /work/SRC/openSUSE:Leap:15.2/.pure-ftpd.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd" Mon May 11 08:38:50 2020 rev:20 rq:801366 version:1.0.49 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/pure-ftpd/pure-ftpd.changes 2020-03-19 08:36:02.553838238 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.pure-ftpd.new.2738/pure-ftpd.changes 2020-05-11 08:39:00.210979679 +0200 @@ -1,0 +2,7 @@ +Wed May 6 08:51:02 UTC 2020 - Peter Simons <[email protected]> + +- Update to version 1.0.49. + * Refresh pure-ftpd-1.0.20_ftpwho_path.patch to + pure-ftpd-1.0.49_ftpwho_path.patch. + +------------------------------------------------------------------- Old: ---- pure-ftpd-1.0.20_ftpwho_path.patch pure-ftpd-1.0.47.tar.bz2 pure-ftpd-1.0.47.tar.bz2.minisig New: ---- pure-ftpd-1.0.49.tar.bz2 pure-ftpd-1.0.49.tar.bz2.minisig pure-ftpd-1.0.49_ftpwho_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.Yl10Up/_old 2020-05-11 08:39:00.670980674 +0200 +++ /var/tmp/diff_new_pack.Yl10Up/_new 2020-05-11 08:39:00.674980683 +0200 @@ -17,7 +17,7 @@ Name: pure-ftpd -Version: 1.0.47 +Version: 1.0.49 Release: 0 Summary: A Lightweight, Fast, and Secure FTP Server License: BSD-3-Clause @@ -36,7 +36,7 @@ Patch1: %{name}-1.0.20_doc.patch # PATCH-FEATURE-OPENSUSE %{name}-1.0.20_virtualhosts.patch -- Custom VHOST_PATH on openSUSE. Patch2: %{name}-1.0.20_virtualhosts.patch -Patch5: %{name}-1.0.20_ftpwho_path.patch +Patch5: %{name}-1.0.49_ftpwho_path.patch # PATCH-FIX-UPSTREAM %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch Patch7: %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch # PATCH-FIX-OPENSUSE: bnc#789833 @@ -82,7 +82,7 @@ %build #CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector -fvisibility=hidden" -%configure \ +%configure --docdir=%{_docdir}/%{name} \ --with-rfc2640 \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-ldap \ @@ -106,7 +106,8 @@ --with-tls \ --with-boring \ --with-peruserlimits \ - --with-virtualchroot + --with-virtualchroot \ + --with-extauth make %{?_smp_mflags} %install @@ -125,6 +126,10 @@ install -D -m0644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.service ln -sf service %{buildroot}%{_sbindir}/rc%{name} +rm %{buildroot}/%{_docdir}/%{name}/README.MacOS-X +rm %{buildroot}/%{_docdir}/%{name}/pureftpd.schema +rm %{buildroot}/%{_docdir}/%{name}/pure-ftpd.conf + %pre %service_add_pre %{name}.service @@ -142,9 +147,11 @@ %files %license COPYING -%doc AUTHORS CONTACT NEWS THANKS README +%doc FAQ AUTHORS NEWS THANKS README %doc README.Configuration-File HISTORY README.Virtual-Users README.AppArmor -%doc README.LDAP pureftpd-ldap.conf README.MySQL README.PGSQL README.TLS +%doc README.LDAP pureftpd-ldap.conf README.MySQL pureftpd-mysql.conf +%doc README.PGSQL pureftpd-pgsql.conf README.TLS +%doc README.Donations README.Authentication-Modules %{_mandir}/man8/* %{_bindir}/* %{_sbindir}/* ++++++ pure-ftpd-1.0.47.tar.bz2 -> pure-ftpd-1.0.49.tar.bz2 ++++++ ++++ 11386 lines of diff (skipped) ++++++ pure-ftpd-1.0.47.tar.bz2.minisig -> pure-ftpd-1.0.49.tar.bz2.minisig ++++++ --- /work/SRC/openSUSE:Leap:15.2/pure-ftpd/pure-ftpd-1.0.47.tar.bz2.minisig 2020-01-15 15:45:41.515331930 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.pure-ftpd.new.2738/pure-ftpd-1.0.49.tar.bz2.minisig 2020-05-11 08:39:00.082979401 +0200 @@ -1,4 +1,4 @@ untrusted comment: signature from minisign secret key -RWRvw8aArS/yEO+w/TYW7L9gIt6iADKe6u6uLeBokmIyJSE4ZC/eK4rH7CN0uDIXeo4xHJ7hS5bmPlzFVpLrbwA4WAHmWosNPAA= -trusted comment: timestamp:1509094144 file:pure-ftpd-1.0.47.tar.bz2 -Sfu2B3GodkbRfPwv0iQyzQaabMa2nXCj/TsvGvhns30Bds46rA/PAU2Mv0Rc2ThOdTMgvkgKLBBg7pyT0FZGAA== +RWQf6LRCGA9i53jbtkymhF4h2cC4NwgcDPxMLwbbhQpd+MxuhP9fq63KtlLE99n1OoP2l4pdNwopuh/B6dXVy5+kPRwsx5AyxA8= +trusted comment: timestamp:1554289403 file:pure-ftpd-1.0.49.tar.bz2 +3H/r3tHgNMKLhBn9DRGOJ/vUDhe1ZF33iAfMnNI/D28ApGcmalgyac/TtBiYP+R1h+8prBTo1QIpp4acRr0VDA== ++++++ pure-ftpd-1.0.20_ftpwho_path.patch -> pure-ftpd-1.0.49_ftpwho_path.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/pure-ftpd/pure-ftpd-1.0.20_ftpwho_path.patch 2020-01-15 15:45:41.331331825 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.pure-ftpd.new.2738/pure-ftpd-1.0.49_ftpwho_path.patch 2020-05-11 08:39:00.106979453 +0200 @@ -1,18 +1,16 @@ -Index: src/ftpwho-update.h -=================================================================== ---- src/ftpwho-update.h.orig -+++ src/ftpwho-update.h -@@ -26,6 +26,9 @@ typedef struct FTPWhoEntry_ { +--- src/ftpwho-update.h 2019-03-25 16:48:42.000000000 +0100 ++++ src/ftpwho-update.h 2020-04-27 16:07:03.449049599 +0200 +@@ -26,6 +26,9 @@ volatile off_t download_total_size; volatile off_t download_current_size; char account[MAX_USER_LENGTH + 1U]; +#ifdef PATH_MAX + char filename[PATH_MAX]; +#else - #if defined(__OpenBSD__) || defined(__Bitrig__) + #if defined(__OpenBSD__) char filename[1024]; #else -@@ -39,6 +42,7 @@ typedef struct FTPWhoEntry_ { +@@ -39,6 +42,7 @@ char filename[1024]; # endif #endif ++++++ pure-ftpd-malloc-limit.patch ++++++ --- /var/tmp/diff_new_pack.Yl10Up/_old 2020-05-11 08:39:01.122981653 +0200 +++ /var/tmp/diff_new_pack.Yl10Up/_new 2020-05-11 08:39:01.126981661 +0200 @@ -1,8 +1,36 @@ -Index: pure-ftpd-1.0.47/src/bsd-glob.c -=================================================================== ---- pure-ftpd-1.0.47.orig/src/bsd-glob.c 2017-08-18 23:47:43.000000000 +0000 -+++ pure-ftpd-1.0.47/src/bsd-glob.c 2019-03-01 17:42:28.494514013 +0000 -@@ -107,9 +107,6 @@ typedef unsigned short Char; +diff -Nur pure-ftpd-1.0.49.orig/man/pure-ftpd.8.in pure-ftpd-1.0.49/man/pure-ftpd.8.in +--- pure-ftpd-1.0.49.orig/man/pure-ftpd.8.in 2019-03-25 16:48:42.000000000 +0100 ++++ pure-ftpd-1.0.49/man/pure-ftpd.8.in 2020-04-27 16:36:01.574470331 +0200 +@@ -9,7 +9,7 @@ + pure\-ftpd \- simple File Transfer Protocol server + + .SH "SYNOPSIS" +-.B pure\-ftpd [\-0] [\-1] [\-2 cert_file[,key_file]] [\-3 certd_socket] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-J ciphers] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] ++.B pure\-ftpd [\-0] [\-1] [\-2 cert_file[,key_file]] [\-3 certd_socket] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-J ciphers] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth:[:maxmemory]] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] + + .br + Alternative style: +@@ -337,11 +337,12 @@ + .I README.MySQL + files for info about the built\-in LDAP and SQL directory support. + .TP +-.B \-L max files:max depth ++.B \-L max files:max depth[:max memory limit] + Avoid denial\-of\-service attacks by limiting the number of displayed files +-in a 'ls' and the maximum depth of a recursive 'ls'. Defaults are 2000:5 +-(2000 files displayed for a single 'ls' and walk through 5 subdirectories +-max). ++in a 'ls', the maximum depth of a recursive 'ls' and optional memory limit ++for globbing in kilobytes. Defaults are 2000:5:512 (2000 files displayed ++for a single 'ls', walk through 5 subdirectories max and limit allocated ++memory for evaluation wildcard characters by 'ls' to 524288 bytes). + .TP + .B \-m load + Do not allow anonymous users to download files if the load is above +diff -Nur pure-ftpd-1.0.49.orig/src/bsd-glob.c pure-ftpd-1.0.49/src/bsd-glob.c +--- pure-ftpd-1.0.49.orig/src/bsd-glob.c 2019-04-02 16:00:39.000000000 +0200 ++++ pure-ftpd-1.0.49/src/bsd-glob.c 2020-04-27 16:33:21.997238426 +0200 +@@ -107,9 +107,6 @@ #define M_SET META('[') #define ismeta(c) (((c)&M_QUOTE) != 0) @@ -12,7 +40,7 @@ #ifndef GLOB_MAX_STARS # define GLOB_MAX_STARS 3 #endif -@@ -160,7 +157,7 @@ static int check_stars(const char *patte +@@ -160,7 +157,7 @@ static int glob_(const char *pattern, int flags, int (*errfunc)(const char *, int), @@ -21,7 +49,7 @@ { const unsigned char *patnext; int c; -@@ -172,6 +169,7 @@ glob_(const char *pattern, int flags, in +@@ -172,6 +169,7 @@ } pglob->gl_maxdepth = maxdepth; pglob->gl_maxfiles = maxfiles; @@ -29,7 +57,7 @@ patnext = (unsigned char *) pattern; if (!(flags & GLOB_APPEND)) { pglob->gl_pathc = 0; -@@ -226,15 +224,15 @@ int +@@ -226,15 +224,15 @@ glob(const char *pattern, int flags, int (*errfunc) (const char *, int), glob_t * pglob) { @@ -48,7 +76,7 @@ } /* -@@ -766,7 +764,7 @@ nospace: +@@ -766,7 +764,7 @@ statv[pglob->gl_offs + pglob->gl_pathc] = NULL; } else { limitp->glim_malloc += sizeof(**statv); @@ -57,7 +85,7 @@ errno = 0; return GLOB_NOSPACE; } -@@ -793,7 +791,7 @@ nospace: +@@ -793,7 +791,7 @@ } pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; @@ -66,11 +94,10 @@ errno = 0; return GLOB_NOSPACE; } -Index: pure-ftpd-1.0.47/src/bsd-glob.h -=================================================================== ---- pure-ftpd-1.0.47.orig/src/bsd-glob.h 2019-03-01 17:42:01.264591838 +0000 -+++ pure-ftpd-1.0.47/src/bsd-glob.h 2019-03-01 17:42:05.016581083 +0000 -@@ -38,6 +38,7 @@ struct stat; +diff -Nur pure-ftpd-1.0.49.orig/src/bsd-glob.h pure-ftpd-1.0.49/src/bsd-glob.h +--- pure-ftpd-1.0.49.orig/src/bsd-glob.h 2018-09-19 23:53:05.000000000 +0200 ++++ pure-ftpd-1.0.49/src/bsd-glob.h 2020-04-27 16:33:22.001238457 +0200 +@@ -38,6 +38,7 @@ typedef struct { unsigned long gl_maxfiles; /* Maximum number of results */ int gl_maxdepth; /* Maximum depth */ @@ -78,7 +105,7 @@ int gl_pathc; /* Count of total paths so far. */ int gl_matchc; /* Count of paths matching pattern. */ int gl_offs; /* Reserved at beginning of gl_pathv. */ -@@ -84,14 +85,14 @@ typedef struct { +@@ -84,14 +85,14 @@ #ifdef DISABLE_GLOBBING # define glob(A, B, C, D) (GLOB_NOSYS) @@ -95,11 +122,10 @@ void globfree(glob_t *); #endif -Index: pure-ftpd-1.0.47/src/ftpd.c -=================================================================== ---- pure-ftpd-1.0.47.orig/src/ftpd.c 2019-03-01 17:42:01.266591832 +0000 -+++ pure-ftpd-1.0.47/src/ftpd.c 2019-03-01 17:42:05.018581078 +0000 -@@ -5988,11 +5988,14 @@ int pureftpd_start(int argc, char *argv[ +diff -Nur pure-ftpd-1.0.49.orig/src/ftpd.c pure-ftpd-1.0.49/src/ftpd.c +--- pure-ftpd-1.0.49.orig/src/ftpd.c 2019-04-02 16:00:40.000000000 +0200 ++++ pure-ftpd-1.0.49/src/ftpd.c 2020-04-27 16:33:22.001238457 +0200 +@@ -5923,11 +5923,14 @@ } case 'L': { int ret; @@ -117,11 +143,10 @@ } break; } -Index: pure-ftpd-1.0.47/src/ftpd.h -=================================================================== ---- pure-ftpd-1.0.47.orig/src/ftpd.h 2019-03-01 17:42:01.267591830 +0000 -+++ pure-ftpd-1.0.47/src/ftpd.h 2019-03-01 17:42:05.019581075 +0000 -@@ -536,6 +536,9 @@ Your platform has a very large PATH_MAX, +diff -Nur pure-ftpd-1.0.49.orig/src/ftpd.h pure-ftpd-1.0.49/src/ftpd.h +--- pure-ftpd-1.0.49.orig/src/ftpd.h 2019-03-25 16:48:42.000000000 +0100 ++++ pure-ftpd-1.0.49/src/ftpd.h 2020-04-27 16:33:22.001238457 +0200 +@@ -541,6 +541,9 @@ #ifndef DEFAULT_MAX_LS_DEPTH # define DEFAULT_MAX_LS_DEPTH 5U #endif @@ -131,11 +156,10 @@ #ifndef GLOB_TIMEOUT # define GLOB_TIMEOUT 17 /* Max user time for a 'ls' to complete */ #endif -Index: pure-ftpd-1.0.47/src/globals.h -=================================================================== ---- pure-ftpd-1.0.47.orig/src/globals.h 2019-03-01 17:42:01.267591830 +0000 -+++ pure-ftpd-1.0.47/src/globals.h 2019-03-01 17:42:05.019581075 +0000 -@@ -69,6 +69,7 @@ GLOBAL(signed char resolve_hostnames, 1) +diff -Nur pure-ftpd-1.0.49.orig/src/globals.h pure-ftpd-1.0.49/src/globals.h +--- pure-ftpd-1.0.49.orig/src/globals.h 2019-03-25 17:58:02.000000000 +0100 ++++ pure-ftpd-1.0.49/src/globals.h 2020-04-27 16:33:22.001238457 +0200 +@@ -77,6 +77,7 @@ GLOBAL0(int allow_anon_mkdir); GLOBAL(unsigned int max_ls_files, DEFAULT_MAX_LS_FILES); GLOBAL(unsigned int max_ls_depth, DEFAULT_MAX_LS_DEPTH); @@ -143,11 +167,10 @@ GLOBAL0(char *fortunes_file); GLOBAL0(char host[NI_MAXHOST]); GLOBAL0(int replycode); -Index: pure-ftpd-1.0.47/src/ls.c -=================================================================== ---- pure-ftpd-1.0.47.orig/src/ls.c 2019-03-01 17:42:01.267591830 +0000 -+++ pure-ftpd-1.0.47/src/ls.c 2019-03-01 17:42:05.019581075 +0000 -@@ -927,7 +927,7 @@ void donlist(char *arg, const int on_ctr +diff -Nur pure-ftpd-1.0.49.orig/src/ls.c pure-ftpd-1.0.49/src/ls.c +--- pure-ftpd-1.0.49.orig/src/ls.c 2019-04-02 16:00:40.000000000 +0200 ++++ pure-ftpd-1.0.49/src/ls.c 2020-04-27 16:33:22.001238457 +0200 +@@ -857,7 +857,7 @@ memset(&g, 0, sizeof g); a = sglob(arg, opt_a ? (GLOB_PERIOD | GLOB_LIMIT) : GLOB_LIMIT, @@ -156,33 +179,3 @@ alarm(0); if (a == 0) { char **path; -Index: pure-ftpd-1.0.47/man/pure-ftpd.8.in -=================================================================== ---- pure-ftpd-1.0.47.orig/man/pure-ftpd.8.in 2019-03-01 17:42:01.268591827 +0000 -+++ pure-ftpd-1.0.47/man/pure-ftpd.8.in 2019-03-01 17:42:05.019581075 +0000 -@@ -9,7 +9,7 @@ - pure\-ftpd \- simple File Transfer Protocol server - - .SH "SYNOPSIS" --.B pure\-ftpd [\-0] [\-1] [\-2] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-J ciphers] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] -+.B pure\-ftpd [\-0] [\-1] [\-2] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-J ciphers] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth[:maxmemory]] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] - - .br - Alternative style: -@@ -330,11 +330,12 @@ and - .I README.MySQL - files for info about the built\-in LDAP and SQL directory support. - .TP --.B \-L max files:max depth -+.B \-L max files:max depth[:max memory limit] - Avoid denial\-of\-service attacks by limiting the number of displayed files --in a 'ls' and the maximum depth of a recursive 'ls'. Defaults are 2000:5 --(2000 files displayed for a single 'ls' and walk through 5 subdirectories --max). -+in a 'ls', the maximum depth of a recursive 'ls' and optional memory limit -+for globbing in kilobytes. Defaults are 2000:5:512 (2000 files displayed -+for a single 'ls', walk through 5 subdirectories max and limit allocated -+memory for evaluation wildcard characters by 'ls' to 524288 bytes). - .TP - .B \-m load - Do not allow anonymous users to download files if the load is above
