From nobody@FreeBSD.org  Sun Feb  7 12:04:29 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1CCE106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  7 Feb 2010 12:04:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id A31BF8FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  7 Feb 2010 12:04:29 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o17C4TWf009206
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 7 Feb 2010 12:04:29 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o17C4TDP009205;
	Sun, 7 Feb 2010 12:04:29 GMT
	(envelope-from nobody)
Message-Id: <201002071204.o17C4TDP009205@www.freebsd.org>
Date: Sun, 7 Feb 2010 12:04:29 GMT
From: Niels Heinen <niels@heinen.ws>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] security/metasploit port upgrade to 3.3.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: onatan@gmail.com

>Number:         143641
>Category:       ports
>Synopsis:       [patch] security/metasploit port upgrade to 3.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 07 12:10:00 UTC 2010
>Closed-Date:    Sun Mar 07 22:05:18 UTC 2010
>Last-Modified:  Sun Mar 07 22:05:18 UTC 2010
>Originator:     Niels Heinen
>Release:        8.0-RELEASE
>Organization:
>Environment:
FreeBSD devbsd.lan 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:48:17 UTC 2009     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:

Hi all,

Attached is an update of the Metasploit port (version 3.2 -> 3.3.3)

Portlint seems to be OK with the changes and the updated port works fine on my machine.  Can you please double check the port dependency changes ?

Thanks!
Niels


>How-To-Repeat:
Apply the patch
>Fix:
Apply the patch

Patch attached with submission follows:

diff -ur metasploit.orig/Makefile metasploit/Makefile
--- metasploit.orig/Makefile	2010-02-07 11:11:02.000000000 +0100
+++ metasploit/Makefile	2010-02-07 12:42:31.000000000 +0100
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	metasploit
-DISTVERSION=	3.2
+DISTVERSION=	3.3.3
 CATEGORIES=	security
-MASTER_SITES=	http://spool.metasploit.com/releases/
+MASTER_SITES=	http://www.metasploit.com/releases/
 DISTNAME=	framework-${DISTVERSION}
 
 MAINTAINER=	onatan@gmail.com
@@ -17,20 +17,16 @@
 SCRIPTS=	msfcli msfconsole msfd msfselfscan msfencode msfmachscan \
 		msfopcode msfpayload msfpescan msfweb
 
