rpms/ncftp/devel ncftp-3.2.2-no_lfs64_source.patch, NONE, 1.1 ncftp-3.2.2-pref.patch, NONE, 1.1 ncftp.spec, 1.14, 1.15 ncftp-3.0.1-pref.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30458

Modified Files:
	ncftp.spec 
Added Files:
	ncftp-3.2.2-no_lfs64_source.patch ncftp-3.2.2-pref.patch 
Removed Files:
	ncftp-3.0.1-pref.patch 
Log Message:
Update to 3.2.2.


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: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ncftp.spec	20 Feb 2008 04:26:12 -0000	1.14
+++ ncftp.spec	29 Aug 2008 19:08:15 -0000	1.15
@@ -1,17 +1,18 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.1
-Release: 2%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 Epoch: 2
 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
+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.2.2-no_lfs64_source.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -24,10 +25,11 @@
 %prep
 %setup -q
 #patch0 -p1 -b .ipv6
-%patch1 -p0 -b .pref
+%patch1 -p1 -b .pref
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pmeter
 %patch4 -p1 -b .ncursesw
+%patch5 -p0 -b .no_lfs64_source
 
 
 %build
@@ -66,7 +68,11 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2:3.2.1-2
+* 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


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