Attachment #97537 for bug #136295

View | Details | Raw Unified | Return to bug 136295
Collapse All | Expand All




#

PORTNAME=	nmap
DISTVERSION=	4.90RC1
PORTREVISION=	1
CATEGORIES=	security ipv6
MASTER_SITES=	http://nmap.org/dist/ \
		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \

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

		--without-zenmap \
		--without-ndiff \
		--with-libpcre=${LOCALBASE} \
		--with-libdnet=${LOCALBASE} \
		--with-liblua=${LOCALBASE}
CONFIGURE_ENV=	LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"

MAN1=		nmap.1 ncat.1
PLIST_SUB=	NCATDATADIR=share/ncat

.ifndef WITHOUT_SSL
USE_OPENSSL=	yes

Lines 1-3 Link Here

(-)nmap/distinfo (-3 / +3 lines)
1	MD5 (nmap-4.85BETA7.tar.bz2) = 49218e9a5ec7b2628334b911a885b432	1	MD5 (nmap-4.90RC1.tar.bz2) = 4355574dfdc3f86bfa85be0a6d9b5bf4
2	SHA256 (nmap-4.85BETA7.tar.bz2) = dfff90a51fa44770a48dbeb31378d090ee334e4df2d013c8934f6ebf33eaabe5	2	SHA256 (nmap-4.90RC1.tar.bz2) = 92c02b6caf4781ff1ccaa24548ed1c7a599ea3616d57bfb496f93a2221d58723
3	SIZE (nmap-4.85BETA7.tar.bz2) = 6454664	3	SIZE (nmap-4.90RC1.tar.bz2) = 9028130




--- Makefile.in.orig	2009-06-24 23:35:54.000000000 +0200
+++ Makefile.in	2009-07-03 19:32:31.000000000 +0200
@@ -10,7 +10,7 @@
 mandir = @mandir@
 srcdir = @srcdir@
 nmaplibexecdir = @libexecdir@/nmap
 nmapdatadir = @datadir@/nmap
-deskdir = $(prefix)/share/applications
+deskdir = $(LOCALBASE)/share/applications
 NMAPDEVDIR=~/nmap-private-dev
 
 export NBASEDIR=@NBASEDIR@




--- configure.orig	2009-06-24 23:35:54.000000000 +0200
+++ configure	2009-07-03 19:35:52.000000000 +0200
@@ -2047,7 +2047,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
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
@@ -7878,8 +7878,8 @@
     no_lua="yes"
   ;;
   *)




