rpms/ncftp/EL-4 ncftp-3.2.2-no_lfs64_source.patch, NONE, 1.1 ncftp-3.2.2-pref.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ncftp.spec, 1.11, 1.12 sources, 1.5, 1.6 ncftp-3.0.1-pref.patch, 1.1, NONE ncftp-3.1.8-epsv.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Fri Apr 10 22:16:28 UTC 2009 

Author: thias

Update of /cvs/extras/rpms/ncftp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13211

Modified Files:
	.cvsignore ncftp.spec sources 
Added Files:
	ncftp-3.2.2-no_lfs64_source.patch ncftp-3.2.2-pref.patch 
Removed Files:
	ncftp-3.0.1-pref.patch ncftp-3.1.8-epsv.patch 
Log Message:
Backport the 3.2.2 update.


ncftp-3.2.2-no_lfs64_source.patch:

--- NEW FILE ncftp-3.2.2-no_lfs64_source.patch ---
Fix bug #235632: Apparently this code is still triggered on 64-bit systems
through configure, when configure is dealing with the proper LFS64 stuff
already (or should allow the glibc wrapper to do so). -JeR

--- libncftp/ncftp.h.orig	2008-08-25 18:55:38.000000000 +0200
+++ libncftp/ncftp.h	2008-08-25 19:09:02.000000000 +0200
@@ -165,17 +165,6 @@
 #	endif
 #else
 	/* Includes for UNIX */
-#	if ((defined(__linux__)) && (! defined(_LARGEFILE64_SOURCE)) && (! defined(NO_LARGEFILE64_SOURCE)) && (! defined(_LARGEFILE_SOURCE)) && (! defined(_FILE_OFFSET_BITS)))
-		/* Define _LARGEFILE64_SOURCE or NO_LARGEFILE64_SOURCE to
-		 * quiet this warning.  Be sure to define this for ALL
-		 * code that uses LibNcFTP.
-		 */
-#		warning "<ncftp.h> is #defining _LARGEFILE64_SOURCE for you"
-#		define _LARGEFILE64_SOURCE 1
-#		define   Stat    stat64
-#		define   Lstat   lstat64
-#		define   Fstat   fstat64
-#	endif
 #	include <unistd.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>

ncftp-3.2.2-pref.patch:

--- NEW FILE ncftp-3.2.2-pref.patch ---
diff -Naupr ncftp-3.2.2.orig/ncftp/pref.c ncftp-3.2.2/ncftp/pref.c
--- ncftp-3.2.2.orig/ncftp/pref.c	2006-08-02 01:34:16.000000000 +0200
+++ ncftp-3.2.2/ncftp/pref.c	2008-08-29 20:43:23.000000000 +0200
@@ -612,7 +612,7 @@ InitPrefs(void)
 	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|");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2007 13:31:25 -0000	1.5
+++ .cvsignore	10 Apr 2009 22:15:58 -0000	1.6
@@ -1,2 +1 @@
-ncftp-3.2.0-src.tar.bz2
-ncftp-320-v6-20061109b.diff.gz
+ncftp-3.2.2-src.tar.bz2


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/ncftp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ncftp.spec	5 Feb 2007 13:31:25 -0000	1.11
+++ ncftp.spec	10 Apr 2009 22:15:58 -0000	1.12
@@ -1,18 +1,18 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.0
-Release: 3%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 Epoch: 2
-License: Distributable
+License: Artistic clarified
 Group: Applications/Internet
 URL: http://www.ncftp.com/ncftp/
 Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
-Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20061109b.diff.gz
-Patch1: ncftp-3.0.1-pref.patch
+#Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20061109b.diff.gz
+Patch1: ncftp-3.2.2-pref.patch
 Patch2: ncftp-3.0.3-resume.patch
 Patch3: ncftp-3.1.5-pmeter.patch
 Patch4: ncftp-3.1.5-ncursesw.patch
-Patch5: ncftp-3.1.8-epsv.patch
+Patch5: ncftp-3.2.2-no_lfs64_source.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -24,24 +24,23 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ipv6
-%patch1 -p0 -b .pref
+#patch0 -p1 -b .ipv6
+%patch1 -p1 -b .pref
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pmeter
 %patch4 -p1 -b .ncursesw
-%patch5 -p1 -b .epsv
+%patch5 -p0 -b .no_lfs64_source
 
 
 %build
-%configure --enable-signals --enable-ipv6
+%configure --enable-signals
 %{__make} STRIPFLAG=""
-%{__rm} -f README.v6.ipv6
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1}
-%makeinstall BINDIR=%{buildroot}%{_bindir}
+%{__make} install DESTDIR=%{buildroot}
 
 
 %clean
@@ -49,8 +48,10 @@
 
 
 %files
-%defattr(-,root,root,0755)
-%doc README* doc/*.txt doc/html/
+%defattr(-,root,root,-)
+%doc README* doc/html/
+%doc doc/CHANGELOG.txt doc/FIREWALLS_AND_PROXIES.txt doc/LICENSE.txt
+%doc doc/READLINE.txt doc/what_changed_between_v2_v3.txt
 %{_bindir}/ncftp
 %{_bindir}/ncftpget
 %{_bindir}/ncftpput
@@ -67,6 +68,26 @@
 
 
 %changelog
+* Fri Aug 29 2008 Matthias Saou <http://freshrpms.net/> 2:3.2.2-1
+- Update to 3.2.2.
+- Include no_lfs64_source from Gentoo to fix the build.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Fri Aug 17 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.1-1
+- Update to 3.2.1.
+- Drop Kame IPv6 patch, should fix #153019. Upstream doesn't seem to want to
+  support IPv6 just yet, so for people requiring IPv6, switching to lftp or
+  some other alternative is probably best.
+- Drop epsv patch, since it applied on top of the IPv6 patch.
+- Clean up included docs (don't include Windows specific ones).
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.0-4
+- Update License field.
+- Use DESTDIR install method.
+- Version 3.2.1 is out, but the KAME IPv6 patch hasn't been updated yet.
+
 * Mon Feb  5 2007 Matthias Saou <http://freshrpms.net/> 2:3.2.0-3
 - Update IPv6 patch from 20060806 to 20061109b (getnameinfo vs. getaddrinfo).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2007 13:31:25 -0000	1.5
+++ sources	10 Apr 2009 22:15:58 -0000	1.6
@@ -1,2 +1 @@
-384b7f01d725c89ccd30692628b3ac1b  ncftp-3.2.0-src.tar.bz2
-54c136bbda91390db22aecb1dc78aeba  ncftp-320-v6-20061109b.diff.gz
+c33da134e5e53b5a3b340e0de5456137  ncftp-3.2.2-src.tar.bz2


--- ncftp-3.0.1-pref.patch DELETED ---


--- ncftp-3.1.8-epsv.patch DELETED ---

More information about the scm-commits mailing list