From ecb498be49f69fafdde608557d3e6f5e339969ae Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Fri, 21 Jun 2013 21:12:38 +0000 Subject: [PATCH] metasploit: minor fixes, needs more love --- net-analyzer/metasploit/Manifest | 2 +- .../metasploit/metasploit-9999.ebuild | 20 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index 4299612c3..3651c2ca4 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -2,4 +2,4 @@ AUX database.yml 481 SHA256 2db3df7b05f28aa5ba6d6dedc32d8d1a2e24e020d6fd8aea15b2 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 6624 SHA256 f4b186c37bc1cf714fe49575239bf245b3725b6e8244184731b008253150c87a SHA512 207966249f8581f34e360154bced60b9c6ab4b050552e66f7c6276eeb181a516798ec5c2afbf10164c8b10dff1f179ff77070af045367d6af42dfd17fdaad6a5 WHIRLPOOL 5665e31e941c43f4076922eb69614a7931673fd81bdcd20324aaf4be02c0105b832ad474266ce05bbb9e9615588adcffcf1302c28cc77daecc170ca7d2d2fe11 -EBUILD metasploit-9999.ebuild 6654 SHA256 b439f3e38d64bc40cb3608d375f184db2e3619e7eb7871354c4b9051874ff2e4 SHA512 5f49c0c8c4f15bfd0d98fe16a427f9cef626d8af657242816004200d5028dc3a03be810b6df9cf3ccdb467b3a527d46f20978b380174e63642885f9dd4c3d129 WHIRLPOOL 9cb32105d9879cd3688748edf0972c3c8ceddbe4b43e81c4ce7706cd6431a4510a8bd81007b70ee84d4942e3eb6bc4ba6a45fa419c7656abeeeaad8e8bddbe2f +EBUILD metasploit-9999.ebuild 6462 SHA256 5839fffb630f61807f84c841ca758532cb66c2f497047f739e4b16e55dd1b789 SHA512 db4b947d2b1105e1df5361a251c090fdee3836b1cd101c60be1891f53cbc0b58f9d683275858d5ce04e2757a5dab4430deb4f7506bbfb98c0441577d0b7063f7 WHIRLPOOL 0f5ffef3beefaede2d40709511b2a97590248cc3f912b07c7dfa4811a74f52654c6e373453a8a119211069723b34ff3423ff58d6011b724a55732e8cfdbbc35c diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index aace1ec17..e909c6e42 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -25,14 +25,13 @@ SLOT="9999" LICENSE="BSD" IUSE="gui +java lorcon pcaprub serialport test" -DEPEND="lorcon? ( net-wireless/lorcon[ruby] )" -RDEPEND="${DEPEND} - dev-db/postgresql-server +DEPEND="test? ( dev-ruby/bundler )" +RDEPEND="dev-db/postgresql-server dev-lang/ruby[ssl] >=dev-ruby/activesupport-3.0.0 >=dev-ruby/activerecord-3.2.11 dev-ruby/json - >=dev-ruby/metasploit_data_models-0.14.3 + >=dev-ruby/metasploit_data_models-0.16.1 dev-ruby/msgpack dev-ruby/nokogiri dev-ruby/builder:3 @@ -45,8 +44,8 @@ RDEPEND="${DEPEND} net-analyzer/nmap gui? ( virtual/jre ) !arm? ( java? ( dev-ruby/rjb ) ) - pcaprub? ( net-libs/libpcap ) - test? ( dev-ruby/bundler )" + dev-ruby/pcaprub + lorcon? ( net-wireless/lorcon[ruby] )" RESTRICT="strip" @@ -114,11 +113,6 @@ src_prepare() { } src_compile() { - if use pcaprub; then - cd "${S}"/external/pcaprub - ruby extconf.rb - emake - fi if use serialport; then cd "${S}"/external/serialport ruby extconf.rb @@ -152,10 +146,6 @@ src_install() { insinto /usr/$(get_libdir)/${PN}${SLOT}/config/ doins "${FILESDIR}"/database.yml - if use pcaprub; then - cd "${S}"/external/pcaprub - emake DESTDIR="${ED}" install - fi if use serialport; then cd "${S}"/external/serialport emake DESTDIR="${ED}" install