rpms/ncftp/EL-5 ncftp-3.2.2-no_lfs64_source.patch, NONE, 1.1 ncftp-3.2.2-pref.patch, NONE, 1.1

Matthias Saou thias at fedoraproject.org
Wed Dec 24 16:08:58 UTC 2008


Author: thias

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

Added Files:
	ncftp-3.2.2-no_lfs64_source.patch ncftp-3.2.2-pref.patch 
Log Message:
Add missing patches.


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|");




More information about the fedora-extras-commits mailing list