Ensure setuid on /usr/bin/dumpcap (bug #457084 by Kobboi).

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 18 insertions, 14 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 2db629ee473e..0890cf4ebff6 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.453 2013/02/22 18:28:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.454 2013/02/25 19:02:38 jer Exp $
+
+  25 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.13-r1.ebuild,
+  wireshark-1.8.5-r1.ebuild, wireshark-1.9.0.ebuild:
+  Ensure setuid on /usr/bin/dumpcap (bug #457084 by Kobboi).
 
   22 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.9.0.ebuild:
   Add dev-libs/libnl dependency.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2d18b04ffc45..c2374e3add8b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,17 +7,17 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.6.13.tar.bz2 22077778 SHA256 32f4811bb7a259612aac04be5722da51f145fcf66fcf69f358e98d4cb78dd091 SHA512 addb42d7630c4c382099cad696581c73a43ebc31727d1838926cb306ff13641b6b586063fa9186a7c0f24522690fa8955844b228ea9b79b7a71ae893730dba45 WHIRLPOOL 72a91fb14529db5e737980b816bd70175b2b0245e387e0fb3d0e937bdddc46085f01bfab75c34663f768b119270bd676367ecc3b0ffa8872e43679bfeb05152f
 DIST wireshark-1.8.5.tar.bz2 24196532 SHA256 d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372 SHA512 3378310870e2e11cd4caf91e0571e2a52bd81bc76f1715997338d867a4d98ad7bb34e0f4443220386b498aeebce15c02d9825e50cf587587f573a5a0c578b039 WHIRLPOOL a9ca0f7cf14efcc4c56f7a2ab16ed0962998bc1467602d3f201e569513b0dde1363a7507e7a3f53535b8878ed2fd4a469699c88dcc1a3c4ce90461ac2c7a3c00
 DIST wireshark-1.9.0.tar.bz2 24592626 SHA256 0a21aa84e78de2ae2f758e5f21edf2ec5c26a372fbfbb30a53a9b67a128e4538 SHA512 b1e6ad9a2320c9a73de57dd4f37189f3319c67e95559648587395fbd20a0ec86f98b6674e77f450df3ac39ebe5b92a4105afa3d6d222ee6ac03a7b6bb5e4bc8c WHIRLPOOL 429322185e44f5dced728d6945ada7abba08328f8e0d3bb22a853cb730df611d9218315ac009987348993c1a3fff53f14b2f5133c67530d3fa92f835fad273fd
-EBUILD wireshark-1.6.13-r1.ebuild 5383 SHA256 9d61121b9d79f50606d9acb969ff0ccd747f7037eeefa3dc58777d25d747498c SHA512 492c1a8fe2893519dde53edc65a24da7885089c1de27f12b38b193b84148d37bc14cecf73d75804c633b2c7dc0628bc52a4f1a6c82df8e32c477a575ddd2590b WHIRLPOOL b427beedec7e6a0c59108742c1be314d07eaff58fc48323f5fa626a38ed0877ae0b0e95b761dd149aed84a883c17dd2685d49b633febcb4f45d4d9271d55cdf6
+EBUILD wireshark-1.6.13-r1.ebuild 5383 SHA256 31a92c013a18b060bbef5aecc675dd242dd2db5a8a83c46c290deab92c5b232c SHA512 be6af48fdae9fc96d489d4b42e115308001ec5988b5c080ef7b86352b45410f803d404b1990a199bea8b7cfadf71686cc3f566b4bb465f7eb78b94e201e434a5 WHIRLPOOL feb57196217428310f2c1a0ed8865aeff96d515675eeeab75cbfc441744a25ae50ee772569ff3065496f7bd4111c67bd1c0fa6a30614f31b183252ea2cd329cd
 EBUILD wireshark-1.6.13.ebuild 6409 SHA256 2084d4b6fbe051f2954e0e70f43e8b69bc4415f7843511d0778a982ab08185c5 SHA512 06e5ed612d116caa105a9c0713cf8cc9af2f7c81bdc07d2cddf5dfcab4d0f0bd15ba86c8902d251369448e8998091d413e24a22a9fe813aeb1fe571a85bcf29f WHIRLPOOL aa1752218035641aacc74fa0ef553908ed13a219c29268d7eb37833b3dd0bb2e26d845056b45901826427d8b8a4a31c9b00b4b68d2be43bfaafeee89e1833eaa
-EBUILD wireshark-1.8.5-r1.ebuild 5702 SHA256 b37909756c90e541210c6a77f6892e27d492f60bfcd2824fd5f61982e62256b0 SHA512 1ea63be0e8964c8e29ceed8955e2c65233a1a4618cd6aba66be15dd7affc230642db8998745d686a3710eca968314047cac6a5fa9bd5de186362d9c72fbab129 WHIRLPOOL a7500c9a05836e6f8d0cf1acaf34613825cf5a2feb70758042e41d18ea0222470dc87bab3ea55613ffa8dc7f6d8394dbe3467286d08fca5a5cc18015aada9820
+EBUILD wireshark-1.8.5-r1.ebuild 5702 SHA256 6a63e791dbf49d6874b27fdaed5de6832f845e091e00699d5f6b6abc98d81675 SHA512 ba91642cd3669803f955471c94a6ec09ed6a01441dc98f84a3b673a3d8bfe0227491d06f71067b8ef5ec4102891bad77e62c20a44f05d7e764dd8c8a31c8ef0b WHIRLPOOL 1dc279aa3794c302087ee88d700cb68c0d0528b5b4ea0edec95e2e6dcddcd632d2317793a8902123a483bbce6bcb8f43272925a992d86ada65b21dad35c3e2ea
 EBUILD wireshark-1.8.5.ebuild 6796 SHA256 f6b50852f4c03692aa88a9d98f3f7edc8131d7cb8f490e483b50358180472630 SHA512 b389b70836ad0e3539e9f1e7eca73362e9ebc87a078422def834559818b0145defca90539284c98657ef704d73b94da14253c90c95f4e6f96c408826a8e2537a WHIRLPOOL 61054a9accda9ac0661bdee3d35c2e7281fcf5c867f1d0f3c789acb86188153507e13a91b3e442f58da69cf5ea9eb548f7c314803ffb3d21eb4c4bd6945c1f77
-EBUILD wireshark-1.9.0.ebuild 5671 SHA256 063923866173fb37f87bb4f2a7a21a4c2c58787f64823ebbe7300e6c898577cc SHA512 3ae132035c25902962c335924381d3765ce57dd697941c27d3a4721943df0c4583f893f123c73413f8a4e2a6ad8c32efae2552901f46004172c224df58c07487 WHIRLPOOL 18d64abb118c5462aab24d9cb6a217ac8d825c4145024d4e158f1904cb99eaeecfc50c029c1d1f16a4179658b2b85b3fb57969610c0b747114c6df171beabe3e
-MISC ChangeLog 65615 SHA256 eedb188e86fb9170b64fd8ad4ca666b48f46a2bf0c4f332ee0c06054a06e4e57 SHA512 f29f93a97af9d1c66c2d3319d80730e61203067655d23e709760610186b2119a3b320cea6a786493c0375872f827576664ec8e51d8478fad51872f6ca53bc9f8 WHIRLPOOL fc5c7c81a8b666190ed69984b4cba0989d55e25953c04e8d110ebfd5b37ab5e3b1a4c86b78e7f046b5d84e75d04dbc59dde4e1b265a9f89c9136452e85fbc6ca
+EBUILD wireshark-1.9.0.ebuild 5671 SHA256 2763e455196063c07c40611087e2f2367ab23e8fb1269f4b078869f2e3ee747f SHA512 9c7167e5b97afe096505c4a3b2c2ed3f56f370b6c88d655b725e52ff3959bf5ee57f56422de4018330655f12ec1125b9ad71c669963a6051d2eca5629ce5342f WHIRLPOOL 72025a50c6371b4e56b8b04174922cabc329c972150f13bb14e301ee4d6384c4b9e884d04faad3a9dba91e876a4e1e19b0810562b8e4fb6e2362682e4e4ba6e3
+MISC ChangeLog 65805 SHA256 456f88cc6e14f0908756b0876ea4bd80e43c7e9cd212964d134a281162df3b2f SHA512 a5ba946e028f70861f35395e13f997bfd0aa05e83058906f915fc40da08eb4f281083ccbe7330b6f7876f80751450c4cb51e093592cef8f641b6492830e23fb7 WHIRLPOOL 4de655f426a76e8a55b29736af6a8ead68cb58294ce26f94a14a03ab2d254536a4bf04b1f9277de7c841d6192f14959a0750c9fe0026de4d9c431df5174a7287
 MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnuMsACgkQVWmRsqeSphNtxwCdF5DPAl3cRbaA/EaO6UqEC9t3
-cjAAn3BUWLcTyd9VTPNtvcJOsdAhee5a
-=xP5A
+iEYEAREIAAYFAlErtU8ACgkQVWmRsqeSphOwhACfRvP3rF2e5cLBf5GTgDR2GBAb
+dbkAmwW10esSUsHdj9uiUvtrj1uCd3zY
+=Nd4s
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild
index 22a5574acab3..90d35b583656 100644
--- a/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v 1.2 2013/02/22 17:19:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13-r1.ebuild,v 1.3 2013/02/25 19:02:38 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -189,7 +189,7 @@ pkg_postinst() {
 	enewgroup wireshark
 
 	if use pcap; then
-		fcaps -o 0 -g wireshark -m 0750 -M 550 \
+		fcaps -o 0 -g wireshark -m 4550 -M 550 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi
diff --git a/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild
index a3132ddd777a..67f0ee2fb416 100644
--- a/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v 1.2 2013/02/22 18:18:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.5-r1.ebuild,v 1.3 2013/02/25 19:02:38 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -197,7 +197,7 @@ pkg_postinst() {
 	enewgroup wireshark
 
 	if use pcap; then
-		fcaps -o 0 -g wireshark -m 0750 -M 0750 \
+		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi
diff --git a/net-analyzer/wireshark/wireshark-1.9.0.ebuild b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
index 5d425e41d514..5b6cf6cb4d85 100644
--- a/net-analyzer/wireshark/wireshark-1.9.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.6 2013/02/22 18:28:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.7 2013/02/25 19:02:38 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -197,7 +197,7 @@ pkg_postinst() {
 	enewgroup wireshark
 
 	if use pcap; then
-		fcaps -o 0 -g wireshark -m 0750 -M 0750 \
+		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
 	fi