Clean up configure patch. Do not strip (bug #251981). Do not call autoconf directly (bug #226585).

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686

5 files changed, 48 insertions, 18 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index 41d597876c62..0059e74dd4dc 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nsat
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.15 2007/07/22 07:59:37 pva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.16 2009/01/15 07:04:29 jer Exp $
+
+  15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  files/nsat-1.5-configure.patch, +files/nsat-1.5-strip.patch,
+  nsat-1.5.ebuild:
+  Clean up configure patch. Do not strip (bug #251981). Do not call autoconf
+  directly (bug #226585).
 
   22 Jul 2007; <pva@gentoo.org> nsat-1.5.ebuild:
   Removed virtual/x11 dependency.
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index b6f1cf9def96..6a82ac7ad534 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,6 +1,7 @@
-AUX nsat-1.5-configure.patch 566 RMD160 e536272282273d18991df8065027636c1d341bca SHA1 ef6b0b670a571249fb43ec715b4a26118f86018c SHA256 77347d12c7f0e321d3251657fd1a64d6b7f3a31913fd0f79c6648dd0cb37fe09
+AUX nsat-1.5-configure.patch 824 RMD160 c68d53efddf2ff95345c456f6bb14c0fc049fe94 SHA1 eab2974bf947ea3ef3ec572181508d43a2437acf SHA256 9bd4ba910c49c41fe40e9ccb91a07f43ef3f49064ee3a1778c46b7c1f4d4c4cd
 AUX nsat-1.5-lvalue-gcc4.patch 516 RMD160 d230de9af065228664f2c90e80da28f25489d1c9 SHA1 25b8155a381d04ac9a9e44f1848d717d2e617dc1 SHA256 0fa797a68bacc8d47790236b103d59fe58a0ef7f752d708f5980b7283c9b6f8a
+AUX nsat-1.5-strip.patch 288 RMD160 cf6c1b471fa10953d0aea36e9c786fed6ba45b76 SHA1 2be079a0a0816e5a9284dc955f9e1d410eb53083 SHA256 1e476a63a8d07bd0a4fad8f0cb9e0ddf5f8e09e1fbcf90bf27454149e5cface0
 DIST nsat-1.5.tgz 410603 RMD160 827db70e04f842f6678ba0f98ce203d656c53d2b SHA1 422febab6f65fb71179a3bb1874767b2f5395955 SHA256 2ece807b3240a6e91ea88fd84c470a87de711c33554b231e071549388cb65114
-EBUILD nsat-1.5.ebuild 1391 RMD160 eea355af226b19a5c9d90f4a7c81dcefb15d8524 SHA1 0b6b77d0b48eb82da15f728c29d5fb0f8193f5d9 SHA256 f386ebb10157d3b5e793c624f1ac4fcd99e88f6349d1bf606631240eeb737cb7
-MISC ChangeLog 1800 RMD160 563f60ec9c74e2747d9ea0186ff58d08c83ef329 SHA1 767e6b97af0af7125071a0ea9a57dd81dc472402 SHA256 ef6e58c5f097f9f775395f3cc866e99d2de8215ee9d69c4f2c238f03c1e57f30
+EBUILD nsat-1.5.ebuild 1469 RMD160 41a32ccc1e90a188b8ff5398d133aade7b4cf7c6 SHA1 ae2d70ac40180a39128b85de3c219b3b42966d12 SHA256 369feb3fe4880d4fcd5a11401586deae6eedf81f79bf58bb0aaec0ccd31e3f84
+MISC ChangeLog 2033 RMD160 526bfacb61010a156319d45fb6c66c4f5811ab0a SHA1 1b4979c95f73c68cb0771885cd73d09726259b1f SHA256 1581aff71fbb290144cb9e68377ca5463e6495fff320ccd11cdf10988d576bd6
 MISC metadata.xml 272 RMD160 02ac1e261d71fced2cd48b3c8862b49fd52ae9d0 SHA1 c814fdabf8603eff54cc8562199f3ec3ea4b1840 SHA256 d01676e6efa217e197952e025cc5b2d4b381fb307786977966a4509b002fe461
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure.patch b/net-analyzer/nsat/files/nsat-1.5-configure.patch
index 1f2c7e65bbf0..803a01f9e2bc 100644
--- a/net-analyzer/nsat/files/nsat-1.5-configure.patch
+++ b/net-analyzer/nsat/files/nsat-1.5-configure.patch
@@ -1,14 +1,25 @@
---- configure.in	2003-10-28 13:27:28.000000000 +0000
-+++ configure.in	2003-10-28 13:28:02.000000000 +0000
-@@ -47,9 +47,9 @@
+--- nsat/configure.in.orig	2003-01-05 22:47:13.000000000 +0100
++++ nsat/configure.in	2009-01-15 07:56:35.000000000 +0100
+@@ -15,7 +15,6 @@
  else
-     CCOPTS='-DLINUX'
+     AC_MSG_RESULT(crappy :P)
+ fi
+- LEETCC=$ac_cv_prog_gcc;
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+@@ -45,11 +44,11 @@
+ if test $LEETCC = yes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
+ else
+-    CCOPTS='-DLINUX'
++    CCOPTS="${CFLAGS} -DLINUX"
  fi
 -    CFLAGS="$CCOPTS"
 -    SMBCFLAGS="-Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
-+    SMBCFLAGS="$CFLAGS -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
++    SMBCFLAGS="${CCOPTS} -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
      SMBLFLAGS="-lnsl -lcrypt"
-+    CFLAGS="$CFLAGS -Wall -funroll-loops -ansi -fPIC -DLINUX"
++    CFLAGS="${CCOPTS} -Wall -ansi -fPIC -DLINUX"
   ;;
   *Darwin* | *Mac* | *MAC*)
    AC_MSG_RESULT(found MAC OS X)
diff --git a/net-analyzer/nsat/files/nsat-1.5-strip.patch b/net-analyzer/nsat/files/nsat-1.5-strip.patch
new file mode 100644
index 000000000000..89b109802de1
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-strip.patch
@@ -0,0 +1,10 @@
+--- nsat/src/Makefile.in.orig	2002-04-26 08:45:38.000000000 +0200
++++ nsat/src/Makefile.in	2009-01-15 07:44:11.000000000 +0100
+@@ -37,7 +37,6 @@
+ 
+ ../nsat:
+ 	${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+-	strip ../nsat
+ 
+ pidalloc.o:
+ 	${GPP} ${CFLAGS} -c pidalloc.cpp
diff --git a/net-analyzer/nsat/nsat-1.5.ebuild b/net-analyzer/nsat/nsat-1.5.ebuild
index 27935332d2a4..bbca1e5efaa7 100644
--- a/net-analyzer/nsat/nsat-1.5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.16 2007/07/22 07:59:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.17 2009/01/15 07:04:29 jer Exp $
 
-inherit eutils
+inherit eutils autotools
+
+WANT_AUTOCONF=2.5
 
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
 HOMEPAGE="http://nsat.sourceforge.net/"
@@ -24,10 +26,11 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	cp -va configure.in{,.orig}
 	epatch "${FILESDIR}"/${P}-configure.patch
 	# bug 128204
 	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
+	epatch "${FILESDIR}"/${P}-strip.patch
 
 	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
 		nsat.conf
@@ -36,12 +39,11 @@ src_unpack() {
 	sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
 		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
 		src/lang.h
+
+	eautoconf
 }
 
 src_compile() {
-	WANT_AUTOCONF=2.5
-	autoconf
-
 	econf $( use_with X x ) || die
 
 	make|| die "compile problem"