From: Richard Farina Date: Tue, 17 Mar 2015 18:31:50 +0000 (+0000) Subject: kismet, updates to fix ruby issues, and repoman issues X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1437eacac3d6dfcc1c365046874ba85be08f35e3;p=gentoo.git kismet, updates to fix ruby issues, and repoman issues Package-Manager: portage-2.2.18/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0xDD11F94A --- diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog index 0674ffccb530..d930fe94bf36 100644 --- a/net-wireless/kismet/ChangeLog +++ b/net-wireless/kismet/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/kismet -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.143 2014/11/02 09:38:04 swift Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.144 2015/03/17 18:31:45 zerochaos Exp $ + +*kismet-2013.03.1-r2 (17 Mar 2015) + + 17 Mar 2015; Rick Farina +files/ruby19_fixes.patch, + +files/update-kismet_shootout.patch, +kismet-2013.03.1-r2.ebuild, + -kismet-2011.03.2-r3.ebuild, -kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild: + kismet, updates to fix ruby issues, and repoman issues 02 Nov 2014; Sven Vermeulen kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild: diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index c197e9761f37..99dc8eb6a444 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -10,28 +10,28 @@ AUX kismet.confd 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3 AUX kismet.initd 742 SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624 SHA512 3346b113f4370097c1638970b70a918f70b49d6db77bef627dbb5ccea8eed1e02d47f57414beaef163475ecf785d27b77a6501f4917ea9fe62a043c3f39fc3ae WHIRLPOOL 1e4de7b8012fa5f3b7d0e1ad704f4383cf5c3110d22ff9e54b292d7792b52a289e9e58fec26d6893f1a084e1501c9eaff728b435468a9f5c67b7cac6848b9e39 AUX makefile.patch 5112 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a SHA512 d571a22ffbb8ee1d015f96641b3770837fe4a1a0da630344c08ce9d338d1b2c4136ad7ccc74496a011742f44984019303e0faa0bb5998cfd880cc92f8ad896a6 WHIRLPOOL 6668d9bffcb17079085c7784828eeb16bcee9f79b6b3f541f38d26416f569d18d66672c4b49fa88f2faf0899efd119a8107b26656e978b2cd2d0ea3b7b04f901 AUX plugins-ldflags.patch 385 SHA256 0cff39e40278880d4810569dc1a17c156a3e3a11579b0ce94ce394795aba1765 SHA512 43dfa75746d7b2bfa4f2de959d08d5eb040053ec98597bec71fd3f4993352936aff9b9f7c6b3a4ac7c69fdfc8308395c83d9427dcb07d22cee907cbb66e05a91 WHIRLPOOL 64a76e73470dfbf78db78ee2d242f4dfd92c4d2562dd597e3281d27abfc7f2a6e21b15d5b2893ba290e6f63c4f59887179717f5feec476e54a1d9165133dd55d +AUX ruby19_fixes.patch 2067 SHA256 ef6d99d920c0af69f24b715060eaa4ed1de323612d957a0481a50f3d48b29dd0 SHA512 e96f817793a0a7cb49501a61480e712a0934d0afb5093605f08d31b34e797a00965ecaf85a23f2addd98003ebe74eced2d29c5817d4bd37061be4d711cc00fe0 WHIRLPOOL 9a410fc0cf6beeedf21af11400ea55014852325ecd9459b15214953ac4b327572070d4c36a09f785de8867dbd5d951a5ce5909f9534ccd2dd0e735a827e5b4b6 +AUX update-kismet_shootout.patch 3428 SHA256 a89a2631df5ab78330a70f33ab963ac43a15bb30299c2d7a576a549d962216b4 SHA512 0fe0906f4105172c3ac2fee177ea2c11b3992826a2cbafa97b13d13b7be6117d42d11f4d256b341a19b540d1f68e3123e70314791fc52402fa2bd24c2775d0e0 WHIRLPOOL 2e4c5080e1a5e72c69258eb99f2da0fca0b1f59087a836d20d90e1fa2e99f707ea6dd75e89be25fc5e5df31959f44d54fcfe90838e78416d8c2f529f2c9f2f1d AUX use-hostname-by-default.patch 1156 SHA256 34b7f8280549ab6022486b5e5744a6d7cebd54d727ebde4fbe5af8955d17d530 SHA512 919ea108ae089a033532ef3bf0d741c2b9e32547326b68bb8b3c1821d60493039882b3e660ea2d326205a68136d550a74e5fdff728a11ac86ea666f43af2ecb8 WHIRLPOOL be922f04a05074bfc78b40598e9ed8e42876859d92666f52b53e3f6725902621ab04050ca3b0a2bbebe5081f21e5d7e4851ff59832e1e84abd99a2c17db2d947 -DIST kismet-2011-03-R2.tar.gz 924988 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 SHA512 4a74edd5b74ecf2171ab20a2cec5c2d0abcb6a9f24fbac6bbcab8039c67927ffa393e27932be49625a9f15c8580ea88ae51b65e42a4de5bf6bdf65631c26bb18 WHIRLPOOL 7975cfe9c754e902fc4861540ac4c21892df39f4edfc71870ee944a09769305614360a640c27753b1770bd2b1ee82f06725afbf30afb51880536d3c38261b920 DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843 -EBUILD kismet-2011.03.2-r3.ebuild 4446 SHA256 8ace1471086cbaf98d9049b258c274f640e6a3a805d1f6dbaca695d431296626 SHA512 cbb4e37e432a60c40cdf52f3f4935fe6efb1ba37b73accab0f2fa686f434e0d19869c1dbfee9a12d61728e17373f8eda7d10ae9880836fdaf9200ff4228a7e60 WHIRLPOOL 5c21e300111d829d6aee4adcb8bbe36f1f36ece0c93eb7b8b03f21e3df73cb56d5423704d44cbacb8933e4879b013a0a4b7f0bd747eecd4f68bbf97e5267573b -EBUILD kismet-2013.03.1-r1.ebuild 4483 SHA256 80690894c5f664728453d7b45692cbc6cdb2d4fe1abd7255f7319739047de7b3 SHA512 f4dec3eb7b2c9f862cfc20d25ac0005bd03b9f2589214922bf303a2b1ebe8061ce64ca54fee5735f65a72059cd2159790e47f7daaa4338ecef27a7e7ac38774a WHIRLPOOL 2dea43cb68be3606f7487f38ebe77adc25f7ef03cac8bc2b9f3077cb9a4071045cbfe13dd9b2fdf9832cfde0dd6788e4837a2f6bcb767ffcfa9dcc93c1d00f53 -EBUILD kismet-9999.ebuild 4410 SHA256 c302968e7a82554b6c05fa5e07f361e17a16ce3eef45f32f7759063c587ed80b SHA512 82e437e268eaede28879bfee5f8016d540132920ca119b180ce08cbc4fbf8461a31b572fb3f5eea8f0932d73fb58dc4ac0eada3997619f21acf8e9c22d19a483 WHIRLPOOL b14c1f41e685e08f45d4411b0e3616c3799e84cabdedba9a0b8db83583c314619ae6d06ac92a9841ca84f51c8ee8989728d1cc6ca851c9420f6a01dcddb431c5 -MISC ChangeLog 23260 SHA256 d366b4906ebca6a6f1ea294020faa6de72f8412a4c51f52b2251f26e0d118f1b SHA512 235f38f1e4ce06a0712c64f7a22eab499784d0df7597d7c91b91211a647817484946bf4e6029fd3188fbc33d4405464a81b2dd891a6dd7ea283b5b61f7f42441 WHIRLPOOL 1fffa071ef2511704564874a2b321b84a0f2a4391d4518e963dcecd87f023a0a45f29b2d7486b4438243ed24b254168a9d5166bf3ff4a943b50cd7b55165ee08 +EBUILD kismet-2013.03.1-r2.ebuild 4554 SHA256 aaa2d8b4167b12a17cdd875a3bdb19c3e963d3519c17f6d54471c7428efe4375 SHA512 14017afade2e9ea2725741d5e3f9fd74d41dc9b98a05dcd8021ed046b7fd78c6d33956e1c4aed29d29ef218e87ca5a5f2029812bbec2f90cab09b171f786da2b WHIRLPOOL 1fe02a01e8a756c65061bd3f27f0dec43fdf99a5314ab08e8c3255e08aea157cd98946bc9e621ea168e35978432740b8c3967ba5f1bc6dbe758d124c55b0e167 +EBUILD kismet-9999.ebuild 4359 SHA256 4687098499d79f36c49e83a30000da28f84b110fcd04de417be28aabc6720924 SHA512 b48c8ec5c2bb1e6663d4aa70bdbda5209051083fc02e2de4765a26d09f1aba88a6cdbe4355e8932e366d016cdeb6eea9d102bc4d97738668fbe2224fc57cfd3f WHIRLPOOL 2f8a71ec5ac84dd742526a3e0735c4a1cc58f516825921f8fff296ab9dec2498f6a15632b788d2cb31d99d593ec68b915de98e0413ea250cb6ba38206391c780 +MISC ChangeLog 23583 SHA256 2b46762a5efd81dc6053807342022f0d367fb2916e2e78e104dcdc6efadaa77d SHA512 86d3cde33eb8cd448ca1ab4c08c2f8a4b595b2cb9bf5fdf5cbc9a7be8f391e0cf1a4c410e5f05117feb8cba76b4dbb057f7f9ae2e05337a04eb82482bb97f8fb WHIRLPOOL f9403562c55e0f59c85aec83d550d63eefc406f2f85b7f5b742c39da64fae0058e8e540f6cc6b4e7ac13cb2d92c1b40d1ff7fda79ce9dcc17e39490b86f73f20 MISC metadata.xml 1341 SHA256 36e071c984d507b1d231b37414b9e9c74183234974ff922d94969b2d33d620d6 SHA512 63654708684f7b1c408269a5cd596d3ca4786ee50fbc76e0d68a3819fb02f50f49a8b9ec42703fac54a318a87f058c304e5ad4a363beb1c41ed407810c5f23ae WHIRLPOOL 45e8cd0ff325361705e6d53059f5f14b171919fa77d24a4572104a9c401036273ba53e5f4dc49c180790495342b72c5da80a975e302de28f4dbf3e67a26b07c9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQIcBAEBCAAGBQJUVft9AAoJEC7dUkA7aK9HB+oP/3Z3NbEPLh40Z4xg+jCBQ276 -Yg1DPuDZaG2tqVcPwxNPRZ/NcEsa/xaBtXI5CRw5DMAFucZUuWZAqcUjD4IR7eOK -S3DR1t06mDTsMXg9wGxoLOPoiOqlVHYNd2RwbBpnS+OEF29kv8TJViqnqWibqqn4 -H/SIlW0RMeIQGS+CrfirUgWet4rZgsy1orT+e42ciNOLyoOLHkMtBOmu4L7VGu/c -oxI61gDwLE7bWXmUk/vArYcv3iQOtSV40MOSsAkMia16eeRR37/aZlPgpPCTrF8H -WZAC587vio6hSiB95dRPvs12gmgvmBWn/C/+f4DnVksNIIxuoD49dqaBS+8j+t/u -HlsJQ+T8TaJRrBt1Q6X1/FGwgxAPFtY9d5exkAOTzW5GqhUTwac9f0N5qvFTV2Fo -AI2kEOzvVVJlpPvrNYNiFF3JJBPU0ZikYRjr0FM3COGpdiZdP5m9CF9TEgH+XUOq -njBdCnA/NsQk877U17cMyE7TzG2gTjYWa7wO2Sq72jkNWqhCSqtqNF4nQ+o4ns+a -fhATvDzYnRbn0d45KqUrOzACGyjdEKnBzvh/13ckx+InjFsQSW3kENZJq20dwff2 -8OAkp26bomxBYYzwmRotbXTk9YFJC0qWGnm/N0sbLz5MEDQenhw4ThvqoP75mKA8 -dvwIUBmqzXLQsR4WGHsj -=Yu7q +iQIcBAEBCAAGBQJVCHMbAAoJEKXdFCfdEflKVzwP/j0PsYQi3eQm3zHDrFdDpPyq +WfUZnJQ6+Arsjego6nHFxnY7kbrdnJt5BdG/Lt36BVULYZuvNM/9m8P9v0HyCZGa +vLbPLP0TBNSMYOLz12gT/uxXMKQYr22cJMNC39+L4unVJ7FRjfeuqYgYDXcMfynb +Z8td9j2mfG4Fb+3JNl3XkgEBT/oKqN1epDYvLRDjXD1GmkcgMCd9u5s9Q8yuqdSs +mi7OHuRsM2GlSx9JWmE8gTSAoj45mMpTqL8sn32E5P1t9cLuPIB3e5BgsqHKhYiS +eO69YpCqDqJLbpueEN3db+nzHy0ascLdF6jMRBZW4XUTkq5VQKSa8kBTPuMRsFM5 +ikshkgP7hAFrRwY6vmrW5+/H8XjPNJwSKtTaOonyEQ/R6qnotCp1koFi6b+Dzms9 +r9jkT4MyIQCfWCNHUKJiHiF/+TL0sfVU2xcSF4UjtMFZcyWECdn1Fvi/tfvDlU5F +T1ZrGjOcy5kqj18DFvqKpSnj4DilYIvYyG7S8syUGMsPLhitOj5eXWrkOKQPAreX +ZqSCryDdC+tGvufAAdow8PNMMAFznGJAK51BHJrO1ucz9iSlmoWc87Me1JQ8sPtH +LgieHXk6xI4Gb9Ab+VOWPhrkJkFI0KVsAe4wYk7KYCQIsdd7vk0N26yr6m2ViqwW +kxWwM8WMMEvrUDK2DUGM +=mGgy -----END PGP SIGNATURE----- diff --git a/net-wireless/kismet/files/ruby19_fixes.patch b/net-wireless/kismet/files/ruby19_fixes.patch new file mode 100644 index 000000000000..28b704d03c66 --- /dev/null +++ b/net-wireless/kismet/files/ruby19_fixes.patch @@ -0,0 +1,85 @@ +commit 09b5076e4cd8338d3b45a760662fc7347f8d93bf +Author: Mike Kershaw / Dragorn +Date: Tue Apr 23 10:33:07 2013 -0400 + + Ruby 1.9 removed '.' from search path, use require_relative; also remove + spurious 'break' in tx code + +diff --git a/ruby/kismet.rb b/ruby/kismet.rb +index 5b18b23..7eab708 100755 +--- a/ruby/kismet.rb ++++ b/ruby/kismet.rb +@@ -61,8 +61,6 @@ class Kismet + rescue Exception => e + pp e + +- break if @die +- + puts "write error: #{$!}" + end + end +diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb +index 057a514..d3ae968 100755 +--- a/ruby/kismet_addsource.rb ++++ b/ruby/kismet_addsource.rb +@@ -20,7 +20,7 @@ + + require 'socket' + require 'time' +-require 'kismet' ++require_relative 'kismet' + require 'pp' + require 'optparse' + +diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb +index 6969247..27373a9 100755 +--- a/ruby/kismet_alert_syslog.rb ++++ b/ruby/kismet_alert_syslog.rb +@@ -20,7 +20,7 @@ + + require 'socket' + require 'time' +-require 'kismet' ++require_relative 'kismet' + require 'pp' + require "getopt/long" + require 'syslog' +diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb +index ec8f0f9..7adffe6 100755 +--- a/ruby/kismet_list.rb ++++ b/ruby/kismet_list.rb +@@ -20,7 +20,7 @@ + + require 'socket' + require 'time' +-require 'kismet' ++require_relative 'kismet' + + def bssidcb(proto, fields) + puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}" +diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb +index accda7e..931360f 100755 +--- a/ruby/kismet_shootout.rb ++++ b/ruby/kismet_shootout.rb +@@ -21,7 +21,7 @@ + + require 'socket' + require 'time' +-require 'kismet' ++require_relative 'kismet' + require 'pp' + require 'optparse' + +diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb +index 9fe581d..b878979 100755 +--- a/ruby/kismet_sql.rb ++++ b/ruby/kismet_sql.rb +@@ -22,7 +22,7 @@ + + require 'socket' + require 'time' +-require 'kismet' ++require_relative 'kismet' + require 'pp' + require "getopt/long" + require "sqlite3" diff --git a/net-wireless/kismet/files/update-kismet_shootout.patch b/net-wireless/kismet/files/update-kismet_shootout.patch new file mode 100644 index 000000000000..57ff69f7bec2 --- /dev/null +++ b/net-wireless/kismet/files/update-kismet_shootout.patch @@ -0,0 +1,103 @@ +From 0ee73bd14c71e44ce53bc1016b871dcb6965e443 Mon Sep 17 00:00:00 2001 +From: "Rick Farina (Zero_Chaos)" +Date: Tue, 17 Mar 2015 12:57:16 -0400 +Subject: [PATCH] update kismet_shootout + +make a little more detailed, 100.00 instead of 100. +also extend space for name now that wlan0mon is a common interface name +--- + ruby/kismet_shootout.rb | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb +index 931360f..61f70b0 100755 +--- a/ruby/kismet_shootout.rb ++++ b/ruby/kismet_shootout.rb +@@ -48,7 +48,7 @@ $lines_per_header = 10 + $num_printed = 10 + + # output type (std, pretty, csv) +-$output_type = "std" ++$output_type = "pretty" + + def sourcecb(proto, fields) + if fields["error"] != "0" +@@ -102,11 +102,11 @@ def sourcecb(proto, fields) + hstr = "" + + if $output_type == "pretty" +- hstr = sprintf("%s %6.6s %5.5s %8.8s %4.4s", hstr, "", "PPS", "Packets", "Pcnt") ++ hstr = sprintf("%s %8.8s %5.5s %8.8s %7.7s", hstr, "Name", "PPS", "Packets", "Percent") + + else + $cards.each { |c| +- hstr = sprintf("%s %6.6s %5.5s %8.8s %4.4s", hstr, c, "PPS", "Total", "Pcnt") ++ hstr = sprintf("%s %8.8s %5.5s %8.8s %7.7s", hstr, c, "PPS", "Total", "Percent") + } + end + +@@ -141,7 +141,7 @@ def sourcecb(proto, fields) + $card_records.each { |cr| + cr[1]["printed"] = 1 + +- printf(" %6.6s %5.5s %8.8s %3d%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100) ++ printf(" %8.8s %5.5s %8.8s %6.2f%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100) + } + + t = Time.now.to_i - $start_time +@@ -163,7 +163,7 @@ def sourcecb(proto, fields) + tu += "#{t}s" + end + +- printf(" %6.6s %5.5s %8.8s %4.4s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu) ++ printf(" %8.8s %5.5s %8.8s %7.7s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu) + else + $card_records.each { |cr| + cr[1]["printed"] = 1 +@@ -171,7 +171,7 @@ def sourcecb(proto, fields) + cname = "" + cname = cr[1]["interface"] if $output_type == "pretty" + +- str = sprintf("%s %6.6s %5.5s %8.8s %3d%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100) ++ str = sprintf("%s %8.8s %5.5s %8.8s %6.2f%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100) + } + + t = Time.now.to_i - $start_time +@@ -282,10 +282,18 @@ OptionParser.new do |opts| + options[:channel] = c + end + +- opts.on("--pretty", "Format output with pretty ANSI codes") do ++ opts.on("--pretty", "Format output with pretty ANSI codes (default)") do + options[:pretty] = true + end + ++ opts.on("--std", "Do not format output with pretty ANSI codes") do ++ options[:std] = true ++ end ++ ++ #opts.on("--csv", "Format output as comma separated values") do ++ # options[:csv] = true ++ #end ++ + end.parse! + + if options[:host] +@@ -315,6 +323,14 @@ if options[:pretty] + $output_type = "pretty" + end + ++if options[:std] ++ $output_type = "std" ++end ++ ++if options[:csv] ++ $output_type = "csv" ++end ++ + $cards = ARGV + + puts "INFO: Kismet NIC Shootout" +-- +2.0.5 + diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild deleted file mode 100644 index 3f6a5164a1d8..000000000000 --- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.10 2013/12/06 17:55:58 swift Exp $ - -EAPI=4 - -inherit eutils multilib user - -MY_P=${P/\./-} -MY_P=${MY_P/./-R} -S=${WORKDIR}/${MY_P} - -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/trunk" - inherit subversion - KEYWORDS="" -else - SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz" - KEYWORDS="amd64 arm ppc x86" -fi - -DESCRIPTION="IEEE 802.11 wireless LAN sniffer" -HOMEPAGE="http://www.kismetwireless.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby selinux +suid" - -# Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch -# or 4.96 which still builds properly. -RDEPEND="net-wireless/wireless-tools - kernel_linux? ( sys-libs/libcap - dev-libs/libnl:3 - net-libs/libpcap[-netlink] ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - client? ( sys-libs/ncurses ) - !arm? ( speech? ( app-accessibility/flite ) ) - ruby? ( dev-lang/ruby ) - plugin-btscan? ( || ( - >=net-wireless/bluez-4.98-r2 - =net-wireless/bluez-4.96 - ) ) - plugin-dot15d4? ( virtual/libusb:0 ) - plugin-spectools? ( net-wireless/spectools ) - selinux? ( sec-policy/selinux-kismet )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet.conf.in - - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in - - epatch "${FILESDIR}"/makefile.patch - epatch "${FILESDIR}"/plugins-ldflags.patch - epatch "${FILESDIR}"/bluechanfix_r3184.patch - epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch - epatch "${FILESDIR}"/header_alignment_r3326.patch - epatch "${FILESDIR}"/use-hostname-by-default.patch - epatch "${FILESDIR}"/${P}-cflags-backport.patch -} - -src_configure() { - econf \ - $(use_enable client) \ - $(use_enable pcre) -} - -src_compile() { - emake - - if use plugin-autowep; then - cd "${S}"/plugin-autowep - KIS_SRC_DIR="${S}" emake - fi - if use plugin-btscan; then - cd "${S}"/plugin-btscan - KIS_SRC_DIR="${S}" emake - fi - if use plugin-dot15d4; then - cd "${S}"/plugin-dot15d4 - KIS_SRC_DIR="${S}" emake - fi - if use plugin-ptw; then - cd "${S}"/plugin-ptw - KIS_SRC_DIR="${S}" emake - fi - if use plugin-spectools; then - cd "${S}"/plugin-spectools - KIS_SRC_DIR="${S}" emake - fi -} - -src_install() { - if use plugin-autowep; then - cd "${S}"/plugin-autowep - KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install - fi - if use plugin-btscan; then - cd "${S}"/plugin-btscan - KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install - fi - if use plugin-dot15d4; then - cd "${S}"/plugin-dot15d4 - KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install - fi - if use plugin-ptw; then - cd "${S}"/plugin-ptw - KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install - fi - if use plugin-spectools; then - cd "${S}"/plugin-spectools - KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install - fi - if use ruby; then - cd "${S}"/ruby - dobin *.rb - fi - - cd "${S}" - emake DESTDIR="${D}" commoninstall - - ##dragorn would prefer I set fire to my head than do this, but it works - ##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is - ##is there an automatic way to force this? - # install headers for external plugins - insinto /usr/include/kismet - doins *.h || die "Header installation failed" - doins Makefile.inc - #todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc - - dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore || die - newinitd "${FILESDIR}"/${PN}.initd kismet - newconfd "${FILESDIR}"/${PN}.confd kismet - - insinto /etc - doins conf/kismet{,_drone}.conf || die - - if use suid; then - dobin kismet_capture || die - fi -} - -pkg_preinst() { - if use suid; then - enewgroup kismet - fowners root:kismet /usr/bin/kismet_capture || die - # Need to set the permissions after chowning. - # See chown(2) - fperms 4550 /usr/bin/kismet_capture || die - elog "Kismet has been installed with a setuid-root helper binary" - elog "to enable minimal-root operation. Users need to be part of" - elog "the 'kismet' group to perform captures from physical devices." - fi -} diff --git a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild b/net-wireless/kismet/kismet-2013.03.1-r2.ebuild similarity index 93% rename from net-wireless/kismet/kismet-2013.03.1-r1.ebuild rename to net-wireless/kismet/kismet-2013.03.1-r2.ebuild index b77c236c283d..4edefc01aa30 100644 --- a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild +++ b/net-wireless/kismet/kismet-2013.03.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.9 2014/11/02 09:38:04 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r2.ebuild,v 1.1 2015/03/17 18:31:45 zerochaos Exp $ EAPI=5 @@ -30,15 +30,13 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin CDEPEND="net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 - || ( - =net-libs/libpcap-1.4.0 - ) ) + net-libs/libpcap + ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) - ruby? ( dev-lang/ruby ) + ruby? ( dev-lang/ruby:* ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) @@ -54,6 +52,9 @@ RDEPEND="${CDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-tinfo.patch + epatch "${FILESDIR}"/ruby19_fixes.patch + epatch "${FILESDIR}"/update-kismet_shootout.patch + mv configure.in configure.ac sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ conf/kismet.conf.in || die diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index f36413114c94..b79f63d110c5 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.12 2014/11/02 09:38:04 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.13 2015/03/17 18:31:45 zerochaos Exp $ EAPI=5 @@ -30,15 +30,13 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin CDEPEND="net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 - || ( - =net-libs/libpcap-1.4.0 - ) ) + net-libs/libpcap + ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) - ruby? ( dev-lang/ruby ) + ruby? ( dev-lang/ruby:* ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )