Sat Feb 16 22:03:49 2008 UTC ()
Deal with fourth arg to mount(2) in NetBSD.  It appeared between
4.99.23 and 4.99.24.


(apb)
diff -r1.4 -r1.5 pkgsrc/security/sfs/distinfo
diff -r0 -r1.1 pkgsrc/security/sfs/patches/patch-bv
cvs diff -r1.4 -r1.5 pkgsrc/security/sfs/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/sfs/Attic/distinfo 2007/05/13 16:13:10 1.4
+++ pkgsrc/security/sfs/Attic/distinfo 2008/02/16 22:03:49 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.4 2007/05/13 16:13:10 agc Exp $ 1$NetBSD: distinfo,v 1.5 2008/02/16 22:03:49 apb Exp $
2 2
3SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08 3SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08
4RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1 4RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1
5Size (sfs-0.7.2.tar.gz) = 1283652 bytes 5Size (sfs-0.7.2.tar.gz) = 1283652 bytes
6SHA1 (patch-aa) = 32bf5ca41bf588bdd4f2471c727822aac2906472 6SHA1 (patch-aa) = 32bf5ca41bf588bdd4f2471c727822aac2906472
7SHA1 (patch-ab) = 7719eda254e57d7cc6cf3ae06db7b3beb30b9f94 7SHA1 (patch-ab) = 7719eda254e57d7cc6cf3ae06db7b3beb30b9f94
8SHA1 (patch-ac) = 3afc535280b6f58090159fd9242edc63563e108d 8SHA1 (patch-ac) = 3afc535280b6f58090159fd9242edc63563e108d
9SHA1 (patch-ad) = f662ca56204ae71c64b2bdbb8a09384f868107c9 9SHA1 (patch-ad) = f662ca56204ae71c64b2bdbb8a09384f868107c9
10SHA1 (patch-ae) = 80222c0384e5d746d1fce66231c0f35e32a572fd 10SHA1 (patch-ae) = 80222c0384e5d746d1fce66231c0f35e32a572fd
11SHA1 (patch-af) = dd5c53e2971e7ad317578e136bac5f239ccdf00d 11SHA1 (patch-af) = dd5c53e2971e7ad317578e136bac5f239ccdf00d
12SHA1 (patch-ag) = 963134e5b5746600dc184f4651bb70cdfaebf125 12SHA1 (patch-ag) = 963134e5b5746600dc184f4651bb70cdfaebf125
13SHA1 (patch-ah) = b411915bed2f6e008c2fa577aae4a96d2a45b2ab 13SHA1 (patch-ah) = b411915bed2f6e008c2fa577aae4a96d2a45b2ab
14SHA1 (patch-ai) = c3c9cc83d07eb423c6732bbfe4191793c2f6dfd8 14SHA1 (patch-ai) = c3c9cc83d07eb423c6732bbfe4191793c2f6dfd8
@@ -40,13 +40,14 @@ SHA1 (patch-bh) = 1f85d5ce9f3e36685b3a18 @@ -40,13 +40,14 @@ SHA1 (patch-bh) = 1f85d5ce9f3e36685b3a18
40SHA1 (patch-bi) = 1354d1cc7da39e91515dbb53e31e8c19976341f8 40SHA1 (patch-bi) = 1354d1cc7da39e91515dbb53e31e8c19976341f8
41SHA1 (patch-bj) = 8fe2fe0a1e1bcd339cc2f791c18a392c401cc630 41SHA1 (patch-bj) = 8fe2fe0a1e1bcd339cc2f791c18a392c401cc630
42SHA1 (patch-bk) = d7ae5c0b7dc0092e605695b7ca0feb8274fac575 42SHA1 (patch-bk) = d7ae5c0b7dc0092e605695b7ca0feb8274fac575
43SHA1 (patch-bl) = 73eb190aa378c8d1d01fd93cc7c17f657d887d6e 43SHA1 (patch-bl) = 73eb190aa378c8d1d01fd93cc7c17f657d887d6e
44SHA1 (patch-bm) = 21a453088da17fc0ec67501168eef8493238a8cf 44SHA1 (patch-bm) = 21a453088da17fc0ec67501168eef8493238a8cf
45SHA1 (patch-bn) = fa92872cd5d9e10a1ef45ccef11aa7b3e507b3ca 45SHA1 (patch-bn) = fa92872cd5d9e10a1ef45ccef11aa7b3e507b3ca
46SHA1 (patch-bo) = 1d812c99e3b75c1296dc17120f82411714f7d8fd 46SHA1 (patch-bo) = 1d812c99e3b75c1296dc17120f82411714f7d8fd
47SHA1 (patch-bp) = 4c550d82a7b85900cca30003c0faaba967c99108 47SHA1 (patch-bp) = 4c550d82a7b85900cca30003c0faaba967c99108
48SHA1 (patch-bq) = df81507b2e2fd5d40a6759bf063229ef3e0fa301 48SHA1 (patch-bq) = df81507b2e2fd5d40a6759bf063229ef3e0fa301
49SHA1 (patch-br) = 411b894e043d105402ab7d0622fc843703457639 49SHA1 (patch-br) = 411b894e043d105402ab7d0622fc843703457639
50SHA1 (patch-bs) = a426787d1b2a74a92a091046c1c9fdf7696a87f4 50SHA1 (patch-bs) = a426787d1b2a74a92a091046c1c9fdf7696a87f4
51SHA1 (patch-bt) = 41b1359d716493aadd861818c9a377247191ecec 51SHA1 (patch-bt) = 41b1359d716493aadd861818c9a377247191ecec
52SHA1 (patch-bu) = 42924f5d59315b99d3d397eedde977366ec0ad96 52SHA1 (patch-bu) = 42924f5d59315b99d3d397eedde977366ec0ad96
 53SHA1 (patch-bv) = d77635ff12f3b6324fc76fbad7ad8a314c2cb12e
File Added: pkgsrc/security/sfs/patches/Attic/patch-bv
$NetBSD: patch-bv,v 1.1 2008/02/16 22:03:49 apb Exp $

--- nfsconf.h.orig	2002-09-19 06:15:18.000000000 +0200
+++ nfsconf.h
@@ -262,6 +262,11 @@ struct nfs3_fh {
 #define SYS_MOUNT(hostname, type, dir, mntflags, args)	\
     vfsmount (type, dir, mntflags, args)
 
+#elif defined(__NetBSD__) && __NetBSD_Prereq__(4,99,24)
+ /* The fifth arg appeared in NetBSD between 4.99.23 and 4.99.24 */
+#define SYS_MOUNT(hostname, type, dir, mntflags, args)	\
+    mount (type, dir, mntflags, args, sizeof(*(args)))
+
 #else /* normal mount syscall */
 #define SYS_MOUNT(hostname, type, dir, mntflags, args)	\
     mount (type, dir, mntflags, (char *) (args))