rpms/mfstools/devel mfstools-fixllseek.patch, NONE, 1.1 mfstools.spec, 1.9, 1.10

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/mfstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453

Modified Files:
	mfstools.spec 
Added Files:
	mfstools-fixllseek.patch 
Log Message:

Fix llseek cruft.


mfstools-fixllseek.patch:

--- NEW FILE mfstools-fixllseek.patch ---
--- MFSTools-snapshot050221/lib/readwrite.c.BAD	2006-09-14 19:22:00.000000000 -0500
+++ MFSTools-snapshot050221/lib/readwrite.c	2006-09-14 19:24:19.000000000 -0500
@@ -43,7 +43,6 @@
 _syscall4 (static long, readsectors, unsigned int, fd, struct FsIovec *, buf, int, buf_len, struct FsIoRequest *, request) _syscall4 (static long, writesectors, unsigned int, fd, struct FsIovec *, buf, int, buf_len, struct FsIoRequest *, request)
 #endif
 #ifdef __NR__llseek
-static _syscall5 (int, _llseek, uint, fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh);
 #define USE_LLSEEK
 #endif
 
@@ -130,7 +129,7 @@
 
 /* A file, or not TiVo, use llseek and read. */
 #ifdef USE_LLSEEK
-	if (_llseek (_tivo_partition_fd (file), sector >> 23, sector << 9, &result, SEEK_SET) < 0)
+	if (syscall(__NR__llseek, _tivo_partition_fd (file), sector >> 23, sector << 9, &result, SEEK_SET) < 0)
 #else
 #if TARGET_OS_MAC
 	if (lseek (_tivo_partition_fd (file), (off_t)sector << 9, SEEK_SET) != (off_t)sector << 9)
@@ -205,7 +204,7 @@
 
 /* A file, or not TiVo, use llseek and write. */
 #ifdef USE_LLSEEK
-	if (_llseek (_tivo_partition_fd (file), sector >> 23, sector << 9, &result, SEEK_SET) < 0)
+	if (syscall(__NR__llseek, _tivo_partition_fd (file), sector >> 23, sector << 9, &result, SEEK_SET) < 0)
 #else
 #if TARGET_OS_MAC
 	if (lseek (_tivo_partition_fd (file), (off_t)sector << 9, SEEK_SET) != (off_t)sector << 9)


Index: mfstools.spec
===================================================================
RCS file: /cvs/extras/rpms/mfstools/devel/mfstools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mfstools.spec	14 Sep 2006 23:29:30 -0000	1.9
+++ mfstools.spec	15 Sep 2006 00:31:40 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		mfstools
 Version:	2.0
-Release:	10.%{releasename}%{?dist}
+Release:	11.%{releasename}%{?dist}
 Summary:	Utilities for TiVo drive upgrades
 Group:		Applications/File
 License:	GPL
@@ -10,6 +10,7 @@
 Source0:	http://download.sourceforge.net/mfstools/MFSTools-%{releasename}-src.tar.gz
 Source1:	http://www.tyger.org/MFS/2.0/howto.html
 Patch0:		mfstools-cvs20060914.patch
+Patch1:		mfstools-fixllseek.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 
@@ -21,6 +22,8 @@
 %setup -q -n MFSTools-%{releasename}
 # There are some notable improvements in CVS
 %patch0 -p1 -b .20060914
+# Do not use the _syscall5 macro -- use syscall(2) instead
+%patch1 -p1 -b .llseek
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -43,6 +46,9 @@
 %{_bindir}/*
 
 %changelog
+* Thu Sep 14 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-11.snapshot050221
+- Do not use the _syscall5 macro -- use syscall(2) instead
+
 * Thu Sep 14 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-10.snapshot050221
 - merge with CVS