From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 13 16:00:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7C651065678 for ; Sun, 13 Apr 2008 16:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2D18FC23 for ; Sun, 13 Apr 2008 16:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3DG032L059684 for ; Sun, 13 Apr 2008 16:00:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3DG03vL059683; Sun, 13 Apr 2008 16:00:03 GMT (envelope-from gnats) Resent-Date: Sun, 13 Apr 2008 16:00:03 GMT Resent-Message-Id: <200804131600.m3DG03vL059683@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94881106566B for ; Sun, 13 Apr 2008 15:57:43 +0000 (UTC) (envelope-from daniel+roe=marvin@roe.ch) Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26]) by mx1.freebsd.org (Postfix) with ESMTP id 281068FC12 for ; Sun, 13 Apr 2008 15:57:42 +0000 (UTC) (envelope-from daniel+roe=marvin@roe.ch) Received: from marvin.roe ([10.23.42.11]) by calvin.roe.ch (envelope-from ) with ESMTPS (TLSv1:AES256-SHA:256) id 1Jl4aL-000GdL-E2 ; Sun, 13 Apr 2008 17:57:41 +0200 Received: from marvin.roe (localhost [127.0.0.1]) by marvin.roe (8.14.2/8.14.2) with ESMTP id m3DFvxhR009482; Sun, 13 Apr 2008 17:57:59 +0200 (CEST) (envelope-from roe@marvin.roe) Received: (from roe@localhost) by marvin.roe (8.14.2/8.14.2/Submit) id m3DFvxen009481; Sun, 13 Apr 2008 17:57:59 +0200 (CEST) (envelope-from roe) Message-Id: <200804131557.m3DFvxen009481@marvin.roe> Date: Sun, 13 Apr 2008 17:57:59 +0200 (CEST) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: daniel@roe.ch Subject: ports/122728: [maintainer] Update security/nmap to 4.60 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 16:00:03 -0000 >Number: 122728 >Category: ports >Synopsis: [maintainer] Update security/nmap to 4.60 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 13 16:00:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 6.3-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD marvin.roe 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Wed Feb 13 02:40:56 UTC 2008 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update nmap to 4.60 and fix moved MASTER_SITES. Also fixed portlint warnings about Makefile structure. >How-To-Repeat: >Fix: --- nmap-4.60.diff begins here --- diff -ruN nmap.orig/Makefile nmap/Makefile --- nmap.orig/Makefile 2008-03-14 22:30:22.000000000 +0100 +++ nmap/Makefile 2008-04-13 17:27:56.000000000 +0200 @@ -6,9 +6,9 @@ # PORTNAME= nmap -PORTVERSION= 4.52 +PORTVERSION= 4.60 CATEGORIES= security ipv6 -MASTER_SITES= http://download.insecure.org/nmap/dist/ \ +MASTER_SITES= http://nmap.org/dist/ \ http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \ http://www.mirrorservice.org/sites/ftp.wiretapped.net/pub/security/network-mapping/nmap/ \ http://mirror.sg.depaul.edu/pub/security/nmap/ @@ -16,27 +16,24 @@ MAINTAINER= daniel@roe.ch COMMENT= Port scanning utility for large networks +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ + dnet.1:${PORTSDIR}/net/libdnet + +USE_LUA= 5.1 +LUA_COMPS= lua USE_BZIP2= yes USE_GMAKE= yes - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-localdirs - +CONFIGURE_ARGS= --without-localdirs \ + --without-zenmap \ + --with-libpcre=${LOCALBASE} \ + --with-libdnet=${LOCALBASE} \ + --with-liblua=${LOCALBASE} +CONFIGURE_ENV= LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= nmap.1 -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - dnet.1:${PORTSDIR}/net/libdnet -USE_LUA= 5.1 -LUA_COMPS= lua - -CONFIGURE_ARGS+= --without-zenmap \ - --with-libpcre=${LOCALBASE} \ - --with-libdnet=${LOCALBASE} \ - --with-liblua=${LOCALBASE} -CONFIGURE_ENV= LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}" - .ifndef WITHOUT_SSL USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} diff -ruN nmap.orig/distinfo nmap/distinfo --- nmap.orig/distinfo 2008-03-14 22:30:23.000000000 +0100 +++ nmap/distinfo 2008-04-13 16:34:21.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (nmap-4.52.tar.bz2) = 4f965a89e4e724d266dd9235c485633f -SHA256 (nmap-4.52.tar.bz2) = ec44e89f12bb1c140e9e580f2ceee8950caa03537cf74f5718b25b19a476589a -SIZE (nmap-4.52.tar.bz2) = 3147364 +MD5 (nmap-4.60.tar.bz2) = 6201551054050c11182fd6dd91682cb1 +SHA256 (nmap-4.60.tar.bz2) = 1c0c6a055761ac2952de49585a6d7209fdbc83aa8a88c8f7f736576a90571cca +SIZE (nmap-4.60.tar.bz2) = 3213870 diff -ruN nmap.orig/files/patch-Makefile.in nmap/files/patch-Makefile.in --- nmap.orig/files/patch-Makefile.in 2008-03-14 22:30:23.000000000 +0100 +++ nmap/files/patch-Makefile.in 2008-04-13 16:48:57.000000000 +0200 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Dec 1 01:21:28 2007 -+++ Makefile.in Fri Jan 4 17:05:28 2008 +--- Makefile.in.orig 2008-01-24 02:36:01.000000000 +0100 ++++ Makefile.in 2008-04-13 16:48:40.000000000 +0200 @@ -11,7 +11,7 @@ srcdir = @srcdir@ nmaplibexecdir = @libexecdir@/nmap @@ -9,3 +9,12 @@ NMAPDEVDIR=~/nmap-dev export NBASEDIR=@NBASEDIR@ +@@ -178,7 +178,7 @@ + # Use strip -x to avoid stripping dynamically loaded NSE functions. See + # http://seclists.org/nmap-dev/2007/q4/0272.html. + $(STRIP) -x $(DESTDIR)$(bindir)/nmap +- $(INSTALL) -c -m 644 docs/$(TARGET).1 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ ++ $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/ + $(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/ + $(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/ + $(INSTALL) -c -m 644 nmap-services $(DESTDIR)$(nmapdatadir)/ diff -ruN nmap.orig/files/patch-configure nmap/files/patch-configure --- nmap.orig/files/patch-configure 2008-03-14 22:30:23.000000000 +0100 +++ nmap/files/patch-configure 2008-04-13 17:17:53.000000000 +0200 @@ -1,15 +1,15 @@ ---- configure.orig Thu Nov 29 10:36:33 2007 -+++ configure Sat Jan 12 16:57:04 2008 -@@ -1488,7 +1488,7 @@ - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. --set dummy gcc; ac_word=$2 -+set dummy $CXX; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -@@ -6781,9 +6781,10 @@ +--- configure.orig 2008-03-15 02:21:22.000000000 +0100 ++++ configure 2008-04-13 17:16:35.000000000 +0200 +@@ -1929,7 +1929,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++set dummy ${ac_tool_prefix}$CXX; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +@@ -7174,9 +7174,10 @@ no_lua="yes" ;; *) diff -ruN nmap.orig/pkg-descr nmap/pkg-descr --- nmap.orig/pkg-descr 2008-03-14 22:30:23.000000000 +0100 +++ nmap/pkg-descr 2008-04-13 17:39:11.000000000 +0200 @@ -6,7 +6,7 @@ offers flexible target and port specification, decoy/stealth scanning, sunRPC scanning, and much more. -WWW: http://www.insecure.org/nmap/ +WWW: http://nmap.org/ See the web page and the Phrack Magazine article (Volume 7, Issue 51 -September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt +September 01, 1997, article 11 of 17) http://nmap.org/p51-11.html diff -ruN nmap.orig/pkg-plist nmap/pkg-plist --- nmap.orig/pkg-plist 2008-03-14 22:30:23.000000000 +0100 +++ nmap/pkg-plist 2008-04-13 16:50:25.000000000 +0200 @@ -44,8 +44,10 @@ %%DATADIR%%/scripts/HTTPpasswd.nse %%DATADIR%%/scripts/HTTP_open_proxy.nse %%DATADIR%%/scripts/HTTPAuth.nse +%%DATADIR%%/scripts/UPnP-info.nse %%DATADIR%%/scripts/zoneTrans.nse @dirrm %%DATADIR%%/scripts +%%DATADIR%%/nselib/http.lua %%DATADIR%%/nselib/ipOps.lua %%DATADIR%%/nselib/strbuf.lua %%DATADIR%%/nselib/stdnse.lua @@ -54,6 +56,7 @@ %%DATADIR%%/nselib/match.lua %%DATADIR%%/nselib/listop.lua %%DATADIR%%/nselib/url.lua +%%DATADIR%%/nselib/tab.lua @dirrm %%DATADIR%%/nselib %%DATADIR%%/nmap-mac-prefixes %%DATADIR%%/nmap-os-db --- nmap-4.60.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: