4 files changed, 23 insertions, 16 deletions

diff --git a/security/amap/Makefile b/security/amap/Makefile
index 8a4a92deff25..b0bbc1d4664d 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -2,14 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	amap
-PORTVERSION=	5.2
-PORTREVISION=	1
+PORTVERSION=	5.4
 CATEGORIES=	security
 MASTER_SITES=	PACKETSTORM/groups/thc
 
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Application mapper
 
+LICENSE=	AMAP GPLv2
+LICENSE_COMB=	multi
+LICENSE_NAME_AMAP=	amap license
+LICENSE_FILE_AMAP=	${WRKSRC}/LICENCE.AMAP
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.GNU
+LICENSE_PERMS_AMAP=	dist-mirror dist-sell pkg-mirror pkg-sell
+
 USES=		ssl
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/security/amap/distinfo b/security/amap/distinfo
index 54a10231987d..8f428e18f5b6 100644
--- a/security/amap/distinfo
+++ b/security/amap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (amap-5.2.tar.gz) = 0ca1d5e9feab7d44af39dc058a688a0636f8e798315ee742847c4057e4467fb6
-SIZE (amap-5.2.tar.gz) = 262875
+TIMESTAMP = 1473776829
+SHA256 (amap-5.4.tar.gz) = a75ea58de75034de6b10b0de0065ec88e32f9e9af11c7d69edbffc4da9a5b059
+SIZE (amap-5.4.tar.gz) = 263331
diff --git a/security/amap/files/patch-amap-lib.c b/security/amap/files/patch-amap-lib.c
index 642986b9670f..4741dd2bce84 100644
--- a/security/amap/files/patch-amap-lib.c
+++ b/security/amap/files/patch-amap-lib.c
@@ -1,9 +1,9 @@
---- amap-lib.c.orig	Wed Jun 29 17:23:56 2005
-+++ amap-lib.c	Wed Jun 29 17:28:09 2005
-@@ -125,10 +125,8 @@
+--- amap-lib.c.orig	2011-04-20 15:10:17 UTC
++++ amap-lib.c
+@@ -125,10 +125,8 @@ int amap_webupdate_file(char *webfile, c
    int len = strlen("http://");
    int wlen = strlen(webfile);
-   int port = 80, s, result = 1, datalen = 0, version = -1;
+   int port = 80, s, result = 1, datalen = 0, version = -1, fck;
 -int xx = 0;
    unsigned long int ip;
    time_t epoch;
@@ -11,7 +11,7 @@
    struct hostent *target;
    struct sockaddr_in addr;
    struct tm *the_time;
-@@ -404,8 +402,8 @@
+@@ -404,8 +402,8 @@ amap_struct_triggers *read_file_triggers
    char *ptr;
    char *only_trigger = NULL;
    int i;
@@ -22,7 +22,7 @@
    int count;
    int count_triggers = 0;
  
-@@ -577,7 +575,7 @@
+@@ -577,7 +575,7 @@ amap_struct_responses *read_file_respons
    char *proto;
    char *length;
    char *string;
@@ -31,7 +31,7 @@
    int errptr;
    int i;
    int count;
-@@ -740,7 +738,7 @@
+@@ -740,7 +738,7 @@ amap_struct_targets *read_file_nmap(char
    char *portinfo;
    char *proto;
    char *ptr;
@@ -40,7 +40,7 @@
    int count = 0;
  
    f = amap_open_file(filename, "nmap", "", opt->verbose);
-@@ -1585,7 +1583,7 @@
+@@ -1613,7 +1611,7 @@ int amap_scan(int scanmode, amap_struct_
    amap_struct_targets *target = (amap_struct_targets*) targets;
    amap_struct_ports *port;
    amap_struct_identifications *ids;
@@ -49,7 +49,7 @@
    amap_struct_coms coms[AMAP_MAX_TASKS];
    amap_struct_scaninfo scaninfo;
  //  struct sockaddr_in target_in;
-@@ -1593,7 +1591,7 @@
+@@ -1621,7 +1619,7 @@ int amap_scan(int scanmode, amap_struct_
    char *rpc_ptr = NULL;
    int todo = 0;
    int ready_for_next;
diff --git a/security/amap/files/patch-pcre-chartables.c b/security/amap/files/patch-pcre-3.9_chartables.c
index 7fea7b581636..80a040e588bc 100644
--- a/security/amap/files/patch-pcre-chartables.c
+++ b/security/amap/files/patch-pcre-3.9_chartables.c
@@ -1,6 +1,6 @@
---- pcre-3.9/chartables.c.orig	Wed Jun 29 17:30:09 2005
-+++ pcre-3.9/chartables.c	Wed Jun 29 17:30:16 2005
-@@ -10,7 +10,7 @@
+--- pcre-3.9/chartables.c.orig	2011-04-20 15:10:17 UTC
++++ pcre-3.9/chartables.c
+@@ -10,7 +10,7 @@ This file is #included in the compilatio
  character tables which are used when no tables are passed to the compile
  function. */