Hello community, here is the log from the commit of package ncftp for openSUSE:Factory checked in at 2014-02-20 06:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncftp (Old) and /work/SRC/openSUSE:Factory/.ncftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncftp" Changes: -------- --- /work/SRC/openSUSE:Factory/ncftp/ncftp.changes 2011-09-23 02:14:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncftp.new/ncftp.changes 2014-02-20 06:22:12.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 18 20:11:42 UTC 2014 - [email protected] + +- update to 3.2.5 + + ncftpls now prefers that you omit the leading dash when you use the -x + option. For example, if you wanted to try "ls -lrt", then try doing + "ncftpls -x lrt" rather than "ncftpls -x -lrt". + + If a server's MLSx output returns both the "UNIX.mode" and the "perm" + parameters, UNIX.mode will take precedence + + confirm-close is now off by default. +- license is the Clarified Artistic License +- use correct line endings for documentation +- remove __DATE__ from binary added patches: + * ncftp-3.2.5-no-date.patch +- use source URLs + +------------------------------------------------------------------- Old: ---- ncftp-3.2.4-src.tar.bz2 New: ---- ncftp-3.2.5-no-date.patch ncftp-3.2.5-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncftp.spec ++++++ --- /var/tmp/diff_new_pack.r82Oa8/_old 2014-02-20 06:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.r82Oa8/_new 2014-02-20 06:22:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ncftp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ncftp Url: http://www.ncftp.com/ -License: Artistic-1.0 -Group: Productivity/Networking/Ftp/Clients -AutoReqProv: on -Version: 3.2.4 -Release: 5 +Version: 3.2.5 +Release: 0 Summary: A Comfortable FTP Program -# ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.gz -Source: ncftp-%{version}-src.tar.bz2 +License: ClArtistic +Group: Productivity/Networking/Ftp/Clients +Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2 Patch: ncftp-3.1.8-locale.diff Patch2: ncftp-3.1.8-implicit_decl.diff +Patch3: ncftp-3.2.5-no-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: dos2unix BuildRequires: ncurses-devel %description @@ -50,6 +48,7 @@ %setup -q %patch -p1 %patch2 +%patch3 -p1 %build export CFLAGS="%{optflags} -D_LARGEFILE64_SOURCE" @@ -58,6 +57,7 @@ %__make %{?jobs:-j%{jobs}} STRIP=/bin/touch %install +dos2unix doc/*.txt %makeinstall STRIP=/bin/touch %clean ++++++ ncftp-3.2.5-no-date.patch ++++++ From: Andreas Stieger <[email protected]> Date: Tue, 18 Feb 2014 19:58:12 +0000 Subject: [PATCH] remove __DATE__ Upstream: no [ 97s] ncftp.i586: W: file-contains-date-and-time /usr/bin/ncftp [ 97s] Your file uses __DATE and __TIME__ this causes the package to rebuild when [ 97s] not needed Remove date from binary to prevent unneccessary rebuilds. --- ncftp/cmds.c | 3 --- 1 file changed, 3 deletions(-) Index: ncftp-3.2.5/ncftp/cmds.c =================================================================== --- ncftp-3.2.5.orig/ncftp/cmds.c 2010-04-05 20:33:21.000000000 +0100 +++ ncftp-3.2.5/ncftp/cmds.c 2014-02-18 19:57:17.000000000 +0000 @@ -4603,9 +4603,6 @@ VersionCmd(const int argc, char **const (void) printf("Archived at: ftp://ftp.NcFTP.com/ncftp/\n";); #endif (void) printf("Library Version: %s\n", gLibNcFTPVersion + 5); -#ifdef __DATE__ - (void) printf("Compile Date: %s\n", __DATE__); -#endif if (gOS[0] != '\0') (void) printf("Platform: %s\n", gOS); } /* VersionCmd */ ++++++ ncftp-3.2.4-src.tar.bz2 -> ncftp-3.2.5-src.tar.bz2 ++++++ ++++ 6309 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.4/doc/CHANGELOG.txt new/ncftp-3.2.5/doc/CHANGELOG.txt --- old/ncftp-3.2.4/doc/CHANGELOG.txt 2010-05-17 02:43:26.000000000 +0200 +++ new/ncftp-3.2.5/doc/CHANGELOG.txt 2010-11-27 00:05:35.000000000 +0100 @@ -1,6 +1,20 @@ NcFTP Change Log: ================ +3.2.5, 2011-01-01 + + + Fixed a problem on Mac OS X Snow Leopard for universal binary support. + + + ncftpls now prefers that you omit the leading dash when you use the -x + option. For example, if you wanted to try "ls -lrt", then try doing + "ncftpls -x lrt" rather than "ncftpls -x -lrt". + + + If a server's MLSx output returns both the "UNIX.mode" and the "perm" + parameters, UNIX.mode will take precedence (Thanks, Jay Kulpinski). + + + confirm-close is now off by default. + + 3.2.4.1, 2010-05-16 + Fixed a bug in Ncftpget/put/ls which could ignore the username (-u) 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.4/libncftp/ncftp.h new/ncftp-3.2.5/libncftp/ncftp.h --- old/ncftp-3.2.4/libncftp/ncftp.h 2010-04-08 01:24:33.000000000 +0200 +++ new/ncftp-3.2.5/libncftp/ncftp.h 2011-01-19 02:10:16.000000000 +0100 @@ -1,6 +1,6 @@ /* ncftp.h * - * Copyright (c) 1996-2010 Mike Gleason, NcFTP Software. + * Copyright (c) 1996-2011 Mike Gleason, NcFTP Software. * All rights reserved. * */ @@ -13,10 +13,10 @@ { #endif /* __cplusplus */ -#define kLibraryVersion "@(#) LibNcFTP 3.2.4 (April 3, 2010)" +#define kLibraryVersion "@(#) LibNcFTP 3.2.5 (January 17, 2011)" /* This is used to verify validty of the data passed in. */ -#define kLibraryMagic "LibNcFTP 3.2.4" +#define kLibraryMagic "LibNcFTP 3.2.5" #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__) /* Includes for Windows */ 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.4/libncftp/open.c new/ncftp-3.2.5/libncftp/open.c --- old/ncftp-3.2.4/libncftp/open.c 2010-04-04 02:53:45.000000000 +0200 +++ new/ncftp-3.2.5/libncftp/open.c 2010-06-16 14:48:21.000000000 +0200 @@ -477,128 +477,133 @@ cip->hasMFF = kCommandNotAvailable; cip->hasRETR_tar = kCommandNotAvailable; } + + /* We cheat here and pre-populate some + * fields when the server is wu-ftpd. + * This server is very common and we + * know it has always had these. + */ + if (cip->serverType == kServerTypeWuFTPd) { + cip->hasPASV = kCommandAvailable; + cip->hasSIZE = kCommandAvailable; + cip->hasMDTM = kCommandAvailable; + cip->hasMDTM_set = kCommandAvailable; + cip->hasREST = kCommandAvailable; + cip->NLSTfileParamWorks = kCommandAvailable; + } else if (cip->serverType == kServerTypeNcFTPd) { + cip->hasPASV = kCommandAvailable; + cip->hasSIZE = kCommandAvailable; + cip->hasMDTM = kCommandAvailable; + cip->hasREST = kCommandAvailable; + cip->NLSTfileParamWorks = kCommandAvailable; + } + + if (cip->hasFEAT == kCommandNotAvailable) { + return (kNoErr); + } rp = InitResponse(); if (rp == NULL) { cip->errNo = kErrMallocFailed; result = cip->errNo; - } else if (cip->hasFEAT != kCommandNotAvailable) { - rp->printMode = (kResponseNoPrint|kResponseNoSave); - result = RCmd(cip, rp, "FEAT"); - if (result < kNoErr) { - DoneWithResponse(cip, rp); - return (result); - } else if (result != 2) { - /* We cheat here and pre-populate some - * fields when the server is wu-ftpd. - * This server is very common and we - * know it has always had these. + return (result); + } + + rp->printMode = (kResponseNoPrint|kResponseNoSave); + result = RCmd(cip, rp, "FEAT"); + if (result < kNoErr) { + DoneWithResponse(cip, rp); + return (result); + } else if (result != 2) { + /* Newer commands are only shown in FEAT, + * so we don't have to do the "try it, + * then save that it didn't work" thing. + */ + cip->hasMLST = kCommandNotAvailable; + cip->hasMLSD = kCommandNotAvailable; + cip->hasMFMT = kCommandNotAvailable; + cip->hasMFF = kCommandNotAvailable; + } else { + cip->hasFEAT = kCommandAvailable; + + for (lp = rp->msg.first; lp != NULL; lp = lp->next) { + /* If first character was not a space it is + * either: + * + * (a) The header line in the response; + * (b) The trailer line in the response; + * (c) A protocol violation. */ - if (cip->serverType == kServerTypeWuFTPd) { + cp = lp->line; + while ((*cp != '\0') && (isspace((int) *cp))) + cp++; + if (*cp == '\0') + continue; + if (ISTRNCMP(cp, "PASV", 4) == 0) { cip->hasPASV = kCommandAvailable; + } else if (ISTRNCMP(cp, "SIZE", 4) == 0) { cip->hasSIZE = kCommandAvailable; + } else if (ISTRNCMP(cp, "MDTM", 4) == 0) { cip->hasMDTM = kCommandAvailable; - cip->hasMDTM_set = kCommandAvailable; + } else if (ISTRNCMP(cp, "MFMT", 4) == 0) { + cip->hasMFMT = kCommandAvailable; + } else if (ISTRNCMP(cp, "MFF", 3) == 0) { + cip->hasMFF = kCommandAvailable; + } else if (ISTRNCMP(cp, "REST", 4) == 0) { cip->hasREST = kCommandAvailable; - cip->NLSTfileParamWorks = kCommandAvailable; - } else if (cip->serverType == kServerTypeNcFTPd) { - cip->hasPASV = kCommandAvailable; - cip->hasSIZE = kCommandAvailable; - cip->hasMDTM = kCommandAvailable; - cip->hasREST = kCommandAvailable; - cip->NLSTfileParamWorks = kCommandAvailable; - } - - /* Newer commands are only shown in FEAT, - * so we don't have to do the "try it, - * then save that it didn't work" thing. - */ - cip->hasMLST = kCommandNotAvailable; - cip->hasMLSD = kCommandNotAvailable; - cip->hasMFMT = kCommandNotAvailable; - cip->hasMFF = kCommandNotAvailable; - } else { - cip->hasFEAT = kCommandAvailable; - - for (lp = rp->msg.first; lp != NULL; lp = lp->next) { - /* If first character was not a space it is - * either: - * - * (a) The header line in the response; - * (b) The trailer line in the response; - * (c) A protocol violation. + } else if (ISTRNCMP(cp, "UTIME", 5) == 0) { + cip->hasSITE_UTIME = kCommandAvailable; + } else if (ISTRNCMP(cp, "MLST", 4) == 0) { + cip->hasMLST = kCommandAvailable; + cip->hasMLSD = kCommandAvailable; + FTPExamineMlstFeatures(cip, cp + 5); + } else if (ISTRNCMP(cp, "CLNT", 4) == 0) { + cip->hasCLNT = kCommandAvailable; + } else if (ISTRNCMP(cp, "Compliance Level: ", 18) == 0) { + /* Probably only NcFTPd will ever implement this. + * But we use it internally to differentiate + * between different NcFTPd implementations of + * IETF extensions. */ - cp = lp->line; - while ((*cp != '\0') && (isspace((int) *cp))) - cp++; - if (*cp == '\0') - continue; - if (ISTRNCMP(cp, "PASV", 4) == 0) { - cip->hasPASV = kCommandAvailable; - } else if (ISTRNCMP(cp, "SIZE", 4) == 0) { - cip->hasSIZE = kCommandAvailable; - } else if (ISTRNCMP(cp, "MDTM", 4) == 0) { - cip->hasMDTM = kCommandAvailable; - } else if (ISTRNCMP(cp, "MFMT", 4) == 0) { - cip->hasMFMT = kCommandAvailable; - } else if (ISTRNCMP(cp, "MFF", 3) == 0) { - cip->hasMFF = kCommandAvailable; - } else if (ISTRNCMP(cp, "REST", 4) == 0) { - cip->hasREST = kCommandAvailable; - } else if (ISTRNCMP(cp, "UTIME", 5) == 0) { - cip->hasSITE_UTIME = kCommandAvailable; - } else if (ISTRNCMP(cp, "MLST", 4) == 0) { - cip->hasMLST = kCommandAvailable; - cip->hasMLSD = kCommandAvailable; - FTPExamineMlstFeatures(cip, cp + 5); - } else if (ISTRNCMP(cp, "CLNT", 4) == 0) { - cip->hasCLNT = kCommandAvailable; - } else if (ISTRNCMP(cp, "Compliance Level: ", 18) == 0) { - /* Probably only NcFTPd will ever implement this. - * But we use it internally to differentiate - * between different NcFTPd implementations of - * IETF extensions. - */ - cip->ietfCompatLevel = atoi(cp + 18); - } + cip->ietfCompatLevel = atoi(cp + 18); } } + } - /* You can set cip->hasHELP_SITE to kCommandNotAvailable - * if your host chokes (i.e. IBM Mainframes) when you - * do "HELP SITE". - */ - ReInitResponse(cip, rp); - result = (cip->hasHELP_SITE == kCommandNotAvailable) ? (-1) : RCmd(cip, rp, "HELP SITE"); - if (result == 2) { - cip->hasHELP_SITE = kCommandAvailable; - for (lp = rp->msg.first; lp != NULL; lp = lp->next) { - cp = lp->line; - if (strstr(cp, "RETRBUFSIZE") != NULL) - cip->hasSITE_RETRBUFSIZE = kCommandAvailable; - if (strstr(cp, "RBUFSZ") != NULL) - cip->hasSITE_RBUFSZ = kCommandAvailable; - /* See if RBUFSIZ matches (but not STORBUFSIZE) */ - if ( - ((p = strstr(cp, "RBUFSIZ")) != NULL) && - ( - (p == cp) || - ((p > cp) && (!isupper((int) p[-1]))) - ) + /* You can set cip->hasHELP_SITE to kCommandNotAvailable + * if your host chokes (i.e. IBM Mainframes) when you + * do "HELP SITE". + */ + ReInitResponse(cip, rp); + result = (cip->hasHELP_SITE == kCommandNotAvailable) ? (-1) : RCmd(cip, rp, "HELP SITE"); + if (result == 2) { + cip->hasHELP_SITE = kCommandAvailable; + for (lp = rp->msg.first; lp != NULL; lp = lp->next) { + cp = lp->line; + if (strstr(cp, "RETRBUFSIZE") != NULL) + cip->hasSITE_RETRBUFSIZE = kCommandAvailable; + if (strstr(cp, "RBUFSZ") != NULL) + cip->hasSITE_RBUFSZ = kCommandAvailable; + /* See if RBUFSIZ matches (but not STORBUFSIZE) */ + if ( + ((p = strstr(cp, "RBUFSIZ")) != NULL) && + ( + (p == cp) || + ((p > cp) && (!isupper((int) p[-1]))) ) - cip->hasSITE_RBUFSIZ = kCommandAvailable; - if (strstr(cp, "STORBUFSIZE") != NULL) - cip->hasSITE_STORBUFSIZE = kCommandAvailable; - if (strstr(cp, "SBUFSIZ") != NULL) - cip->hasSITE_SBUFSIZ = kCommandAvailable; - if (strstr(cp, "SBUFSZ") != NULL) - cip->hasSITE_SBUFSZ = kCommandAvailable; - if (strstr(cp, "BUFSIZE") != NULL) - cip->hasSITE_BUFSIZE = kCommandAvailable; - } + ) + cip->hasSITE_RBUFSIZ = kCommandAvailable; + if (strstr(cp, "STORBUFSIZE") != NULL) + cip->hasSITE_STORBUFSIZE = kCommandAvailable; + if (strstr(cp, "SBUFSIZ") != NULL) + cip->hasSITE_SBUFSIZ = kCommandAvailable; + if (strstr(cp, "SBUFSZ") != NULL) + cip->hasSITE_SBUFSZ = kCommandAvailable; + if (strstr(cp, "BUFSIZE") != NULL) + cip->hasSITE_BUFSIZE = kCommandAvailable; } - DoneWithResponse(cip, rp); } + DoneWithResponse(cip, rp); return (kNoErr); } /* FTPQueryFeatures */ 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.4/libncftp/unls.c new/ncftp-3.2.5/libncftp/unls.c --- old/ncftp-3.2.4/libncftp/unls.c 2010-04-17 16:20:31.000000000 +0200 +++ new/ncftp-3.2.5/libncftp/unls.c 2010-11-26 23:47:56.000000000 +0100 @@ -947,8 +947,13 @@ m1 = (mli.mode & 00700) >> 6; m2 = (mli.mode & 00070) >> 3; m3 = (mli.mode & 00007); - } - if (mli.perm[0] != '\0') { + } else if (mli.perm[0] != '\0') { + /* Note that if both UNIX.mode and + * perm are avaiable, we will use + * UNIX.mode. This is probably + * not what the RFC would like + * us to do. + */ m3 = 0; if (fi.type == 'd') { if (strchr(mli.perm, 'e') != 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.4/ncftp/pref.c new/ncftp-3.2.5/ncftp/pref.c --- old/ncftp-3.2.4/ncftp/pref.c 2006-08-02 01:34:16.000000000 +0200 +++ new/ncftp-3.2.5/ncftp/pref.c 2010-11-27 00:04:54.000000000 +0100 @@ -612,7 +612,7 @@ gAutoResume = 0; gSOBufsize = 0; gMaxLogSize = 10240; - gConfirmClose = 1; + gConfirmClose = 0; gAutoSaveChangesToExistingBookmarks = 0; gRedialDelay = kDefaultRedialDelay; STRNCPY(gAutoAscii, "|.txt|.asc|.html|.htm|.css|.xml|.ini|.pl|.hqx|.cfg|.c|.h|.cpp|.hpp|.bat|.m3u|.pls|"); 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.4/ncftp/rc.rc new/ncftp-3.2.5/ncftp/rc.rc --- old/ncftp-3.2.4/ncftp/rc.rc 2010-04-04 03:13:20.000000000 +0200 +++ new/ncftp-3.2.5/ncftp/rc.rc 2011-01-18 04:50:47.000000000 +0100 @@ -1,118 +1,118 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_NCFTP_ICON ICON DISCARDABLE "ncftp.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,4,18 - PRODUCTVERSION 3,2,4,18 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x29L -#else - FILEFLAGS 0x28L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", " \0" - VALUE "CompanyName", "NcFTP Software\0" - VALUE "FileDescription", " \0" - VALUE "FileVersion", "3.2.4\0" - VALUE "InternalName", " \0" - VALUE "LegalCopyright", "Copyright � 2010\0" - VALUE "LegalTrademarks", " \0" - VALUE "OriginalFilename", "ncftp.exe\0" - VALUE "PrivateBuild", " \0" - VALUE "ProductName", " \0" - VALUE "ProductVersion", "3.2.4\0" - VALUE "SpecialBuild", " \0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_NCFTP_ICON ICON DISCARDABLE "ncftp.ico" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,2,5,19 + PRODUCTVERSION 3,2,5,19 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", " \0" + VALUE "CompanyName", "NcFTP Software\0" + VALUE "FileDescription", " \0" + VALUE "FileVersion", "3.2.5\0" + VALUE "InternalName", " \0" + VALUE "LegalCopyright", "Copyright � 2011\0" + VALUE "LegalTrademarks", " \0" + VALUE "OriginalFilename", "ncftp.exe\0" + VALUE "PrivateBuild", " \0" + VALUE "ProductName", " \0" + VALUE "ProductVersion", "3.2.5\0" + VALUE "SpecialBuild", " \0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + 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.4/ncftp/util.c new/ncftp-3.2.5/ncftp/util.c --- old/ncftp-3.2.4/ncftp/util.c 2009-10-24 01:31:23.000000000 +0200 +++ new/ncftp-3.2.5/ncftp/util.c 2010-10-30 23:34:25.000000000 +0200 @@ -19,7 +19,7 @@ char gShell[256]; char gOurDirectoryPath[260]; char gOurInstallationPath[260]; -int gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = 0; +const char *gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = NULL; #ifdef ncftp static int gResolveSig; #endif 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.4/ncftp/util.h new/ncftp-3.2.5/ncftp/util.h --- old/ncftp-3.2.4/ncftp/util.h 2008-07-14 04:02:48.000000000 +0200 +++ new/ncftp-3.2.5/ncftp/util.h 2010-10-30 23:34:14.000000000 +0200 @@ -59,10 +59,10 @@ # define kOurDirectoryName ".ncftp" #endif -extern int gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings; +extern const char *gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings; #if (defined(__APPLE_CC__)) && (__APPLE_CC__ < 10000) -# define NCFTP_USE_VAR(a) a = 0; gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = (a == 0) +# define NCFTP_USE_VAR(a) gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = (const char *) (&a); # ifndef UNUSED # define UNUSED(a) a # endif @@ -77,7 +77,7 @@ # endif # define NCFTP_USE_VAR(a) #else -# define NCFTP_USE_VAR(a) a = 0; gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = (a == 0) +# define NCFTP_USE_VAR(a) gNcFTP_Uses_Me_To_Quiet_Variable_Unused_Warnings = (const char *) (&a); # ifndef UNUSED # define UNUSED(a) a # endif 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.4/ncftp/version.c new/ncftp-3.2.5/ncftp/version.c --- old/ncftp-3.2.4/ncftp/version.c 2010-05-17 02:58:12.000000000 +0200 +++ new/ncftp-3.2.5/ncftp/version.c 2011-02-03 00:13:08.000000000 +0100 @@ -6,7 +6,7 @@ /******************************************************************************/ -const char gVersion[] = "@(#) NcFTP 3.2.4/466 May 16 2010, 07:58 PM"; +const char gVersion[] = "@(#) NcFTP 3.2.5/474 Feb 02 2011, 05:13 PM"; /******************************************************************************/ @@ -23,7 +23,7 @@ /******************************************************************************/ const char gCopyright[] = "@(#) \ -Copyright (c) 1992-2009 by Mike Gleason.\n\ +Copyright (c) 1992-2011 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.4/sh_util/ncftpls.c new/ncftp-3.2.5/sh_util/ncftpls.c --- old/ncftp-3.2.4/sh_util/ncftpls.c 2010-05-17 02:52:33.000000000 +0200 +++ new/ncftp-3.2.5/sh_util/ncftpls.c 2010-10-31 19:21:09.000000000 +0100 @@ -225,7 +225,7 @@ -gg As above, but append a \"/\" character to directory pathnames.\n\ -a Show all files, if server allows it (as in \"/bin/ls -a\").\n\ -i XX Filter the listing (if server supports it) with the wildcard XX.\n\ - -x XX List command flags to use on the remote server.\n"); + -x XX List command flags to try on the remote server (without leading dash).\n"); (void) fprintf(fp, "\nFTP Flags:\n\ -u XX Use username XX instead of anonymous.\n\ -p XX Use password XX with the username.\n\ @@ -251,7 +251,7 @@ ncftpls -1 ftp://ftp.freebsd.org/pub/FreeBSD/\n\ ncftpls -la -i '*.TXT' ftp://ftp.freebsd.org/pub/FreeBSD/\n\ ncftpls -m ftp://ftp.ncftp.com/ncftpd/\n\ - ncftpls -x \"-lrt\" ftp://ftp.freebsd.org/pub/FreeBSD/\n";); + ncftpls -x \"lrt\" ftp://ftp.freebsd.org/pub/FreeBSD/\n";); (void) fprintf(fp, "%s", "\nNote: The standard specifies that URL pathnames are are relative pathnames.\n For FTP, this means that URLs specify relative pathnames from the start\n directory, which for user logins, are typically the user's home directory.\n If you want to use absolute pathnames, you need to include a literal slash,\n using the \"%2F\" code for a \"/\" character. Examples:\n\n"); @@ -542,8 +542,13 @@ STRNCAT(lsflags, "a"); } lsflagstouse = lsflags; - if (userflags != NULL) - lsflagstouse = userflags; + if (userflags != NULL) { + lsflags[0] = '-'; + lsflags[1] = '\0'; + while (*userflags== '-') + userflags++; + STRNCAT(lsflags, userflags); + } InitOurDirectory(); 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.4/sh_util/rc.rc new/ncftp-3.2.5/sh_util/rc.rc --- old/ncftp-3.2.4/sh_util/rc.rc 2010-04-04 03:13:20.000000000 +0200 +++ new/ncftp-3.2.5/sh_util/rc.rc 2010-10-30 23:21:22.000000000 +0200 @@ -63,8 +63,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,4,18 - PRODUCTVERSION 3,2,4,18 + FILEVERSION 3,2,5,19 + PRODUCTVERSION 3,2,5,19 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.4\0" + VALUE "FileVersion", "3.2.5\0" VALUE "InternalName", "\0" VALUE "LegalCopyright", "Copyright � 2010\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "NcFTP Software \0" - VALUE "ProductVersion", "3.2.4\0" + VALUE "ProductVersion", "3.2.5\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.4/sio/SRead.c new/ncftp-3.2.5/sio/SRead.c --- old/ncftp-3.2.4/sio/SRead.c 2009-12-17 18:45:56.000000000 +0100 +++ new/ncftp-3.2.5/sio/SRead.c 2010-10-30 23:25:35.000000000 +0200 @@ -4,7 +4,7 @@ #endif static const char UNUSED(gSioVersion[]) = kSioVersion; -static const char UNUSED(gCopyright[]) = "@(#) libsio Copyright 1992-2005, by Mike Gleason. All rights reserved."; +static const char UNUSED(gCopyright[]) = "@(#) libsio Copyright 1992-2011, by Mike Gleason. All rights reserved."; /* Read up to "size" bytes on sfd before "tlen" seconds. 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.4/sio/main.c new/ncftp-3.2.5/sio/main.c --- old/ncftp-3.2.4/sio/main.c 2008-05-07 23:24:50.000000000 +0200 +++ new/ncftp-3.2.5/sio/main.c 2010-10-30 23:33:25.000000000 +0200 @@ -3,7 +3,7 @@ # pragma hdrstop #endif -int gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = 0; +const char *gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = NULL; /* Your app can set this to 1 to avoid pointless setting/restoring of SIGPIPE */ int sio_sigpipe_ignored_already = 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.4/sio/sio.h new/ncftp-3.2.5/sio/sio.h --- old/ncftp-3.2.4/sio/sio.h 2008-05-07 23:25:39.000000000 +0200 +++ new/ncftp-3.2.5/sio/sio.h 2010-10-30 23:32:22.000000000 +0200 @@ -1,6 +1,6 @@ /* sio.h * - * Copyright 1992-2003 Mike Gleason, NcFTP Software. All Rights Reserved. + * Copyright 1992-2011 Mike Gleason, NcFTP Software. All Rights Reserved. * */ @@ -157,10 +157,10 @@ typedef void (*sio_sigproc_t)(int); -extern int gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings; +extern const char *gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings; #if (defined(__APPLE_CC__)) && (__APPLE_CC__ < 10000) -# define LIBSIO_USE_VAR(a) gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = (a == 0) +# define LIBSIO_USE_VAR(a) gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = (const char *) (&a) # ifndef UNUSED # define UNUSED(a) a # endif @@ -175,7 +175,7 @@ # endif # define LIBSIO_USE_VAR(a) #else -# define LIBSIO_USE_VAR(a) gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = (a == 0) +# define LIBSIO_USE_VAR(a) gLibSio_Uses_Me_To_Quiet_Variable_Unused_Warnings = (const char *) (&a) # ifndef UNUSED # define UNUSED(a) a # endif 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.4/vis/bmed.c new/ncftp-3.2.5/vis/bmed.c --- old/ncftp-3.2.4/vis/bmed.c 2005-01-01 22:36:01.000000000 +0100 +++ new/ncftp-3.2.5/vis/bmed.c 2011-02-03 00:14:06.000000000 +0100 @@ -5,7 +5,6 @@ * */ - #include "syshdrs.h" #ifdef PRAGMA_HDRSTOP # pragma hdrstop @@ -231,7 +230,6 @@ - /* This prompts for a key of input when in the main host editor window. */ int HostWinGetKey(void) { 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.4/vis/syshdrs.h new/ncftp-3.2.5/vis/syshdrs.h --- old/ncftp-3.2.4/vis/syshdrs.h 2009-10-24 01:32:26.000000000 +0200 +++ new/ncftp-3.2.5/vis/syshdrs.h 2011-02-03 00:13:00.000000000 +0100 @@ -139,6 +139,7 @@ #endif #ifdef HAVE_NCURSES_H +# define NCURSES_OPAQUE 0 # include <ncurses.h> #else # ifdef HAVE_CURSES_H 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.4/win/bmed/bmed.rc new/ncftp-3.2.5/win/bmed/bmed.rc --- old/ncftp-3.2.4/win/bmed/bmed.rc 2010-04-04 03:13:20.000000000 +0200 +++ new/ncftp-3.2.5/win/bmed/bmed.rc 2010-10-30 23:21:22.000000000 +0200 @@ -161,8 +161,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,4,18 - PRODUCTVERSION 3,2,4,18 + FILEVERSION 3,2,5,19 + PRODUCTVERSION 3,2,5,19 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.4\0" + VALUE "FileVersion", "3.2.5\0" VALUE "InternalName", "\0" VALUE "LegalCopyright", "Copyright � 2010\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "NcFTP Software \0" - VALUE "ProductVersion", "3.2.4\0" + VALUE "ProductVersion", "3.2.5\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.4/win/setup/ncftp.wse new/ncftp-3.2.5/win/setup/ncftp.wse --- old/ncftp-3.2.4/win/setup/ncftp.wse 2010-04-07 04:32:04.000000000 +0200 +++ new/ncftp-3.2.5/win/setup/ncftp.wse 2010-10-30 23:21:22.000000000 +0200 @@ -1,7 +1,7 @@ Document Type: WSE item: Global Version=8.14 - Title=NcFTP 3.2.4 Installation + Title=NcFTP 3.2.5 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.4-win32.exe + EXE Filename=ncftp-3.2.5-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.4 + Value=NcFTP 3.2.5 Flags=10000000 end item: Remark -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
