metasploit: go back to bundled rbreadline or it's broken :-(

This commit is contained in:
Zero_Chaos 2014-10-19 23:52:48 +00:00
parent ce43402637
commit b38a09573e
2 changed files with 5 additions and 3 deletions

View file

@ -11,4 +11,4 @@ AUX msfrpcd-4.4-conf 598 SHA256 3ad3e837061fd2b8b28d5afede50fc1965b0df083a8e4b74
AUX msfrpcd-4.4-initd 638 SHA256 4e3f18ab619a0067c7ac9a9f13d6824496cb36adf20c216bb96ad365b1ef2725 SHA512 21faadd62a90deaecb617cb106a471de39147e1702f149c1d356ae18f188bf3102bb9e9642122afa2d9c49325bd4cba6f04acaa8f5be2ca238adeb56c9c81821 WHIRLPOOL 8069bec85919e26faf838b8965153425adbd5c46c004ddb0a94c7e6d2b63aeaa30479592b556f2939c90c216d63103931967c36a21b3d9eaa2763d0120c9ba09
AUX msfweb.confd 273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460 SHA512 58481d69f99bec1644188ecb5f67249c3c85c12ae65d46643c3daf42b5221f8d1b025ea318ed6d11557cbc16e50acc5eaabb99162d538518265755ebcdb042ab WHIRLPOOL 1cbb5a5ff20eb90f7db6f5523bf8834cfd5aa2c98e378408e418f388993af661273257112db2ebcd950bfa9243e9f19ba4a5262fd2bccc7cc6276658f86115bb
AUX msfweb.initd 533 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c SHA512 ec8eb9c09191d273417174c23d2fb1a3d27939a74b010fa33ca696bcce88e9c81d6cc1e6ebff90ea97cb6d730776364de4560db1bed10516ba4a7030e7233a53 WHIRLPOOL dec6ca3cf45ac4e6cea35266df1342b4dcdb3f813dc90820603f23e9d62ee67a9633de17d747cc12d7cb9c982e8868559896c2f8c42540a5005f485045d9730a
EBUILD metasploit-9999.ebuild 10602 SHA256 945fde895d3cade8629480367cfe14c3f03029d27a7d8bc4a7520e9e677bdf33 SHA512 7df3068ff2eb7c672e36707b030904f0edd85fc3e8b5337a70b2cec7bdc9557732856d9118b6a533ee6e71edbd534fbe11cc9a755c8cf15d886825f2471e3d68 WHIRLPOOL 59fd71cd736384839b9464d14c023d80c3d804362601b17369869b4a2504e19f04d1561a8a32ae3b9478a493ba092e528555a5701f2c0102c412855848020395
EBUILD metasploit-9999.ebuild 10711 SHA256 6b3116f6c2ea36579cbb79d868381bf79d7f73c5d727bd7a6b4d43bf267dea8b SHA512 fb311c09fab3c52f32fe0eec2cc4540f3cc9c4d4abc9b800005005feb5d970c676d2f88fa209b4762769c1263635645c8cbdc6a5b44480e9c5fbd20f7bf38786 WHIRLPOOL a1d31ddb6bb3691dae7d2af6a86ee3b5d021eec99f6d492e2e9eb0f22b080299749d7a6893a1f81974822714d908a9a62003e7215a6024d4bf04b2525658331e

View file

@ -141,12 +141,14 @@ all_ruby_prepare() {
rm Gemfile.lock
#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
#and then they broke it...
#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
#but now we have to go back to bundled readline because otherwise it's broken
#rm lib/rbreadline.rb
#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