rpms/ncftp/devel ncftp-3.0.1-pref.patch, NONE, 1.1 ncftp-3.0.3-resume.patch, NONE, 1.1 ncftp-3.1.5-ncursesw.patch, NONE, 1.1 ncftp-3.1.5-pmeter.patch, NONE, 1.1 ncftp-3.1.6-rh1.patch, NONE, 1.1 ncftp-3.1.7-shell.patch, NONE, 1.1 ncftp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Sat Mar 5 22:28:26 UTC 2005
Author: thias
Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322/devel
Modified Files:
.cvsignore sources
Added Files:
ncftp-3.0.1-pref.patch ncftp-3.0.3-resume.patch
ncftp-3.1.5-ncursesw.patch ncftp-3.1.5-pmeter.patch
ncftp-3.1.6-rh1.patch ncftp-3.1.7-shell.patch ncftp.spec
Log Message:
auto-import ncftp-3.1.8-4 on branch devel from ncftp-3.1.8-4.src.rpm
ncftp-3.0.1-pref.patch:
--- NEW FILE ncftp-3.0.1-pref.patch ---
--- ncftp/pref.c 2000/07/30 07:01:37 1.1
+++ ncftp/pref.c 2000/07/30 07:01:55
@@ -552,7 +552,7 @@
gAutoResume = 0;
gSOBufsize = 0;
gMaxLogSize = 10240;
- gConfirmClose = 1;
+ gConfirmClose = 0;
gAutoSaveChangesToExistingBookmarks = 0;
gRedialDelay = kDefaultRedialDelay;
ncftp-3.0.3-resume.patch:
--- NEW FILE ncftp-3.0.3-resume.patch ---
--- ncftp-3.0.3/ncftp/pref.c.resume Tue May 22 21:56:21 2001
+++ ncftp-3.0.3/ncftp/pref.c Tue May 22 21:57:07 2001
@@ -625,7 +625,7 @@
gCtrlTimeout = 135;
gDataPortMode = kFallBackToSendPortMode;
gConn.dataPortMode = gDataPortMode;
- gAutoResume = 0;
+ gAutoResume = 1;
gSOBufsize = 0;
gMaxLogSize = 10240;
gConfirmClose = 0;
ncftp-3.1.5-ncursesw.patch:
--- NEW FILE ncftp-3.1.5-ncursesw.patch ---
--- ncftp-3.1.5/autoconf/aclocal.m4.ncursesw 2003-08-12 12:17:43.000000000 +0200
+++ ncftp-3.1.5/autoconf/aclocal.m4 2003-08-12 12:25:39.000000000 +0200
@@ -3704,7 +3704,7 @@
wi_cv_lib_curses=no
wi_cv_lib_curses_result=no
ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
do
if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
# This should never work
@@ -3752,7 +3752,7 @@
if test "$wi_cv_lib_curses_result" != "no" ; then
case "$LIBCURSES" in
- "-lncurses")
+ "-lncurses*")
AC_DEFINE(HAVE_LIBNCURSES)
;;
"-lcurses")
--- ncftp-3.1.5/configure.ncursesw 2003-08-12 12:28:43.000000000 +0200
+++ ncftp-3.1.5/configure 2003-08-12 12:28:47.000000000 +0200
@@ -3452,7 +3452,7 @@
wi_cv_lib_curses=no
wi_cv_lib_curses_result=no
ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
do
if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
# This should never work
ncftp-3.1.5-pmeter.patch:
--- NEW FILE ncftp-3.1.5-pmeter.patch ---
--- ncftp-3.1.5/sh_util/gpshare.c.pmeter Thu Dec 5 19:04:42 2002
+++ ncftp-3.1.5/sh_util/gpshare.c Thu Dec 5 19:06:36 2002
@@ -436,8 +436,8 @@
#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;
+ /* progmeters = (getppid() > 1) ? 1 : 0; */
#endif
return (progmeters);
} /* GetDefaultProgressMeterSetting */
ncftp-3.1.6-rh1.patch:
--- NEW FILE ncftp-3.1.6-rh1.patch ---
--- ncftp-3.1.6/ncftp/cmds.c.rh1 2003-10-27 15:10:52.000000000 +0100
+++ ncftp-3.1.6/ncftp/cmds.c 2003-10-27 16:18:48.000000000 +0100
@@ -267,7 +267,7 @@
FillBookmarkInfo(&gBm);
saveBmPassword = gSavePasswords;
- if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+ if ((saveBmPassword < 0) && (gBm.pass[0] == '\0') && (gLoadedBm == 0)) {
if (gIsTTYr == 0) {
saveBmPassword = 0;
} else {
@@ -280,7 +280,10 @@
(void) printf("\nNot saving the password.\n");
}
}
+ } else if ((saveBmPassword < 0) && (gBm.pass[0] != '\0')) {
+ saveBmPassword = 1;
}
+
if (PutBookmark(&gBm, saveBmPassword) < 0) {
(void) fprintf(stderr, "Could not save bookmark.\n");
} else {
ncftp-3.1.7-shell.patch:
--- NEW FILE ncftp-3.1.7-shell.patch ---
--- ncftp-3.1.7/ncftp/shell.c.shell 2004-01-14 16:17:04.243105318 +0100
+++ ncftp-3.1.7/ncftp/shell.c 2004-01-14 16:17:31.502130388 +0100
@@ -225,7 +225,6 @@
char *dcp;
char *scp;
char *arg;
- static char xclam[4];
*cargc = 0;
scp = line;
@@ -257,9 +256,7 @@
if (scp[1] == '!') {
scp[1] = '\0';
} else if ((scp[1] != '\0') && (!isspace((int) scp[1]))) {
- xclam[0] = '!';
- xclam[1] = '\0';
- cargv[0] = xclam;
+ cargv[0] = "!";
scp++;
arg = dcp;
cargv[*cargc] = arg;
--- NEW FILE ncftp.spec ---
Summary: An improved FTP client.
Name: ncftp
Version: 3.1.8
Epoch: 2
Release: 4
Prefix: %{_prefix}
License: Distributable
Group: Applications/Internet
Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
Patch1: ncftp-3.0.1-pref.patch
Patch2: ncftp-3.1.7-shell.patch
Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
Patch4: ncftp-3.0.3-resume.patch
Patch5: ncftp-3.1.5-pmeter.patch
Patch6: ncftp-3.1.5-ncursesw.patch
Patch7: ncftp-3.1.6-rh1.patch
BuildRoot: /var/tmp/%{name}-root
BuildRequires: ncurses-devel glibc-devel gcc
URL: http://www.ncftp.com/ncftp/
%description
Ncftp is an improved FTP client. Ncftp's improvements include support
for command line editing, command histories, recursive gets, automatic
anonymous logins, and more.
%prep
%setup -q
%patch1 -p0 -b .pref
%patch2 -p1
%patch3 -p1 -b .ipv6
%patch4 -p1 -b .res
%patch5 -p1 -b .pmeter
%patch6 -p1 -b .ncursesw
#%patch7 -p1 -b .ask_save
%build
#aclocal -I autoconf
#cp -f autoconf/aclocal.m4 .
%configure --enable-signals --enable-ipv6
make STRIPFLAG=""
rm -f README.v6.ipv6
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}
%makeinstall BINDIR=$RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README* doc
%{_bindir}/ncftp
%{_bindir}/ncftpget
%{_bindir}/ncftpput
%{_bindir}/ncftpbatch
%{_bindir}/ncftpls
%{_bindir}/ncftpbookmarks
%{_bindir}/ncftpspooler
%{_mandir}/man1/ncftp.1*
%{_mandir}/man1/ncftpget.1*
%{_mandir}/man1/ncftpput.1*
%{_mandir}/man1/ncftpbatch.1*
%{_mandir}/man1/ncftpls.1*
%{_mandir}/man1/ncftpspooler.1*
%changelog
* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-4
- build with gcc-4
* Wed Feb 09 2005 Karsten Hopp <karsten at redhat.de> 2:3.1.8-3
- rebuilt
* Thu Aug 26 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-2
- new upstream ipv6 patch, enable ipv6 again
* Mon Aug 09 2004 Karsten Hopp <karsten at redhat.de> 3.1.8-1
- update to version 3.1.8
- new ipv6 patch, but currently disabled due to problems with active-ftp
(#127553)
* Wed Jul 07 2004 Karsten Hopp <karsten at redhat.de> 2:3.1.7-5
- rebuild with new gcc
* Mon Jul 05 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-4
- add new ipv6 patch (#124232)
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jan 14 2004 Karsten Hopp <karsten at redhat.de> 3.1.7-1
- update to 3.1.7
* Mon Oct 27 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.6-2
- don't ask again if the password should be saved when it already is in the
bookmarks file (#62177)
* Fri Oct 03 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- 3.1.6
- disabled patch6, seems not necessary
* Tue Aug 12 2003 Karsten Hopp <karsten at redhat.de> 2:3.1.5-7
- don't terminate when 8bit characters are entered (#83107)
- link ncursesw if available
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Sun Feb 23 2003 Tim Powers <timp at redhat.com>
- rebuild to try and fix a missing dep on libresolv.so.2
* Tue Feb 04 2003 Karsten Hopp <karsten at redhat.de> 3.1.5-4
- updated ipv6 patch (#83186)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Wed Dec 04 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-2
- don't enable progressbar when called from a script (#78905)
* Mon Nov 18 2002 Karsten Hopp <karsten at redhat.de> 3.1.5-1
- update to 3.1.5
- fix #75253
- disable patch3
- fix filelist
* Mon Jul 1 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-6
- Bring back IPv6 support (#67322)
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Apr 10 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- add new patch from Jakub as given in #61961
select his second patch, that seems a very clean solution
* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-2
- Add workaround for glibc bug #61961 (should-fix)
* Sat Feb 9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.3-1
- 3.1.3
* Mon Jan 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.1.1-1
- Update to 3.1.1
- Temporarily disable the IPv6 patch as it breaks IPv4 connecting
to machines with both an IPv6 and an IPv4 address
* Tue Nov 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-2
- Update IPv6 patch
* Wed Oct 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.4-1
- 3.0.4
- Add URL tag to spec file (RFE #54622)
- Update and port IPv6 patches
- Fix build with gcc 3.1
* Sat Aug 4 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-6
- Fix suspend (#44101, #50846)
* Sun Jul 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-5
- Add build requirements (#49541)
* Sat Jul 21 2001 Tim Powers <timp at redhat.com>
- no ncftp applnk entry, it's cluttering the menus
* Wed Jul 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-3
- Fix ipv6 crash (Patch from Pekka Savola, #47763)
* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-2
- Default to auto-resume=yes (REF #28705)
* Tue Apr 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-1
- Update to 3.0.3
* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Add PLD's IPv6 patches (#35645)
* Fri Oct 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.2
* Thu Aug 24 2000 Philipp Knirsch <pknirsch at redhat.com>
- Fixed bug in ncftp/cmds.c in LocalListCmd where the use of the popen/pclose
was simply wrong and ocasionally resulted in a SIGSEGV (#16315)
* Fri Aug 4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Add Swedish and German translations to .desktop file, Bug #15325
* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- small changes to spec file and redo prev patch
* Sun Jul 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- set "confirm-close no" per default
* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Mon Jun 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- FHSify
* Sun Apr 02 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.1
* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0.0 final
* Mon Mar 6 2000 Jeff Johnson <jbj at redhat.com>
- permit 8-bit input chars to be returned without exiting (#9981),
* Sat Feb 5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Deal with rpm compressing man pages
- remove wmconfig stuff
* Thu Jan 6 2000 Jeff Johnson <jbj at redhat.com>
- add missing docs.
- y2k wartlet (#8225)
* Tue Nov 9 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 3.0b21
- enable signal usage
* Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
- 3.0b19
* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 3)
* Wed Feb 24 1999 Bill Nottingham <notting at redhat.com>
- return of wmconfig
* Tue Feb 23 1999 Bill Nottingham <notting at redhat.com>
- 3.0b18
* Fri Feb 12 1999 Bill Nottingham <notting at redhat.com>
- 3.0b17
* Wed Dec 2 1998 Bill Nottingham <notting at redhat.com>
- 3.0b16
* Wed Nov 18 1998 Bill Nottingham <notting at redhat.com>
- add docs
* Thu Nov 5 1998 Bill Nottingham <notting at redhat.com>
- update to 3.0beta15
* Thu Aug 13 1998 Jeff Johnson <jbj at redhat.com>
- build root
* Fri Apr 24 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr
* Wed Apr 08 1998 Cristian Gafton <gafton at redhat.com>
- compiled for Manhattan
* Fri Mar 20 1998 Cristian Gafton <gafton at redhat.com>
- updated to 2.4.3 for security reasons
* Wed Nov 05 1997 Donnie Barnes <djb at redhat.com>
- added wmconfig entry
* Wed Oct 21 1997 Cristian Gafton <gafton at redhat.com>
- fixed the spec file
* Fri Oct 10 1997 Erik Troan <ewt at redhat.com>
- updated to ncftp 2.4.2
* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
- built against glibc
* Tue Mar 25 1997 Donnie Barnes <djb at redhat.com>
- Rebuild as Sun version didn't work.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Mar 2005 22:26:48 -0000 1.1
+++ .cvsignore 5 Mar 2005 22:28:24 -0000 1.2
@@ -0,0 +1,2 @@
+ncftp-3.1.8-src.tar.bz2
+ncftp-3181-v6-20040826.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Mar 2005 22:26:48 -0000 1.1
+++ sources 5 Mar 2005 22:28:24 -0000 1.2
@@ -0,0 +1,2 @@
+dd5f47c72b6958fdb652355fb9bdb70c ncftp-3.1.8-src.tar.bz2
+ade187726693f5c6c6415e41832f514d ncftp-3181-v6-20040826.diff.gz
More information about the scm-commits
mailing list