From owner-svn-ports-all@freebsd.org Sat Sep 17 00:04:01 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37CB1BDC5A6; Sat, 17 Sep 2016 00:04:01 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1385BA0; Sat, 17 Sep 2016 00:04:00 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8H040Zt080259; Sat, 17 Sep 2016 00:04:00 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8H03xtU080251; Sat, 17 Sep 2016 00:03:59 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201609170003.u8H03xtU080251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 17 Sep 2016 00:03:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422290 - in head/security/amap: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Sep 2016 00:04:01 -0000 Author: woodsb02 Date: Sat Sep 17 00:03:59 2016 New Revision: 422290 URL: https://svnweb.freebsd.org/changeset/ports/422290 Log: security/amap: Update to 5.4 - Add LICENSE details (both GPLv2 and AMAP license must be accepted) - Refactor patches with makepatch (pet portlint) Changes this release: https://www.thc.org/thc-amap/ PR: 212658 Approved by: onatan@gmail.com (maintainer), adamw (mentor) Added: head/security/amap/files/patch-pcre-3.9_chartables.c - copied, changed from r422289, head/security/amap/files/patch-pcre-chartables.c Deleted: head/security/amap/files/patch-pcre-chartables.c Modified: head/security/amap/Makefile head/security/amap/distinfo head/security/amap/files/patch-amap-lib.c Modified: head/security/amap/Makefile ============================================================================== --- head/security/amap/Makefile Fri Sep 16 23:55:10 2016 (r422289) +++ head/security/amap/Makefile Sat Sep 17 00:03:59 2016 (r422290) @@ -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} Modified: head/security/amap/distinfo ============================================================================== --- head/security/amap/distinfo Fri Sep 16 23:55:10 2016 (r422289) +++ head/security/amap/distinfo Sat Sep 17 00:03:59 2016 (r422290) @@ -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 Modified: head/security/amap/files/patch-amap-lib.c ============================================================================== --- head/security/amap/files/patch-amap-lib.c Fri Sep 16 23:55:10 2016 (r422289) +++ head/security/amap/files/patch-amap-lib.c Sat Sep 17 00:03:59 2016 (r422290) @@ -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; Copied and modified: head/security/amap/files/patch-pcre-3.9_chartables.c (from r422289, head/security/amap/files/patch-pcre-chartables.c) ============================================================================== --- head/security/amap/files/patch-pcre-chartables.c Fri Sep 16 23:55:10 2016 (r422289, copy source) +++ head/security/amap/files/patch-pcre-3.9_chartables.c Sat Sep 17 00:03:59 2016 (r422290) @@ -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. */