Mon Mar 8 01:21:25 2010 UTC ()
Fix Linux build broken since 2006. Two issues: (1) do _FILE_OFFSET_BITS=64
instead of rolling a private _llseek syscall using now-nonexistent type
declarations; (2) as noted in PR 33893 use errno.h instead of "extern int
errno".


(dholland)
diff -r1.6 -r1.7 pkgsrc/security/tct/distinfo
diff -r1.2 -r1.3 pkgsrc/security/tct/patches/patch-ag
diff -r0 -r1.1 pkgsrc/security/tct/patches/patch-ap
cvs diff -r1.6 -r1.7 pkgsrc/security/tct/distinfo (expand / switch to unified diff)

--- pkgsrc/security/tct/distinfo 2006/03/01 22:48:05 1.6
+++ pkgsrc/security/tct/distinfo 2010/03/08 01:21:24 1.7
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.6 2006/03/01 22:48:05 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2010/03/08 01:21:24 dholland Exp $
2 2
3SHA1 (tct-1.09.tar.gz) = fffb6ae1f389cfdfad95a9a81f6eaba115c9dfc0 3SHA1 (tct-1.09.tar.gz) = fffb6ae1f389cfdfad95a9a81f6eaba115c9dfc0
4RMD160 (tct-1.09.tar.gz) = ee4ddc286a2564f9b1daaa41f35e3d0fe8d6ea71 4RMD160 (tct-1.09.tar.gz) = ee4ddc286a2564f9b1daaa41f35e3d0fe8d6ea71
5Size (tct-1.09.tar.gz) = 314134 bytes 5Size (tct-1.09.tar.gz) = 314134 bytes
6SHA1 (patch-aa) = 6b91f920a42fc33dfd535bcf910407b612bb9c4e 6SHA1 (patch-aa) = 6b91f920a42fc33dfd535bcf910407b612bb9c4e
7SHA1 (patch-ab) = 5db53f9015c1362e20a1591859652fc121cd639b 7SHA1 (patch-ab) = 5db53f9015c1362e20a1591859652fc121cd639b
8SHA1 (patch-ac) = 18cf7490310cbf1831f4fcc77fb9c414191542dc 8SHA1 (patch-ac) = 18cf7490310cbf1831f4fcc77fb9c414191542dc
9SHA1 (patch-ad) = 747a0eb789933bd3f7e840a3dc28bd2dd6929819 9SHA1 (patch-ad) = 747a0eb789933bd3f7e840a3dc28bd2dd6929819
10SHA1 (patch-ae) = 6403b5788edabd7e9146450282aad2460e83bc7e 10SHA1 (patch-ae) = 6403b5788edabd7e9146450282aad2460e83bc7e
11SHA1 (patch-af) = bbf402d8d4c5c6118e158d70f4e1814f0e179c8d 11SHA1 (patch-af) = bbf402d8d4c5c6118e158d70f4e1814f0e179c8d
12SHA1 (patch-ag) = f4bcf5d08b2df418b38182aa0ea0e574d377f9f4 12SHA1 (patch-ag) = 9767ae8b3ed7f940c8350f944c363ac10694f7f4
13SHA1 (patch-ah) = 6a4b473141ffbced2f5491b215b30cbf4fc9bfd1 13SHA1 (patch-ah) = 6a4b473141ffbced2f5491b215b30cbf4fc9bfd1
14SHA1 (patch-ai) = 8bc7f949bed634b1c5e0ee78295e80a0b8ce6e0a 14SHA1 (patch-ai) = 8bc7f949bed634b1c5e0ee78295e80a0b8ce6e0a
15SHA1 (patch-aj) = fc67eefa3f92ceb8f4703b6a00ad7fe3777c3357 15SHA1 (patch-aj) = fc67eefa3f92ceb8f4703b6a00ad7fe3777c3357
16SHA1 (patch-ak) = 040fcaf2151c06b655e56305941b1dec3c8ae17d 16SHA1 (patch-ak) = 040fcaf2151c06b655e56305941b1dec3c8ae17d
17SHA1 (patch-al) = 4d01407b6566d16d7f5c0fb718644e90aa2b9094 17SHA1 (patch-al) = 4d01407b6566d16d7f5c0fb718644e90aa2b9094
18SHA1 (patch-am) = 2a45fcdfb88c0340e46419bcd76eef7c7202a9f9 18SHA1 (patch-am) = 2a45fcdfb88c0340e46419bcd76eef7c7202a9f9
19SHA1 (patch-an) = ee3ed219467a4e3212a8ff7345e4d6a6c2163b17 19SHA1 (patch-an) = ee3ed219467a4e3212a8ff7345e4d6a6c2163b17
20SHA1 (patch-ao) = 243091eb5dc20955f82b4707947ee7f09a5a3c20 20SHA1 (patch-ao) = 243091eb5dc20955f82b4707947ee7f09a5a3c20
 21SHA1 (patch-ap) = 1587d7b4e4da1226a2943a4f98b9fa20bd83c79d
