[pkgsrc/trunk]: pkgsrc/security/nfsbug bump to 1.0nb1: make this build on Net...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6425a1bd6acc
branches:  trunk
changeset: 510149:6425a1bd6acc
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Mar 28 22:07:18 2006 +0000

description:
bump to 1.0nb1: make this build on NetBSD 2.0 and 3.0 after fsid_t's
implementation was changed then.

diffstat:

 security/nfsbug/Makefile         |  11 ++---------
 security/nfsbug/distinfo         |   4 ++--
 security/nfsbug/patches/patch-ac |  14 +++++++++-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diffs (96 lines):

diff -r 07c39a7f191b -r 6425a1bd6acc security/nfsbug/Makefile
--- a/security/nfsbug/Makefile  Tue Mar 28 22:03:42 2006 +0000
+++ b/security/nfsbug/Makefile  Tue Mar 28 22:07:18 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:35 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/28 22:07:18 hubertf Exp $
 
 DISTNAME=      nfsshell-1.0
+PKGREVISION=   1
 CATEGORIES=    net security
 MASTER_SITES=  http://www.asmodeus.com/archive/Xnix/
 DISTFILES=     nfsBugFerret.tgz \
@@ -9,18 +10,10 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       NFS security verification suite
 
-BROKEN_IN=     pkgsrc-2005Q4
-
 EXTRACT_ONLY=   nfsBugFerret.tgz
 WRKSRC=                ${WRKDIR}/nfsbug
 
 
-# Only works on 1.5B or greater on most platforms but will work on any x86
-# since struct pmap didn't get exposed through vm.h there.
-ONLY_FOR_PLATFORM=     NetBSD-1.5[B-Z]-* NetBSD-1.5Z[A-Z]-*
-ONLY_FOR_PLATFORM+=    NetBSD-1.6*-* NetBSD-[2-9]*-*
-ONLY_FOR_PLATFORM+=    NetBSD-*-i386
-
 INSTALLATION_DIRS=     bin
 
 post-extract:
diff -r 07c39a7f191b -r 6425a1bd6acc security/nfsbug/distinfo
--- a/security/nfsbug/distinfo  Tue Mar 28 22:03:42 2006 +0000
+++ b/security/nfsbug/distinfo  Tue Mar 28 22:07:18 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/03/28 22:07:18 hubertf Exp $
 
 SHA1 (nfsBugFerret.tgz) = 6b0b2d25fadd3156cf0f8851d72b6d6070dc528c
 RMD160 (nfsBugFerret.tgz) = e238e0a892bb8e46969278687ce6ec1944ae24c8
@@ -8,4 +8,4 @@
 Size (nfsShell.c) = 47258 bytes
 SHA1 (patch-aa) = b28b48831632d2ffe8e103589c9fbf5b3e840d02
 SHA1 (patch-ab) = 92908f57337c9fd2857720f14027f426809c669a
-SHA1 (patch-ac) = fcf34bf55208f49215a219801b2be5c4ef55eded
+SHA1 (patch-ac) = 4a75568fc8bc5c2ea6059641d62188230387184a
diff -r 07c39a7f191b -r 6425a1bd6acc security/nfsbug/patches/patch-ac
--- a/security/nfsbug/patches/patch-ac  Tue Mar 28 22:03:42 2006 +0000
+++ b/security/nfsbug/patches/patch-ac  Tue Mar 28 22:07:18 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2000/10/11 16:02:45 wennmach Exp $
+$NetBSD: patch-ac,v 1.5 2006/03/28 22:07:18 hubertf Exp $
 
---- nfsbug.c.orig      Fri Feb 17 00:57:27 1995
+--- nfsbug.c.orig      1995-02-17 06:57:27.000000000 +0100
 +++ nfsbug.c
 @@ -14,6 +14,7 @@
   *    - close sockets (?)
@@ -10,7 +10,7 @@
  #include <ctype.h>
  #include <netdb.h>
  #include <errno.h>
-@@ -25,18 +26,20 @@
+@@ -25,18 +26,24 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
@@ -26,6 +26,10 @@
  #ifndef HPUX
 +#ifdef __NetBSD__
 +#include <ufs/ufs/dinode.h>
++#  if __NetBSD_Version__ >= 200040000
++     /* at some point, fsid_t's "val" member was renamed to __fsid_val - HF */
++#    define val __fsid_val
++#  endif
 +#else
  #include <ufs/inode.h>
  #endif
@@ -34,7 +38,7 @@
  
  #include "mount.h"
  #include "nfs_prot.h"
-@@ -240,7 +245,7 @@
+@@ -240,7 +247,7 @@ nfsbug(host)
      } else
        proto = "TCP/IP";
  
@@ -43,7 +47,7 @@
      mntclient->cl_auth = create_unix_auth(0, 0);
      if (mntclient->cl_auth == NULL) {
        clnt_destroy(mntclient);
-@@ -277,7 +282,7 @@
+@@ -277,7 +284,7 @@ nfsbug(host)
      } else
        proto = "TCP/IP";