From antoine@pepperseed.dreadbsd.org  Fri May 31 22:18:24 2013
Return-Path: <antoine@pepperseed.dreadbsd.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 3AED6E38
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 May 2013 22:18:24 +0000 (UTC)
	(envelope-from antoine@pepperseed.dreadbsd.org)
Received: from pepperseed.dreadbsd.org (88-191-185-190.rev.dedibox.fr [88.191.185.190])
	by mx1.freebsd.org (Postfix) with ESMTP id DC9A7F2C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 May 2013 22:18:23 +0000 (UTC)
Received: from pepperseed.dreadbsd.org (localhost [127.0.0.1])
	by pepperseed.dreadbsd.org (8.14.5/8.14.5) with ESMTP id r4VLlCxN025010;
	Fri, 31 May 2013 21:47:12 GMT
	(envelope-from antoine@pepperseed.dreadbsd.org)
Received: (from antoine@localhost)
	by pepperseed.dreadbsd.org (8.14.5/8.14.5/Submit) id r4VLl7hm025008;
	Fri, 31 May 2013 21:47:07 GMT
	(envelope-from antoine)
Message-Id: <201305312147.r4VLl7hm025008@pepperseed.dreadbsd.org>
Date: Fri, 31 May 2013 21:47:07 GMT
From: Antoine Brodin <antoine@freebsd.org>
Reply-To: Antoine Brodin <antoine@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tanawts <tanawts@gmail.com>
Subject: [patch] update security/metasploit to 4.6.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: tanawts@gmail.com

>Number:         179159
>Category:       ports
>Synopsis:       [patch] update security/metasploit to 4.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 31 22:20:00 UTC 2013
>Closed-Date:    Fri Jun 14 20:48:24 UTC 2013
>Last-Modified:  Fri Jun 14 20:50:01 UTC 2013
>Originator:     Antoine Brodin
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
none
>Environment:
System: FreeBSD pepperseed.dreadbsd.org 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
Update security/metasploit to 4.6.2
This includes a new port, security/rubygems-metasploit_data_models
>How-To-Repeat:
>Fix:


--- msf.diff begins here ---
Index: security/metasploit/Makefile
===================================================================
--- security/metasploit/Makefile	(revision 319543)
+++ security/metasploit/Makefile	(working copy)
@@ -2,46 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit
-DISTVERSION=	4.5.0
+DISTVERSION=	4.6.2
 CATEGORIES=	security
-MASTER_SITES=	http://downloads.metasploit.com/data/releases/
+MASTER_SITES=	http://downloads.metasploit.com/data/releases/archive/
 DISTNAME=	framework-${DISTVERSION}
 
 MAINTAINER=	tanawts@gmail.com
 COMMENT=	Exploit-Framework for Penetration-Testing
 
-RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm				\
-		nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
+		nmap:${PORTSDIR}/security/nmap \
+		rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport \
+		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
+		rubygem-msgpack>=0:${PORTSDIR}/devel/rubygem-msgpack \
+		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
+		rubygem-pcaprub>=0:${PORTSDIR}/net/rubygem-pcaprub \
+		rubygem-robots>=0:${PORTSDIR}/www/rubygem-robots
 
 WRKSRC=		${WRKDIR}/msf3
-SCRIPTS=	msfcli msfconsole msfd msfelfscan msfencode msfmachscan \
-		msfopcode msfpayload msfpescan msfweb
+SCRIPTS=	msfbinscan msfcli msfconsole msfd msfelfscan msfencode \
+		msfmachscan msfpayload msfpescan msfrop msfrpc msfrpcd msfvenom
 
-OPTIONS_DEFINE=	SVN
-
 NO_BUILD=	yes
 USES=		ncurses:port
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
 USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DB
+OPTIONS_DEFAULT=DB
+DB_DESC=	Database support
 
