Version bump as per bug #71433

6 files changed, 121 insertions, 11 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 5770de0180f5..37e7006ef744 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.14 2004/09/25 05:00:04 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.15 2005/01/09 05:16:50 dragonheart Exp $
+
+*amap-4.7 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/4.7-system-pcre.patch, +amap-4.7.ebuild:
+  Version bump as per bug #71433. Thanks to Robert Rodgers <rrodgers@gmail.com>
+  and Vanquirius <marcelogoes@gmail.com>.
 
 *amap-4.6 (25 Sep 2004)
 
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index ace828febd2f..03905656fa07 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 afeb7b6084a256c24595976154666174 ChangeLog 1694
+MD5 5ebc9f3a86ff38b18b05d2d8ee9fea3d amap-4.7.ebuild 1358
+MD5 adb203ccaff76e121de0b8426a3db48b amap-4.6.ebuild 1330
+MD5 76b8d7f65fd9a06a7cde4845737a9052 ChangeLog 1950
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 64198856b7adfc72015b16ebc44a732e amap-4.6.ebuild 1325
-MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
+MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
 MD5 a5f16a887d88f7d685dbaed470ee6ec8 files/digest-amap-4.6 60
+MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
+MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBWBfiHTu7gpaalycRAktGAKCKnxIS7Ns+y0QCGuQAEJu1hEhddwCcDanF
-JvVi+A3/c1o3GMXCAcxRXzk=
-=Adoe
+iD8DBQFB4L5ImdTrptrqvGERAur8AJ9YcxrVsSbiaK4kt9cPMS0MepQZrACdF0Tt
+RLIdOjScw2CxoX8RY2mQ0sY=
+=0Qg2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/amap/amap-4.6.ebuild b/net-analyzer/amap/amap-4.6.ebuild
index 29f37dc02ec5..bb1386b3d1b7 100644
--- a/net-analyzer/amap/amap-4.6.ebuild
+++ b/net-analyzer/amap/amap-4.6.ebuild
@@ -1,6 +1,6 @@
-# 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/amap/amap-4.6.ebuild,v 1.1 2004/09/25 05:00:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.6.ebuild,v 1.2 2005/01/09 05:16:50 dragonheart Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/amap/amap-4.7.ebuild b/net-analyzer/amap/amap-4.7.ebuild
new file mode 100644
index 000000000000..692e7a2aa940
--- /dev/null
+++ b/net-analyzer/amap/amap-4.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.7.ebuild,v 1.1 2005/01/09 05:16:50 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="http://www.thc.org/releases.php"
+SRC_URI="http://packetstormsecurity.nl/groups/thc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="virtual/libc
+	ssl? ( >=dev-libs/openssl-0.9.6j )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e 's:/usr/local:/usr:' \
+		-e '/AMAP_APPDEF_PATH/s:/bin:/share/amap:' \
+		amap.h || die
+
+	rm -rf pcre-3.9
+	epatch ${FILESDIR}/${PV}-system-pcre.patch || die "patch failed"
+}
+
+src_compile() {
+	# has it's own stupid custom configure script
+	./configure || die "configure"
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		Makefile || die "pruning vars"
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die "adding ssl"
+	fi
+	emake OPT="${CFLAGS}" || die "make"
+}
+
+src_install() {
+	dobin amap amapcrap || die "dobin"
+	insinto /usr/share/amap
+	doins appdefs.* || die "doins"
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}
diff --git a/net-analyzer/amap/files/4.7-system-pcre.patch b/net-analyzer/amap/files/4.7-system-pcre.patch
new file mode 100644
index 000000000000..82554a4a27e0
--- /dev/null
+++ b/net-analyzer/amap/files/4.7-system-pcre.patch
@@ -0,0 +1,43 @@
+diff -Naur amap-4.7.orig/amap-inc.h amap-4.7/amap-inc.h
+--- amap-4.7.orig/amap-inc.h	2004-12-18 22:18:07.077224832 -0200
++++ amap-4.7/amap-inc.h	2004-12-18 22:19:09.243774080 -0200
+@@ -20,7 +20,7 @@
+ #include <errno.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+-#include "pcre-3.9/pcre.h"
++#include <pcre.h>
+ #ifdef OPENSSL
+  #include <openssl/ssl.h>
+  #include <openssl/err.h>
+diff -Naur amap-4.7.orig/configure amap-4.7/configure
+--- amap-4.7.orig/configure	2004-12-18 22:18:07.064226808 -0200
++++ amap-4.7/configure	2004-12-18 22:19:40.911959784 -0200
+@@ -13,10 +13,6 @@
+   exit 0
+ fi
+ 
+-cd pcre-3.9 || exit 1
+-./configure || exit 1
+-cd ..
+-
+ echo
+ echo
+ echo "Starting amap auto configuration ..."
+diff -Naur amap-4.7.orig/Makefile.am amap-4.7/Makefile.am
+--- amap-4.7.orig/Makefile.am	2004-12-18 22:18:07.065226656 -0200
++++ amap-4.7/Makefile.am	2004-12-18 22:18:43.609671056 -0200
+@@ -1,11 +1,11 @@
+ CC=gcc
+-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
++LIB=-lpcre
+ OPT=-O2
+ OPT_DEBUG=-ggdb -Wall -lefence
+ DIR=/bin
+ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
+ MANPAGE=amap.1
+-all:	pcre strip
++all:	amap amapcrap
+ 
+ pcre:
+ 	cd pcre-3.9 && make
diff --git a/net-analyzer/amap/files/digest-amap-4.7 b/net-analyzer/amap/files/digest-amap-4.7
new file mode 100644
index 000000000000..030a187c647b
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-4.7
@@ -0,0 +1 @@
+MD5 c2ce244321b0b7b5eb28fdc785452b9a amap-4.7.tar.gz 253217