5 files changed, 76 insertions, 5 deletions

diff --git a/security/amap/Makefile b/security/amap/Makefile
index 8cfb72fa83ae..ad470a1e0212 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amap
-PORTVERSION=	5.0
+PORTVERSION=	5.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
diff --git a/security/amap/distinfo b/security/amap/distinfo
index ac02327959c5..1f0ac2f6da1b 100644
--- a/security/amap/distinfo
+++ b/security/amap/distinfo
@@ -1,2 +1,2 @@
-MD5 (amap-5.0.tar.gz) = 4f43cbaeac859523ee2d1af9a3bd39a9
-SIZE (amap-5.0.tar.gz) = 261784
+MD5 (amap-5.1.tar.gz) = 6d0a1c54d07967dfc10768a5ca6ee16b
+SIZE (amap-5.1.tar.gz) = 261983
diff --git a/security/amap/files/patch-amap-lib.c b/security/amap/files/patch-amap-lib.c
new file mode 100644
index 000000000000..642986b9670f
--- /dev/null
+++ b/security/amap/files/patch-amap-lib.c
@@ -0,0 +1,60 @@
+--- 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 @@
+   int len = strlen("http://");
+   int wlen = strlen(webfile);
+   int port = 80, s, result = 1, datalen = 0, version = -1;
+-int xx = 0;
+   unsigned long int ip;
+   time_t epoch;
+-  struct in_addr in;
+   struct hostent *target;
+   struct sockaddr_in addr;
+   struct tm *the_time;
+@@ -404,8 +402,8 @@
+   char *ptr;
+   char *only_trigger = NULL;
+   int i;
+-  int a;
+-  int b;
++  int a = 0;
++  int b = 0;
+   int count;
+   int count_triggers = 0;
+ 
+@@ -577,7 +575,7 @@
+   char *proto;
+   char *length;
+   char *string;
+-  char *ptr;
++  char *ptr = NULL;
+   int errptr;
+   int i;
+   int count;
+@@ -740,7 +738,7 @@
+   char *portinfo;
+   char *proto;
+   char *ptr;
+-  int ip_prot;
++  int ip_prot = 0;
+   int count = 0;
+ 
+   f = amap_open_file(filename, "nmap", "", opt->verbose);
+@@ -1585,7 +1583,7 @@
+   amap_struct_targets *target = (amap_struct_targets*) targets;
+   amap_struct_ports *port;
+   amap_struct_identifications *ids;
+-  amap_struct_identifications *ids_save;
++  amap_struct_identifications *ids_save = NULL;
+   amap_struct_coms coms[AMAP_MAX_TASKS];
+   amap_struct_scaninfo scaninfo;
+ //  struct sockaddr_in target_in;
+@@ -1593,7 +1591,7 @@
+   char *rpc_ptr = NULL;
+   int todo = 0;
+   int ready_for_next;
+-  int i;
++  int i = 0;
+   int ii;
+   int s;
+   int ret;
diff --git a/security/amap/files/patch-configure b/security/amap/files/patch-configure
new file mode 100644
index 000000000000..27dc668c031c
--- /dev/null
+++ b/security/amap/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Jun 29 17:40:57 2005
++++ configure	Wed Jun 29 17:41:18 2005
+@@ -29,7 +29,7 @@
+ SOCKET_PATH=""
+ MANDIR=""
+ LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null`
+-PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//i'`
++PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//'`
+ echo
+ 
+ echo "Checking for openssl ..."
diff --git a/security/amap/files/patch-pcre-3.9_chartables.c b/security/amap/files/patch-pcre-chartables.c
index 288d07254bd2..7fea7b581636 100644
--- a/security/amap/files/patch-pcre-3.9_chartables.c
+++ b/security/amap/files/patch-pcre-chartables.c
@@ -1,5 +1,5 @@
---- pcre-3.9/chartables.c.orig	Sun May 22 12:18:27 2005
-+++ pcre-3.9/chartables.c	Sun May 22 12:18:34 2005
+--- 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 @@
  character tables which are used when no tables are passed to the compile
  function. */