bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 73 insertions, 17 deletions

diff --git a/net-analyzer/cloudshark/ChangeLog b/net-analyzer/cloudshark/ChangeLog
index 052602c65c5f..8b77edaa6db0 100644
--- a/net-analyzer/cloudshark/ChangeLog
+++ b/net-analyzer/cloudshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cloudshark
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cloudshark/ChangeLog,v 1.4 2013/06/03 13:54:17 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cloudshark/ChangeLog,v 1.5 2014/06/06 02:38:43 zerochaos Exp $
+
+*cloudshark-1.0.3.180 (06 Jun 2014)
+
+  06 Jun 2014; Rick Farina <zerochaos@gentoo.org> +cloudshark-1.0.3.180.ebuild:
+  bump
 
   03 Jun 2013; Rick Farina <zerochaos@gentoo.org> cloudshark-1.0.2.174.ebuild:
   adjusting some line lengths down for readability
diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest
index 22a37c7acca8..eedaa7454a37 100644
--- a/net-analyzer/cloudshark/Manifest
+++ b/net-analyzer/cloudshark/Manifest
@@ -3,23 +3,25 @@ Hash: SHA512
 
 AUX cs_log_dir.patch 402 SHA256 7f8e9bc482c4e83dadf617386b769e11d6a56428c4ba7c270bae63cc37f81dfa SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9 WHIRLPOOL 4547b19f333c143d9fae7c550ac1d6d057fb69e0e8ead6600c94dc5cd776815c0bd99f86097c3549ebf01ade5a1fa259bf8a5b576c580f6ab4163cd97e0dda6f
 DIST cloudshark-plugin-1.0.2-174.tgz 143067 SHA256 d5918e9e3dc60059bdc40d436409c18197df428266863d90367a762f08c3623e SHA512 42445e67630b1bd2968f0836f625acb3792f22257de104ec0b90c59fa8d2096649eba2252cd6161ce57c8ff79095d52c5663d2fa018c650667896c9905e9dd7e WHIRLPOOL 01f3f6bc87b3f09645d2fef953d84b7ba3828f960d7e9bb952bf18cbeb8422beb63cee21355434f392727795b0462e59fd2b07549cce6048e689e5e02bcdd19d
+DIST cloudshark-plugin-1.0.3-180.tgz 143381 SHA256 0c0b204622107dcb29d302401688b62fa3b904eb0b5ccfa6bb42802084f5d102 SHA512 765144e6a2c7ce17eaa05f8170216e08ccac224ba6c11750893ae5caa8f40a2b6bee883fd9be91fa800ad3b45dc42d2ec81e564aa573015a91a8537be8384c73 WHIRLPOOL 818abb8dd904c72fe870336bb3702df04af7299c6e3bbed21510a0a4484997ec4eef68c14f0a556285f82a89ef57fd9768c6814cc3311c4abd28194d70159926
 EBUILD cloudshark-1.0.2.174.ebuild 1766 SHA256 39d4267d4362bd993dd876c2b1e2f98ec33d4f96b5f055fbb3261237e5d767f2 SHA512 b3ed7a601d2b5682f9fb5f7bbdeabfafa7a1255fd04797b1d26f7956f617c09c9c2dc76025d71a2a1d034df092814095d2d7cbb440326eaeaddcc7a7c09f1890 WHIRLPOOL 456870234979bf243f7a1510be34ba1b34b10b11c1c8fe2c53071292331279c7a7230919208a44cb0fd8b620f82e3c3d01672c73c16206ca6ab19a3108ce044b
