Add patch to build against net-libs/gnutls-3 by Bartosz Brachaczek (bug #436212). Rename USE=gcrypt to USE=ipsec (name the feature, not the implementation). Add dev-libs/libgcrypt dep when USE=ssl (bug #431888).

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

5 files changed, 263 insertions, 7 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 495f1a4102bb..91b614bdaba2 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.403 2012/10/03 15:24:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.404 2012/10/03 16:21:09 jer Exp $
+
+*wireshark-1.8.3-r1 (03 Oct 2012)
+
+  03 Oct 2012; Jeroen Roovers <jer@gentoo.org> +wireshark-1.8.3-r1.ebuild,
+  +files/wireshark-1.8.3-gnutls3.patch, metadata.xml:
+  Add patch to build against net-libs/gnutls-3 by Bartosz Brachaczek (bug
+  #436212). Rename USE=gcrypt to USE=ipsec (name the feature, not the
+  implementation). Add dev-libs/libgcrypt dep when USE=ssl (bug #431888).
 
   03 Oct 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.3.ebuild,
   +files/wireshark-1.8.3-dtls-sctp.patch:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 32b6f92e2aed..1eab200746e2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,6 +7,7 @@ AUX wireshark-1.8.1-ldflags.patch 312 SHA256 b4cf259892774b4a72ab90b7ea28fbf3c92
 AUX wireshark-1.8.2-CVE-2012-3548.patch 722 SHA256 02e0ba7d19aa721e569aa5452bdfdd15786d440cdae48cdd932935c3f9e299a5 SHA512 279d3b91245ab6e9b2f9f88a208587ec068ae6d156edba993904fda422b931359d777b3cb8235e4301470ca3e3a12b3424fb4ea52a7d704bf62f7d81918c4d88 WHIRLPOOL 00a281fe94fea104c4381853144012bdc1eeebaa4557a89e4aacd2d4a85036a39992407f10b273a00867af77f343c988cd98c807fb658b4e36e4170bc24cdd6b
 AUX wireshark-1.8.2-python3.patch 2728 SHA256 e4656a840cd4ab09138ef18bf4fb45e6623ace40ff09b13cc42ec216aab75895 SHA512 1018c05648a21e9dce456de58fef92db7237a374ae4d1f1b050bcc13764f17a6eb6e97d3d5d73e6f584cdd389f588aa4a1c1e4843079e10d239ef95acf9e2c51 WHIRLPOOL 2dec75d08f650da2dae4540a616b728290646d4b9b0dfb52624ca7b1f79036125e85c49a2e7cf9696b74f71c8253970b35f5d10737c838cde3e5c6054532329a
 AUX wireshark-1.8.3-dtls-sctp.patch 680 SHA256 4e8c697c99085c0f715659b63f7f4e78015d329e6fae16c2dcaa328c7c7a229d SHA512 79d2da1d3560a1d20c06083841bc59d3438ca246e3277a5763c8ee81cef0efc6ac1a089df2fd45474f03893009b7393388cf05e798f33ecd0a02b75533316aff WHIRLPOOL 9be98672f51022295149f5b23b9378599308ba6028ba8d7cec5634ae1349cc5460838e0d61e64ec61abbd78497446152c13938633ea23d2d329223fb99709dc4
+AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
 DIST wireshark-1.6.10.tar.bz2 22026939 SHA256 a00797d8cb436531a79cd823a53c6475cc2f52d41a72efff926af4a964dd56a6 SHA512 e99b7cf2d2bfbb3102ad41fea407b47577672927f0b0f4dee8cfadde6c4a8c638b6f1b0111846794a5c7beffb426122310ae67e43bfa26c1014c1362654962d7 WHIRLPOOL 43e2c08701ad099df48646e6ae3dcdd7d6d972247cbe0e9b592635dbf8050b770cefea708895b0b8def26020fae2fa7c9f04aee7195a422119a5dd168ce47237
 DIST wireshark-1.6.11.tar.bz2 22048186 SHA256 8bbac117e3f516e566c1c8f997c3ddd41eedd77fb0818fd6317eeb72f8d31a37 SHA512 4a560513a6c386f63de5c48bebe0f56b9c547b34650261c091311b30f75e122146251ea177fe6616ffebc8bfec62a2a1e24a445ab8d28122859495a434cfaec0 WHIRLPOOL 388986b30c562adea3090ad239bcf4c73c8afa102c57aaeb0131dc76dc4a5c6eac5615ebac43b561404dd63f49edf5eb686e82966595cbe8e4f05d39a1bc8f3d
 DIST wireshark-1.8.2.tar.bz2 24121798 SHA256 3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc SHA512 219ec8249072773719162851515eb9c29a01693c9ba4d57976afad1e58d30cac9aefb482d3c6113386c39cfab775919ad68a888e94de8d62af0e8b8da7c3991b WHIRLPOOL 08bbe59e096de90a99766aa49c6d419351b1e178f5eb2e9160e00900c695dd46515448571ebbf19172679db0637f82359757c302cd87ea176936eb32c3625ba1
@@ -15,13 +16,14 @@ EBUILD wireshark-1.6.10-r2.ebuild 6466 SHA256 fa0a4d2f19852240721045b58abe661eaf
 EBUILD wireshark-1.6.11.ebuild 6415 SHA256 f2eca4384db45bdeda0c18d3340b8054ee9372af7a86f831dc7c65307303ad26 SHA512 80f52bb4cdfcd783180e94e7bf8d1387efb59ce1b22b1c59f72367ac25136f7bcdf4d85830d24a5c020ef3a3cc4475c308b078da7336b7f7efa178c7dfed01cc WHIRLPOOL d33784df6404f78c1d45f380fef6b2ac880fc1f2eedbedbb26e13c342a2093042257672cdc4d2f05281b7c4cc5805d080dccda052f47e420ff2e3cb734ee4ff4
 EBUILD wireshark-1.8.2-r2.ebuild 6455 SHA256 9685183389fc7da4323182db0149340012391839814c27c606876c192fd95f5c SHA512 c04026738a303160843bc241c185f26327a896e1a89cd654fc20af4b642e75a8ea5f75c03ee30e3b22d4ae1d40b029e833cb7cb2f41eacd7c87775c0ae18f15c WHIRLPOOL ffe4792bbb2d857e9a9da6f2f197ac18274e67beafd50b81c5b91d437d009076347beb3251127c67485a13428520e595ea786a6968d77be70251d6c06aa19416
 EBUILD wireshark-1.8.2-r3.ebuild 6529 SHA256 dff7db5b279f94f45a39143af0fbb9efa830e9ec2bec20109543885de061a3d0 SHA512 218af752485bf9880430fe35a871ac7baf753717a6dd226e389d7b6bc90640460d84204d645c9020d763b3315a1be6efab8a7913748dad7c9c3fdb9f29fc3397 WHIRLPOOL 86bfb07b309f62605f727544c5e6029899669b760ac45c775627a71d8d80ffb8617255f067cc216c1894a68369da0c612cdbd7814dabeb53201a6c716af9df55
+EBUILD wireshark-1.8.3-r1.ebuild 6546 SHA256 4592f1d50498a8467f10643d41b72c53bdd1b0221c50781bda3daa97ef25ac5c SHA512 294453788dd497905abe1c02a7dfb321dde9d415ac2cc57e3d90608a64f637a475542164962c8e7e07ed036e758f2a9b658bacd811f778cdf1dee28956f6947b WHIRLPOOL c60b01cbec145b1aa0b72b3b0443d07f760255c8a36b91a7932d32eac18108856f056e60097c45e811ec7cb2801e78632897b0fe63f031dd1eacc1ea77a61b0e
 EBUILD wireshark-1.8.3.ebuild 6474 SHA256 b55ce3dfe8ba1184168e31ec0547c32a40814ca7423fec9bd209a73fc61246f1 SHA512 856ba97ad8609791e1b20dbd1bd108c9c1af5dde14a287637974392941befe8bcb6dfed353d9324d9ffaa3932116a195a2f58d847c3da6f2778e1d5bf5bac7fd WHIRLPOOL d42060dd7fce492989456a9388ac6242c0d5102510a75159de58063c247d5472595f48cbe3acf5cad3e05bc7b8cd8ca0d60aaa2a5cf6798b89ad077ba8ac6e5b
-MISC ChangeLog 58753 SHA256 d56fa53d578298b91d479e2b50fa4ae1baf568113915a9b6800a17d4c2eab53c SHA512 0525439680d6431c5ca8d8307e6f92cc31a0416d7addaa4dd273d04c8138d72f3bfc3b8d78b7246b171e41f6066ec224c117e308b0750a5496d9e5653c384310 WHIRLPOOL 93aa5b42ea5254d7f2fe99374c6d2b6ea87a279c1b65c430a3d363dd83e85b8356adb4c7599a95280e788c8ed72c67a53ea12ed7e2ffd0d84310c80c8fc09d7f
-MISC metadata.xml 2531 SHA256 7061b38f182ceca328fa1ae6599f97d30a6f67b402eba676fd011baaa0ed1c7f SHA512 1b7feab8dcd1b3c183b71dcafb04f09f61203bb767d95748a0860bcba6c874a53aed09833f5d8d797e599c0063a0f269171170b06003ca57a257b687a18ebaff WHIRLPOOL ee0ae5b99f54c32db6bb8bfd0cf60e6c9cfea5204ec4ac1042ba2c242a035e074648ab5e40e332de79a58e950bfe36780bf382aae27c16ee2a6855be621fe13a
+MISC ChangeLog 59136 SHA256 861fffdeb982a3d7864fcf72ac26829d5fac011d97f9dcc7152a6cc1d8791d78 SHA512 1c4dfbc777dfb89e1c4a3215e7ba186bf7ea6412d7dbe0f7b28d259749792cf670a662df378c62ed157975e4d6e0859a7b631c087f6590c46913264abad68055 WHIRLPOOL 9e56341e5f94b48892fef76883d888228a3bac2884e0b8aad4f8cc7dce013398093861930a3e1f675244f48259496ac5cd12eae09d42ef65ef69f3f608621832
+MISC metadata.xml 2599 SHA256 cf4ca16a34354680320097bea15b8d7e5d5397b61d28a5102799d70fd29bdf9e SHA512 53a98c625e6e2c01e2581e82b714755c75babd2b2483ef10752d7cc9ed67768521b2859cfdbf5b668f105fb9f4bdb177798683ee2bba886c8e12cb7cbc943125 WHIRLPOOL 26e25c5a2508be4184de6022529cef4c3ebb90e82d64d6aec06468185e9332181b7f28bcd5e5b0c4022a1de0ba0131dac70de56f30e4e6be333a87e9ce500e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBsWJgACgkQVWmRsqeSphO/dwCfRP1zwYxyyj4qNr5r8O8+HQ1o
-oIQAn1BLrJNh7vWfEydVu57S5OB8Fh92
-=2x5L
+iEYEAREIAAYFAlBsZfYACgkQVWmRsqeSphNt0QCdEu6CVtU6OKVZOp8GTMkxLCde
+9usAn0u15RWjBTrgFSBnQa8ub6mpGxAh
+=fdrN
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch b/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch
new file mode 100644
index 000000000000..45250dcf58e0
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.8.3-gnutls3.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -185,7 +185,7 @@
+ 		  [use GnuTLS library @<:@default=yes@:>@]),
+   with_gnutls="$withval", with_gnutls="yes")
+ if test "x$with_gnutls" = "xyes"; then
+-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
++  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
+         [
+                 echo "GnuTLS found, enabling SSL decryption"
+                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 0a09a5e46c91..9bf156bf564a 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -36,7 +36,8 @@
 <use>
 <flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt ipsec traffic</flag>
+<flag name='gcrypt'>Use (<pkg>dev-libs/libgcrypt</pkg>) to decrypt IPsec traffic</flag>
+<flag name='ipsec'>Use (<pkg>dev-libs/libgcrypt</pkg>) to decrypt IPsec traffic</flag>
 <flag name='libadns'>Use <pkg>net-lib/adns</pkg> (DEPRECATED) instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
diff --git a/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..fa968d4e56c5
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild,v 1.1 2012/10/03 16:21:09 jer Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+inherit autotools eutils flag-o-matic python toolchain-funcs user
+
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+	adns +caps doc doc-pdf geoip gtk ipsec ipv6 kerberos libadns lua +pcap
+	portaudio profile python selinux smi ssl zlib
+"
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	zlib? ( sys-libs/zlib
+		!=sys-libs/zlib-1.2.4 )
+	smi? ( net-libs/libsmi )
+	gtk? ( >=x11-libs/gtk+-2.4.0:2
+		x11-libs/pango
+		dev-libs/atk
+		x11-misc/xdg-utils )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
+	ipsec? ( dev-libs/libgcrypt )
+	pcap? ( net-libs/libpcap )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	adns? (
+		!libadns? ( >=net-dns/c-ares-1.5 )
+	)
+	libadns? ( net-libs/adns )
+	geoip? ( dev-libs/geoip )
+	lua? ( >=dev-lang/lua-5.1 )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-libs/libxslt
+		dev-libs/libxml2
+		app-doc/doxygen
+		doc-pdf? ( dev-java/fop ) )
+	virtual/pkgconfig
+	dev-lang/perl
+	sys-devel/bison
+	sys-apps/sed
+	sys-devel/flex
+"
+
+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 <FS>_FS_SECURITY enabled where <FS> is the filesystem"
+		ewarn "to store ${path} (e.g. EXT3_FS_SECURITY). For kernels version before"
+		ewarn "2.6.33_rc1 SECURITY_FILE_CAPABILITIES must be enabled as well."
+		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."
+		ewarn "Only command line utils will be built available"
+	fi
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.8.3-dtls-sctp.patch \
+		"${FILESDIR}"/${PN}-1.8.3-gnutls3.patch
+	sed -i -e 's|.png||g' ${PN}.desktop || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if [[ $(gcc-major-version) -lt 3 ||
+		( $(gcc-major-version) -eq 3 &&
+			$(gcc-minor-version) -le 4 ) ]] ; then
+		die "Unsupported compiler version, please upgrade."
+	fi
+
+	# profile and pie are incompatible #215806, #292991
+	if use profile; then
+		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
+		append-flags $(test-flags-CC -nopie)
+	fi
+
+	if use adns; then
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --with-c-ares" )
+		fi
+	else
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --without-c-ares" )
+		fi
+	fi
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case `krb5-config --libs` in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap, setuid-install requires dumpcap
+	econf \
+		$(use pcap && use_enable !caps setuid-install) \
+		$(use pcap && use_enable caps setcap-install) \
+		$(use_enable gtk wireshark) \
+		$(use_enable ipv6) \
+		$(use_enable profile profile-build) \
+		$(use_with caps libcap) \
+		$(use_with ipsec gcrypt) \
+		$(use_with geoip) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with python) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		--disable-extra-gcc-checks \
+		--disable-usr-local \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	use doc && emake -C docbook
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk; then
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		domenu wireshark.desktop
+	fi
+	use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
+}
+
+pkg_postinst() {
+	if use caps && use pcap; then
+		fcaps 0:wireshark 550 cap_dac_read_search,cap_net_raw,cap_net_admin "${EROOT}"/usr/bin/dumpcap
+	fi
+	echo
+	ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
+	ewarn "the wireshark group. This security measure ensures that only trusted"
+	ewarn "users are allowed to sniff your traffic."
+	echo
+}