Index: ncat/ncat_core.c
diff -u -p ncat/ncat_core.c.orig ncat/ncat_core.c
--- ncat/ncat_core.c.orig	2009-04-02 11:57:42.000000000 +0900
+++ ncat/ncat_core.c	2009-04-22 00:58:48.839927966 +0900
@@ -89,6 +89,7 @@ int resolve(char *hostname, unsigned sho
 
   memset(&hints, 0, sizeof(hints));
   hints.ai_family = o.af;
+  hints.ai_socktype = SOCK_DGRAM;
   if (o.nodns)
      hints.ai_flags |= AI_NUMERICHOST;
 




bin/nmap
bin/ncat
%%DATADIR%%/scripts/script.db
%%DATADIR%%/scripts/rpcinfo.nse
%%DATADIR%%/scripts/nbstat.nse
%%DATADIR%%/scripts/finger.nse
%%DATADIR%%/scripts/whois.nse
%%DATADIR%%/scripts/upnp-info.nse
%%DATADIR%%/scripts/telnet-brute.nse

%%DATADIR%%/scripts/sshv1.nse
%%DATADIR%%/scripts/ssh-hostkey.nse
%%DATADIR%%/scripts/sql-injection.nse
%%DATADIR%%/scripts/socks-open-proxy.nse
%%DATADIR%%/scripts/snmp-sysdescr.nse
%%DATADIR%%/scripts/snmp-brute.nse
%%DATADIR%%/scripts/sniffer-detect.nse

%%DATADIR%%/scripts/smb-brute.nse
%%DATADIR%%/scripts/skypev2-version.nse
%%DATADIR%%/scripts/robots.txt.nse
%%DATADIR%%/scripts/rpcinfo.nse
%%DATADIR%%/scripts/realvnc-auth-bypass.nse
%%DATADIR%%/scripts/pptp-version.nse
%%DATADIR%%/scripts/pop3-capabilities.nse
%%DATADIR%%/scripts/pop3-brute.nse
%%DATADIR%%/scripts/p2p-conficker.nse
%%DATADIR%%/scripts/nbstat.nse
%%DATADIR%%/scripts/mysql-info.nse
%%DATADIR%%/scripts/ms-sql-info.nse
%%DATADIR%%/scripts/irc-info.nse
%%DATADIR%%/scripts/imap-capabilities.nse
%%DATADIR%%/scripts/iax2-version.nse
%%DATADIR%%/scripts/http-trace.nse
%%DATADIR%%/scripts/http-passwd.nse
%%DATADIR%%/scripts/http-open-proxy.nse
%%DATADIR%%/scripts/http-auth.nse
%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
%%DATADIR%%/scripts/html-title.nse
%%DATADIR%%/scripts/ftp-brute.nse
%%DATADIR%%/scripts/ftp-bounce.nse
%%DATADIR%%/scripts/ftp-anon.nse
%%DATADIR%%/scripts/finger.nse
%%DATADIR%%/scripts/dns-zone-transfer.nse
%%DATADIR%%/scripts/dns-recursion.nse
%%DATADIR%%/scripts/dns-random-txid.nse

%%DATADIR%%/nselib/msrpctypes.lua
%%DATADIR%%/nselib/msrpcperformance.lua
%%DATADIR%%/nselib/msrpc.lua
%%DATADIR%%/nselib/imap.lua
@dirrm %%DATADIR%%/nselib
%%DATADIR%%/nse_main.lua
%%DATADIR%%/nmap-mac-prefixes
%%DATADIR%%/nmap-os-db
%%DATADIR%%/nmap-protocols

%%DATADIR%%/nmap.dtd
%%DATADIR%%/nmap.xsl
@dirrm %%DATADIR%%
%%NCATDATADIR%%/ca-bundle.crt
@dirrm %%NCATDATADIR%%
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/HACKING
%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd

Return to bug 136295

Lines 6-13 Link Here

(-)nmap/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= nmap	8	PORTNAME= nmap
9	DISTVERSION= 4.85BETA7	9	DISTVERSION= 4.90RC1
10	PORTREVISION= 1
11	CATEGORIES= security ipv6	10	CATEGORIES= security ipv6
12	MASTER_SITES= http://nmap.org/dist/ \	11	MASTER_SITES= http://nmap.org/dist/ \
13	http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \	12	http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
Lines 17-24 Link Here
17	MAINTAINER= daniel@roe.ch	16	MAINTAINER= daniel@roe.ch
18	COMMENT= Port scanning utility for large networks	17	COMMENT= Port scanning utility for large networks
19		18
20	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \	19	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
21	dnet.1:${PORTSDIR}/net/libdnet
22		20
23	USE_LUA= 5.1	21	USE_LUA= 5.1
24	LUA_COMPS= lua	22	LUA_COMPS= lua
Lines 29-39 Link Here
29	--without-zenmap \	27	--without-zenmap \
30	--without-ndiff \	28	--without-ndiff \
31	--with-libpcre=${LOCALBASE} \	29	--with-libpcre=${LOCALBASE} \
32	--with-libdnet=${LOCALBASE} \
33	--with-liblua=${LOCALBASE}	30	--with-liblua=${LOCALBASE}
34	CONFIGURE_ENV= LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"	31	CONFIGURE_ENV= LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"
35		32
36	MAN1= nmap.1 ncat.1	33	MAN1= nmap.1 ncat.1
		34	PLIST_SUB= NCATDATADIR=share/ncat
37		35
38	.ifndef WITHOUT_SSL	36	.ifndef WITHOUT_SSL
39	USE_OPENSSL= yes	37	USE_OPENSSL= yes

Lines 1-11 Link Here

(-)nmap/files/patch-Makefile.in (-5 / +5 lines)
1	--- Makefile.in.orig 2008-01-24 02:36:01.000000000 +0100	1	--- Makefile.in.orig 2009-06-24 23:35:54.000000000 +0200
2	+++ Makefile.in 2008-04-13 16:48:40.000000000 +0200	2	+++ Makefile.in 2009-07-03 19:32:31.000000000 +0200
3	@@ -11,7 +11,7 @@	3	@@ -10,7 +10,7 @@
		4	mandir = @mandir@
4	srcdir = @srcdir@	5	srcdir = @srcdir@
5	nmaplibexecdir = @libexecdir@/nmap
6	nmapdatadir = @datadir@/nmap	6	nmapdatadir = @datadir@/nmap
7	-deskdir = $(prefix)/share/applications	7	-deskdir = $(prefix)/share/applications
8	+deskdir = $(LOCALBASE)/share/applications	8	+deskdir = $(LOCALBASE)/share/applications
9	NMAPDEVDIR=~/nmap-dev	9	NMAPDEVDIR=~/nmap-private-dev
10		10
11	export NBASEDIR=@NBASEDIR@	11	export NBASEDIR=@NBASEDIR@

Lines 1-15 Link Here

(-)nmap/files/patch-configure (-6 / +6 lines)
1	--- configure.orig 2008-06-15 09:05:12.000000000 +0200	1	--- configure.orig 2009-06-24 23:35:54.000000000 +0200
2	+++ configure 2008-08-03 12:41:04.000000000 +0200	2	+++ configure 2009-07-03 19:35:52.000000000 +0200
3	@@ -1930,7 +1930,7 @@	3	@@ -2047,7 +2047,7 @@
4	ac_compiler_gnu=$ac_cv_c_compiler_gnu	4	ac_compiler_gnu=$ac_cv_c_compiler_gnu
5	if test -n "$ac_tool_prefix"; then	5	if test -n "$ac_tool_prefix"; then
6	# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.	6	# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
7	-set dummy ${ac_tool_prefix}gcc; ac_word=$2	7	-set dummy ${ac_tool_prefix}gcc; ac_word=$2
8	+set dummy ${ac_tool_prefix}$CXX; ac_word=$2	8	+set dummy ${ac_tool_prefix}$CXX; ac_word=$2
9	{ echo "$as_me:$LINENO: checking for $ac_word" >&5	9	{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }	10	$as_echo_n "checking for $ac_word... " >&6; }
11	if test "${ac_cv_prog_CC+set}" = set; then	11	if test "${ac_cv_prog_CC+set}" = set; then
12	@@ -7337,8 +7337,8 @@	12	@@ -7878,8 +7878,8 @@
13	no_lua="yes"	13	no_lua="yes"
14	;;	14	;;
15	*)	15	*)