+WRKSRC=		${WRKDIR}/msf3
 NO_BUILD=	yes
 USE_RUBY=	yes
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} == 1.9
+RUN_DEPENDS+=	${LOCALBASE}/bin/infocmp:${PORTSDIR}/devel/ncurses
 RUN_DEPENDS+=	${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems
-.endif
-
-.if defined(WITH_MSFGUI)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
-SCRIPTS+=	msfgui
-.endif
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
 
 do-install:
 	${MKDIR} ${DATADIR}
diff -ur metasploit.orig/distinfo metasploit/distinfo
--- metasploit.orig/distinfo	2010-02-07 11:11:02.000000000 +0100
+++ metasploit/distinfo	2010-02-07 11:28:29.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (framework-3.2.tar.gz) = d543bda031b36a247912aa9c6a0f74d9
-SHA256 (framework-3.2.tar.gz) = fc9366a2ab01924e91575352889970e57a551e087c78b5d1dd4287aaf2136a04
-SIZE (framework-3.2.tar.gz) = 13099756
+MD5 (framework-3.3.3.tar.bz2) = aee22d8cfa2c081051434ad893cd3533
+SHA256 (framework-3.3.3.tar.bz2) = a650778f7946a7f113acd716023978fd94f01325e9a4cf6342fb00ba3f6a2c0b
+SIZE (framework-3.3.3.tar.bz2) = 23438382
diff -ur metasploit.orig/pkg-descr metasploit/pkg-descr
--- metasploit.orig/pkg-descr	2010-02-07 11:11:02.000000000 +0100
+++ metasploit/pkg-descr	2010-02-07 12:31:20.000000000 +0100
@@ -1,14 +1,10 @@
 The Metasploit Project
 
-This is the Metasploit Project. The goal is to provide useful
-information to people who perform penetration testing, IDS signature
-development, and exploit research. This site was created to fill the
-gaps in the information publicly available on various exploitation
-techniques and to create a useful resource for exploit developers. The
-tools and information on this site are provided for legal penetration
-testing and research purposes only.
-
-This port is an in-development version of the upcoming Metasploit Framework.
-It is based on Ruby instead of perl, and has a different license.
+Metasploit provides useful information and tools for penetration
+testers, security researchers, and IDS signature developers. This
+project was created to provide information on exploit techniques
+and to create a functional knowledgebase for exploit developers and
+security professionals. The Metasploit Framework is provided for
+legal security research and testing purposes only.
 
 WWW: http://www.metasploit.org


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Feb 7 12:10:11 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: onatan@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/143641: [patch] security/metasploit port upgrade to 3.3.3
Date: Sun, 7 Feb 2010 12:10:09 UT

 Maintainer of security/metasploit,
 
 Please note that PR ports/143641 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/143641
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Sun Feb 7 15:11:38 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: Sylvio Cesar Teixeira <sylvio@FreeBSD.org>
To: bug-followup@FreeBSD.org,
 niels@heinen.ws
Cc:  
Subject: Re: ports/143641: [patch] security/metasploit port upgrade to 3.3.3
Date: Sat, 13 Feb 2010 20:24:20 -0200

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Please,
 
    fix this error:
 
 http://people.freebsd.org/~sylvio/metasploit-3.3.3.log
 
 
 Thanks.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 
 iQEcBAEBAgAGBQJLdyaVAAoJEIyJLN1L2ARbfzMH/2bO4cOlbxXgDNmHT+A5+PVE
 LnZXwwDpIWG0CD3jasmjq8v7tMNepm/jUgVRvforIJHY890l/AYPQMSDDeh5Ssp6
 21YmfmmlnaKO/xnBIMhJBjcfS0agLI1nh1eTgcBGVhkx3U0QU1s5Oggn83YATEmx
 FiOpwloclb78FdfQgKJiZSvHP8RQnaQS+hDpjF0PJSUQP71HBtaj1Fu7k1tTWyrJ
 D5Vpi3E7Ut8oGu5GLOLd9l3/oK2HkFBjxxYf5euOVjGE2z1HOEFGXiskP8KT+DzY
 Ow2TSoh68O/u/gx5ky2g3OkfGzbHoIodZLSfR7fnMOocWHz/Y0NwInotx7RzCK4=3D
 =3DoVpl
 -----END PGP SIGNATURE-----

From: Peter Thoenen <peter.thoenen@yahoo.com>
To: bug-followup@FreeBSD.org
Cc: niels@heinen.ws
Subject: Re: ports/143641: [patch] security/metasploit port upgrade to 3.3.3
Date: Thu, 4 Mar 2010 21:44:04 -0800 (PST)

 --0-1924978198-1267767844=:85989
 Content-Type: text/plain; charset=us-ascii
 
 Pretty sure the original patch is a duplicate given the port tree is currently showing 3.3.3 but attached is a fix for a RUN_DEPENDS issue (msfweb requires it)
 --0-1924978198-1267767844=:85989
 Content-Type: application/octet-stream; name="metasploit.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="metasploit.diff"
 
 ZGlmZiAtcnVOIG1ldGFzcGxvaXQub2xkL01ha2VmaWxlIG1ldGFzcGxvaXQv
 TWFrZWZpbGUKLS0tIG1ldGFzcGxvaXQub2xkL01ha2VmaWxlCTIwMTAtMDMt
 MDQgMTk6MTg6MTkuMjY5MjQzMzc4IC0xMDAwCisrKyBtZXRhc3Bsb2l0L01h
 a2VmaWxlCTIwMTAtMDMtMDQgMTk6Mzg6NDQuOTA4Njc4ODM3IC0xMDAwCkBA
 IC03LDYgKzcsNyBAQAogCiBQT1JUTkFNRT0JbWV0YXNwbG9pdAogRElTVFZF
 UlNJT049CTMuMy4zCitQT1JUUkVWSVNJT049CTEKIENBVEVHT1JJRVM9CXNl
 Y3VyaXR5CiBNQVNURVJfU0lURVM9CWh0dHA6Ly93d3cubWV0YXNwbG9pdC5j
 b20vcmVsZWFzZXMvCiBESVNUTkFNRT0JZnJhbWV3b3JrLSR7RElTVFZFUlNJ
 T059CkBAIC0xNCw3ICsxNSw4IEBACiBNQUlOVEFJTkVSPQlvbmF0YW5AZ21h
 aWwuY29tCiBDT01NRU5UPQlFeHBsb2l0LUZyYW1ld29yayBmb3IgUGVuZXRy
 YXRpb24tVGVzdGluZwogCi1SVU5fREVQRU5EUz0JaW5mb2NtcDoke1BPUlRT
 RElSfS9kZXZlbC9uY3Vyc2VzCQkJXAorUlVOX0RFUEVORFM9CSR7UlVCWV9B
 UkNITElCRElSOlMsJHtQUkVGSVh9LCw6UyxeLywsfS9pY29udi5zbzoke1BP
 UlRTRElSfS9jb252ZXJ0ZXJzL3J1YnktaWNvbnYJCQlcCisJCWluZm9jbXA6
 JHtQT1JUU0RJUn0vZGV2ZWwvbmN1cnNlcwkJCVwKIAkJbmFzbToke1BPUlRT
 RElSfS9kZXZlbC9uYXNtCQkJCVwKIAkJbm1hcDoke1BPUlRTRElSfS9zZWN1
 cml0eS9ubWFwCiAK
 
 --0-1924978198-1267767844=:85989--

From: Niels Heinen <niels@heinen.ws>
To: Peter Thoenen <peter.thoenen@yahoo.com>, Sylvio Cesar Teixeira <sylvio@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/143641: [patch] security/metasploit port upgrade to 3.3.3
Date: Fri, 5 Mar 2010 15:33:03 +0100

 --001485f45096ccaf4604810e9733
 Content-Type: text/plain; charset=ISO-8859-1
 
 You are right Peter: from the timeline it appears that the other PR
 (ports/143220) was closed (but not committed) upon my submission so thats
 why these PR's crossed eachother.
 
 Niels
 
 
 On Fri, Mar 5, 2010 at 6:44 AM, Peter Thoenen <peter.thoenen@yahoo.com>wrote:
 
 > Pretty sure the original patch is a duplicate given the port tree is
 > currently showing 3.3.3 but attached is a fix for a RUN_DEPENDS issue
 > (msfweb requires it)
 
 --001485f45096ccaf4604810e9733
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div>=A0</div>
 <div>=A0</div>
 <div>You are right Peter: from the timeline it appears that the other PR (p=
 orts/143220) was closed (but not committed) upon my submission so thats why=
  these PR&#39;s crossed eachother.</div>
 <div>=A0</div>
 <div>Niels</div>
 <div class=3D"gmail_quote">=A0</div>
 <div class=3D"gmail_quote">=A0</div>
 <div class=3D"gmail_quote">On Fri, Mar 5, 2010 at 6:44 AM, Peter Thoenen <s=
 pan dir=3D"ltr">&lt;<a href=3D"mailto:peter.thoenen@yahoo.com">peter.thoene=
 n@yahoo.com</a>&gt;</span> wrote:<br>
 <blockquote style=3D"BORDER-LEFT: #ccc 1px solid; MARGIN: 0px 0px 0px 0.8ex=
 ; PADDING-LEFT: 1ex" class=3D"gmail_quote">Pretty sure the original patch i=
 s a duplicate given the port tree is currently showing 3.3.3 but attached i=
 s a fix for a RUN_DEPENDS issue (msfweb requires it)</blockquote>
 </div><br>
 
 --001485f45096ccaf4604810e9733--
State-Changed-From-To: feedback->closed 
State-Changed-By: sylvio 
State-Changed-When: Sun Mar 7 22:05:17 UTC 2010 
State-Changed-Why:  
Close because this port already updated for ports/143220. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143641 
>Unformatted:
