summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Farina <zerochaos@gentoo.org>2014-06-28 00:49:40 +0000
committerRichard Farina <zerochaos@gentoo.org>2014-06-28 00:49:40 +0000
commit03e7e6dc6710dc6eec0ae02b625e792be9bdc3be (patch)
tree081dde19e3e41d2f5c7f48251d9981ce3536bd25 /net-analyzer/metasploit
parentBump, now with IPv6. (diff)
downloadhistorical-03e7e6dc6710dc6eec0ae02b625e792be9bdc3be.tar.gz
historical-03e7e6dc6710dc6eec0ae02b625e792be9bdc3be.tar.bz2
historical-03e7e6dc6710dc6eec0ae02b625e792be9bdc3be.zip
fix msfupdate
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A
Diffstat (limited to 'net-analyzer/metasploit')
-rw-r--r--net-analyzer/metasploit/ChangeLog5
-rw-r--r--net-analyzer/metasploit/Manifest30
-rw-r--r--net-analyzer/metasploit/metasploit-9999.ebuild12
3 files changed, 25 insertions, 22 deletions
diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 8e73048a5a10..ffde71c408ef 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,9 @@
# 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.95 2014/06/07 21:32:00 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.96 2014/06/28 00:49:34 zerochaos Exp $
+
+ 28 Jun 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild:
+ fix msfupdate
*metasploit-4.9.3 (07 Jun 2014)
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 117f871ba101..cde47f8abf82 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -18,23 +18,23 @@ DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f8
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.3.ebuild 10221 SHA256 5d1a651397d5b9e7dc8c4f746799922d7c2d73466b41b52ec2efa39f822fc1b9 SHA512 1ecc2106d6e21c196e07a9f3680daaa6a95915941ccbcc0b23c2d2a6224b3999f2929c718a1ad20db0891e698eaad70b748d6fc1d3167bf6eb5849760584cb26 WHIRLPOOL 7fef121960c18252580f08d23a913e9b327f4fba3fe3387b902f9bc97b4b2a65fe18b6562338638d20ff4ba289fd8469c78c37433ebbe518a9825767d955aa5f
-EBUILD metasploit-9999.ebuild 10222 SHA256 9d285071adc461c34bc21b3306d5a643b7711ace04ed1b99bd126ac25d0b8803 SHA512 3a31c56e69d0e01fdc954b7271a0156960becfc2a7d67e65f9c103149d818bd22b857f208b6a476bdeda12a1a6940640129ad7286527b7144e4714e6c91dc8e8 WHIRLPOOL 14d6d893eaac2594cf821735f580fd1773f042a3bec144dcfca063fdf1e1554e8521da8001ece65ccd52237462a9f802b34ed51981156a9888029d6a28c0a807
-MISC ChangeLog 16685 SHA256 1cebd19f25803ae12805eec5a792c5dd5ba7c1d8bf0076eb4cfea03dd2b0e163 SHA512 1548fb59046a7599153191a7f2ecfcda8596318602531d539efa18c24a24a4f8b702597467ad88ba0e3d5a3e26ca72ec3888b092c0fa18b00304f0caf1bf75e6 WHIRLPOOL bf48fcff53115956b23cec75c7dc955086332cde18fe87cd862ee304267c354c28fb93c231d7f635e1b36784238a5637ca719b030bb2721717210c9b62052bea
+EBUILD metasploit-9999.ebuild 10337 SHA256 c08447424d087224e4a760914452f2450f2fd001d6ba3ddbcd5b9fbff80382c7 SHA512 63c5d0b4b8b2856b4d14068b36e967572ab8c6415d604c25eaea631d012c707f40470a15c98be1d8f535f455efb745b0dc3e8ddbdba46191ecc94e1a7752231e WHIRLPOOL f189172cd4b981656a7bc497e46301f011aeef63a0e735b86468b7ed8d856d62b492753b9837e2c4912463a3a496890cde48b3d26963d1a4782eafe12c74d636
+MISC ChangeLog 16776 SHA256 56a3434ae1d4c31560423d9c5a503c7642ad72d161b98c4e6bdf26d10a71436a SHA512 b2d54a3cac9ddc2d56798483d7bc0c664c3984fd8a62046f03452e806057073403b9f73aa9600733bbc39a70386785bd27c685a9906d8bce575afd8cc72c5c86 WHIRLPOOL a9408d6354db8636bbd30c9b60d98a51c208a98435d0f2015fa1983502f63289c1864bc31e2b22f4f6f9b409243fc0e838c5f51bdbc3948c40caa58d16778803
MISC metadata.xml 648 SHA256 f7220754018805378926741b975a9eb32101e606d6b06081718ab0111c161b5f SHA512 924cfb15b02a0437c832f82bf9ec76ba5d3d013f6b02d99e089bb36c8772c9f92d93c7b83f180ec8b782384e4135b55b984267e76342b319e6ebbeb0f54d5f0d WHIRLPOOL 7fb28d2784bf7800e24bf6d8679e1792127b6797864d45467e9b2a65ae923068dc354596145c699f7dbe2a25494b6278a68c08a2264ac6a03ae45279d4e0b4a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-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
+iQIcBAEBCgAGBQJTrhHVAAoJEKXdFCfdEflKYlcQAJvvICJz+b6S7K/Nga+brDLP
+m41Jd2smF76C96IJNIPzysKMcoNC8rir2y/jLLXj5kHj7pDSVFP4GvxZUduGkL2P
+EMyucq5Hx8HRw7AUkOeBUO3zeraiBi41Gp07b3Y/EfYYxpWZu5257/+w0fLm2Q9g
+kEr6vDlbaG1EEM8Ac0ZVhYG4GxpplAzM1J1JVS0yU39g+wRU00LjXmwKNhKmWR6/
+ZToZO7sdn+puNDG1eJMUIFbnKQ68ZYrIQdjz8M9JZMqhRhY/V/WJHOAkeP/h9sA0
++ZlcR18s6mapOe+kQrxfKJ0mlhbrw0VIaPCM1I00Y5LzldqBKaI4z0s3y5lgjY0k
+c0EciLW4ppfvD5hFK9G1ZxQGLeKMzUda0c0GokE9dmw8EnUWwARVm3SeR3D+onNn
+5LETmjWkTedXy06rhUxfNYeP/9ClHSGW0aYnu0QUuJD4Ct05HGpd44+V0QFGZGux
+T4bznN0PFfVttR4uWKHxJg8UmPxnjj+4IJUfAIdE1nu/XyKtf7eOhglAMow+knZO
+4d/8KShJp2Bit/p3wcqWiktmOMdPLpcy0lBDs9J3OvJpfi2mKTwtBLJyAcz6GTc5
+4WwFPtBeIP0DmUXiTXFzimj5R0OWx8uQ46IXJteL+80d7cvnKTUnAXYUVhGTRl5i
+1QuXi1Tct1psG+rPTO97
+=NgtY
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 2afca19d69fa..9101d236e402 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.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-9999.ebuild,v 1.25 2014/05/30 14:18:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.26 2014/06/28 00:49:34 zerochaos Exp $
EAPI="5"
@@ -191,8 +191,8 @@ all_ruby_prepare() {
}
each_ruby_prepare() {
- ${RUBY} -S bundle install --local || die
- ${RUBY} -S bundle check || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
#force all metasploit executables to ruby19, ruby18 is not supported anymore and ruby20 is not supported yet
#https://dev.metasploit.com/redmine/issues/8357
@@ -212,10 +212,10 @@ each_ruby_test() {
rm spec/tools/virustotal_spec.rb || die
# https://dev.metasploit.com/redmine/issues/8425
- ${RUBY} -S bundle exec rake db:create || die
- ${RUBY} -S bundle exec rake db:migrate || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
- MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S bundle exec rake || die
+ MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die
su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
}