Lines 1-12 Link Here

(-)nmap/files/patch-ncat__ncat_core.c (-12 lines)
1	Index: ncat/ncat_core.c
2	diff -u -p ncat/ncat_core.c.orig ncat/ncat_core.c
3	--- ncat/ncat_core.c.orig 2009-04-02 11:57:42.000000000 +0900
4	+++ ncat/ncat_core.c 2009-04-22 00:58:48.839927966 +0900
5	@@ -89,6 +89,7 @@ int resolve(char *hostname, unsigned sho
6
7	memset(&hints, 0, sizeof(hints));
8	hints.ai_family = o.af;
9	+ hints.ai_socktype = SOCK_DGRAM;
10	if (o.nodns)
11	hints.ai_flags \|= AI_NUMERICHOST;
12

Lines 1-9 Link Here

(-)nmap/pkg-plist (-3 / +11 lines)
1	bin/nmap	1	bin/nmap
2	bin/ncat	2	bin/ncat
3	%%DATADIR%%/scripts/script.db	3	%%DATADIR%%/scripts/script.db
4	%%DATADIR%%/scripts/rpcinfo.nse
5	%%DATADIR%%/scripts/nbstat.nse
6	%%DATADIR%%/scripts/finger.nse
7	%%DATADIR%%/scripts/whois.nse	4	%%DATADIR%%/scripts/whois.nse
8	%%DATADIR%%/scripts/upnp-info.nse	5	%%DATADIR%%/scripts/upnp-info.nse
9	%%DATADIR%%/scripts/telnet-brute.nse	6	%%DATADIR%%/scripts/telnet-brute.nse
Lines 11-16 Link Here
11	%%DATADIR%%/scripts/sshv1.nse	8	%%DATADIR%%/scripts/sshv1.nse
12	%%DATADIR%%/scripts/ssh-hostkey.nse	9	%%DATADIR%%/scripts/ssh-hostkey.nse
13	%%DATADIR%%/scripts/sql-injection.nse	10	%%DATADIR%%/scripts/sql-injection.nse
		11	%%DATADIR%%/scripts/socks-open-proxy.nse
14	%%DATADIR%%/scripts/snmp-sysdescr.nse	12	%%DATADIR%%/scripts/snmp-sysdescr.nse
15	%%DATADIR%%/scripts/snmp-brute.nse	13	%%DATADIR%%/scripts/snmp-brute.nse
16	%%DATADIR%%/scripts/sniffer-detect.nse	14	%%DATADIR%%/scripts/sniffer-detect.nse
Lines 31-52 Link Here
31	%%DATADIR%%/scripts/smb-brute.nse	29	%%DATADIR%%/scripts/smb-brute.nse
32	%%DATADIR%%/scripts/skypev2-version.nse	30	%%DATADIR%%/scripts/skypev2-version.nse
33	%%DATADIR%%/scripts/robots.txt.nse	31	%%DATADIR%%/scripts/robots.txt.nse
		32	%%DATADIR%%/scripts/rpcinfo.nse
34	%%DATADIR%%/scripts/realvnc-auth-bypass.nse	33	%%DATADIR%%/scripts/realvnc-auth-bypass.nse
35	%%DATADIR%%/scripts/pptp-version.nse	34	%%DATADIR%%/scripts/pptp-version.nse
36	%%DATADIR%%/scripts/pop3-capabilities.nse	35	%%DATADIR%%/scripts/pop3-capabilities.nse
37	%%DATADIR%%/scripts/pop3-brute.nse	36	%%DATADIR%%/scripts/pop3-brute.nse
		37	%%DATADIR%%/scripts/p2p-conficker.nse
		38	%%DATADIR%%/scripts/nbstat.nse
38	%%DATADIR%%/scripts/mysql-info.nse	39	%%DATADIR%%/scripts/mysql-info.nse
39	%%DATADIR%%/scripts/ms-sql-info.nse	40	%%DATADIR%%/scripts/ms-sql-info.nse
40	%%DATADIR%%/scripts/irc-info.nse	41	%%DATADIR%%/scripts/irc-info.nse
		42	%%DATADIR%%/scripts/imap-capabilities.nse
41	%%DATADIR%%/scripts/iax2-version.nse	43	%%DATADIR%%/scripts/iax2-version.nse
42	%%DATADIR%%/scripts/http-trace.nse	44	%%DATADIR%%/scripts/http-trace.nse
43	%%DATADIR%%/scripts/http-passwd.nse	45	%%DATADIR%%/scripts/http-passwd.nse
44	%%DATADIR%%/scripts/http-open-proxy.nse	46	%%DATADIR%%/scripts/http-open-proxy.nse
45	%%DATADIR%%/scripts/http-auth.nse	47	%%DATADIR%%/scripts/http-auth.nse
		48	%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
46	%%DATADIR%%/scripts/html-title.nse	49	%%DATADIR%%/scripts/html-title.nse
47	%%DATADIR%%/scripts/ftp-brute.nse	50	%%DATADIR%%/scripts/ftp-brute.nse
48	%%DATADIR%%/scripts/ftp-bounce.nse	51	%%DATADIR%%/scripts/ftp-bounce.nse
49	%%DATADIR%%/scripts/ftp-anon.nse	52	%%DATADIR%%/scripts/ftp-anon.nse
		53	%%DATADIR%%/scripts/finger.nse
50	%%DATADIR%%/scripts/dns-zone-transfer.nse	54	%%DATADIR%%/scripts/dns-zone-transfer.nse
51	%%DATADIR%%/scripts/dns-recursion.nse	55	%%DATADIR%%/scripts/dns-recursion.nse
52	%%DATADIR%%/scripts/dns-random-txid.nse	56	%%DATADIR%%/scripts/dns-random-txid.nse
Lines 83-89 Link Here
83	%%DATADIR%%/nselib/msrpctypes.lua	87	%%DATADIR%%/nselib/msrpctypes.lua
84	%%DATADIR%%/nselib/msrpcperformance.lua	88	%%DATADIR%%/nselib/msrpcperformance.lua
85	%%DATADIR%%/nselib/msrpc.lua	89	%%DATADIR%%/nselib/msrpc.lua
		90	%%DATADIR%%/nselib/imap.lua
86	@dirrm %%DATADIR%%/nselib	91	@dirrm %%DATADIR%%/nselib
		92	%%DATADIR%%/nse_main.lua
87	%%DATADIR%%/nmap-mac-prefixes	93	%%DATADIR%%/nmap-mac-prefixes
88	%%DATADIR%%/nmap-os-db	94	%%DATADIR%%/nmap-os-db
89	%%DATADIR%%/nmap-protocols	95	%%DATADIR%%/nmap-protocols
Lines 93-98 Link Here
93	%%DATADIR%%/nmap.dtd	99	%%DATADIR%%/nmap.dtd
94	%%DATADIR%%/nmap.xsl	100	%%DATADIR%%/nmap.xsl
95	@dirrm %%DATADIR%%	101	@dirrm %%DATADIR%%
		102	%%NCATDATADIR%%/ca-bundle.crt
		103	@dirrm %%NCATDATADIR%%
96	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG	104	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
97	%%PORTDOCS%%%%DOCSDIR%%/HACKING	105	%%PORTDOCS%%%%DOCSDIR%%/HACKING
98	%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd	106	%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd