cleanup, prospective stable version 5.2

Package-Manager: portage-2.1.2-r1

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 99e3a6c8e5b81e52732937e8a3fdfe770b245aba..c4b907e1dae06812e532ea5e775aca5111524235 100644 (file)
--- 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 (file)
index 112f265..0000000
--- 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 (file)
index a39221e..0000000
--- 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 (file)
index 82554a4..0000000
--- 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 (file)
index fff8835..0000000
--- 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 81a50fc78fa305e58b727423a3e7472d628c0834..eb5daf5506f9c3298fa4c99dfa9e1ae49f057f5d 100644 (file)
--- 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 (file)
index 7f7b35d..0000000
--- 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 (file)
index 22b67ce..0000000
--- 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 e1394ae6a62c705a569262c1bcac8f3da981f853..6f7b489966204b3ec9f86a116e4df644707485b4 100644 (file)
--- 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

diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 01d8674b49463956d49fac155de7fd208758b926..7b8f4ae8077e2d088aa9031fa19d0e760a624dea 100644 (file)
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,50 +1,43 @@
-AUX arpwatch.confd 145 RMD160 a28e71f549b55df40bc0541c1e2912ee618b5bbe SHA1 401257fd7997cd43e1882fb9a3da3f40b486b579 SHA256 008e9c665bcf62cbecd3f16b8b5c750d660c15c8da63af42e1698151b70fe1be
-MD5 d71450140bb1d62d44244bf767f791ce files/arpwatch.confd 145
-RMD160 a28e71f549b55df40bc0541c1e2912ee618b5bbe files/arpwatch.confd 145
-SHA256 008e9c665bcf62cbecd3f16b8b5c750d660c15c8da63af42e1698151b70fe1be files/arpwatch.confd 145
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX arpwatch.confd 255 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c SHA1 9ca8f47b6957fe46b51fcab80bb0c49557435d5b SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f
+MD5 ee7d2c3e5a7af87e4b18a1e23183c88d files/arpwatch.confd 255
+RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c files/arpwatch.confd 255
+SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f files/arpwatch.confd 255
 AUX arpwatch.confd-2 255 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c SHA1 9ca8f47b6957fe46b51fcab80bb0c49557435d5b SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f
 MD5 ee7d2c3e5a7af87e4b18a1e23183c88d files/arpwatch.confd-2 255
 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c files/arpwatch.confd-2 255
 SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f files/arpwatch.confd-2 255
-AUX arpwatch.init 770 RMD160 b3006f4504096c5809903cbf95d56427d0932d7d SHA1 1046f1ff8a8f396e8190cf6a98763fc673b05656 SHA256 ba47623a6deacaab3b3b4b589cc94c3adf5c188e493fe95007d1a5e6185d0e3c
-MD5 91b745c801cc89f14612ed19de35a044 files/arpwatch.init 770
-RMD160 b3006f4504096c5809903cbf95d56427d0932d7d files/arpwatch.init 770
-SHA256 ba47623a6deacaab3b3b4b589cc94c3adf5c188e493fe95007d1a5e6185d0e3c files/arpwatch.init 770
+AUX arpwatch.init 1006 RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 SHA1 140a89d24f6b6f8b34b3cfec75daa68541bfc307 SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b
+MD5 406db1599d9945f5e6f259c203b9511c files/arpwatch.init 1006
+RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 files/arpwatch.init 1006
+SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b files/arpwatch.init 1006
 AUX arpwatch.init-2 1005 RMD160 a28507e42f1c9fb78436de5e25ccb2a35e3eefba SHA1 de4c7ad9d11cb4e2321059a108ce52dba6e1d87a SHA256 6e19ef662d29307851045d4703678db7884e9ded2967bfa45e38cb4332a4c664
 MD5 09847c4c465b89dad79e7af245be7e41 files/arpwatch.init-2 1005
 RMD160 a28507e42f1c9fb78436de5e25ccb2a35e3eefba files/arpwatch.init-2 1005
 SHA256 6e19ef662d29307851045d4703678db7884e9ded2967bfa45e38cb4332a4c664 files/arpwatch.init-2 1005
-DIST arpwatch-2.1.11-r1.diff.gz 7550 RMD160 3c022ea0e96953b5a5c38463241b01ca219e32d7 SHA1 fed55d43b508ea6da59c5d00f453ea65c6290e06 SHA256 41e373ef8e43435191a9126a1cc96ed055e5bf82882e1dbdcbb48781f533df63
-DIST arpwatch-2.1a11.tar.gz 126550 RMD160 e5932b488fbbe34926525e2795f31d2e8b3974dc SHA1 d14f9218928885ea9b502461259513a815809be7 SHA256 98224c1d4e09fa9d42a7de8dde4cd938d20633da87d3a6d8f936c93895be5fe6
 DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
-DIST arpwatch-patchset-0.2.tbz2 15087 RMD160 f90ab345cd902b832da88410035d04d996d3cd76 SHA1 4d8d7996a28bbea3202d42f44df944b6a3435586 SHA256 95d37ec744d52995fa44abd86bb6618993bfceec14a6252c7fcdd89f7bdef873
 DIST arpwatch-patchset-0.3.tbz2 15934 RMD160 5e21ac57fa5beca751d1d5a42ea3632e70ee953e SHA1 43952e686965211eb930bcd82bf54d75012883fb SHA256 7721f983ea21f5e0bfb265982e59d0de9d76f1021abf2c2e359f91805922bfe3
