Cleaned up ebuild; Added a patch with some gcc-3.4 fixes as well replacing all occurrences of 'nat' with 'nbaudit' in the manual page.

(Portage version: 2.0.51-r15)

4 files changed, 92 insertions, 29 deletions

diff --git a/net-analyzer/nbaudit/ChangeLog b/net-analyzer/nbaudit/ChangeLog
index 8cb4931e53b7..2942687e39ca 100644
--- a/net-analyzer/nbaudit/ChangeLog
+++ b/net-analyzer/nbaudit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nbaudit
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/ChangeLog,v 1.8 2004/08/24 10:37:22 eldad Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/ChangeLog,v 1.9 2005/02/08 12:23:10 ka0ttic Exp $
+
+  08 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nbaudit-1.0-gentoo.diff, nbaudit-1.0.ebuild:
+  Cleaned up ebuild; Added a patch with some gcc-3.4 fixes as well replacing
+  all occurrences of 'nat' with 'nbaudit' in the manual page.
 
   24 Aug 2004; Eldad Zack <eldad@gentoo.org> nbaudit-1.0.ebuild:
   Fixed -lshadow linking problem. Thanks to wernfried haas
diff --git a/net-analyzer/nbaudit/Manifest b/net-analyzer/nbaudit/Manifest
index e04748d388c4..ee4b7a9b6c6c 100644
--- a/net-analyzer/nbaudit/Manifest
+++ b/net-analyzer/nbaudit/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d0e307e7401c6c93bb262984eb72f690 ChangeLog 1236
-MD5 e192b5384fe781cadabf5fcea0de4a6f nbaudit-1.0.ebuild 1007
+MD5 a32ee5c28d94e2692ea4ce1f4fa98192 ChangeLog 1479
+MD5 0ef34f9bade0e74404babcfeaa417754 nbaudit-1.0.ebuild 978
 MD5 3d43677d80da81ea017059e47706b615 metadata.xml 240
+MD5 3db83317eead74eb910f332814c82988 files/nbaudit-1.0-gentoo.diff 2517
 MD5 ad726c93a81f56b634d898446e1a803b files/digest-nbaudit-1.0 54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBKxrET+MN7JbqCpMRAkykAJ9d2gA2zh5NK1uud4jFhIcSfaLLHQCfUR5k
