diff options
| -rw-r--r-- | net-analyzer/metasploit/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/metasploit/Manifest | 32 | ||||
| -rw-r--r-- | net-analyzer/metasploit/metasploit-4.9.3.ebuild (renamed from net-analyzer/metasploit/metasploit-4.9.2-r2.ebuild) | 48 |
3 files changed, 52 insertions, 36 deletions
diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog index df0bcee3e2c4..8e73048a5a10 100644 --- a/net-analyzer/metasploit/ChangeLog +++ b/net-analyzer/metasploit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/metasploit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.94 2014/05/30 14:18:39 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.95 2014/06/07 21:32:00 zerochaos Exp $ + +*metasploit-4.9.3 (07 Jun 2014) + + 07 Jun 2014; Rick Farina <zerochaos@gentoo.org> +metasploit-4.9.3.ebuild, + -metasploit-4.9.2-r2.ebuild: + 4.9.3 bump, include openssl fixes for recent vuln 30 May 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild: fix for bug 511690 diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index c529b1aca2ab..117f871ba101 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -15,26 +15,26 @@ AUX msfrpcd-4.4-initd 638 SHA256 4e3f18ab619a0067c7ac9a9f13d6824496cb36adf20c216 AUX msfweb.confd 273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460 SHA512 58481d69f99bec1644188ecb5f67249c3c85c12ae65d46643c3daf42b5221f8d1b025ea318ed6d11557cbc16e50acc5eaabb99162d538518265755ebcdb042ab WHIRLPOOL 1cbb5a5ff20eb90f7db6f5523bf8834cfd5aa2c98e378408e418f388993af661273257112db2ebcd950bfa9243e9f19ba4a5262fd2bccc7cc6276658f86115bb AUX msfweb.initd 533 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c SHA512 ec8eb9c09191d273417174c23d2fb1a3d27939a74b010fa33ca696bcce88e9c81d6cc1e6ebff90ea97cb6d730776364de4560db1bed10516ba4a7030e7233a53 WHIRLPOOL dec6ca3cf45ac4e6cea35266df1342b4dcdb3f813dc90820603f23e9d62ee67a9633de17d747cc12d7cb9c982e8868559896c2f8c42540a5005f485045d9730a DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f SHA512 a65740c81e6c711e6661170ec0dd87919cad6c4aa3aaac08fdaa72b4825be4bea28ec09c78f818ddab7660f5b485b13f87e3175b43c625319ce89b044a40f2a0 WHIRLPOOL f309608e30488484b24555fec84e65ed0dcbeba62a69e6ec23c507dbc0fcf720551a795e2a0793886fcd38d3a9b160819c864720155f58f274577b0246f05946 -DIST framework-4.9.2.tar.bz2 36150330 SHA256 0371cbaf5d5f7c66e3e8eb5cc7ee10ffeb043a2c2622550a5d79852b4a09777d SHA512 5b5c89b0f81ac551bb6b7f78eee322aa149a16df9f56696ec9c8df2ca68b7f9d09203d073f71fe97422e1e2c85755295fe53a0e07169ef52d39ccbbf92008c0d WHIRLPOOL 01627530a2e62fec41bb0e5201f1defdf37b1648f890048e2f44f870aed34ddbb4749a85066f1397d2fbc309fe8400604122fabb1ebdac761b8b458fd69da4ef +DIST framework-4.9.3.tar.bz2 36334540 SHA256 76aa4651b8235a018ccb46b31974fa8785e3d16bd753ac34d66fa60468d304b3 SHA512 a16608c718c57913fa5206032ca3707504f83fb25e1a9aec93dbec8d799c7d600f8f2eafb6882bddf64082a19bf9ad39b461c180946499f4e4821f249270ee6f WHIRLPOOL cd4fa596e810a63ee16147f7c4acd3af9b6389732159721c1ce560233ff0a2364964fa56393fbc2e5dc6d0ba161a484c5b7c02603cd23da081ea896c4fd7370e EBUILD metasploit-2.7.ebuild 1448 SHA256 4e186ca7e1133568ae38e62584b86600cfc65c7b7bec691b85418151901ea984 SHA512 a31c2dfc5a32eabad32dd50ba9a82a75b35661c81b039a284a14d0ecc0ae2ebae46c29f7e6dd6f30b2671f0509f3ef1a7045c6537d626832eac375d0cb8325a1 WHIRLPOOL ff86aadb12002ea6d2f050927c087ba436b3362d64d0cd2b0785ae727349ae12f010eba7e7e572831e9d95c217d93abc2ecc9862061feada26e823987560d7be -EBUILD metasploit-4.9.2-r2.ebuild 10056 SHA256 2eba0a62b91f9778caa029307bb0b0bedeb4dac38bb5abc7fa6f091ed010b79f SHA512 2d95f8d2492e757d8024c7a8758ca800b1b4a53cca2631d1e2fd654dcd1fbf5386d6a389e833b5c95079e2c1e21a85ff69a20f0c53b0e0226835bcb33c0363ab WHIRLPOOL af8821953e198a8585f6f8720fa92c73fe04bc00b99df2575571eb087ceead215798bab97c7de8a16073c682fe403ebb05796627d284adaf5bb33d2aeb6f16ce +EBUILD metasploit-4.9.3.ebuild 10221 SHA256 5d1a651397d5b9e7dc8c4f746799922d7c2d73466b41b52ec2efa39f822fc1b9 SHA512 1ecc2106d6e21c196e07a9f3680daaa6a95915941ccbcc0b23c2d2a6224b3999f2929c718a1ad20db0891e698eaad70b748d6fc1d3167bf6eb5849760584cb26 WHIRLPOOL 7fef121960c18252580f08d23a913e9b327f4fba3fe3387b902f9bc97b4b2a65fe18b6562338638d20ff4ba289fd8469c78c37433ebbe518a9825767d955aa5f EBUILD metasploit-9999.ebuild 10222 SHA256 9d285071adc461c34bc21b3306d5a643b7711ace04ed1b99bd126ac25d0b8803 SHA512 3a31c56e69d0e01fdc954b7271a0156960becfc2a7d67e65f9c103149d818bd22b857f208b6a476bdeda12a1a6940640129ad7286527b7144e4714e6c91dc8e8 WHIRLPOOL 14d6d893eaac2594cf821735f580fd1773f042a3bec144dcfca063fdf1e1554e8521da8001ece65ccd52237462a9f802b34ed51981156a9888029d6a28c0a807 -MISC ChangeLog 16492 SHA256 976dba719381db572189781a20c982cc778f56ac852494612298f7dcee9d007b SHA512 e3c2b80a3bab16f5e88893ca77b81927af1853ea7772a71b9158140c1514fce3c4fa18fc5ca9c58091a0acdba7f9174352e8860cb74dce89023f5bd19c9fcf5d WHIRLPOOL 9010d454f6b92f45948a2a2dab03011498f2510ceb3d16eef8468d0b53859ac8b289c99ceffec86c2f1227fa503cd06e960d002b4edb5c7855ba328a6da537d5 +MISC ChangeLog 16685 SHA256 1cebd19f25803ae12805eec5a792c5dd5ba7c1d8bf0076eb4cfea03dd2b0e163 SHA512 1548fb59046a7599153191a7f2ecfcda8596318602531d539efa18c24a24a4f8b702597467ad88ba0e3d5a3e26ca72ec3888b092c0fa18b00304f0caf1bf75e6 WHIRLPOOL bf48fcff53115956b23cec75c7dc955086332cde18fe87cd862ee304267c354c28fb93c231d7f635e1b36784238a5637ca719b030bb2721717210c9b62052bea MISC metadata.xml 648 SHA256 f7220754018805378926741b975a9eb32101e606d6b06081718ab0111c161b5f SHA512 924cfb15b02a0437c832f82bf9ec76ba5d3d013f6b02d99e089bb36c8772c9f92d93c7b83f180ec8b782384e4135b55b984267e76342b319e6ebbeb0f54d5f0d WHIRLPOOL 7fb28d2784bf7800e24bf6d8679e1792127b6797864d45467e9b2a65ae923068dc354596145c699f7dbe2a25494b6278a68c08a2264ac6a03ae45279d4e0b4a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJTiJPdAAoJEKXdFCfdEflK5WgQAJEiT1knGfQBGkiVgkOfWCci -pKRIXCxJlEA76Xftw7wafon5krzwTMMPKwwvSw5GoecL2PhMuem4gJn0JmFyjsYk -y7+aetnyGDAzROllHri5fi0WHgBUv7potDY7p5GX/QTM8mYRF0MF4GwV1OSN6l97 -0KY7zLBP/7wVGP24KqeJ4IntRg2q/IkZ6l5i4RsSCrvefoGFvCqnKG79qTVxgdeP -WlUqraZV2BfOmJhHXufrHV9h3u+vBMDJ1nm1wBK4CIJyPzVN6/jk0RG5Ycztpnm7 -Z3fCiqeOzosYv7JDv0FOXFhQe5F6nHHmeugOrN1bx42Mg1KS6gCBkS6unK23bbEw -DE43ffjgFyffpKu6k5/H99NW3FPg11cjYfDj9HfE5KgNgJ2qxvbM5hRdzZJp8SgN -dFwmnmwkTeNuG212jFob/7tDPUCQjoz9qh8ysIZ48mQ7qKmoQf80wWuczPM72T5t -863yMasEDMeaZPUGwxS7xTYD4imVyiVmKdCBl9E1QTeCpnw3XfDNPxTr1Kv4GiuR -5KBeM5R+is0JOh6vUOUYtSiEVFf0Ib9fFrN1Gvw5Hwznfn0VDAaCbNH6+NODuZEW -inRIbWXwwtId4yscWjDT0UBDtQKAceZr78osK5vBW5AwsgmROV6a6N2qhk7x+nJZ -337dzKpdA/UHylxipKbI -=GpJK +iQIcBAEBCgAGBQJTk4WBAAoJEKXdFCfdEflKxekQAJzZm7OawAPFc2qSv6BovNzl +4MCd1RRkg57Vy57MCL3F7xPRkOM7ojuoDE5ww87QtMFmyPV8AORkPXSKJitmcwXA +CEdjKLftJTW84D/OEiIkSmz/jgXqjMZofdP8PdHrTb0hLjvrQ399X4eWE6FBNCAE +6UDq39wPbWtfhdummzN1VtIzbc2S42bIqZ8HfS1ob/e4zH6DrW6hfXDcDnEp7O/7 +pGJ6rWQa0D6h97buGbPcNEtLc/3nWPx1yJGy4FDQygfSuB+fMjbdAnhLc/NJyTxh +hN205md7igMdoOVKf4etk9hv2Qkc+IjcghiComG/Ixqqed4v379m6H819+bmll1w +q/hXaFRh1DTjovhqUJuu+Jp8AbzO7kbFqTm17NU8ALpKsqzA2a0SfMczQ4J7Q938 +884peBdjBcUKVcY5Yb8MIR31UFcfXmFQG/Usa/ipi+vtGyhOHF3GeiK6m0alQ0q3 +yStk8+LEonmZc1zZlZ+npF3hXKj6g6LqzJfBXVhqKmwC+Xka7augxErj+fbe0yp+ +w8Ccdo3u+wm8VQv/5v0GYX4Y/NqfGOLbqpX8ABQdtpjJ2tXE8r2fDPnaY4aAU3wx +Z7NDAsnqMw0+Jf5GPPwZv++KmaCmTme0C/57Hp6ZEAFhZansykcVgfIj0eFGIoWR +n/tDGbmoF32smNpM8e1n +=2jBi -----END PGP SIGNATURE----- diff --git a/net-analyzer/metasploit/metasploit-4.9.2-r2.ebuild b/net-analyzer/metasploit/metasploit-4.9.3.ebuild index b7406b4ead8c..a362efd7e29b 100644 --- a/net-analyzer/metasploit/metasploit-4.9.2-r2.ebuild +++ b/net-analyzer/metasploit/metasploit-4.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.9.2-r2.ebuild,v 1.1 2014/04/21 19:20:05 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.9.3.ebuild,v 1.1 2014/06/07 21:32:00 zerochaos Exp $ EAPI="5" @@ -31,6 +31,7 @@ IUSE="development +java lorcon oracle +pcap test" RESTRICT="test" RUBY_COMMON_DEPEND="virtual/ruby-ssl + =dev-ruby/rkelly-remix-0.0.6 dev-ruby/bcrypt-ruby dev-ruby/activesupport:3.2 dev-ruby/activerecord:3.2 @@ -38,6 +39,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl >=dev-ruby/metasploit_data_models-0.17.0 dev-ruby/msgpack dev-ruby/nokogiri + dev-ruby/sqlite3 dev-ruby/builder:3 >=dev-ruby/pg-0.11 =dev-ruby/packetfu-1.1.9 @@ -50,17 +52,19 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl pcap? ( dev-ruby/pcaprub dev-ruby/network_interface ) dev-ruby/bundler - development? ( dev-ruby/redcarpet + development? ( dev-ruby/fivemat + dev-ruby/redcarpet dev-ruby/yard - dev-ruby/rake + >=dev-ruby/rake-10.0.0 >=dev-ruby/factory_girl-4.1.0 )" ruby_add_bdepend "${RUBY_COMMON_DEPEND} test? ( >=dev-ruby/factory_girl-4.1.0 - dev-ruby/database_cleaner - >=dev-ruby/rspec-2.12 - dev-ruby/shoulda-matchers - dev-ruby/timecop )" - #>=dev-ruby/rake-10.0.0[ruby_targets_ruby19] re-add when in gentoo. I'm not allowed to add it :-( + dev-ruby/fivemat + dev-ruby/database_cleaner + >=dev-ruby/rspec-2.12 + dev-ruby/shoulda-matchers + dev-ruby/timecop + >=dev-ruby/rake-10.0.0 )" ruby_add_rdepend "${RUBY_COMMON_DEPEND}" COMMON_DEPEND="dev-db/postgresql-server @@ -68,7 +72,7 @@ COMMON_DEPEND="dev-db/postgresql-server net-analyzer/nmap" DEPEND+=" ${COMMON_DEPEND}" RDEPEND+=" ${COMMON_DEPEND} - >=app-admin/eselect-metasploit-0.10" + >=app-admin/eselect-metasploit-0.13" RESTRICT="strip" @@ -140,14 +144,11 @@ all_ruby_prepare() { #The Gemfile contains real known deps #add our dep on upstream rb-readline instead of bundled one sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die + sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die #remove the bundled readline #https://github.com/rapid7/metasploit-framework/pull/3105 + #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux rm lib/rbreadline.rb - #fix for bug #507816 while waiting on upstream to actually set their own deps right - sed -i "s#gem 'activesupport', '>= 3.0.0'#gem 'activesupport', '~> 3.2'#" Gemfile || die - sed -i "s#gem 'activerecord'#gem 'activerecord', '~> 3.2'#" Gemfile || die - #backport of upstream fix for bcrypt gem changing name, bug #508014 - sed -i "s#bcrypt-ruby#bcrypt#" Gemfile || die #now we edit the Gemfile based on use flags #even if we pass --without=blah bundler still calculates the deps and messes us up if ! use pcap; then @@ -203,17 +204,26 @@ each_ruby_prepare() { } each_ruby_test() { - #rake --trace spec || die + #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox + + #we bogart msfupdate so no point in trying to test it + rm spec/msfupdate_spec.rb || die + #we don't really want to be uploading to virustotal during the tests + rm spec/tools/virustotal_spec.rb || die + # https://dev.metasploit.com/redmine/issues/8425 - ${RUBY} -S rake db:migrate || die - RAILS_ENV=test MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S rake spec || die + ${RUBY} -S bundle exec rake db:create || die + ${RUBY} -S bundle exec rake db:migrate || die + + MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S bundle exec rake || die su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" } each_ruby_install() { #Tests have already been run, we don't need this stuff - rm -rf spec - rm -rf test + rm -r spec || die + rm -r test || die + rm Gemfile.lock || die #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. # should be as simple as copying everything into the target... |