From 1621c2c10ac167725e9458bf1b4404a0256582e4 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Mon, 5 Sep 2011 21:45:38 -0400 Subject: network/amap: Updated for version 5.4. Signed-off-by: dsomero --- network/amap/README | 2 +- network/amap/amap.SlackBuild | 6 +++--- network/amap/amap.info | 8 ++++---- network/amap/slack-desc | 4 ++-- network/amap/slackware.diff | 40 ++++++++++++++-------------------------- network/amap/slackware64.diff | 40 ++++++++++++++-------------------------- 6 files changed, 38 insertions(+), 62 deletions(-) diff --git a/network/amap/README b/network/amap/README index 1e9d43e02d..0d7a00630f 100644 --- a/network/amap/README +++ b/network/amap/README @@ -1,4 +1,4 @@ Amap is a next-generation scanning tool for pentesters. It attempts to identify applications even if they are running on a different port than normal. It also identifies non-ascii based applications. This is achieved by sending -trigger packets, and looking up the responses in a list of response strings. +trigger packets, and looking up the responses in a list of response strings. diff --git a/network/amap/amap.SlackBuild b/network/amap/amap.SlackBuild index d0cc769622..9cba1adcb2 100644 --- a/network/amap/amap.SlackBuild +++ b/network/amap/amap.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Amap (Application Mapper) # -# Copyright 2009-2010 Marco Bonetti +# Copyright 2009-2011 Marco Bonetti # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ PRGNAM=amap -VERSION=${VERSION:-5.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: diff --git a/network/amap/amap.info b/network/amap/amap.info index 62d0733af5..774aef6946 100644 --- a/network/amap/amap.info +++ b/network/amap/amap.info @@ -1,8 +1,8 @@ PRGNAM="amap" -VERSION="5.2" -HOMEPAGE="http://freeworld.thc.org/thc-amap/" -DOWNLOAD="http://freeworld.thc.org/releases/amap-5.2.tar.gz" -MD5SUM="e3b1f5ebd24aac03aacb38ec183eb426" +VERSION="5.4" +HOMEPAGE="http://www.thc.org/thc-amap/" +DOWNLOAD="http://www.thc.org/releases/amap-5.4.tar.gz" +MD5SUM="2617c13b0738455c0e61c6e980b8decc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Marco Bonetti" diff --git a/network/amap/slack-desc b/network/amap/slack-desc index e5feee0104..a12e997f17 100644 --- a/network/amap/slack-desc +++ b/network/amap/slack-desc @@ -8,11 +8,11 @@ |-----handy-ruler---------------------------------------------------------| amap: Amap (Application Mapper) amap: -amap: Amap is a next-generation tool for assisting network penetration +amap: Amap is a next-generation tool for assisting network penetration amap: testing. It performs fast and reliable application protocol detection, amap: independant on the TCP/UDP port they are being bound to. amap: -amap: +amap: http://www.thc.org/thc-amap/ amap: amap: amap: diff --git a/network/amap/slackware.diff b/network/amap/slackware.diff index dc3fa3c449..ba47698b88 100644 --- a/network/amap/slackware.diff +++ b/network/amap/slackware.diff @@ -1,6 +1,6 @@ -diff -Naur amap-5.2.orig/Makefile.am amap-5.2/Makefile.am ---- amap-5.2.orig/Makefile.am 2005-09-22 17:39:18.000000000 +0200 -+++ amap-5.2/Makefile.am 2009-03-03 13:48:56.000000000 +0100 +diff -Naur amap-5.4.orig/Makefile.am amap-5.4/Makefile.am +--- amap-5.4.orig/Makefile.am 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/Makefile.am 2011-09-01 12:25:40.374265928 +0200 @@ -1,13 +1,13 @@ CC=gcc -LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/ @@ -40,13 +40,13 @@ diff -Naur amap-5.2.orig/Makefile.am amap-5.2/Makefile.am + -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo + -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR) + -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR) -+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6 || true ++ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6 clean: cd pcre-3.9 && make clean -diff -Naur amap-5.2.orig/amap-inc.h amap-5.2/amap-inc.h ---- amap-5.2.orig/amap-inc.h 2003-10-29 23:37:41.000000000 +0100 -+++ amap-5.2/amap-inc.h 2009-03-03 13:49:14.000000000 +0100 +diff -Naur amap-5.4.orig/amap-inc.h amap-5.4/amap-inc.h +--- amap-5.4.orig/amap-inc.h 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/amap-inc.h 2011-09-01 12:23:29.709474562 +0200 @@ -20,7 +20,7 @@ #include #include @@ -56,9 +56,9 @@ diff -Naur amap-5.2.orig/amap-inc.h amap-5.2/amap-inc.h #ifdef OPENSSL #include #include -diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c ---- amap-5.2.orig/amap-lib.c 2005-09-07 23:22:24.000000000 +0200 -+++ amap-5.2/amap-lib.c 2009-03-03 13:49:17.000000000 +0100 +diff -Naur amap-5.4.orig/amap-lib.c amap-5.4/amap-lib.c +--- amap-5.4.orig/amap-lib.c 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/amap-lib.c 2011-09-01 12:24:09.751491082 +0200 @@ -306,7 +306,7 @@ strcpy(file_name, AMAP_PREFIX); if (file_name[strlen(file_name) - 1] != '/') @@ -68,7 +68,7 @@ diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c strcat(file_name, AMAP_DEFAULT_FILENAME); strcat(file_name, extension); f = fopen(file_name, "r"); -@@ -2032,9 +2032,9 @@ +@@ -2058,9 +2058,9 @@ if (opt->update) { printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE); if (opt->filename == NULL) { @@ -80,21 +80,9 @@ diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c strcat(opt->filename, AMAP_DEFAULT_FILENAME); } opt->file_log = malloc(strlen(opt->filename) + 6); -diff -Naur amap-5.2.orig/amap.h amap-5.2/amap.h ---- amap-5.2.orig/amap.h 2005-09-08 00:08:57.000000000 +0200 -+++ amap-5.2/amap.h 2009-03-03 13:49:06.000000000 +0100 -@@ -22,7 +22,7 @@ - #define AMAP_YEAR "2005" - #define AMAP_AUTHOR "van Hauser" - #define AMAP_EMAIL "amap-dev@thc.org" --#define AMAP_RESOURCE "www.thc.org/thc-amap" -+#define AMAP_RESOURCE "freeworld.thc.org/thc-amap" - - #ifndef AMAP_PREFIX - #ifdef PREFIX -diff -Naur amap-5.2.orig/configure amap-5.2/configure ---- amap-5.2.orig/configure 2005-06-03 15:34:19.000000000 +0200 -+++ amap-5.2/configure 2009-03-03 13:49:22.000000000 +0100 +diff -Naur amap-5.4.orig/configure amap-5.4/configure +--- amap-5.4.orig/configure 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/configure 2011-09-01 12:24:22.359181454 +0200 @@ -152,17 +152,6 @@ XLIBS="$XLIBS -lresolv" fi diff --git a/network/amap/slackware64.diff b/network/amap/slackware64.diff index 3636631a74..b577a4819f 100644 --- a/network/amap/slackware64.diff +++ b/network/amap/slackware64.diff @@ -1,6 +1,6 @@ -diff -Naur amap-5.2.orig/Makefile.am amap-5.2/Makefile.am ---- amap-5.2.orig/Makefile.am 2005-09-22 17:39:18.000000000 +0200 -+++ amap-5.2/Makefile.am 2009-03-03 13:48:56.000000000 +0100 +diff -Naur amap-5.4.orig/Makefile.am amap-5.4/Makefile.am +--- amap-5.4.orig/Makefile.am 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/Makefile.am 2011-09-01 12:12:49.312257079 +0200 @@ -1,13 +1,13 @@ CC=gcc -LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/ @@ -40,13 +40,13 @@ diff -Naur amap-5.2.orig/Makefile.am amap-5.2/Makefile.am + -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo + -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR) + -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR) -+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6 || true ++ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6 clean: cd pcre-3.9 && make clean -diff -Naur amap-5.2.orig/amap-inc.h amap-5.2/amap-inc.h ---- amap-5.2.orig/amap-inc.h 2003-10-29 23:37:41.000000000 +0100 -+++ amap-5.2/amap-inc.h 2009-03-03 13:49:14.000000000 +0100 +diff -Naur amap-5.4.orig/amap-inc.h amap-5.4/amap-inc.h +--- amap-5.4.orig/amap-inc.h 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/amap-inc.h 2011-09-01 11:58:42.686496429 +0200 @@ -20,7 +20,7 @@ #include #include @@ -56,9 +56,9 @@ diff -Naur amap-5.2.orig/amap-inc.h amap-5.2/amap-inc.h #ifdef OPENSSL #include #include -diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c ---- amap-5.2.orig/amap-lib.c 2005-09-07 23:22:24.000000000 +0200 -+++ amap-5.2/amap-lib.c 2009-03-03 13:49:17.000000000 +0100 +diff -Naur amap-5.4.orig/amap-lib.c amap-5.4/amap-lib.c +--- amap-5.4.orig/amap-lib.c 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/amap-lib.c 2011-09-01 12:03:02.962916159 +0200 @@ -306,7 +306,7 @@ strcpy(file_name, AMAP_PREFIX); if (file_name[strlen(file_name) - 1] != '/') @@ -68,7 +68,7 @@ diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c strcat(file_name, AMAP_DEFAULT_FILENAME); strcat(file_name, extension); f = fopen(file_name, "r"); -@@ -2032,9 +2032,9 @@ +@@ -2058,9 +2058,9 @@ if (opt->update) { printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE); if (opt->filename == NULL) { @@ -80,21 +80,9 @@ diff -Naur amap-5.2.orig/amap-lib.c amap-5.2/amap-lib.c strcat(opt->filename, AMAP_DEFAULT_FILENAME); } opt->file_log = malloc(strlen(opt->filename) + 6); -diff -Naur amap-5.2.orig/amap.h amap-5.2/amap.h ---- amap-5.2.orig/amap.h 2005-09-08 00:08:57.000000000 +0200 -+++ amap-5.2/amap.h 2009-03-03 13:49:06.000000000 +0100 -@@ -22,7 +22,7 @@ - #define AMAP_YEAR "2005" - #define AMAP_AUTHOR "van Hauser" - #define AMAP_EMAIL "amap-dev@thc.org" --#define AMAP_RESOURCE "www.thc.org/thc-amap" -+#define AMAP_RESOURCE "freeworld.thc.org/thc-amap" - - #ifndef AMAP_PREFIX - #ifdef PREFIX -diff -Naur amap-5.2.orig/configure amap-5.2/configure ---- amap-5.2.orig/configure 2005-06-03 15:34:19.000000000 +0200 -+++ amap-5.2/configure 2009-03-03 13:49:22.000000000 +0100 +diff -Naur amap-5.4.orig/configure amap-5.4/configure +--- amap-5.4.orig/configure 2011-04-20 17:10:17.000000000 +0200 ++++ amap-5.4/configure 2011-09-01 12:11:31.478192814 +0200 @@ -152,17 +152,6 @@ XLIBS="$XLIBS -lresolv" fi -- cgit v1.2.3