diff options
| author |   Richard Farina <zerochaos@gentoo.org> | 2014-03-19 21:05:14 +0000 |
|---|---|---|
| committer | Richard Farina <zerochaos@gentoo.org> | 2014-03-19 21:05:14 +0000 |
| commit | 436b82eb9793d5222b990fafd89bae5a0ed9e7be (patch) | |
| tree | aa97b34a4cb12053af618a6cf38edb5470317d9e /net-analyzer | |
| parent | Version bump (diff) | |
| download | historical-436b82eb9793d5222b990fafd89bae5a0ed9e7be.tar.gz historical-436b82eb9793d5222b990fafd89bae5a0ed9e7be.tar.bz2 historical-436b82eb9793d5222b990fafd89bae5a0ed9e7be.zip | |
remove bundled rb-readline due to multiple bugs, use upstream version instead
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/metasploit/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/metasploit/Manifest | 30 | ||||
| -rw-r--r-- | net-analyzer/metasploit/metasploit-9999.ebuild | 8 |
3 files changed, 26 insertions, 17 deletions
diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog index a66b68a50b44..1f75a4cb3f1b 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.79 2014/03/06 15:44:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.80 2014/03/19 21:04:57 zerochaos Exp $ + + 19 Mar 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild: + remove bundled rb-readline due to multiple bugs, use upstream version instead 06 Mar 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild: replace failing patch with epatch_user diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index 7a4e5ffe9351..d1ccaccf75bf 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -21,23 +21,23 @@ EBUILD metasploit-2.7.ebuild 1448 SHA256 4e186ca7e1133568ae38e62584b86600cfc65c7 EBUILD metasploit-4.4.0-r1.ebuild 6023 SHA256 d3b9ba91f0572d07cf9e858e5a51f4d40d14d019ab1485ecdc186dd46b0a87db SHA512 73f1a07b35cc9e83082c7998d44422f80c02ca34a06664d0cd8b486dfac9ae6a4d2d3a7158c6eedc1713487d9ec1cac79ebc1acc1d3d30723381b871b120e8f1 WHIRLPOOL 18074f28e2fe33960df766ba9f48cef00caaef64b631d651d0bb07f40f461a7388e2637d8d35f515ed8dbf11d96c626d1912762593cf9f25d0d067550d2edf05 EBUILD metasploit-4.8.2-r1.ebuild 9181 SHA256 0d871765c984ad403c9f9fc9e582c9d4e1d4485d8a1b9cdaf9b50fb2c909fc11 SHA512 9635055a497a229e10fccfa96fc84ccbe98c351d207fb1a04c99f31f7b537111ddb44c89e6328a5acaecf0ac4a77ef85145928156b8d894d9995045eba42226d WHIRLPOOL 0864d5ecaa9577dedcc98387dff67136812dd413b0da8eb63b76e37be22958b96916648a8405272a3a27fc9aa2216c34619820d7bc94e3942688d2404e57a89f EBUILD metasploit-4.8.2.ebuild 9637 SHA256 27d3c3d0c6947d6b13b9df1efa3622b4ab289f6900446c5b42e20e7d5e89e8de SHA512 0c01e59623bcb998631963e7f54481d798bf65292044c2c2d304fc75b9967ebba2acf9a40f56b7b9b88d7dc0ff7afc40ddfed0d6d51e09183620bc4ec5491bdd WHIRLPOOL 6def4d3eb99c429fb804c6568baf5bce6e6ebbfaac96998efc8776e71336bef17bcf026d22ea42defaf29f0d1bab9d5c8c142a8f67e663d30949e19cae874cc3 -EBUILD metasploit-9999.ebuild 9253 SHA256 e4535c2a342cd17eb55f9ffb664bbccf206228f9aa1078cadaf05baa3c7c1626 SHA512 40c51247b5c85362bbdc8b4ff9866995407703ccd6eef7be451ac6ba31d1873759127ef6cf0addc95c397b97e1a1d080f81a90fabb9bfeb9c6e460a3dbd1a0cb WHIRLPOOL 34ccb4c18e009f3dba0b3392588c3f6141afeb849132052748ff96640cfc6b17385c55b2f286ba9db4a9501e1d5b6191273aa74eedf993753421858da30c6072 -MISC ChangeLog 14213 SHA256 131062066ff4dfe5b93ca1a753e2e7b88abbe8339bb45ceba02bf7da5dab35a4 SHA512 7ebb731b6b9b7e00e51c28dbb8057fa7cf1c0f236c0c9bd1a1adab53d4ddfcb37f81e00089426057429283371951cbf850bc642db7a99073249f270cdd0881c1 WHIRLPOOL c8cafcd34f789140f06b8aa96419cf8e741c2db5cb251c6e37535ad81950f1bca3a0224b4054e9fc3f73a232d73de1391fa4db7b7a05a2a9732e5d0bc19cda0c +EBUILD metasploit-9999.ebuild 9551 SHA256 f61ea91486e11b876d0acbc7c675b5abbd839d7130181d460e6538c300217367 SHA512 c1d20f9550fe515b6dd9b954bf3d13838a6c62adde7190f2732df399ba93881829250ae1aa23bcb6e8a17e479f78e306d365d46e1021e37db8eb627310248708 WHIRLPOOL 0c6f9e400aaa85c261c58e72d1a0a970cad278ea19cf71f0b67c27cf80d39f7ca9950c183a77b33826993f415fd2713c1c9494fde914919cda9356d62e4425e2 +MISC ChangeLog 14368 SHA256 6e92b388d92e8b4135744530e1a88ace1aa07abb57aec974fa6795a29e754836 SHA512 a428e95e193e744a52d9e52a7d3296e499e418b5e8cc9299b9cc58583e15648bb4fba2fc0053107fdce3363cac61cf833b51bba7a686266ccb4cac76b2985610 WHIRLPOOL e7c5f228f650a557ff9715e34f7713189df0fda17eba224334194c59e2ab56c7cd5f5a2daa91df233f344a99e8cde26fee5105905cb7ca527cac8316431f4917 MISC metadata.xml 690 SHA256 3b24db79935a37e1583fdcee310076a175dcc7dc6d174b02f2aaede536435455 SHA512 3d0f49d10bd37b71036823c5eae753049778604610d05cd180a55bac731b746eae57e1362f33fba3f4e642dd558a818012ed9e00bb56b92f2219a743e70fd9e6 WHIRLPOOL bc55738aa50b4d6a8bb98755af0d1966d0d5a939ae2ef57bce093400ff1e82a5ffd50f6bce72ea5e1e3f40c8d36fd33392741af901355dbe6a200bd3892cb6a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJTGJhYAAoJEKXdFCfdEflKXxMP/3Q4/rtzjgI9oJWoQtcklvQ+ -JALYIqkYrJ7Yj5bGrSUhAAgvfkMebFYiyl+5y5urxSX1lLdzS7t7EHluKWve9l7W -FHfbX/EeY8B0FaIt+P7z10TuiCIRhVAURaD5ppF/pV+/U7VLOT2vc6j7e4FbE1Ct -LcGsIUI+KVt+b1g6eXwuXSiIsCDlUSM0pydkAyouMqg1KbwWf36K3Jf7rzrCOvse -sykK2XT5eKDsBa9tR9T6rzyETQXSr9968e9RN5GeK9/5yqlGKrv7ofKUSRBpYC9q -kvQ09w0qn6D4tPr+QeBbUG8OCdRgFilUnToA9KugH0y88Yf0xR3DiCGeefAAoD7Z -IKyEzq7hUXgo8Luzw7P/7RxJtWe6vrXOh7QUO+K0iV4DWNYiAkPI08HZFUdBHwJw -s4kyIhYPXf9AjQj9LrbTiri+IPVOF8YLBYnRlT4Pg44tmSCZ+lB/P2w7xj7K8eff -+rhBkxNep4qN7EVZn5Fk+21P7phK0FCc9dxBM6YVVR8o+whejwD5KVN2RY4n6Y9P -hyO1OODJ/vv3mtiIMtbrK1/Hlhc7EaAXJVMz3VjiUFXx3KCK2/UcyP5zq//cSMdW -YVJ7+Jp+nhq+4zbQxr3Tct81kB2fkP5iO4qHFeZon+77I40jnrNg95kxHNXqSCaz -NY9d1Ss5v0g9ory9qFwd -=15J5 +iQIcBAEBCgAGBQJTKgbcAAoJEKXdFCfdEflKDAQQAJXG/xcbytQzEG6iFBQ3sQXm +1qTdraqD8wDZU6+BQ3gjuE4m/pZHVYQclSFha7fCX1qROmEGVUmT3XAE0wPHm4aA +iFhfvcpb3myGUOy5fVBMamYFt2n3M+JoJvmNpXlvgOHTw3G/Zxgdnay4HRJmu/KP +fdQc2R+mLJnUst6+AKIPIP/LIhH2X0RXZP1XIkLQZCAnagW3i26j3GgB93mj6KEw +dZzR8+wAv7Fh3+K6K+Ei2ayQMVkLNetCLz8N1kh/E0d915IfLd8M+9xCu26klMQ0 +iRB51JXkodUqzwn4gaWHrE5RC1DXVi9aR/1d5ltrLdFMRlcf/xwmi6RbSHaprbes +3wWIi84/Kfv+WfWBcroH2vcfXwuLF12cvuRUu7nsQDGyk8VmNXIHq2aMyCLnS1qg +FVDqW1I58BCAFzlqfTUapf7kcDkVMCDnnMburaCfp142Cuh2oi3H6BuQqChT/Eoz +mtKVQPN24rlkiTxl+3B6/YdtkIFVz6ooE11MkfGfrsP2gzAknVU7b12mPTxaXe34 +wo3G36x6wD1pnQW7NQ3T6J0E8QMDBJWBwxz7l5tvrgpeZagHlT2E78fj9odxiGWY +wzytr76aKJA/U9DGWslfK9i+1viJEhBOcGtd7boM32sqVQUvwMuzIhcPW1V706WE +lf0QMiZIVJgeiAT7re4U +=jp8J -----END PGP SIGNATURE----- diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index d081535d53c7..c9581bb81da2 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.12 2014/03/06 15:44:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.13 2014/03/19 21:04:57 zerochaos Exp $ EAPI="5" @@ -41,6 +41,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/builder:3 >=dev-ruby/pg-0.11 =dev-ruby/packetfu-1.1.9 + dev-ruby/rb-readline dev-ruby/robots dev-ruby/kissfft java? ( dev-ruby/rjb ) @@ -137,6 +138,11 @@ all_ruby_prepare() { #we regen this file in each_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 + #remove the bundled readline + #https://github.com/rapid7/metasploit-framework/pull/3105 + 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 |