Version bump for bug 90550; updated gcc4 patch and fixed all those ugly 'differ in signedness' warnings.

Package-Manager: portage-2.0.51.20-r4

5 files changed, 299 insertions, 2 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index c018dc675a82..2beb3efc3e80 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.24 2005/04/10 17:37:02 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.25 2005/04/27 12:19:01 ka0ttic Exp $
+
+*amap-5.0 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +files/amap-5.0-gcc4.patch,
+  +amap-5.0.ebuild:
+  Version bump for bug 90550; updated gcc4 patch and fixed all those ugly
+  'differ in signedness' warnings.
 
 *amap-4.8-r1 (10 Apr 2005)
 
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 27566c581d2a..38ef4b3384be 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,15 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6f1e34801a7ab85b6284cfeb3f889c29 amap-4.6.ebuild 1393
 MD5 b839623bdffcf9474859bbca266230bd amap-4.8.ebuild 1438
 MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
 MD5 462f671e891cbf251fc2dd267c60b785 amap-4.8-r1.ebuild 1477
-MD5 c9188b6976bbe3f4fb56b7668476d4bc ChangeLog 3304
+MD5 7a5ff30962c4f129b08fcafc1cc43ae6 amap-5.0.ebuild 1446
+MD5 326b5be1f99d1c0eeea7d9844bdaf746 ChangeLog 3533
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 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 e557979284a669fda0ca792fc9fc7ad5 files/digest-amap-5.0 60
 MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
 MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
+MD5 b078c53b085eba48231c7df7123766b5 files/amap-5.0-gcc4.patch 15883
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb4N3EZCkKN40op4RArE0AJwPcscxlOgQnvQsULBga9TU/2gVlQCfXktt
+vBUlRl+VN0163uAhdP2PLVI=
+=HICb
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/amap/amap-5.0.ebuild b/net-analyzer/amap/amap-5.0.ebuild
new file mode 100644
index 000000000000..eec08defb04d
--- /dev/null
+++ b/net-analyzer/amap/amap-5.0.ebuild
@@ -0,0 +1,57 @@
+# 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.1 2005/04/27 12:19:01 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}
+	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/files/amap-5.0-gcc4.patch b/net-analyzer/amap/files/amap-5.0-gcc4.patch
new file mode 100644
index 000000000000..fff88356b65a
--- /dev/null
+++ b/net-analyzer/amap/files/amap-5.0-gcc4.patch
@@ -0,0 +1,219 @@
+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-5.0 b/net-analyzer/amap/files/digest-amap-5.0
new file mode 100644
index 000000000000..7f7b35d4b982
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-5.0
@@ -0,0 +1 @@
+MD5 4f43cbaeac859523ee2d1af9a3bd39a9 amap-5.0.tar.gz 261784