version bump, fixing #39391 and #40115

6 files changed, 54 insertions, 3 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 722973ed8cfd..04ef680790e7 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/amap
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.5 2004/03/21 14:06:54 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.6 2004/05/20 18:16:20 squinky86 Exp $
+
+  20 May 2004; Jon Hood <squinky86@gentoo.org> amap-4.3.ebuild:
+  version bump, fixing #39391 and #40115
 
   21 Mar 2004; Michael Boman <mboman@gentoo.org> amap-2.7.ebuild,
   amap-4.3.ebuild:
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 54414043a0eb..fd89cbf974b2 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,7 @@
 MD5 043354e9ecee05f383e408688e8e0b89 amap-2.7.ebuild 1023
 MD5 4064f678d150e993a33a1121845dc720 amap-4.3.ebuild 1142
+MD5 c54e02d534875ad2a642818f14357216 amap-4.5.ebuild 967
 MD5 f9958e5a58860cecae284fff494c55db ChangeLog 841
 MD5 6ab433a807edba43512f283f9c6c9bbc files/digest-amap-2.7 59
 MD5 6bdf30d6d6aa4b292a997760f68c8cd3 files/digest-amap-4.3 60
+MD5 7c224016f4cdcd954c8ec479473b4e84 files/digest-amap-4.5 60
diff --git a/net-analyzer/amap/amap-4.3.ebuild b/net-analyzer/amap/amap-4.3.ebuild
index 7e3c7fe7b275..e9256d696314 100644
--- a/net-analyzer/amap/amap-4.3.ebuild
+++ b/net-analyzer/amap/amap-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.3.ebuild,v 1.3 2004/03/21 14:04:46 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.3.ebuild,v 1.4 2004/05/20 18:16:20 squinky86 Exp $
 
 DESCRIPTION="A network scanning tool for pentesters"
 HOMEPAGE="http://www.thc.org/releases.php"
@@ -16,7 +16,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# gentoo standard place for templates/configuration files
-	sed -i -e 's:/usr/local/bin:/usr/share/amap:' > amap.h
+	sed -i -e 's:/usr/local/bin:/usr/share/amap:g' amap.h || die
+	sed -i -e 's:#define AMAP_APPDEF_PATH.*$:#define AMAP_APPDEF_PATH "/usr/share/amap":g' amap.h || die
 }
 
 src_compile() {
diff --git a/net-analyzer/amap/amap-4.5.ebuild b/net-analyzer/amap/amap-4.5.ebuild
new file mode 100644
index 000000000000..f30ae8dc19d6
--- /dev/null
+++ b/net-analyzer/amap/amap-4.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+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="~x86 ~amd64 ~ia64 ~sparc ~ppc"
+IUSE="ssl"
+DEPEND="virtual/glibc
+	ssl? ( >=openssl-0.9.6j )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:/usr/local/bin:/usr/share/amap:g" amap.h || die
+	sed -i -e "s:AMAP_PREFIX\":\"/usr:g" amap.h || die
+}
+
+src_compile() {
+	./configure --prefix=/usr
+	emake || die
+}
+
+src_install() {
+	local files
+	files="appdefs.trig appdefs.resp appdefs.rpc"
+
+	# the makefile is difficult to patch in a gentoo-sane way
+	# easyer to install by hand
+	exeinto /usr/bin
+	#files must be in exe directory (fix bug 39391)
+	doexe amap amapcrap ${files}
+
+	doman ${PN}.1
+
+	dodoc README VOTE LICENSE TODO CHANGES
+}
diff --git a/net-analyzer/amap/files/digest-amap-4.5 b/net-analyzer/amap/files/digest-amap-4.5
new file mode 100644
index 000000000000..dbab0e832ca2
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-4.5
@@ -0,0 +1 @@
+MD5 3c58c31a0e8e264baa06f13e068d3f91 amap-4.5.tar.gz 253075
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-analyzer/amap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>