push bug fix, gcc-4 fix

(Portage version: 2.0.51.19)

5 files changed, 124 insertions, 7 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 2404bf020b1b..c018dc675a82 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/amap
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.23 2005/04/09 08:29:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.24 2005/04/10 17:37:02 vanquirius Exp $
+
+*amap-4.8-r1 (10 Apr 2005)
+
+  10 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/amap-4.8-gcc4.patch, +amap-4.8-r1.ebuild:
+  Revision bump. Push fix from bug 88228, adding slightly modified gcc-4 patch
+  from Debian.
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> amap-4.7.ebuild:
   Stable on ppc64
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 9d84de23c5ba..25505d4479c7 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,12 +1,15 @@
-MD5 1144efeca5a535e39d5aa2dc1640c8b4 ChangeLog 3075
 MD5 6f1e34801a7ab85b6284cfeb3f889c29 amap-4.6.ebuild 1393
-MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
 MD5 b839623bdffcf9474859bbca266230bd amap-4.8.ebuild 1438
+MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
+MD5 6b2dcb7cc4a9e56cde5e39a256e6562e amap-4.8-r1.ebuild 1474
+MD5 1144efeca5a535e39d5aa2dc1640c8b4 ChangeLog 3075
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
-MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
-MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
-MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
 MD5 a5f16a887d88f7d685dbaed470ee6ec8 files/digest-amap-4.6 60
 MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
 MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8 60
+MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
+MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
+MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
+MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
+MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
+MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
diff --git a/net-analyzer/amap/amap-4.8-r1.ebuild b/net-analyzer/amap/amap-4.8-r1.ebuild
new file mode 100644
index 000000000000..524e6aef7666
--- /dev/null
+++ b/net-analyzer/amap/amap-4.8-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.8-r1.ebuild,v 1.1 2005/04/10 17:37:02 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="http://www.thc.org/thc-amap/"
+SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="virtual/libc
+	dev-libs/libpcre
+	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:/etc:/share/amap:' \
+		amap.h || die "sed amap.h failed"
+
+	rm -rf pcre-3.9
+	epatch ${FILESDIR}/${PV}-system-pcre.patch
+	epatch ${FILESDIR}/${P}-fix-icky-lvalue-casts.diff
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_compile() {
+	# has it's own stupid custom configure script
+	./configure || die "configure failed"
+	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 "emake failed"
+}
+
+src_install() {
+	dobin amap amapcrap || die "dobin failed"
+	insinto /usr/share/amap
+	doins appdefs.* || die "doins failed"
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}
diff --git a/net-analyzer/amap/files/amap-4.8-gcc4.patch b/net-analyzer/amap/files/amap-4.8-gcc4.patch
new file mode 100644
index 000000000000..33ce822f233c
--- /dev/null
+++ b/net-analyzer/amap/files/amap-4.8-gcc4.patch
@@ -0,0 +1,47 @@
+--- amap-4.8/amap.c	2005-04-10 14:28:06.000000000 -0300
++++ amap-4.8.new/amap.c	2005-04-10 14:23:00.000000000 -0300
+@@ -424,7 +424,7 @@
+   f = amap_open_file(filename, "trigger", extension, opt->verbose);
+   if (opt->verbose > 1)
+     printf("\n");
+-  if (((amap_struct_triggers*) triggers = (amap_struct_triggers*) trigger = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
++  if ((triggers = trigger = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
+     amap_error("malloc failed");
+   memset(trigger, 0, sizeof(amap_struct_triggers));
+ 
+@@ -599,7 +599,7 @@
+   f = amap_open_file(filename, "response", extension, opt->verbose);
+   if (opt->verbose > 1)
+     printf("\n");
+-  if (((amap_struct_responses*) responses = (amap_struct_responses*) response = (amap_struct_responses*) malloc(sizeof(amap_struct_responses))) == NULL)
++  if ((responses = response = (amap_struct_responses*) malloc(sizeof(amap_struct_responses))) == NULL)
+     amap_error("malloc failed");
+   memset(response, 0, sizeof(amap_struct_responses));
+ 
+@@ -644,7 +644,7 @@
+         for (i = 0; i < strlen(triggerptr); i++)
+           if (triggerptr[i] == ',')
+             count++;
+-        if (((amap_struct_triggerptr*) triggerptr_tmp = response->triggerptr = malloc(sizeof(amap_struct_triggerptr))) == NULL)
++        if ((triggerptr_tmp = response->triggerptr = malloc(sizeof(amap_struct_triggerptr))) == NULL)
+           amap_error("malloc failed");
+         triggerptr_tmp->next = NULL;
+         
+@@ -756,7 +756,7 @@
+   int count = 0;
+ 
+   f = amap_open_file(filename, "nmap", "", opt->verbose);
+-  if (((amap_struct_targets*) targets = (amap_struct_targets*) target = (amap_struct_targets*) malloc(sizeof(amap_struct_targets))) == NULL)
++  if ((targets = target = (amap_struct_targets*) malloc(sizeof(amap_struct_targets))) == NULL)
+     amap_error("malloc failed");
+   memset(target, 0, sizeof(amap_struct_targets));
+   if ((port_tmp = target->ports = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
+@@ -2057,7 +2057,7 @@
+       responses_tmp = (amap_struct_responses*) responses_tmp->next;
+     }
+   } else {
+-    if (((amap_struct_triggers*) triggers = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
++    if (( triggers = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
+       amap_error("malloc failed");
+     triggers->next = NULL;
+     triggers->id = strdup("NULL");
diff --git a/net-analyzer/amap/files/digest-amap-4.8-r1 b/net-analyzer/amap/files/digest-amap-4.8-r1
new file mode 100644
index 000000000000..81a50fc78fa3
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-4.8-r1
@@ -0,0 +1 @@
+MD5 db6f6aa06afc6aeea7c7e0c594c73b69 amap-4.8.tar.gz 258019