metasploit: minor cleanups hoping to make tests work but they don't yet

This commit is contained in:
Zero_Chaos 2013-09-30 23:01:41 +00:00
parent 79ec42819f
commit 80b21e892b
3 changed files with 12 additions and 9 deletions

View file

@ -1,5 +1,5 @@
AUX database.yml 651 SHA256 aa5f0d71de766fd14974d962731abbba36e0d844fe07663e1392c01cdf3fca99 SHA512 95e4625d79cce50f1d7008b1a8b4594b49b7ee4090f37cd4d22260d4746d4ea5b5698aafe9abd5a42ec31f403860892d7cfaaed1db6141bf0c79ac7932c06064 WHIRLPOOL e9e50c4f50c78c19504cd61e53e8f8dd9f156eb2a59e3c163be9774d54ca10773d7102ec0ac53c77e2d033d792c97d31c664cb033aab2b7b89f7c2f29bf0660c
AUX database.yml 675 SHA256 397c6e42af99f0691c3380fd65ce8625389e104d75eff806a43ba296537067ea SHA512 a56d474e1b562c3eaaca009d722fa6f6496745608c4fffeed9aae42408625edb01ae13a488d3bdeef5e51131852ec505f35d25f8c21a091f70690c853850cfe1 WHIRLPOOL 103420f9dfd43e1427d2a7d1e3e47e4d3a9a36e220ed45cba5c91106aa15007fdb653911a238216d90fd3dea042cbe8494fd5d57b21bcd177a5a7c284be11a0d
AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
EBUILD metasploit-4.6.0.ebuild 6293 SHA256 6343754b28505ccec773e20c9a2385890803859d5d38c51f601448d50f39048f SHA512 45cc5cd171bae5f559035bede6bebb7bb81ace641886317c6bf540f34c2c4a645c677c00b72e47daeaa06e195d358d8ad1a95f9c9307ae2f4e65df5fddc7b168 WHIRLPOOL 36fc119489d82c116b822b7742b575f8361f3bb041d8041f309cd4e171502054d0153cd07ef75fc26b9e87fb9104adaa0ed9ce59086d47e34a58d491cdef3885
EBUILD metasploit-9999.ebuild 9067 SHA256 348d6969233f7212dced0cf1f027eb14638ed74b14b81b5187b3ae4618d311e4 SHA512 bb43a1927a0135bd344a0d582eb4eec3d8dd2cae65b8e50e7b0c233368fab2ba36dc290263243e57986c788869897f5d075f696c65159fff38e06d9ef99c71b1 WHIRLPOOL 160ec31ac715269a3e59deab280bb7a0b83c5b81145d55b9818f864c77a4a6e7bedbe663b876d814a89541d2ecdbf9f513453c83902f6fdbbd99ee84aa00526c
EBUILD metasploit-9999.ebuild 9160 SHA256 66e5efafb430a343c40302f4a1b3e482f688d482c73bf979f8f970bf276afbf4 SHA512 6e42366d471d46cfb91a7947e4366a92754bc8ad672b857e19897f4d2b572ea9b5cbbb9e013de54ab751ee717d11e21c0515d33ca72fa0b35b671ee4b73dee25 WHIRLPOOL e507075464677cc39ea6df640753c8c897571a42b6b1e1458c474d1d8dfe70622a9afa0f894a75b65871f2c0ceca9efdb285247172af1152e218b15aa5ff84b7

View file

@ -5,8 +5,8 @@
development:
adapter: "postgresql"
database: "msf_database"
username: "msf_user"
database: "msf_development_database"
username: "msf_development_user"
password: "secure"
port: 5432
host: "localhost"

View file

@ -35,7 +35,7 @@ COMMON_DEPEND="dev-db/postgresql-server
dev-ruby/nokogiri[ruby_targets_ruby19]
dev-ruby/builder:3[ruby_targets_ruby19]
>=dev-ruby/pg-0.11[ruby_targets_ruby19]
>=dev-ruby/packetfu-1.1.8[ruby_targets_ruby19]
>=dev-ruby/packetfu-1.1.9[ruby_targets_ruby19]
dev-ruby/robots[ruby_targets_ruby19]
dev-ruby/kissfft[ruby_targets_ruby19]
>=app-crypt/johntheripper-1.7.9-r1[-minimal]
@ -51,7 +51,7 @@ COMMON_DEPEND="dev-db/postgresql-server
>=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby19] )"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby19]
>=dev-ruby/rake-10.1.0[ruby_targets_ruby19]
>=dev-ruby/rake-10.0.0[ruby_targets_ruby19]
dev-ruby/database_cleaner[ruby_targets_ruby19]
>=dev-ruby/rspec-2.12[ruby_targets_ruby19]
dev-ruby/shoulda-matchers[ruby_targets_ruby19]
@ -90,8 +90,11 @@ QA_PREBUILT="
pkg_setup() {
if use test; then
su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
su postgres -c "createuser msf_test_user -d -S -R" || su postgres -c "dropuser msf_test_user"
su postgres -c "createuser msf_test_user -d -S -R" || die
su postgres -c "createuser msf_test_user -d -S -R"
if [ $? -ne 0 ]; then
su postgres -c "dropuser msf_test_user"
su postgres -c "createuser msf_test_user -d -S -R" || die
fi
su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
fi
}
@ -186,7 +189,7 @@ src_prepare() {
src_test() {
#rake --trace spec || die
rake spec || die
RAILS_ENV=test MSF_DATABASE_CONFIG="${S}}"/config/database.yml rake spec || die
su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
}