Add patch to fix lvalue error when compiling with gcc4. Fixes bug 128204, thanks to Robert Marmorstein <rmmarm at wm dot edu>. Also, do not install LICENSE.

Package-Manager: portage-2.0.54

4 files changed, 30 insertions, 19 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index 6dfaf2179012..6f6cab19f674 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nsat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.11 2006/02/15 23:37:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.12 2006/04/19 00:31:07 vanquirius Exp $
+
+  19 Apr 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/nsat-1.5-lvalue-gcc4.patch, nsat-1.5.ebuild:
+  Add patch to fix lvalue error when compiling with gcc4. Fixes bug 128204,
+  thanks to Robert Marmorstein <rmmarm at wm dot edu>. Also, do not install
+  LICENSE.
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> nsat-1.5.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index c7556145e6bc..07d10df7dc20 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,15 +1,6 @@
-MD5 d17b0b26f8f90303d99de2d3e5b05eba ChangeLog 1279
-RMD160 3e394137efc881a2349f11395f6625cb38082f92 ChangeLog 1279
-SHA256 4496fecfa4ed27edd97ca1d151c7e00a6132e9f2ab5a4fdb41963177136b3ae7 ChangeLog 1279
+MD5 aff6702c0ff8ec076e926acedf0c9816 ChangeLog 1554
 MD5 99fbec45790d1b3bcdc76807e592f1bf files/digest-nsat-1.5 57
-RMD160 4bbe842a6dd01f79f64011debb908feb3774f637 files/digest-nsat-1.5 57
-SHA256 9d868e29cc98225bb8487ab4d1b0652a21148291f7b4a5ac1ef05dc1613ec844 files/digest-nsat-1.5 57
 MD5 dd2688ef10995aad69fac0669f7413eb files/nsat-1.5-configure.patch 566
-RMD160 e536272282273d18991df8065027636c1d341bca files/nsat-1.5-configure.patch 566
-SHA256 77347d12c7f0e321d3251657fd1a64d6b7f3a31913fd0f79c6648dd0cb37fe09 files/nsat-1.5-configure.patch 566
+MD5 86aa41aed572237c1f9c6795d59d22bd files/nsat-1.5-lvalue-gcc4.patch 516
 MD5 e5a78f2f9a0dd2c74696935d8b9347c9 metadata.xml 272
-RMD160 02ac1e261d71fced2cd48b3c8862b49fd52ae9d0 metadata.xml 272
-SHA256 d01676e6efa217e197952e025cc5b2d4b381fb307786977966a4509b002fe461 metadata.xml 272
-MD5 032d1a90ee70b2fcd35d5b0e4c838ebb nsat-1.5.ebuild 1362
-RMD160 68f4f1494c2049d02ea7e76a740d8864f5f30279 nsat-1.5.ebuild 1362
-SHA256 02f3cb77c0991741d0a442be3de45832eb081d2b97468eed13deb4f58c9d042a nsat-1.5.ebuild 1362
+MD5 6330a39697e9ce11558f51fef1bb59cb nsat-1.5.ebuild 1418
diff --git a/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch b/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch
new file mode 100644
index 000000000000..b6f197805b78
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch
@@ -0,0 +1,12 @@
+diff -Naur nsat.old/src/smb/ADMsmb.c nsat/src/smb/ADMsmb.c
+--- nsat.old/src/smb/ADMsmb.c	2006-03-31 01:51:26.000000000 -0500
++++ nsat/src/smb/ADMsmb.c	2006-03-31 01:52:27.000000000 -0500
+@@ -123,7 +123,7 @@
+     {
+       usleep (100000);
+ 
+-      if (recvfrom (socket_client, buffer2, sizeof (buffer2), 0, (struct sockaddr *) &sin_dst, &(int) longueur) != -1)
++      if (recvfrom (socket_client, buffer2, sizeof (buffer2), 0, (struct sockaddr *) &sin_dst, (int *) &longueur) != -1)
+ 	{
+ 
+ 	  if (nmb2->rep_num != 0)
diff --git a/net-analyzer/nsat/nsat-1.5.ebuild b/net-analyzer/nsat/nsat-1.5.ebuild
index e5bb5bc4d31d..bd0b742adc0d 100644
--- a/net-analyzer/nsat/nsat-1.5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.13 2006/02/15 23:37:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.14 2006/04/19 00:31:08 vanquirius Exp $
 
 inherit eutils
 
@@ -14,18 +14,20 @@ KEYWORDS="~ppc ~sparc x86"
 IUSE="X"
 
 RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 )
-				dev-lang/tk )
+		dev-lang/tk )
 	net-libs/libpcap"
 
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	# bug 128204
+	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
 
 	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
 		nsat.conf
@@ -55,6 +57,6 @@ src_install () {
 	insinto /etc/nsat
 	doins nsat.conf
 
-	dodoc README doc/LICENSE doc/CHANGES
+	dodoc README doc/CHANGES
 	doman doc/nsat.8
 }