[pkgsrc/trunk]: pkgsrc/security/sfs Deal with fourth arg to mount(2) in NetBS...

[apb <apb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0db2ef007234
branches:  trunk
changeset: 538695:0db2ef007234
user:      apb <apb%pkgsrc.org@localhost>
date:      Sat Feb 16 22:03:49 2008 +0000

description:
Deal with fourth arg to mount(2) in NetBSD.  It appeared between
4.99.23 and 4.99.24.

diffstat:

 security/sfs/distinfo         |   3 ++-
 security/sfs/patches/patch-bv |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 289bb4527e1c -r 0db2ef007234 security/sfs/distinfo
--- a/security/sfs/distinfo     Sat Feb 16 15:57:06 2008 +0000
+++ b/security/sfs/distinfo     Sat Feb 16 22:03:49 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/05/13 16:13:10 agc Exp $
+$NetBSD: distinfo,v 1.5 2008/02/16 22:03:49 apb Exp $
 
 SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08
 RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1
@@ -50,3 +50,4 @@
 SHA1 (patch-bs) = a426787d1b2a74a92a091046c1c9fdf7696a87f4
 SHA1 (patch-bt) = 41b1359d716493aadd861818c9a377247191ecec
 SHA1 (patch-bu) = 42924f5d59315b99d3d397eedde977366ec0ad96
+SHA1 (patch-bv) = d77635ff12f3b6324fc76fbad7ad8a314c2cb12e
diff -r 289bb4527e1c -r 0db2ef007234 security/sfs/patches/patch-bv
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sfs/patches/patch-bv     Sat Feb 16 22:03:49 2008 +0000
@@ -0,0 +1,16 @@
+$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))