Package: fdclone
Version: 2.06c-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my fdclone 2.06c-1.1 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u fdclone-2.06c/debian/changelog fdclone-2.06c/debian/changelog
--- fdclone-2.06c/debian/changelog
+++ fdclone-2.06c/debian/changelog
@@ -1,3 +1,11 @@
+fdclone (2.06c-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to kernel syscall macros (Closes: #393027).
+ * Add $(MAKE) config to debian/rules (Closes: #394091).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Mon, 23 Oct 2006 21:00:28 +0200
+
fdclone (2.06c-1) unstable; urgency=low
* New upstream release
diff -u fdclone-2.06c/debian/rules fdclone-2.06c/debian/rules
--- fdclone-2.06c/debian/rules
+++ fdclone-2.06c/debian/rules
@@ -23,7 +23,7 @@
configure-stamp:
dh_testdir
# Add here commands to configure the package.
-
+ $(MAKE) config
touch configure-stamp
build: build-stamp
diff -u fdclone-2.06c/mkmf.sed fdclone-2.06c/mkmf.sed
--- fdclone-2.06c/mkmf.sed
+++ fdclone-2.06c/mkmf.sed
@@ -1,6 +1,6 @@
s:__VERSION__:2:
s:__RCVERSION__:2:
-s:__PREFIX__:/usr:
+s:__PREFIX__:/usr/local:
s:__EXE__::g
s:__OBJ__:.o:g
s:__OBJS__:dosemu.o:
@@ -15,7 +15,7 @@
s:__COPY__:cp:
s:__RM__:rm -f:
s:__OSTYPE__:LINUX:
-s:__LANGDIR__:/ja_JP.eucJP:
+s:__LANGDIR__::
s:__INSTALL__:install -c:
s:__INSTSTRIP__:-s:
s:__LN__:ln:
only in patch2:
unchanged:
--- fdclone-2.06c.orig/Configur
+++ fdclone-2.06c/Configur
@@ -538,12 +538,7 @@
if isexist "sysconf(0)"; then
echo "#define USESYSCONF"
fi
-if isexist "_llseek(0,0,0,0,0)" "linux/unistd" "static _syscall5(int, _llseek,
- unsigned int, fd,
- unsigned long, ofs_h,
- unsigned long, ofs_l,
- long long *, result,
- unsigned int, whence);
+if isexist "_llseek(0,0,0,0,0)" "sys/syscall" "#define _llseek(fd, ofs_h,
ofs_l, result, whence) syscall(SYS__llseek, fd, ofs_h, ofs_l, result, whence)
"; then
echo "#define USELLSEEK"
fi
only in patch2:
unchanged:
--- fdclone-2.06c.orig/dosdisk.c
+++ fdclone-2.06c/dosdisk.c
@@ -84,7 +84,7 @@
#ifdef LINUX
#include <mntent.h>
#include <sys/mount.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
# ifndef BLKFLSBUF
# include <linux/fs.h>
# endif
@@ -1028,12 +1028,7 @@
#endif /* !FD */
#ifdef USELLSEEK
-static _syscall5(int, _llseek,
- unsigned int, fd,
- unsigned long, ofs_h,
- unsigned long, ofs_l,
- l_off_t *, result,
- unsigned int, whence);
+#define _llseek(fd, ofs_h, ofs_l, result, whence) syscall(SYS__llseek, fd,
ofs_h, ofs_l, result, whence)
static l_off_t NEAR Xllseek(fd, offset, whence)
int fd;