cvs diff -r1.2 -r1.3 pkgsrc/security/tct/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/security/tct/patches/patch-ag 2005/01/22 15:59:58 1.2
+++ pkgsrc/security/tct/patches/patch-ag 2010/03/08 01:21:25 1.3
@@ -1,17 +1,39 @@ @@ -1,17 +1,39 @@
1$NetBSD: patch-ag,v 1.2 2005/01/22 15:59:58 ben Exp $ 1$NetBSD: patch-ag,v 1.3 2010/03/08 01:21:25 dholland Exp $
2 2
3--- src/fstools/fs_tools.h.orig 2001-09-07 10:06:57.000000000 -0700 3--- src/fstools/fs_tools.h.orig 2001-09-07 10:06:57.000000000 -0700
4+++ src/fstools/fs_tools.h 4+++ src/fstools/fs_tools.h
 5@@ -182,14 +182,20 @@ extern int optind;
 6 * Linux 2.whatever. We'll see how stable the interfaces are.
 7 */
 8 #if defined(LINUX2)
 9+#define _FILE_OFFSET_BITS 64
 10 #define SUPPORTED
 11 #include <linux/ext2_fs.h>
 12 #define HAVE_EXT2FS
 13+#if 0
 14 #define USE_MYLSEEK
 15 #define HAVE_LLSEEK
 16-#define HAVE_DTIME
 17 #define LSEEK mylseek
 18 #define OFF_T long long
 19+#else
 20+#define LSEEK lseek
 21+#define OFF_T off_t
 22+#endif
 23+#define HAVE_DTIME
 24 #define STRTOUL strtoul
 25 #define DADDR_T __u32
 26 #define EXT2FS_TYPE "ext2fs"
5@@ -203,6 +203,26 @@ extern int optind; 27@@ -203,6 +203,26 @@ extern int optind;
6 #endif 28 #endif
7 #endif 29 #endif
8  30
9+#if defined(NETBSD1) || defined(NETBSD2) 31+#if defined(NETBSD1) || defined(NETBSD2)
10+#define SUPPORTED 32+#define SUPPORTED
11+#define HAVE_UFS_FFS 33+#define HAVE_UFS_FFS
12+#include <sys/vnode.h> 34+#include <sys/vnode.h>
13+#include <ufs/ufs/quota.h> 35+#include <ufs/ufs/quota.h>
14+#include <ufs/ufs/inode.h> 36+#include <ufs/ufs/inode.h>
15+#include <ufs/ufs/ufs_bswap.h> 37+#include <ufs/ufs/ufs_bswap.h>
16+#include <ufs/ffs/fs.h> 38+#include <ufs/ffs/fs.h>
17+#define LSEEK lseek 39+#define LSEEK lseek
File Added: pkgsrc/security/tct/patches/patch-ap
$NetBSD: patch-ap,v 1.1 2010/03/08 01:21:25 dholland Exp $

Don't declare own errno, it doesn't work on various platforms.

--- src/file/file.h~	2000-07-30 19:39:20.000000000 -0400
+++ src/file/file.h	2010-03-07 20:09:46.000000000 -0500
@@ -101,8 +101,11 @@ extern void  ckfprintf		__P((FILE *, con
 extern unsigned long signextend	__P((struct magic *, unsigned long));
 
 
-
+#if 0
 extern int errno;		/* Some unixes don't define this..	*/
+#else
+#include <errno.h>
+#endif
 
 extern char *progname;		/* the program name 			*/
 extern char *magicfile;		/* name of the magic file		*/