Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncftp for openSUSE:Factory checked in at 2024-03-13 22:18:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncftp (Old) and /work/SRC/openSUSE:Factory/.ncftp.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncftp" Wed Mar 13 22:18:57 2024 rev:24 rq:1157314 version:3.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ncftp/ncftp.changes 2024-02-27 22:48:21.354539217 +0100 +++ /work/SRC/openSUSE:Factory/.ncftp.new.1770/ncftp.changes 2024-03-13 22:20:03.331537982 +0100 @@ -1,0 +2,8 @@ +Mon Mar 11 07:41:15 UTC 2024 - jun wang <jgw...@suse.com> + +- Update to version 3.2.7 + * Portability fixes + * Fix parsing MLSD listings with absolute pathnames for files + * Default to automatic resumption of downloads + +------------------------------------------------------------------- Old: ---- ncftp-3.2.6-src.tar.xz New: ---- ncftp-3.2.7-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncftp.spec ++++++ --- /var/tmp/diff_new_pack.BVQhJ8/_old 2024-03-13 22:20:04.063564967 +0100 +++ /var/tmp/diff_new_pack.BVQhJ8/_new 2024-03-13 22:20:04.063564967 +0100 @@ -1,7 +1,7 @@ # # spec file for package ncftp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: ncftp -Version: 3.2.6 +Version: 3.2.7 Release: 0 Summary: A Comfortable FTP Program License: ClArtistic Group: Productivity/Networking/Ftp/Clients URL: https://www.ncftp.com/ -Source: ftp://ftp.ncftp.com/ncftp/%{name}-%{version}-src.tar.xz +Source: https://www.ncftp.com/public_ftp/%{name}/%{name}-%{version}-src.tar.xz Patch0: ncftp-3.1.8-locale.diff Patch2: ncftp-3.1.8-implicit_decl.diff Patch3: ncftp-3.2.5-no-date.patch ++++++ ncftp-3.2.6-src.tar.xz -> ncftp-3.2.7-src.tar.xz ++++++ ++++ 6435 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/autoconf_local/acgeneral-2.13.m4.patch new/ncftp-3.2.7/autoconf_local/acgeneral-2.13.m4.patch --- old/ncftp-3.2.6/autoconf_local/acgeneral-2.13.m4.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/ncftp-3.2.7/autoconf_local/acgeneral-2.13.m4.patch 2024-01-01 05:04:44.000000000 +0100 @@ -0,0 +1,42 @@ +--- acgeneral-20081018.m4 2008-10-18 12:45:43.000000000 -0500 ++++ acgeneral.m4 2023-12-31 21:42:41.000000000 -0600 +@@ -1634,7 +1634,7 @@ + AC_CACHE_VAL(AC_CV_NAME, + [ac_save_LIBS="$LIBS" + LIBS="-l[]AC_LIB_NAME[] $4 $LIBS" +-AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no) ++AC_TRY_LINK( , [int main(void)], AC_CV_NAME=yes, AC_CV_NAME=no) + LIBS="$ac_save_LIBS" + ])dnl + AC_MSG_RESULT($AC_CV_NAME) +@@ -1733,7 +1733,7 @@ + [#]line __oline__ "configure" + #include "confdefs.h" + [$1] +-int main() { ++int main(void) { + [$2] + ; return 0; } + ])EOF +@@ -1777,7 +1777,7 @@ + [#]line __oline__ "configure" + #include "confdefs.h" + [$1] +-int main() { ++int main(void) { + [$2] + ; return 0; } + ])EOF +@@ -1988,7 +1988,11 @@ + AC_MSG_CHECKING(size of $1) + AC_CACHE_VAL(AC_CV_NAME, + [AC_TRY_RUN([#include <stdio.h> +-main() ++#if STDC_HEADERS ++# include <stdlib.h> ++# include <stddef.h> ++#endif ++int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/autoconf_local/acspecific-2.13.m4.patch new/ncftp-3.2.7/autoconf_local/acspecific-2.13.m4.patch --- old/ncftp-3.2.6/autoconf_local/acspecific-2.13.m4.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/ncftp-3.2.7/autoconf_local/acspecific-2.13.m4.patch 2024-01-01 05:04:16.000000000 +0100 @@ -0,0 +1,155 @@ +--- acspecific-20081018.m4 2008-10-18 12:45:43.000000000 -0500 ++++ acspecific.m4 2023-12-31 21:37:00.000000000 -0600 +@@ -202,7 +202,7 @@ + [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works]) + AC_LANG_SAVE + AC_LANG_C +-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross) ++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross) + AC_LANG_RESTORE + AC_MSG_RESULT($ac_cv_prog_cc_works) + if test $ac_cv_prog_cc_works = no; then +@@ -217,7 +217,7 @@ + [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS +-AC_TRY_COMPILER([int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) ++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) + AC_LANG_RESTORE + AC_MSG_RESULT($ac_cv_prog_cxx_works) + if test $ac_cv_prog_cxx_works = no; then +@@ -820,7 +820,7 @@ + AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void, + [AC_TRY_RUN([#include <sys/types.h> + #include <$ac_header_dirent> +-int closedir(); main() { exit(closedir(opendir(".")) != 0); }], ++int closedir(); int main(void) { exit(closedir(opendir(".")) != 0); }], + ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)]) + if test $ac_cv_func_closedir_void = yes; then + AC_DEFINE(VOID_CLOSEDIR) +@@ -911,7 +911,7 @@ + #define NGID 256 + #undef MAX + #define MAX(x, y) ((x) > (y) ? (x) : (y)) +-main() ++int main(void) + { + gid_t gidset[NGID]; + int i, n; +@@ -989,7 +989,7 @@ + AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void, + [AC_TRY_RUN([#include <sys/types.h> + #include <$ac_header_dirent> +-int closedir(); main() { exit(closedir(opendir(".")) != 0); }], ++int closedir(); int main(void) { exit(closedir(opendir(".")) != 0); }], + ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)]) + if test $ac_cv_func_closedir_void = yes; then + AC_DEFINE(CLOSEDIR_VOID) +@@ -1001,7 +1001,7 @@ + # Some versions of Solaris or SCO have a broken fnmatch function. + # So we run a test program. If we are cross-compiling, take no chance. + # Thanks to John Oleynick and Franc,ois Pinard for this test. +-[AC_TRY_RUN([main() { exit (fnmatch ("a*", "abc", 0) != 0); }], ++[AC_TRY_RUN([int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }], + ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no, + ac_cv_func_fnmatch_works=no)]) + if test $ac_cv_func_fnmatch_works = yes; then +@@ -1087,7 +1087,7 @@ + #endif + + int +-main() ++main(void) + { + char *data, *data2, *data3; + int i, pagesize; +@@ -1172,7 +1172,7 @@ + int pg1, pg2, pg3, pg4; + int ng, np, s, child; + +-main() ++int main(void) + { + pid = getpid(); + pg1 = getpgrp(0); +@@ -1228,7 +1228,7 @@ + * If this system has a BSD-style setpgrp, which takes arguments, exit + * successfully. + */ +-main() ++int main(void) + { + if (setpgrp(1,1) == -1) + exit(0); +@@ -1291,7 +1291,7 @@ + } + } + } +-main() { ++int main(void) { + pid_t parent = getpid (); + pid_t child; + +@@ -1360,7 +1360,7 @@ + #include <sys/resource.h> + #include <stdio.h> + /* HP-UX has wait3 but does not fill in rusage at all. */ +-main() { ++int main(void) { + struct rusage r; + int i; + /* Use a field that we can force nonzero -- +@@ -1582,7 +1582,7 @@ + # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. + AC_TRY_RUN([#include <sys/types.h> + #include <sys/stat.h> +-main() { ++int main(void) { + struct stat s, t; + exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 + && stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime +@@ -1647,7 +1647,7 @@ + AC_DEFUN(AC_FUNC_MEMCMP, + [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean, + [AC_TRY_RUN([ +-main() ++int main(void) + { + char c0 = 0x40, c1 = 0x80, c2 = 0x81; + exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); +@@ -1805,7 +1805,7 @@ + #if !defined(__STDC__) || __STDC__ != 1 + #define volatile + #endif +-main() { ++int main(void) { + volatile char c = 255; exit(c < 0); + }], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no) + fi]) +@@ -1819,7 +1819,7 @@ + [if test "$GCC" = yes; then + ac_cv_c_long_double=yes + else +-AC_TRY_RUN([int main() { ++AC_TRY_RUN([int main(void) { + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ +@@ -1834,7 +1834,7 @@ + AC_DEFUN(AC_INT_16_BITS, + [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl + AC_MSG_CHECKING(whether int is 16 bits) +-AC_TRY_RUN([main() { exit(sizeof(int) != 2); }], ++AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }], + [AC_MSG_RESULT(yes) + AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no)) + ]) +@@ -1842,7 +1842,7 @@ + AC_DEFUN(AC_LONG_64_BITS, + [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl + AC_MSG_CHECKING(whether long int is 64 bits) +-AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }], ++AC_TRY_RUN([int main(void) { exit(sizeof(long int) != 8); }], + [AC_MSG_RESULT(yes) + AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no)) + ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/doc/CHANGELOG.txt new/ncftp-3.2.7/doc/CHANGELOG.txt --- old/ncftp-3.2.6/doc/CHANGELOG.txt 2016-12-04 19:59:38.000000000 +0100 +++ new/ncftp-3.2.7/doc/CHANGELOG.txt 2024-01-01 05:02:32.000000000 +0100 @@ -1,6 +1,15 @@ NcFTP Change Log: ================ +3.2.7, 2024-01-01 + + + Portability fixes from Florian Weimer <fwei...@redhat.com>. + + + Fix parsing MLSD listings with absolute pathnames for files. + + + Default to automatic resumption of downloads. + + 3.2.6, 2016-12-04 + If a recursive download operation is also requested with delete mode, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/doc/manifest new/ncftp-3.2.7/doc/manifest --- old/ncftp-3.2.6/doc/manifest 2016-12-04 20:00:34.000000000 +0100 +++ new/ncftp-3.2.7/doc/manifest 2024-01-01 23:51:17.000000000 +0100 @@ -1,5 +1,7 @@ autoconf_local/acconfig.h +autoconf_local/acgeneral-2.13.m4.patch autoconf_local/aclocal.m4 +autoconf_local/acspecific-2.13.m4.patch config.h.in configure configure.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/doc/manifest.txt new/ncftp-3.2.7/doc/manifest.txt --- old/ncftp-3.2.6/doc/manifest.txt 2016-12-04 20:00:34.000000000 +0100 +++ new/ncftp-3.2.7/doc/manifest.txt 2024-01-01 23:51:17.000000000 +0100 @@ -1,5 +1,7 @@ autoconf_local/acconfig.h +autoconf_local/acgeneral-2.13.m4.patch autoconf_local/aclocal.m4 +autoconf_local/acspecific-2.13.m4.patch config.h.in configure configure.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/ftp.c new/ncftp-3.2.7/libncftp/ftp.c --- old/ncftp-3.2.6/libncftp/ftp.c 2016-11-15 21:26:02.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/ftp.c 2024-01-01 06:29:04.000000000 +0100 @@ -975,8 +975,14 @@ * shut the compiler up about variable * not being used. */ - && (gCopyright[0] != '\0')) + && (gCopyright[0] != '\0') +#ifdef NO_SIGNALS + && (gNoSignalsMarker[0] != '\0') +#endif + ) + { break; + } } } return (result); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/ftw.c new/ncftp-3.2.7/libncftp/ftw.c --- old/ncftp-3.2.6/libncftp/ftw.c 2016-11-13 01:35:25.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/ftw.c 2024-01-01 23:49:14.000000000 +0100 @@ -191,7 +191,6 @@ char *filename; char *newBuf; char *path = ftwip->curPath; - int nSubdirs; FtwSubDirListPtr head = NULL, tail = NULL, sdp, nextsdp; int rc = (-1); int isRootDir; @@ -202,7 +201,6 @@ return (0); } - nSubdirs = 0; ++ftwip->numDirs; ftwip->depth = depth; if (ftwip->maxDepth < ftwip->depth) { @@ -283,7 +281,7 @@ tail->next = sdp; tail = sdp; } - nSubdirs++; + /* nSubdirs++; */ } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/io_listmem.c new/ncftp-3.2.7/libncftp/io_listmem.c --- old/ncftp-3.2.6/libncftp/io_listmem.c 2016-10-30 18:33:38.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/io_listmem.c 2017-07-15 21:25:42.000000000 +0200 @@ -205,6 +205,7 @@ if (line[result - 1] == '\n') line[result - 1] = '\0'; + PrintF(cip, " %s\n", line); if ((blankLines == 0) && (result <= 1)) continue; @@ -271,6 +272,7 @@ } else { cip->bytesTransferred += (longest_int) nread; + PrintF(cip, " %s\n", line); if ((line[0] == '.') && ((line[1] == '\0') || ((line[1] == '.') && ((line[2] == '\0') || (iscntrl(line[2])))))) continue; /* Skip . and .. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/lglob.c new/ncftp-3.2.7/libncftp/lglob.c --- old/ncftp-3.2.6/libncftp/lglob.c 2005-01-01 22:30:07.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/lglob.c 2024-01-01 06:19:03.000000000 +0100 @@ -128,7 +128,7 @@ static int LazyUnixLocalGlob(FTPCIPtr cip, FTPLineListPtr fileList, const char *const pattern) { - char cmd[512]; + char cmd[600]; longstring gfile; FILE *fp; FTPSigProc sp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/rftw.c new/ncftp-3.2.7/libncftp/rftw.c --- old/ncftp-3.2.6/libncftp/rftw.c 2016-11-13 01:26:45.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/rftw.c 2024-01-01 23:49:42.000000000 +0100 @@ -41,7 +41,6 @@ char *filename; char *newBuf; char *path = ftwip->curPath; - int nSubdirs; FtwSubDirListPtr head = NULL, tail = NULL, sdp, nextsdp; int rc = (-1); int lsl, mls, unlsrc; @@ -108,7 +107,6 @@ } } - nSubdirs = 0; ++ftwip->numDirs; ftwip->depth = (size_t) depth; if (ftwip->maxDepth < ftwip->depth) { @@ -265,7 +263,7 @@ tail->next = sdp; tail = sdp; } - nSubdirs++; + /* nSubdirs++; */ } } nxt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/libncftp/unls.c new/ncftp-3.2.7/libncftp/unls.c --- old/ncftp-3.2.6/libncftp/unls.c 2016-10-30 18:35:42.000000000 +0100 +++ new/ncftp-3.2.7/libncftp/unls.c 2017-07-15 22:30:11.000000000 +0200 @@ -765,7 +765,7 @@ int UnMlsT(const FTPCIPtr UNUSED(cip), const char *const line0, const MLstItemPtr mlip) { - char *cp, *val, *fact; + char *cp, *val, *fact, *basecp; int ec; size_t len; char line[1024]; @@ -882,12 +882,32 @@ break; } - len = strlen(cp); - if (len > (sizeof(mlip->fname) - 1)) { - /* Filename too long */ - return (-1); + if ((mlip->ftype != '-') || (*cp != '/')) { + /* The spec says filenames SHOULD be relative. */ + len = strlen(cp); + if (len > (sizeof(mlip->fname) - 1)) { + /* Filename too long */ + return (-1); + } + memcpy(mlip->fname, cp, len + 1); + } else { + /* Absolute path given for file. Booooo. + * + * Return only the base name. + * Note that this would be a bad idea if the + * contents included recursive subtrees. + */ + basecp = strrchr(cp, '/'); + if (basecp == NULL) + return (-1); /* huh? */ + basecp++; + len = strlen(basecp); + if (len > (sizeof(mlip->fname) - 1)) { + /* Filename too long */ + return (-1); + } + memcpy(mlip->fname, basecp, len + 1); } - memcpy(mlip->fname, cp, len); /* also set linkto here if used */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/ncftp/ls.c new/ncftp-3.2.7/ncftp/ls.c --- old/ncftp-3.2.6/ncftp/ls.c 2016-11-13 01:20:28.000000000 +0100 +++ new/ncftp-3.2.7/ncftp/ls.c 2017-12-16 21:47:57.000000000 +0100 @@ -514,7 +514,6 @@ int parsed; int linkedTo; int endChars; - int rlisted; int opt; const char *cp; int sortBy; @@ -538,7 +537,6 @@ memset(unoptstr, 0, sizeof(unoptstr)); unoptstr[0] = '-'; doNotUseCache = 0; - rlisted = 0; for (cp = options; *cp != '\0'; cp++) { opt = *cp; @@ -597,7 +595,6 @@ return; } - rlisted = 1; parsed = -1; wasInCache = 0; filp = NULL; @@ -612,7 +609,6 @@ return; } - rlisted = 1; filp = &fil; if (mlsd != 0) { parsed = UnMlsD(&gConn, filp, &dirContents); @@ -640,18 +636,6 @@ Trace(0, "ls cache hit: %s\n", itempath); } - if (rlisted != 0) { - Trace(0, "Remote listing contents {\n"); - for (linePtr = dirContents.first; - linePtr != NULL; - linePtr = nextLinePtr) - { - nextLinePtr = linePtr->next; - Trace(0, " %s\n", linePtr->line); - } - Trace(0, "}\n"); - } - if (parsed >= 0) { SortFileInfoList(filp, sortBy, sortOrder); if (stream != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/ncftp/pref.c new/ncftp-3.2.7/ncftp/pref.c --- old/ncftp-3.2.6/ncftp/pref.c 2016-10-30 21:24:13.000000000 +0100 +++ new/ncftp-3.2.7/ncftp/pref.c 2016-12-04 20:09:26.000000000 +0100 @@ -613,7 +613,7 @@ gCtrlTimeout = 135; gDataPortMode = kFallBackToSendPortMode; gConn.dataPortMode = gDataPortMode; - gAutoResume = 0; + gAutoResume = 1; gSOBufsize = 0; gMaxLogSize = 10240; gConfirmClose = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/ncftp/rc.rc new/ncftp-3.2.7/ncftp/rc.rc --- old/ncftp-3.2.6/ncftp/rc.rc 2013-01-08 05:34:01.000000000 +0100 +++ new/ncftp-3.2.7/ncftp/rc.rc 2017-12-16 21:58:02.000000000 +0100 @@ -63,8 +63,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,6,20 - PRODUCTVERSION 3,2,6,20 + FILEVERSION 3,2,7,21 + PRODUCTVERSION 3,2,7,21 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x29L @@ -82,14 +82,14 @@ VALUE "Comments", " \0" VALUE "CompanyName", "NcFTP Software\0" VALUE "FileDescription", " \0" - VALUE "FileVersion", "3.2.6\0" + VALUE "FileVersion", "3.2.7\0" VALUE "InternalName", " \0" - VALUE "LegalCopyright", "Copyright © 2013\0" + VALUE "LegalCopyright", "Copyright © 2017\0" VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "ncftp.exe\0" VALUE "PrivateBuild", " \0" VALUE "ProductName", " \0" - VALUE "ProductVersion", "3.2.6\0" + VALUE "ProductVersion", "3.2.7\0" VALUE "SpecialBuild", " \0" END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/ncftp/version.c new/ncftp-3.2.7/ncftp/version.c --- old/ncftp-3.2.6/ncftp/version.c 2016-12-04 20:00:12.000000000 +0100 +++ new/ncftp-3.2.7/ncftp/version.c 2024-01-01 23:50:24.000000000 +0100 @@ -6,7 +6,7 @@ /******************************************************************************/ -const char gVersion[] = "@(#) NcFTP 3.2.6/575 Dec 04 2016, 01:00 PM"; +const char gVersion[] = "@(#) NcFTP 3.2.7/588 Jan 01 2024, 04:50 PM"; /******************************************************************************/ @@ -23,7 +23,7 @@ /******************************************************************************/ const char gCopyright[] = "@(#) \ -Copyright (c) 1992-2016 by Mike Gleason.\n\ +Copyright (c) 1992-2018 by Mike Gleason.\n\ All rights reserved.\n\ "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/sh_util/gpshare.c new/ncftp-3.2.7/sh_util/gpshare.c --- old/ncftp-3.2.6/sh_util/gpshare.c 2016-11-13 00:53:39.000000000 +0100 +++ new/ncftp-3.2.7/sh_util/gpshare.c 2022-02-20 00:49:18.000000000 +0100 @@ -28,7 +28,7 @@ static int gIsAtty1 = 1, gIsAtty2 = 1; extern int gLoadedBm, gBookmarkMatchMode; -Bookmark gBm; +extern Bookmark gBm; double FileSize(double size, const char **uStr0, double *uMult0) @@ -494,8 +494,7 @@ #else gIsAtty1 = isatty(1); gIsAtty2 = isatty(2); - /* progmeters = ((isatty(2) != 0) && (getppid() > 1)) ? 1 : 0; */ - progmeters = (getppid() > 1) ? 1 : 0; + progmeters = ((gIsAtty2 != 0) && (getppid() > 1)) ? 1 : 0; #endif return (progmeters); } /* GetDefaultProgressMeterSetting */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/sh_util/ncftpbatch.c new/ncftp-3.2.7/sh_util/ncftpbatch.c --- old/ncftp-3.2.6/sh_util/ncftpbatch.c 2016-11-16 01:29:43.000000000 +0100 +++ new/ncftp-3.2.7/sh_util/ncftpbatch.c 2017-08-12 19:39:18.000000000 +0200 @@ -3083,7 +3083,7 @@ } else { /* User Spooler */ GetoptReset(&opt); - while ((c = Getopt(&opt, argc, (char **) argv, "|:aXDdlLO::x:S:Z:s:wU:K:")) > 0) switch(c) { + while ((c = Getopt(&opt, argc, (char **) argv, "|:aXDdlL:O::x:S:Z:s:wU:K:")) > 0) switch(c) { case 'a': activeonly++; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/sh_util/rc.rc new/ncftp-3.2.7/sh_util/rc.rc --- old/ncftp-3.2.6/sh_util/rc.rc 2013-01-08 05:34:01.000000000 +0100 +++ new/ncftp-3.2.7/sh_util/rc.rc 2017-12-16 21:58:02.000000000 +0100 @@ -63,8 +63,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,6,20 - PRODUCTVERSION 3,2,6,20 + FILEVERSION 3,2,7,21 + PRODUCTVERSION 3,2,7,21 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -82,14 +82,14 @@ VALUE "Comments", "\0" VALUE "CompanyName", "NcFTP Software\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "3.2.6\0" + VALUE "FileVersion", "3.2.7\0" VALUE "InternalName", "\0" - VALUE "LegalCopyright", "Copyright © 2013\0" + VALUE "LegalCopyright", "Copyright © 2017\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "NcFTP Software \0" - VALUE "ProductVersion", "3.2.6\0" + VALUE "ProductVersion", "3.2.7\0" VALUE "SpecialBuild", "\0" END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/win/bmed/bmed.rc new/ncftp-3.2.7/win/bmed/bmed.rc --- old/ncftp-3.2.6/win/bmed/bmed.rc 2013-01-08 05:34:01.000000000 +0100 +++ new/ncftp-3.2.7/win/bmed/bmed.rc 2017-12-16 21:58:02.000000000 +0100 @@ -161,8 +161,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,6,20 - PRODUCTVERSION 3,2,6,20 + FILEVERSION 3,2,7,21 + PRODUCTVERSION 3,2,7,21 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -180,14 +180,14 @@ VALUE "Comments", "\0" VALUE "CompanyName", "NcFTP Software\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "3.2.6\0" + VALUE "FileVersion", "3.2.7\0" VALUE "InternalName", "\0" - VALUE "LegalCopyright", "Copyright © 2013\0" + VALUE "LegalCopyright", "Copyright © 2017\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "NcFTP Software \0" - VALUE "ProductVersion", "3.2.6\0" + VALUE "ProductVersion", "3.2.7\0" VALUE "SpecialBuild", "\0" END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ncftp-3.2.6/win/setup/ncftp.wse new/ncftp-3.2.7/win/setup/ncftp.wse --- old/ncftp-3.2.6/win/setup/ncftp.wse 2013-01-08 05:34:01.000000000 +0100 +++ new/ncftp-3.2.7/win/setup/ncftp.wse 2017-12-16 21:58:02.000000000 +0100 @@ -1,7 +1,7 @@ Document Type: WSE item: Global Version=8.14 - Title=NcFTP 3.2.6 Installation + Title=NcFTP 3.2.7 Installation Flags=00010100 Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Copy Default=1 @@ -21,7 +21,7 @@ Patch Flags=0000000000000001 Patch Threshold=85 Patch Memory=4000 - EXE Filename=ncftp-3.2.6-win32.exe + EXE Filename=ncftp-3.2.7-win32.exe FTP Cluster Size=20 Per-User Version ID=1 Dialogs Version=7 @@ -115,7 +115,7 @@ end item: Set Variable Variable=APPTITLE - Value=NcFTP 3.2.6 + Value=NcFTP 3.2.7 Flags=10000000 end item: Remark ++++++ ncftp-gcc10-gBm.patch ++++++ --- /var/tmp/diff_new_pack.BVQhJ8/_old 2024-03-13 22:20:04.443578976 +0100 +++ /var/tmp/diff_new_pack.BVQhJ8/_new 2024-03-13 22:20:04.463579713 +0100 @@ -43,7 +43,7 @@ static int gIsAtty1 = 1, gIsAtty2 = 1; extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; +-extern Bookmark gBm; double FileSize(double size, const char **uStr0, double *uMult0) @@ -84,3 +84,4 @@ static void +