-B6TiDepCZcWs2+KkDWJ9xss=
-=lEFP
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nbaudit/files/nbaudit-1.0-gentoo.diff b/net-analyzer/nbaudit/files/nbaudit-1.0-gentoo.diff
new file mode 100644
index 000000000000..00e9f7586e79
--- /dev/null
+++ b/net-analyzer/nbaudit/files/nbaudit-1.0-gentoo.diff
@@ -0,0 +1,66 @@
+diff -urN nat10.orig/Makefile nat10/Makefile
+--- nat10.orig/Makefile	2005-02-07 21:47:47.324382272 -0500
++++ nat10/Makefile	2005-02-07 22:41:44.381274824 -0500
+@@ -70,8 +70,8 @@
+ # contributed by Andrew.Tridgell@anu.edu.au
+ # add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the
+ # right libraries and includes
+-# FLAGSM = -DLINUX -DSHADOW_PWD
+-# LIBSM = -lshadow
++FLAGSM = -DLINUX -DSHADOW_PWD -DNO_ASMSIGNALH -trigraphs
++LIBSM = -lshadow -L/usr/X11R6/lib/modules 
+ 
+ # Use this for Linux without shadow passwords
+ # contributed by Andrew.Tridgell@anu.edu.au
+diff -urN nat10.orig/nat.1 nat10/nat.1
+--- nat10.orig/nat.1	2005-02-07 21:47:47.325382120 -0500
++++ nat10/nat.1	2005-02-07 22:43:52.645775656 -0500
+@@ -1,12 +1,12 @@
+-.TH NAT 1
++.TH nbaudit 1
+ .SH NAME
+-nat - NetBIOS Auditing Tool
++nbaudit - NetBIOS Auditing Tool
+ .SH SYNOPSIS
+-nat [-o <\fBoutput\fP>] [-u <\fBuserlist\fP>] [-p <\fBpasslist\fP>] \fB<address>\fP
++nbaudit [-o <\fBoutput\fP>] [-u <\fBuserlist\fP>] [-p <\fBpasslist\fP>] \fB<address>\fP
+ .SH DESCRIPTION
+ .PP
+-\fBnat\fP is a tool written to perform various security checks on systems
+-offering the NetBIOS file sharing service.  \fBnat\fP will attempt to retrieve
++\fBnbaudit\fP is a tool written to perform various security checks on systems
++offering the NetBIOS file sharing service.  \fBnbaudit\fP will attempt to retrieve
+ all information availible from the remote server, and attempt to access any
+ services provided by the server.
+ .SH OPTIONS
+@@ -54,10 +54,10 @@
+ and usernames, as the time required increases exponentially with the size of
+ these lists.
+ .SH SUPPORTED PLATFORMS
+-This version of \fBnat\fP has been tested against Windows NT 4.0 and various
++This version of \fBnbaudit\fP has been tested against Windows NT 4.0 and various
+ versions of the Samba server written by Andrew Tridgell.
+ .PP
+-This version of \fBnat\fP has been tested and compiled on the following
++This version of \fBnbaudit\fP has been tested and compiled on the following
+ operating systems:
+ \fBSolaris\fP 2.5,
+ \fBLinux\fP 2.0,
+@@ -68,4 +68,4 @@
+ \fBWindows 95\fP
+ 
+ .SH FILES
+-\fBnat\fP, \fBuserlist.txt\fP, \fBpasslist.txt\fP
++\fBnbaudit\fP, \fBuserlist.txt\fP, \fBpasslist.txt\fP
+diff -urN nat10.orig/nmb.c nat10/nmb.c
+--- nat10.orig/nmb.c	2005-02-07 21:47:47.325382120 -0500
++++ nat10/nmb.c	2005-02-07 22:42:05.182112616 -0500
+@@ -40,7 +40,7 @@
+ #endif /* SCANNER */
+ 
+ int Debug1(char *, ...);
+-int Debug1();
++/*int Debug1();*/
+ 
+ int num_good_sends=0;
+ int  num_good_receives=0;
diff --git a/net-analyzer/nbaudit/nbaudit-1.0.ebuild b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
index 7d1f199678a6..8512ee48c8e4 100644
--- a/net-analyzer/nbaudit/nbaudit-1.0.ebuild
+++ b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0.ebuild,v 1.16 2004/08/24 10:37:22 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0.ebuild,v 1.17 2005/02/08 12:23:10 ka0ttic Exp $
+
+inherit eutils
 
 # It is officially called nat10 but the name conflicts with other projects
 # so I'm following the *BSDs suggestion of calling it nbaudit
@@ -11,28 +13,27 @@ DESCRIPTION="NetBIOS file sharing services scanner (nat10)"
 SRC_URI="http://www.tux.org/pub/security/secnet/tools/nat10/${MY_P}.tgz"
 HOMEPAGE="http://www.tux.org/pub/security/secnet/tools/nat10/"
 
-DEPEND=""
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE=""
 
-src_compile() {
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/libc"
 
-	sed -i -e "s/# \(FLAGSM = -DLINUX -DSHADOW_PWD\)/\1 -DNO_ASMSIGNALH/; s;# LIBSM = -lshadow;LIBSM = -lshadow -L/usr/X11R6/lib/modules ;" Makefile
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
 
+src_compile() {
 	# NOTE: DO NOT SET CFLAGS OR THE PROGRAM WILL SEGFAULT
-	make all || die
-
+	make all || die "make failed"
 }
 
 src_install () {
-	mv nat nbaudit
-	dobin nbaudit
-
-	mv nat.1 nbaudit.1
-	doman nbaudit.1
-
+	newbin nat nbaudit
+	newman nat.1 nbaudit.1
 	dodoc README COPYING
 }