Version bump, #346529 wrt Mike Auty.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 57 insertions, 25 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index a84b4156f736..77c6b6a25861 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.259 2010/11/27 11:22:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.260 2010/11/30 08:51:13 pva Exp $
+
+*wireshark-1.4.2 (30 Nov 2010)
+
+  30 Nov 2010; Peter Volkov <pva@gentoo.org> -wireshark-1.4.0_rc2.ebuild,
+  +wireshark-1.4.2.ebuild:
+  Version bump, #346529 wrt Mike Auty.
 
   27 Nov 2010; Raúl Porcel <armin76@gentoo.org> wireshark-1.2.13.ebuild:
   alpha/ia64/sparc stable wrt #346191
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 42b6a20c7771..419fba9cd4db 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,9 +7,9 @@ AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.2.12.tar.gz 19494312 RMD160 e8af01607c182f500ef189be97632e4fc3695e82 SHA1 3cf873315360d566f4c18775046912c58d9f41fe SHA256 67cbf1ad4586facea61180979cedbec422b688d5971e53c125e91836fb94f1b5
 DIST wireshark-1.2.13.tar.gz 19512648 RMD160 ebdc29f83546391cb8eb4056ef686f3ced21215f SHA1 e4a1550a2f98fa49926ed6fe10e2fc28e4bf7221 SHA256 eaa8f3f0eb1b701e3fc5f5e7f8a493df8333a53a25be9dc589cb962dba9cc666
-DIST wireshark-1.4.0rc2.tar.bz2 20419902 RMD160 cb20ccd71f5c8bf0abb4edd662306f82932efab7 SHA1 592580662e0c868999d6643a24fc3b9841e05321 SHA256 16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79
+DIST wireshark-1.4.2.tar.bz2 20208792 RMD160 5f0c1a9c52347782fcdcd6c11e24d21cfe89f7e2 SHA1 03eb2bcd1de93fd0b45d6f1346e97d5f03a47c3e SHA256 44c6e1ec328fa8e1e7b3838b2f25d51c36b38c562fc0d097ba464205fdb049b2
 EBUILD wireshark-1.2.12.ebuild 4573 RMD160 17bd50d666f9b4d77144ddcfdc8f29f1c9eca8f3 SHA1 514105e7cb0c3c8fb5674fe92b87687a8f8342bb SHA256 aaa6626f481386cc001940aa693ead322bfaf9a65cdf8144e91a1c104e935838
 EBUILD wireshark-1.2.13.ebuild 4574 RMD160 c3af6ca63c5c5e5154a77edecdb59f1469f85b4c SHA1 c49121f138824b9d9bdd1ebb8a2448db3edb0cf2 SHA256 2a05ceb54e9018dd3aa53beb0db69038550e074b45aac18c426ff58ae5110549
-EBUILD wireshark-1.4.0_rc2.ebuild 5718 RMD160 a483a5a9358833a22c2fa4f70ee50c8d24711788 SHA1 d2ace392ce7d62b358c3be3e441c018ad27ebb19 SHA256 f3511919b978115a8cd41f276d23ed01f9b063bef2074ec3a68107d7358cac04
-MISC ChangeLog 37796 RMD160 5079467325525d8fb8a82f1f24e88c09ec3c6e47 SHA1 b8d918b442f1bc0bc14c9bc863148102fa2a3a75 SHA256 3173aab573616a448b34bffd15ba499e701118eb1042388a22e4b43d60f6fcd9
+EBUILD wireshark-1.4.2.ebuild 6309 RMD160 a8a4b5ea16c6cd80789a7627d7d222b9a2d2220a SHA1 c980a0fa3a0adb0525422cd8e0cb26b0fbb5ac3a SHA256 e63792b6c181fc233b9c5cc6ad64e6487a6272f91bb5da46d806d07e04b85df0
+MISC ChangeLog 37965 RMD160 becd6487ca75a8f1204717f5b6f621f1965f0219 SHA1 d6af865fa7ce7a621f3c34f2e50c5fec76914e11 SHA256 0d324cdb6652a5da78a19f68fa4495be29f07fbafa6d5529544300a51c8b130d
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
diff --git a/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-1.4.2.ebuild
index fc8b222d18da..4dd93fe2751a 100644
--- a/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild,v 1.1 2010/07/30 10:27:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.2.ebuild,v 1.1 2010/11/30 08:51:13 pva Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
 
@@ -52,6 +52,44 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
+# @FUNCTION: fcaps 
+# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
+# @RETURN: 0 if all okay; non-zero if failure and fallback
+# @DESCRIPTION:
+# fcaps sets the specified capabilities in the effective and permitted set of
+# the given file. In case of failure fcaps sets the given file-mode.
+fcaps() {
+	local uid_gid=$1
+	local perms=$2
+	local capset=$3
+	local path=$4
+	local res
+
+	chmod $perms $path && \
+	chown $uid_gid $path
+	res=$?
+
+	use caps || return $res
+
+	#set the capability
+	setcap "$capset=ep" "$path" &> /dev/null
+	#check if the capabilitiy got set correctly
+	setcap -v "$capset=ep" "$path" &> /dev/null
+	res=$?
+
+	if [ $res -ne 0 ]; then
+		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
+		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
+		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
+		ewarn "${path}"
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}
+
 pkg_setup() {
 	if ! use gtk; then
 		ewarn "USE=-gtk disables gtk-based gui called wireshark."
@@ -65,24 +103,13 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
-src_prepare() {
-	cd "${S}"/epan # old hardened toolchain bug...
-	epatch "${FILESDIR}/wireshark-except-double-free.diff"
-}
-
 src_configure() {
 	local myconf
 
-	# optimization bug, see bug #165340, bug #40660
-	if [[ $(gcc-version) == 3.4 ]] ; then
-		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
-		replace-flags -O? -O3
-		# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-		# our old hardened toolchain bug
-		filter-flags -fstack-protector
-	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
-		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
-		replace-flags -O? -O
+	if [[ $(gcc-major-version) -lt 3 ||
+		( $(gcc-major-version) -eq 3 &&
+			$(gcc-minor-version) -le 4 ) ]] ; then
+		die "Unsupported compiler version, please upgrade."
 	fi
 
 	if use ares && use adns; then
@@ -166,9 +193,6 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h || die
 
-	use caps && local perms=550 || local perms=6550
-	use pcap && fperms ${perms} /usr/bin/dumpcap
-
 	if use gtk; then
 		for c in hi lo; do
 			for d in 16 32 48; do
@@ -182,7 +206,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	use caps && setcap cap_net_raw,cap_net_admin+eip "${ROOT}"/usr/bin/dumpcap
+	if use caps && use pcap; then
+		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${ROOT}"/usr/bin/dumpcap
+	fi
 	echo
 	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
 	ewarn "wireshark group. This security measure ensures that only trusted"