-EBUILD arpwatch-2.1.11-r1.ebuild 1606 RMD160 1a472abf216453731c6c89f8cdddd8e7a77a625d SHA1 cc4562a67d9267f208a2037cb8245accced62db7 SHA256 26d9d1c27159a6baa9a310381b181fbfd94564a87060dbd3c855eee80cf72c91
-MD5 a00231d8bd68c31f100514738a2d7a03 arpwatch-2.1.11-r1.ebuild 1606
-RMD160 1a472abf216453731c6c89f8cdddd8e7a77a625d arpwatch-2.1.11-r1.ebuild 1606
-SHA256 26d9d1c27159a6baa9a310381b181fbfd94564a87060dbd3c855eee80cf72c91 arpwatch-2.1.11-r1.ebuild 1606
-EBUILD arpwatch-2.1.15-r2.ebuild 2054 RMD160 5f9654b2202eeaa46c66ae11de79e48ce9978354 SHA1 843e42775e1d5d25f89da71da076b6930a771ae7 SHA256 d1264baeb974db004aede28ecba837a7f997c3d176a31d87255b80271f31c434
-MD5 ad38edca3b95f53b7b63cbd197a9c9e8 arpwatch-2.1.15-r2.ebuild 2054
-RMD160 5f9654b2202eeaa46c66ae11de79e48ce9978354 arpwatch-2.1.15-r2.ebuild 2054
-SHA256 d1264baeb974db004aede28ecba837a7f997c3d176a31d87255b80271f31c434 arpwatch-2.1.15-r2.ebuild 2054
-EBUILD arpwatch-2.1.15-r3.ebuild 2109 RMD160 1d85692a8d7c3b20a60ed18a5aeb4487e8ffb9b1 SHA1 eb129b6958d4fe6f59987203131637ef86fdb1c3 SHA256 97c24b08c3af74e6039b0013cfd8b43260660e23784d82b5e422352c00d14467
-MD5 f988450db82c80fcfc2260818329c951 arpwatch-2.1.15-r3.ebuild 2109
-RMD160 1d85692a8d7c3b20a60ed18a5aeb4487e8ffb9b1 arpwatch-2.1.15-r3.ebuild 2109
-SHA256 97c24b08c3af74e6039b0013cfd8b43260660e23784d82b5e422352c00d14467 arpwatch-2.1.15-r3.ebuild 2109
-MISC ChangeLog 5806 RMD160 ef5640ef69ca0c285d9106b651813c6bdde64800 SHA1 70a395803f223cfbc1a40ed7b05fae4fc7945bc7 SHA256 66455ddcdef928b24be702000d7cdef45af70efe18ce8b86e779847d8dcc1536
-MD5 643cd17b275a1d2169853388c9f73c47 ChangeLog 5806
-RMD160 ef5640ef69ca0c285d9106b651813c6bdde64800 ChangeLog 5806
-SHA256 66455ddcdef928b24be702000d7cdef45af70efe18ce8b86e779847d8dcc1536 ChangeLog 5806
+EBUILD arpwatch-2.1.15-r3.ebuild 2107 RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 SHA1 b6b6cf53d689abf75a016ae456da7d934e34ad1f SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451
+MD5 030bbb2603f8d3402736aeded7cb4490 arpwatch-2.1.15-r3.ebuild 2107
+RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 arpwatch-2.1.15-r3.ebuild 2107
+SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451 arpwatch-2.1.15-r3.ebuild 2107
+MISC ChangeLog 5998 RMD160 f6b1cb49f9567583bf96522c567fa2e7a517a9a1 SHA1 84521d716543664e44ec5b74d773b687537b7518 SHA256 16d96d21cd4efa0fbb933453685af0d55b5e15ae9244a41cebfb3036837249f6
+MD5 faa18010ca9451acd1289a19a058db3e ChangeLog 5998
+RMD160 f6b1cb49f9567583bf96522c567fa2e7a517a9a1 ChangeLog 5998
+SHA256 16d96d21cd4efa0fbb933453685af0d55b5e15ae9244a41cebfb3036837249f6 ChangeLog 5998
 MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
 MD5 5be7208eacb14b197c97ef6fc4aa67c7 metadata.xml 710
 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b metadata.xml 710
 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814 metadata.xml 710
-MD5 904f54db4b073dcaefd049289f5a31b3 files/digest-arpwatch-2.1.11-r1 500
-RMD160 9a0323cacc0adc4ea998765e18269d6a9f28db61 files/digest-arpwatch-2.1.11-r1 500
-SHA256 8e7bae4cb9ed2cd063f060c3b2198928bbd0dad7f41c3c07e1dc8b402020ccc6 files/digest-arpwatch-2.1.11-r1 500
-MD5 73e5a75ec88719161d7abf4c970257df files/digest-arpwatch-2.1.15-r2 503
-RMD160 2a40ee1e36bda76c4811bc2eeab25ee7cba20701 files/digest-arpwatch-2.1.15-r2 503
-SHA256 a573d6046553a93b6016893b97481cd5a1fb29a6fc92fad830494640f1900294 files/digest-arpwatch-2.1.15-r2 503
 MD5 374e59ae14b38c9bfafe88c19ba7f4e8 files/digest-arpwatch-2.1.15-r3 503
 RMD160 b740c7ece11d2de3cbeb9744d7751211d8987854 files/digest-arpwatch-2.1.15-r3 503
 SHA256 c8d0bcbe625c4b707591bc2e74117dbde9d7dfe3c962552c7ade8004a178674f files/digest-arpwatch-2.1.15-r3 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFwlbhz974XjDVpbkRAih4AJ9BlJkIjpM37blXnml4nMlc4lE0XgCgrnG0
+a60oghDu/t4UgLUQBEK1vwc=
+=Q4Q8
+-----END PGP SIGNATURE-----