-MISC ChangeLog 728 SHA256 a016b0cb82fb83de8a3977bd55846fcbe8d2c8586a41745fcb015ef22aee2016 SHA512 d6fbfb618990382f0eed4e8d505d934b6fd77517cdc2e4c9825055316dfba18e9106964e26cd5ddbce03759eb3f3efea5b7e109cdbd6120431f607af76ee9160 WHIRLPOOL 1dde9ee41bd512d7c9d2f616a69b2d2f5ce8893a11b68734e0d01b185a8844dec07c14e1170ee6dea86e4639e8b57e1a68f9544215a74d54c8a1f226d22851c2
+EBUILD cloudshark-1.0.3.180.ebuild 1763 SHA256 be5c082ea83331654a9f7e53ec6c962ae3c38e32f619a047b560368dc4489dc9 SHA512 569bdd3e310e4ec63ce8feb26dce7ae68625a2cf7734e757629257f61d423cad7c81e8f4db2e498af457daccd0673a8302bcf54857bac8886cb7ff304df21b71 WHIRLPOOL 2e7db03399d4d422a2e1032c846dd5caeba9b00b8c44ab7688e2096fc8303febfee67e5186a90f786f343fac4cb3a0102722f1ff9698c63cb8261f17e0b4e3bb
+MISC ChangeLog 853 SHA256 40dcbea6618213cac2dd952c3610c3fd28dc1fac8090eda249d8925cf6a57dec SHA512 e4b3c9b2df149a9b126d82cd96108c6e59d4147468b558cb584af1aefacb8ea2185ae1368ee6aa20ff64cdc72c6f581383e5731a04de5cd8f2027a516a5bdb48 WHIRLPOOL 1313028e44b3da445511a5353f08ff8c898b801a4ed73fe45a1fc3222c75e9822ad4de6ebb6f4d11532efaa1932e5f1079918a801bb6977e95d249378c6cde36
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRrKBEAAoJEKXdFCfdEflKHKIQALa6oH4Yap5EYcf3juwjNkSP
-sGgC8CRGXCAOCklzbKOhvnyOPwU6Je8fKG3Ms4JVgUGzWFGyBND4PLJmCJluBNft
-XuBqVLwLKyJ0M0WewmBk7EvHgt8M8Q5JLW+9xISJ/bSBjfCjQiYPWC6BliLe9wXq
-Tr2OLrVs710BcaZgAZAL+ptLcZIetk+l/SIrlz2FQilv6SW8XPJNQ3nAB/wMRYKH
-mpwccJpY+5XKmuF7iigdvLwZgDf5+0LqxaoPdiU58/kspYWyaihR2MxHq31WOVls
-jxEXWICpyftYd4o1b9niUnAY+Ye8k4Or3b9RQ09D8cM+yz5WT8hsOq3s2rdxn4XS
-I3GjsYiW8ap/83JAmOGLLs+Tn8v1mKbcpw9+26EWsk54Q9SEy+jiR4eQbd85/C6W
-g3ncvPk0HUjmUZSbaJ0Heclyr/nm+UeR3JxVTorUL5qhJ+a7DT4MGqYebUZ2ZojZ
-CTWMEmXyUd2m2ddysDRUDzHoN6JhpXGc3iogXkFNu74g5kTCd3+jRd3B+r7ccpJc
-YrRTpbtS+DTV6LZKgS5rXeONTUNqTyVZzn8Cx2R1ZMdJwXVHHLaRwAZ3kQFMufcN
-FCYP9OQRS7UAocgG2rpCqhle5zdrnMNl7aMCHaAkiEhhW3ldKitu04UGvTZP7QLZ
-+1IsANGPdA4YfDXNZqar
-=v/7D
+iQIcBAEBCgAGBQJTkSpkAAoJEKXdFCfdEflKtAUP/2lKVy9XAbimneqOxa++ErKY
+7Mexdwqw32md45c0XiZtr2Q9zEWsnYv269gepVwFvQ5vF+ArI50K+WWgCfbcaU39
+hLygmzZpkwwfTKOg6kTj7tRzsOCteJGJ8+DyAKN4tE/M11Qpl/qspsgqoF4/fU2U
+AcsE+IYkgz69kjtoYAVhuks3DLkhpdsho13ZhNR3E9Td/7Jj5F40q4N/MF2rFcXr
+RND/EezwSHUeSS233a45j1RNRK8Q1Yq9aYU99hebx4pfmu/64QDifFSSlsEBfJQp
+fje3UKQsZ4ttteCbasCHOhAn/AciBmBuGbF4jqRe+Ip9yxnhumSJvmN6Gwyc2P9B
+sq16Uuz2qfgKT7WavB7exXaRxMxcE2LmATo7lJllpt8hdpOt1etrBCCCdQ+pvOpp
+2ITqGv7KA7EczPH1kDW4ypGbUsm8h5mUXtJGKadMGsvBdCHZV7oZ5TMV9NoUrDcL
+7JqRPtzi7hohZfAnZFRhHKq50q6HRAx2sEDY/oxhfi462P2OvzrejxB7B+Le+o9G
+N769o9uSZp2zVg9On9GwkoDQzp0TFmRmndrRy8HDsfF/BZ6vacFn/UpZFB0ht9XJ
+YcBBXs548D6AGKdp54wrdD/v1L8AMrEFUmJP2AQlKCaVV15kA8sZC2iiP2KTsNqj
+7PPJOt0ooqgu1/qQ/SDr
+=Rrcs
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
new file mode 100644
index 000000000000..3be4ea9be1ad
--- /dev/null
+++ b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild,v 1.1 2014/06/06 02:38:43 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils multilib
+
+SV="1.0.3-180"
+
+DESCRIPTION="Easily upload your wireshark captures to CloudShark"
+HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html"
+SRC_URI="http://appliance.cloudshark.org/plugin/${PN}-plugin-${SV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PDEPEND="net-analyzer/wireshark:=[lua]
+	net-misc/curl"
+
+S="${WORKDIR}/${PN}-${SV}"
+
+get_PV() {
+	local pv=$(best_version $1)
+	pv=${pv#$1-}; pv=${pv%-r*}
+	pv=${pv//_}; echo ${pv}
+}
+
+src_prepare() {
+	#cloudshark isn't meant to be installed systemwide, we fix that
+	epatch "${FILESDIR}"/cs_log_dir.patch
+
+	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
+	#causes errors, looks like it expects windows paths only
+	#echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default
+	sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua
+
+	#stuff to fix cloudshark_init.default to be more sane
+	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work)
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
+	doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt
+	newins cloudshark_init.default cloudshark_init.lua
+	dodoc CLOUDSHARK_README.txt
+}