-.if ${RUBY_VER} == 1.8
-RUN_DEPENDS+=	${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems
-.else
-RUN_DEPENDS+=	rubygem-actionpack>0:${PORTSDIR}/www/rubygem-actionpack	\
-		rubygem-sqlite3>0:${PORTSDIR}/databases/rubygem-sqlite3	\
-		rubygem-activerecord>0:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activesupport>0:${PORTSDIR}/devel/rubygem-activesupport
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSVN}
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+.if ${PORT_OPTIONS:MDB}
+RUN_DEPENDS+=	rubygem-activerecord>=0:${PORTSDIR}/databases/rubygem-activerecord \
+		rubygem-metasploit_data_models>=0.15.1:${PORTSDIR}/security/rubygem-metasploit_data_models \
+		rubygem-pg>=0.11:${PORTSDIR}/databases/rubygem-pg
 .endif
 
+post-patch:
+	${REINPLACE_CMD} 's|bundler/setup|rubygems|' ${WRKSRC}/lib/msfenv.rb
+
 do-install:
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${DATADIR}
 	${CP} -Rp ${WRKSRC}/ ${DATADIR}
 .for f in ${SCRIPTS}
 	${LN} -s ${DATADIR}/${f} ${PREFIX}/bin/${f}
@@ -56,4 +60,4 @@
 	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
 		${SED} 's,${PREFIX}/,, ; s,^,@dirrm ,' >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: security/metasploit/distinfo
===================================================================
--- security/metasploit/distinfo	(revision 319543)
+++ security/metasploit/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (framework-4.5.0.tar.bz2) = 1538770b622a9de4acdebe7a73ed6eb584376278e5c914ece329092112dcc3e0
-SIZE (framework-4.5.0.tar.bz2) = 63963598
+SHA256 (framework-4.6.2.tar.bz2) = fc7f9cdf5be68c117fde4ce80b7446c7d89d3a9860b8509e5a5b3fc4a325eae1
+SIZE (framework-4.6.2.tar.bz2) = 40789497
Index: security/rubygem-metasploit_data_models/Makefile
===================================================================
--- security/rubygem-metasploit_data_models/Makefile	(revision 0)
+++ security/rubygem-metasploit_data_models/Makefile	(working copy)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME=	metasploit_data_models
+PORTVERSION=	0.15.1
+CATEGORIES=	security rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	tanawts@gmail.com
+COMMENT=	Database layer for Metasploit
+
+LICENSE=	BSD
+
+RUN_DEPENDS=	rubygem-activerecord>=3.2.13:${PORTSDIR}/databases/rubygem-activerecord \
+		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
+		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=yes
+PLIST_FILES=	bin/mdm_console
+
+.include <bsd.port.mk>

Property changes on: security/rubygem-metasploit_data_models/Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: security/rubygem-metasploit_data_models/distinfo
===================================================================
--- security/rubygem-metasploit_data_models/distinfo	(revision 0)
+++ security/rubygem-metasploit_data_models/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (rubygem/metasploit_data_models-0.15.1.gem) = bc8635c7c2571bd2963a4a61f4abe033a437c796c5302ad87c898dbd78fea854
+SIZE (rubygem/metasploit_data_models-0.15.1.gem) = 81408

Property changes on: security/rubygem-metasploit_data_models/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: security/rubygem-metasploit_data_models/pkg-descr
===================================================================
--- security/rubygem-metasploit_data_models/pkg-descr	(revision 0)
+++ security/rubygem-metasploit_data_models/pkg-descr	(working copy)
@@ -0,0 +1,11 @@
+MetasploitDataModels exists to do several key things:
+- Allow code sharing between Metasploit Framework (MSF) and the commercial
+versions of Metasploit (Community, Express, Pro -- usually referred to
+collectively as "Pro")
+- Give developers a lightweight entry point to MSF's backend for use in
+developing tools that gather data intended for later use with Metasploit
+(e.g. specialized scanners)
+- Make it easy to keep commercial stuff private while increasing the
+functionality of the open-source tools we provide to the community
+
+WWW: https://github.com/rapid7/metasploit_data_models/

Property changes on: security/rubygem-metasploit_data_models/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- msf.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri May 31 22:20:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179159 
Responsible-Changed-From-To: freebsd-ports-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Fri May 31 22:22:42 UTC 2013 
Responsible-Changed-Why:  
Track. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179159 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: tanawts@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/179159: [patch] update security/metasploit to 4.6.2
Date: Fri, 31 May 2013 22:20:07 UT

 Maintainer of security/metasploit,
 
 Please note that PR ports/179159 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179159
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: antoine 
State-Changed-When: Fri Jun 14 20:48:05 UTC 2013 
State-Changed-Why:  
Update committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179159 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179159: commit references a PR
Date: Fri, 14 Jun 2013 20:40:24 +0000 (UTC)

 Author: antoine
 Date: Fri Jun 14 20:40:09 2013
 New Revision: 320962
 URL: http://svnweb.freebsd.org/changeset/ports/320962
 
 Log:
   - Update metasploit to 4.6.2
   - Update the list of scripts
   - SVN is discontinued
   - new DB option for database support
   
   PR:		ports/179159
   Approved by:	maintainer timeout (15 days)
 
 Added:
   head/security/rubygem-metasploit_data_models/
   head/security/rubygem-metasploit_data_models/Makefile   (contents, props changed)
   head/security/rubygem-metasploit_data_models/distinfo   (contents, props changed)
   head/security/rubygem-metasploit_data_models/pkg-descr   (contents, props changed)
 Modified:
   head/security/Makefile
   head/security/metasploit/Makefile
   head/security/metasploit/distinfo
 
 Modified: head/security/Makefile
 ==============================================================================
 --- head/security/Makefile	Fri Jun 14 20:24:11 2013	(r320961)
 +++ head/security/Makefile	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -852,6 +852,7 @@
      SUBDIR += rubygem-ezcrypto
      SUBDIR += rubygem-gpgr
      SUBDIR += rubygem-hmac
 +    SUBDIR += rubygem-metasploit_data_models
      SUBDIR += rubygem-net-scp
      SUBDIR += rubygem-net-sftp
      SUBDIR += rubygem-net-ssh
 
 Modified: head/security/metasploit/Makefile
 ==============================================================================
 --- head/security/metasploit/Makefile	Fri Jun 14 20:24:11 2013	(r320961)
 +++ head/security/metasploit/Makefile	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -2,22 +2,26 @@
  # $FreeBSD$
  
  PORTNAME=	metasploit
 -DISTVERSION=	4.5.0
 +DISTVERSION=	4.6.2
  CATEGORIES=	security
 -MASTER_SITES=	http://downloads.metasploit.com/data/releases/
 +MASTER_SITES=	http://downloads.metasploit.com/data/releases/archive/
  DISTNAME=	framework-${DISTVERSION}
  
  MAINTAINER=	tanawts@gmail.com
  COMMENT=	Exploit-Framework for Penetration-Testing
  
 -RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm				\
 -		nmap:${PORTSDIR}/security/nmap
 +RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 +		nmap:${PORTSDIR}/security/nmap \
 +		rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport \
 +		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
 +		rubygem-msgpack>=0:${PORTSDIR}/devel/rubygem-msgpack \
 +		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
 +		rubygem-pcaprub>=0:${PORTSDIR}/net/rubygem-pcaprub \
 +		rubygem-robots>=0:${PORTSDIR}/www/rubygem-robots
  
  WRKSRC=		${WRKDIR}/msf3
 -SCRIPTS=	msfcli msfconsole msfd msfelfscan msfencode msfmachscan \
 -		msfopcode msfpayload msfpescan msfweb
 -
 -OPTIONS_DEFINE=	SVN
 +SCRIPTS=	msfbinscan msfcli msfconsole msfd msfelfscan msfencode \
 +		msfmachscan msfpayload msfpescan msfrop msfrpc msfrpcd msfvenom
  
  NO_BUILD=	yes
  USES=		ncurses:port
 @@ -25,23 +29,23 @@ USE_RUBY=	yes
  USE_RUBY_FEATURES=	iconv
  USE_BZIP2=	yes
  
 -.include <bsd.port.pre.mk>
 -
 -.if ${RUBY_VER} == 1.8
 -RUN_DEPENDS+=	${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems
 -.else
 -RUN_DEPENDS+=	rubygem-actionpack>0:${PORTSDIR}/www/rubygem-actionpack	\
 -		rubygem-sqlite3>0:${PORTSDIR}/databases/rubygem-sqlite3	\
 -		rubygem-activerecord>0:${PORTSDIR}/databases/rubygem-activerecord \
 -		rubygem-activesupport>0:${PORTSDIR}/devel/rubygem-activesupport
 +OPTIONS_DEFINE=	DB
 +OPTIONS_DEFAULT=DB
 +DB_DESC=	Database support
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MDB}
 +RUN_DEPENDS+=	rubygem-activerecord>=0:${PORTSDIR}/databases/rubygem-activerecord \
 +		rubygem-metasploit_data_models>=0.15.1:${PORTSDIR}/security/rubygem-metasploit_data_models \
 +		rubygem-pg>=0.11:${PORTSDIR}/databases/rubygem-pg
  .endif
  
 -.if ${PORT_OPTIONS:MSVN}
 -RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 -.endif
 +post-patch:
 +	${REINPLACE_CMD} 's|bundler/setup|rubygems|' ${WRKSRC}/lib/msfenv.rb
  
  do-install:
 -	${MKDIR} ${DATADIR}
 +	@${MKDIR} ${DATADIR}
  	${CP} -Rp ${WRKSRC}/ ${DATADIR}
  .for f in ${SCRIPTS}
  	${LN} -s ${DATADIR}/${f} ${PREFIX}/bin/${f}
 @@ -56,4 +60,4 @@ post-install:
  	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
  		${SED} 's,${PREFIX}/,, ; s,^,@dirrm ,' >> ${TMPPLIST}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/security/metasploit/distinfo
 ==============================================================================
 --- head/security/metasploit/distinfo	Fri Jun 14 20:24:11 2013	(r320961)
 +++ head/security/metasploit/distinfo	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -1,2 +1,2 @@
 -SHA256 (framework-4.5.0.tar.bz2) = 1538770b622a9de4acdebe7a73ed6eb584376278e5c914ece329092112dcc3e0
 -SIZE (framework-4.5.0.tar.bz2) = 63963598
 +SHA256 (framework-4.6.2.tar.bz2) = fc7f9cdf5be68c117fde4ce80b7446c7d89d3a9860b8509e5a5b3fc4a325eae1
 +SIZE (framework-4.6.2.tar.bz2) = 40789497
 
 Added: head/security/rubygem-metasploit_data_models/Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/security/rubygem-metasploit_data_models/Makefile	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -0,0 +1,22 @@
 +# $FreeBSD$
 +
 +PORTNAME=	metasploit_data_models
 +PORTVERSION=	0.15.1
 +CATEGORIES=	security rubygems
 +MASTER_SITES=	RG
 +
 +MAINTAINER=	tanawts@gmail.com
 +COMMENT=	Database layer for Metasploit
 +
 +LICENSE=	BSD
 +
 +RUN_DEPENDS=	rubygem-activerecord>=3.2.13:${PORTSDIR}/databases/rubygem-activerecord \
 +		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
 +		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 +
 +USE_RUBY=	yes
 +USE_RUBYGEMS=	yes
 +RUBYGEM_AUTOPLIST=yes
 +PLIST_FILES=	bin/mdm_console
 +
 +.include <bsd.port.mk>
 
 Added: head/security/rubygem-metasploit_data_models/distinfo
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/security/rubygem-metasploit_data_models/distinfo	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -0,0 +1,2 @@
 +SHA256 (rubygem/metasploit_data_models-0.15.1.gem) = bc8635c7c2571bd2963a4a61f4abe033a437c796c5302ad87c898dbd78fea854
 +SIZE (rubygem/metasploit_data_models-0.15.1.gem) = 81408
 
 Added: head/security/rubygem-metasploit_data_models/pkg-descr
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/security/rubygem-metasploit_data_models/pkg-descr	Fri Jun 14 20:40:09 2013	(r320962)
 @@ -0,0 +1,11 @@
 +MetasploitDataModels exists to do several key things:
 +- Allow code sharing between Metasploit Framework (MSF) and the commercial
 +versions of Metasploit (Community, Express, Pro -- usually referred to
 +collectively as "Pro")
 +- Give developers a lightweight entry point to MSF's backend for use in
 +developing tools that gather data intended for later use with Metasploit
 +(e.g. specialized scanners)
 +- Make it easy to keep commercial stuff private while increasing the
 +functionality of the open-source tools we provide to the community
 +
 +WWW: https://github.com/rapid7/metasploit_data_models/
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
