cleanup, prospective stable version 5.2

(Portage version: 2.1.2-r1)

9 files changed, 11 insertions, 387 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 99e3a6c8e5b8..c4b907e1dae0 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.34 2006/01/16 01:28:57 vanquirius Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.35 2007/02/01 21:06:32 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/4.7-system-pcre.patch, -files/amap-5.0-gcc4.patch,
+  -amap-5.0.ebuild, -amap-5.1.ebuild:
+  cleanup, prospective stable version 5.2
 
 *amap-5.2 (16 Jan 2006)
 
diff --git a/net-analyzer/amap/amap-5.0.ebuild b/net-analyzer/amap/amap-5.0.ebuild
deleted file mode 100644
index 112f265f5561..000000000000
--- a/net-analyzer/amap/amap-5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-5.0.ebuild,v 1.3 2005/05/05 09:22:16 dragonheart 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}
-	chmod 755 .
-	sed -i -e "s:etc/:share/amap/:g" \
-		amap-lib.c || die "sed amap-lib.c failed"
-	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
-	sed -i '/DATADIR/s:/etc:/share/amap:' \
-		Makefile.am || die "sed Makefile.am failed"
-	rm -rf pcre-3.9
-
-	epatch ${FILESDIR}/4.8-system-pcre.patch
-	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/amap-5.1.ebuild b/net-analyzer/amap/amap-5.1.ebuild
deleted file mode 100644
index a39221ec62f1..000000000000
--- a/net-analyzer/amap/amap-5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-5.1.ebuild,v 1.1 2005/06/14 14:15:33 ka0ttic 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}
-
-	chmod 755 .
-	sed -i -e "s:etc/:share/amap/:g" \
-		amap-lib.c || die "sed amap-lib.c failed"
-	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
-	sed -i '/DATADIR/s:/etc:/share/amap:' \
-		Makefile.am || die "sed Makefile.am failed"
-	rm -rf pcre-3.9
-
-	epatch ${FILESDIR}/4.8-system-pcre.patch
-	epatch ${FILESDIR}/${PN}-5.0-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/4.7-system-pcre.patch b/net-analyzer/amap/files/4.7-system-pcre.patch
deleted file mode 100644
index 82554a4a27e0..000000000000
--- a/net-analyzer/amap/files/4.7-system-pcre.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/amap-5.0-gcc4.patch b/net-analyzer/amap/files/amap-5.0-gcc4.patch
deleted file mode 100644
index fff88356b65a..000000000000
--- a/net-analyzer/amap/files/amap-5.0-gcc4.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff --exclude='*~' -urN amap-5.0.orig/amapcrap.c amap-5.0/amapcrap.c
---- amap-5.0.orig/amapcrap.c	2005-04-27 00:08:58.000000000 -0400
-+++ amap-5.0/amapcrap.c	2005-04-27 00:30:35.000000000 -0400
-@@ -103,14 +103,14 @@
-   while ((i = getopt(argc, argv, "M:N:SVem:n:p:uvw:")) >= 0) {
-     switch (i) {
-     case 'M':
--      if ((str = index(optarg, ',')) == NULL) {
-+      if ((str = (unsigned char *)index(optarg, ',')) == NULL) {
- 	fprintf(stderr,
- 		"Error: Syntax is \"-M min,max\", e.g. \"-M 1,256\".\n");
- 	exit(-1);
-       }
-       *str++ = 0;
-       send_min = atoi(optarg);
--      send_max = atoi(str);
-+      send_max = atoi((char *)str);
-       if (send_min < 3 || send_max < 3 || send_min > 1024 || send_max > 1024
- 	  || send_min > send_max) {
- 	fprintf(stderr,
-diff --exclude='*~' -urN amap-5.0.orig/amap-lib.c amap-5.0/amap-lib.c
---- amap-5.0.orig/amap-lib.c	2005-04-27 00:08:58.000000000 -0400
-+++ amap-5.0/amap-lib.c	2005-04-27 00:30:35.000000000 -0400
-@@ -396,7 +396,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));
- 
-@@ -571,7 +571,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));
- 
-@@ -616,7 +616,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;
-         
-@@ -728,7 +728,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)
-@@ -1058,14 +1058,14 @@
-       }
-       // oh yeah, we received data!
-       if (len > 0 && opt->banner_only) {
--        printf("Banner on %s:%d/%s : %s\n", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_printable_banner_string(buf, len, banner, sizeof(banner)));
-+        printf("Banner on %s:%d/%s : %s\n", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_printable_banner_string((char *)buf, len, banner, sizeof(banner)));
-         if (opt->logfile != NULL) {
-           if (opt->machine_readable) {
--            fprintf(opt->logfile, "%s:%d:%s:%s::%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), AMAP_UFO, amap_printable_banner_string(buf, len, banner, sizeof(banner)));
-+            fprintf(opt->logfile, "%s:%d:%s:%s::%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), AMAP_UFO, amap_printable_banner_string((char *)buf, len, banner, sizeof(banner)));
-             amap_banner_string(opt->logfile, buf, len);
-             fprintf(opt->logfile, "\n");
-           } else
--            fprintf(opt->logfile, "Banner on %s:%d/%s : %s\n", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_printable_banner_string(buf, len, banner, sizeof(banner)));
-+            fprintf(opt->logfile, "Banner on %s:%d/%s : %s\n", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_printable_banner_string((char *)buf, len, banner, sizeof(banner)));
-         }
-         coms[i].port->skip = 1;
- #ifdef OPENSSL
-@@ -1096,7 +1096,7 @@
-             if ((opt->one_is_enough == 0 || found == 0) && amap_lookup_id(coms[i].port->ids, "echo") == 0) {
-               if (len >= response->min_length && len <= response->max_length && (response->ip_prot == AMAP_PROTO_BOTH || response->ip_prot == coms[i].port->ip_prot)
-                   && amap_lookup_id(coms[i].port->ids, response->id) == 0 && (response->triggerptr == NULL || amap_lookup_triggerptr(response->triggerptr, coms[i].trigger->id) == 1)) {
--                if (pcre_exec(response->pattern, response->hints, buf, len, 0, 0, offsets, sizeof(offsets)) >= 0) {
-+                if (pcre_exec(response->pattern, response->hints, (char *)buf, len, 0, 0, offsets, sizeof(offsets)) >= 0) {
-                   found++;
-                   amap_add_id(coms[i].port, response->id);
-                   if (strcmp(response->id, "ssl") == 0 || strncmp(response->id, "ssl-", 4) == 0)
-@@ -1109,13 +1109,13 @@
-                     info[0] = 0;
-                   if (opt->logfile != NULL) {
-                     if (opt->machine_readable) {
--                      fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), coms[i].ssl_enabled ? "SSL" : "", response->id, amap_printable_banner_string(coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-+                      fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), coms[i].ssl_enabled ? "SSL" : "", response->id, amap_printable_banner_string((char *)coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-                       amap_banner_string(opt->logfile, coms[i].response, coms[i].response_length);
-                       fprintf(opt->logfile, "\n");
-                     } else {
-                       fprintf(opt->logfile, "Protocol on %s:%d/%s%s%smatches %s", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", coms[i].ssl_enabled ? " over SSL " : " ", info, response->id);
-                       if (opt->banner) 
--                        fprintf(opt->logfile, " - banner: %s\n", amap_printable_banner_string(coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-+                        fprintf(opt->logfile, " - banner: %s\n", amap_printable_banner_string((char *)coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-                       else
-                         fprintf(opt->logfile, "\n");
-                       if (opt->dump_all) {
-@@ -1127,7 +1127,7 @@
-                   }
-                   printf("Protocol on %s:%d/%s%s%smatches %s", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", coms[i].ssl_enabled ? " over SSL " : " ", info, response->id);
-                   if (opt->banner) 
--                    printf(" - banner: %s\n", amap_printable_banner_string(coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-+                    printf(" - banner: %s\n", amap_printable_banner_string((char *)coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-                   else
-                     printf("\n");
-                   if (opt->dump_all) {
-@@ -1159,7 +1159,7 @@
-               printf("Please send this output and the name of the application to %s:\n", AMAP_EMAIL);
-               amap_dump_string(stdout, coms[i].response, coms[i].response_length, 16);
-             }
--            coms[i].port->unknown_response = amap_memdup(coms[i].response, coms[i].response_length);
-+            coms[i].port->unknown_response = (unsigned char *)amap_memdup((char *)coms[i].response, coms[i].response_length);
-             coms[i].port->unknown_response_length = coms[i].response_length;
-           }
-           // now shutdown the connection
-@@ -1182,7 +1182,7 @@
-             amap_add_id(coms[i].port, banner);
-             if (opt->logfile != NULL) {
-               if (opt->machine_readable) {
--                fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), coms[i].ssl_enabled ? "SSL" : "", coms[i].port->ids->id, amap_printable_banner_string(coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-+                fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(coms[i].port->skip), coms[i].ssl_enabled ? "SSL" : "", coms[i].port->ids->id, amap_printable_banner_string((char *)coms[i].response, coms[i].response_length, banner, sizeof(banner)));
-                 amap_banner_string(opt->logfile, coms[i].response, coms[i].response_length);
-                 fprintf(opt->logfile, "\n");
-               } else
-@@ -1290,7 +1290,7 @@
-       if (FD_ISSET(coms[i].socket, &rfd) || FD_ISSET(coms[i].socket, &wfd)) {
-       // somethings here ...
-         error = 0;
--        if (getsockopt(coms[i].socket, SOL_SOCKET, SO_ERROR, &error, &error_len) < 0 || error != 0) {
-+        if (getsockopt(coms[i].socket, SOL_SOCKET, SO_ERROR, &error, (socklen_t *)&error_len) < 0 || error != 0) {
-           if (coms[i].port->skip < 1 && (opt->portscanner == 0 || opt->verbose) && opt->quiet == 0)
-             amap_warn("Could not connect (unreachable) to %s:%d/%s, disabling port (EUNKN)", coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           coms[i].port->skip = 2;
-@@ -1346,14 +1346,14 @@
-           if (opt->ipv6) {
-             struct sockaddr_in6 sa;
-             int t = sizeof(sa);
--            getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             printf("DEBUG: socket %d/%d to %s:%d/%s is now RETRY CONNECT\n", coms[i].socket, htons(sa.sin6_port), coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           } else
- #endif
-           {
-             struct sockaddr_in sa;
-             int t = sizeof(sa);
--            getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             printf("DEBUG: socket %d/%d to %s:%d/%s is now RETRY CONNECT\n", coms[i].socket, htons(sa.sin_port), coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           }
-         }
-@@ -1408,18 +1408,18 @@
-           if (opt->ipv6) {
-             struct sockaddr_in6 sa;
-             int t = sizeof(sa);
--            getpeername(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getpeername(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             dport = htons(sa.sin6_port);
--            getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             printf("DEBUG: socket %d/%d->%d to %s:%d/%s became RETRY CONNECT\n", coms[i].socket, htons(sa.sin6_port), dport, coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           } else
- #endif
-           {
-             struct sockaddr_in sa;
-             int t = sizeof(sa);
--            getpeername(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getpeername(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             dport = htons(sa.sin_port);
--            getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+            getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-             printf("DEBUG: socket %d/%d->%d to %s:%d/%s became RETRY CONNECT\n", coms[i].socket, htons(sa.sin_port), dport, coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           }
-         }
-@@ -1528,18 +1528,18 @@
-             if (opt->ipv6) {
-               struct sockaddr_in6 sa;
-               int t = sizeof(sa);
--              getpeername(coms[i].socket, (struct sockaddr*)&sa, &t);
-+              getpeername(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-               dport = htons(sa.sin6_port);
--              getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+              getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-               printf("DEBUG: socket %d/%d->%d to %s:%d/%s became ACTIVE (trigger %s send)\n", coms[i].socket, ntohs(sa.sin6_port), dport, coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", coms[i].trigger->id);
-             } else
- #endif
-             {
-               struct sockaddr_in sa;
-               int t = sizeof(sa);
--              getpeername(coms[i].socket, (struct sockaddr*)&sa, &t);
-+              getpeername(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-               dport = htons(sa.sin_port);
--              getsockname(coms[i].socket, (struct sockaddr*)&sa, &t);
-+              getsockname(coms[i].socket, (struct sockaddr*)&sa, (socklen_t *)&t);
-               printf("DEBUG: socket %d/%d->%d to %s:%d/%s became ACTIVE (trigger %s send)\n", coms[i].socket, ntohs(sa.sin_port), dport, coms[i].target->target, coms[i].port->port, coms[i].port->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", coms[i].trigger->id);
-             }
-           }
-@@ -2067,7 +2067,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");
-@@ -2268,7 +2268,7 @@
-           printf(" %s:%d/%s", target_tmp->target, port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-           if (opt->logfile != NULL) {
-             if (opt->machine_readable) {
--              fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", target_tmp->target, port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(port_tmp->skip), port_tmp->ssl ? "SSL" : "", AMAP_UFO, amap_printable_banner_string(port_tmp->unknown_response, port_tmp->unknown_response_length, banner, sizeof(banner)));
-+              fprintf(opt->logfile, "%s:%d:%s:%s:%s:%s:%s:", target_tmp->target, port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp", amap_skip_translate(port_tmp->skip), port_tmp->ssl ? "SSL" : "", AMAP_UFO, amap_printable_banner_string((char *)port_tmp->unknown_response, port_tmp->unknown_response_length, banner, sizeof(banner)));
-               amap_banner_string(opt->logfile, port_tmp->unknown_response, port_tmp->unknown_response_length);
-               fprintf(opt->logfile, "\n");
-             } else
diff --git a/net-analyzer/amap/files/digest-amap-4.8-r1 b/net-analyzer/amap/files/digest-amap-4.8-r1
index 81a50fc78fa3..eb5daf5506f9 100644
--- a/net-analyzer/amap/files/digest-amap-4.8-r1
+++ b/net-analyzer/amap/files/digest-amap-4.8-r1
@@ -1 +1,3 @@
 MD5 db6f6aa06afc6aeea7c7e0c594c73b69 amap-4.8.tar.gz 258019
+RMD160 bb1dd1d0b6e7de676dcf9ee368b88eef15a65ed0 amap-4.8.tar.gz 258019
+SHA256 85b6426bf6c67517d6298207ce6fdde14f9ec6ac8cbca7d43ab1c171722a0490 amap-4.8.tar.gz 258019
diff --git a/net-analyzer/amap/files/digest-amap-5.0 b/net-analyzer/amap/files/digest-amap-5.0
deleted file mode 100644
index 7f7b35d4b982..000000000000
--- a/net-analyzer/amap/files/digest-amap-5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f43cbaeac859523ee2d1af9a3bd39a9 amap-5.0.tar.gz 261784
diff --git a/net-analyzer/amap/files/digest-amap-5.1 b/net-analyzer/amap/files/digest-amap-5.1
deleted file mode 100644
index 22b67cec2dfb..000000000000
--- a/net-analyzer/amap/files/digest-amap-5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d0a1c54d07967dfc10768a5ca6ee16b amap-5.1.tar.gz 261983
diff --git a/net-analyzer/amap/files/digest-amap-5.2 b/net-analyzer/amap/files/digest-amap-5.2
index e1394ae6a62c..6f7b48996620 100644
--- a/net-analyzer/amap/files/digest-amap-5.2
+++ b/net-analyzer/amap/files/digest-amap-5.2
@@ -1 +1,3 @@
 MD5 e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz 262875
+RMD160 4ea604ecb086f8e3cac84b45caac93b4a04eba26 amap-5.2.tar.gz 262875
+SHA256 0ca1d5e9feab7d44af39dc058a688a0636f8e798315ee742847c4057e4467fb6 amap-5.2.tar.gz 262875