Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 165 insertions, 2 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 6cc8aaa3f116..e7471052bd3d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.245 2010/08/10 17:36:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.246 2010/09/03 07:33:26 pva Exp $
+
+*wireshark-1.2.11 (03 Sep 2010)
+
+  03 Sep 2010; Peter Volkov <pva@gentoo.org> +wireshark-1.2.11.ebuild:
+  Version bump.
 
   10 Aug 2010; Brent Baude <ranger@gentoo.org> wireshark-1.2.10.ebuild:
   Marking wireshark-1.2.10 ppc64 for bug 330479
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a39b9c2ea9e0..09b6b824f25c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,8 +6,10 @@ AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf
 AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.2.10.tar.gz 19455912 RMD160 73cd4ecf1b7a6b2b05871b6ab925d24a5fef9912 SHA1 24d0be340a3506db893a21d1d996a65c33619b05 SHA256 4848a48f535f5137c93d47ce33d3ce73d2b0718b3f1f36e5cd4155728800be33
+DIST wireshark-1.2.11.tar.gz 19466681 RMD160 34d7c2095dd280193d0c36eca3fc5f0f1b2f714c SHA1 f2a1c558df42845788b71488f5a973e71682bbce SHA256 f1369416c94d6b2cf6a132be138e85cddca2e94b765f79737de5775b2f279608
 DIST wireshark-1.4.0rc2.tar.bz2 20419902 RMD160 cb20ccd71f5c8bf0abb4edd662306f82932efab7 SHA1 592580662e0c868999d6643a24fc3b9841e05321 SHA256 16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79
 EBUILD wireshark-1.2.10.ebuild 4572 RMD160 60602a61323267599cabf35f47c63afcbaeadb60 SHA1 edb6b819daef123f3969cefc386deb2b99cd8c93 SHA256 7afe0e09e81849e352925b405c74212046e95fad2f67906ea4776a7706859c44
+EBUILD wireshark-1.2.11.ebuild 4577 RMD160 28cded1066d9d7d8f6d5c9d053eedfbd2784a6c4 SHA1 78988feb19c35bf489b8f12f95cf2abac013734e SHA256 525b4028f7b9aa50d904a8b657fbf68d2f02222250e95ee551343ff65343577e
 EBUILD wireshark-1.4.0_rc2.ebuild 5718 RMD160 a483a5a9358833a22c2fa4f70ee50c8d24711788 SHA1 d2ace392ce7d62b358c3be3e441c018ad27ebb19 SHA256 f3511919b978115a8cd41f276d23ed01f9b063bef2074ec3a68107d7358cac04
-MISC ChangeLog 35996 RMD160 8ea4dbdbdbfaeabbfe5b885d6597134d716c5d95 SHA1 22903ec60a81a06dab17fa3dc1f4e378093b5b4c SHA256 e4ff4a0b34cc651441d99388eaadbc81d8d30e5a027ca05161018bc2fd57d803
+MISC ChangeLog 36114 RMD160 cbe5ae8041a68de936e53051d957a0bba6d72d76 SHA1 0e53e98af9722a92f57c59c813300448f0dc81bd SHA256 6d5b5952249a3a412414cf999ae26faec54dd9a79fe32c23a78fe6eee33c015a
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
diff --git a/net-analyzer/wireshark/wireshark-1.2.11.ebuild b/net-analyzer/wireshark/wireshark-1.2.11.ebuild
new file mode 100644
index 000000000000..f70f74a99492
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.2.11.ebuild
@@ -0,0 +1,156 @@
+# 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.2.11.ebuild,v 1.1 2010/09/03 07:33:26 pva Exp $
+
+EAPI=2
+inherit autotools libtool flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+
+# _rc versions has different download location.
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
+SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
+S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
+SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
+
+RDEPEND=">=dev-libs/glib-2.4.0: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 )
+	gnutls? ( net-libs/gnutls )
+	gcrypt? ( dev-libs/libgcrypt )
+	pcap? ( net-libs/libpcap )
+	pcre? ( dev-libs/libpcre )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	ares? ( >=net-dns/c-ares-1.5 )
+	!ares? ( adns? ( net-libs/adns ) )
+	geoip? ( dev-libs/geoip )
+	lua? ( >=dev-lang/lua-5.1 )
+	selinux? ( sec-policy/selinux-wireshark )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15.0
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	if ! use gtk; then
+		ewarn "USE=-gtk will means no gui called wireshark will be created and"
+		ewarn "only command line utils are available"
+	fi
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+}
+
+src_prepare() {
+	cd "${S}"/epan # our hardened toolchain bug...
+	epatch "${FILESDIR}/wireshark-except-double-free.diff"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
+	eautoreconf
+}
+
+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
+	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
+		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
+		replace-flags -O? -O
+	fi
+
+	if use ares && use adns; then
+		einfo "You asked for both, ares and adns, but we can use only one of them."
+		einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
+		myconf="$(use_with ares c-ares) --without-adns"
+	else
+		myconf="$(use_with adns) $(use_with ares c-ares)"
+	fi
+
+	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
+	# our hardened toolchain bug
+	filter-flags -fstack-protector
+
+	# profile and pie are incompatible #215806, #292991
+	if use profile; then
+		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+		append-flags $(test-flags-CC -nopie)
+	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*) myconf="${myconf} --with-ssl" ;;
+		esac
+	fi
+
+	# dumpcap requires libcap, setuid-install requires dumpcap
+	econf $(use_enable gtk wireshark) \
+		$(use_enable profile profile-build) \
+		$(use_with gnutls) \
+		$(use_with gcrypt) \
+		$(use_enable ipv6) \
+		$(use_enable threads) \
+		$(use_with lua) \
+		$(use_with kerberos krb5) \
+		$(use_with smi libsmi) \
+		$(use_with pcap) \
+		$(use_with zlib) \
+		$(use_with pcre) \
+		$(use_with geoip) \
+		$(use_with portaudio) \
+		$(use_with caps libcap) \
+		$(use_enable pcap setuid-install) \
+		--sysconfdir=/etc/wireshark \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	use pcap && fowners 0:wireshark /usr/bin/dumpcap
+	use pcap && fperms 6550 /usr/bin/dumpcap
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
+
+	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
+		insinto /usr/share/applications
+		doins wireshark.desktop
+	fi
+}
+
+pkg_postinst() {
+	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"
+	ewarn "users allowed to sniff your traffic."
+	echo
+}