rpms/ntfsprogs/F-8 ntfsprogs-1.13.1-debianfixes.patch, NONE, 1.1 ntfsprogs-1.13.1.1-ntfsresize-vista.patch, NONE, 1.1 ntfsprogs.spec, 1.7, 1.8

Fri Nov 30 15:16:06 UTC 2007

Author: spot

Update of /cvs/pkgs/rpms/ntfsprogs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1299/F-8

Modified Files:
	ntfsprogs.spec 
Added Files:
	ntfsprogs-1.13.1-debianfixes.patch 
	ntfsprogs-1.13.1.1-ntfsresize-vista.patch 
Log Message:

Debian fixes, vista resizing support.


ntfsprogs-1.13.1-debianfixes.patch:

--- NEW FILE ntfsprogs-1.13.1-debianfixes.patch ---
diff -up ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c.BAD ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c
--- ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c.BAD	2007-11-30 09:55:58.000000000 -0500
+++ ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c	2007-11-30 09:56:58.000000000 -0500
@@ -1608,6 +1608,7 @@ static void check_dest_free_space(u64 sr
 {
 	u64 dest_bytes;
 	struct statvfs stvfs;
+	struct stat stat;
 
 	if (opt.metadata || opt.blkdev_out || opt.std_out)
 		return;
@@ -1620,6 +1621,14 @@ static void check_dest_free_space(u64 sr
 		       strerror(errno));
 		return;
 	}
+	/* if file is a FIFO there is no point in checking the size */
+	if (!fstat(fd_out, &stat)) {
+		if (S_ISFIFO(stat.st_mode))
+			return;
+	} else {
+		Printf("WARNING: Couldn't get file info because of the following error: %s\n",
+			strerror(errno));
+	}
 
 	dest_bytes = (u64)stvfs.f_frsize * stvfs.f_bfree;
 	if (!dest_bytes)
diff -up ntfsprogs-1.13.1/libntfs/logging.c.BAD ntfsprogs-1.13.1/libntfs/logging.c
--- ntfsprogs-1.13.1/libntfs/logging.c.BAD	2007-11-30 09:54:33.000000000 -0500
+++ ntfsprogs-1.13.1/libntfs/logging.c	2007-11-30 09:55:48.000000000 -0500
@@ -78,7 +78,7 @@ static struct ntfs_logging ntfs_log = {
 #endif
 	NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET | NTFS_LOG_LEVEL_WARNING |
 	NTFS_LOG_LEVEL_ERROR | NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
-	NTFS_LOG_LEVEL_REASON | NTFS_LOG_LEVEL_PROGRESS,
+	NTFS_LOG_LEVEL_PROGRESS,
 	NTFS_LOG_FLAG_ONLYNAME,
 #ifdef DEBUG
 	ntfs_log_handler_outerr
@@ -352,21 +352,6 @@ int ntfs_log_handler_syslog(const char *
 	int ret = 0;
 	int olderr = errno;
 
-	if (level == NTFS_LOG_LEVEL_REASON) {
-		if (!reason)
-			reason = malloc(reason_size);
-		if (reason) {
-			memset(reason, 0, reason_size);
-			return vsnprintf(reason, reason_size, format, args);
-		} else {
-			/* Rather than call ourselves, just drop through */
-			level = NTFS_LOG_LEVEL_PERROR;
-			format = "Couldn't create reason";
-			args = NULL;
-			olderr = errno;
-		}
-	}
-
 	if ((ntfs_log.flags & NTFS_LOG_FLAG_ONLYNAME) &&
 	    (strchr(file, PATH_SEP)))		/* Abbreviate the filename */
 		file = strrchr(file, PATH_SEP) + 1;
@@ -437,21 +422,6 @@ int ntfs_log_handler_fprintf(const char 
 		return 0;	/* If it's NULL, we can't do anything. */
 	stream = (FILE*)data;
 
-	if (level == NTFS_LOG_LEVEL_REASON) {
-		if (!reason)
-			reason = malloc(reason_size);
-		if (reason) {
-			memset(reason, 0, reason_size);
-			return vsnprintf(reason, reason_size, format, args);
-		} else {
-			/* Rather than call ourselves, just drop through */
-			level = NTFS_LOG_LEVEL_PERROR;
-			format = "Couldn't create reason";
-			args = NULL;
-			olderr = errno;
-		}
-	}
-
 	if (ntfs_log.flags & NTFS_LOG_FLAG_COLOUR) {
 		/* Pick a colour determined by the log level */
 		switch (level) {
diff -up ntfsprogs-1.13.1/include/ntfs/logging.h.BAD ntfsprogs-1.13.1/include/ntfs/logging.h
--- ntfsprogs-1.13.1/include/ntfs/logging.h.BAD	2007-11-30 09:57:09.000000000 -0500
+++ ntfsprogs-1.13.1/include/ntfs/logging.h	2007-11-30 09:57:35.000000000 -0500
@@ -75,7 +75,6 @@ int ntfs_log_redirect(const char *functi
 #define NTFS_LOG_LEVEL_ERROR	(1 <<  7) /* Operation failed, no damage done */
 #define NTFS_LOG_LEVEL_PERROR	(1 <<  8) /* Message : standard error description */
 #define NTFS_LOG_LEVEL_CRITICAL	(1 <<  9) /* Operation failed,damage may have occurred */
-#define NTFS_LOG_LEVEL_REASON	(1 << 10) /* Human readable reason for failure */
 
 /* Logging style flags - Manage the style of the output */
 #define NTFS_LOG_FLAG_PREFIX	(1 << 0) /* Prefix messages with "ERROR: ", etc */
@@ -96,7 +95,6 @@ int ntfs_log_redirect(const char *functi
 #define ntfs_log_quiet(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_QUIET,NULL,FORMAT,##ARGS)
 #define ntfs_log_verbose(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_VERBOSE,NULL,FORMAT,##ARGS)
 #define ntfs_log_warning(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_WARNING,NULL,FORMAT,##ARGS)
-#define ntfs_log_reason(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_REASON,NULL,FORMAT,##ARGS)
 
 /* By default debug and trace messages are compiled into the program,
  * but not displayed.

ntfsprogs-1.13.1.1-ntfsresize-vista.patch:

--- NEW FILE ntfsprogs-1.13.1.1-ntfsresize-vista.patch ---
diff -up ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c.BAD ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c
--- ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c.BAD	2007-11-30 09:59:34.000000000 -0500
+++ ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c	2007-11-30 09:59:43.000000000 -0500
@@ -2289,8 +2289,6 @@ static void prepare_volume_fixup(ntfs_vo
 	u16 flags;
 
 	flags = vol->flags | VOLUME_IS_DIRTY;
-	if (vol->major_ver >= 2)
-		flags |= VOLUME_MOUNTED_ON_NT4;
 
 	printf("Schedule chkdsk for NTFS consistency check at Windows "
 		"boot time ...\n");


Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/F-8/ntfsprogs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ntfsprogs.spec	24 Aug 2007 18:15:09 -0000	1.7
+++ ntfsprogs.spec	30 Nov 2007 15:15:33 -0000	1.8
@@ -1,10 +1,12 @@
 Name:		ntfsprogs
 Version:	1.13.1
-Release:	7%{?dist}.2
+Release:	8%{?dist}
 Summary:	NTFS filesystem libraries and utilities
 Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.gz
 Patch0:		ntfsprogs-1.13.1-build-extras-by-default.patch
 Patch1:		ntfsprogs-1.13.1-glibc27-open.patch
+Patch2:		ntfsprogs-1.13.1-debianfixes.patch
+Patch3:		ntfsprogs-1.13.1.1-ntfsresize-vista.patch
 License:	GPLv2+
 URL:		http://www.linux-ntfs.org/
 Group:		System Environment/Base
@@ -42,6 +44,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 # If we need to enable the fuse module, we'd change this.
@@ -108,6 +112,10 @@
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 
 %changelog
+* Fri Nov 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-8
+- pick up debian patches (fixes alpha, handling FIFO files)
+- 1.13.1.1 patch for ntfsresize to enable vista support
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-7.2
 - fix open call (glibc2.7)
 


