Enable lua support, bug 206151, thank you Jaroslaw Niec <zuljin AT go2.pl>.

Package-Manager: portage-2.1.3.19

5 files changed, 214 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 62db7d431926..d83e18c12de7 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.76 2008/01/10 18:36:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.77 2008/01/26 15:52:12 pva Exp $
+
+*wireshark-0.99.7-r2 (27 Jan 2008)
+
+  27 Jan 2008; <pva@gentoo.org>
+  +files/wireshark-0.99.7-glib-1.2-compile-fix.patch,
+  +wireshark-0.99.7-r2.ebuild:
+  Enable lua support, bug 206151, thank you Jaroslaw Niec <zuljin AT go2.pl>.
 
 *wireshark-0.99.7-r1 (10 Jan 2008)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8f72770f83d3..6f2ef6d4d33d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,6 +10,10 @@ AUX wireshark-0.99.7-exit.patch 2553 RMD160 078fe05e5901c1e94e84bf0de5dba4974bf0
 MD5 8268e4350c645542c8a6859f2ec150c1 files/wireshark-0.99.7-exit.patch 2553
 RMD160 078fe05e5901c1e94e84bf0de5dba4974bf0d273 files/wireshark-0.99.7-exit.patch 2553
 SHA256 b7b4d4832fc7053620bd81e4ea3466a9aacf6341b3de093fe9fdf36c909fc07e files/wireshark-0.99.7-exit.patch 2553
+AUX wireshark-0.99.7-glib-1.2-compile-fix.patch 308 RMD160 91e1779b76b152242527caff6c2e8d2d74f7b9c1 SHA1 966880965cddd7645ac1d65ba2f6d1309a062978 SHA256 4e598666cc3622aa7da11161306e2b1b52958aada5393c10fb78114d0f0882f7
+MD5 062dcdb4062c83ee0e3ca4a231682f6c files/wireshark-0.99.7-glib-1.2-compile-fix.patch 308
+RMD160 91e1779b76b152242527caff6c2e8d2d74f7b9c1 files/wireshark-0.99.7-glib-1.2-compile-fix.patch 308
+SHA256 4e598666cc3622aa7da11161306e2b1b52958aada5393c10fb78114d0f0882f7 files/wireshark-0.99.7-glib-1.2-compile-fix.patch 308
 AUX wireshark-0.99.7-libgcrypt.patch 1460 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 SHA1 c0aec79a244b1d9e133de903c6953493958d2ef0 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814
 MD5 f5616c6212db9c61bcb71002f1c74bb5 files/wireshark-0.99.7-libgcrypt.patch 1460
 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 files/wireshark-0.99.7-libgcrypt.patch 1460
@@ -23,14 +27,18 @@ EBUILD wireshark-0.99.7-r1.ebuild 5107 RMD160 3709b61da94f61f119de71fa2ef53e7f2f
 MD5 064606a0a3115b455d6f056c0da662cc wireshark-0.99.7-r1.ebuild 5107
 RMD160 3709b61da94f61f119de71fa2ef53e7f2f36b710 wireshark-0.99.7-r1.ebuild 5107
 SHA256 c4789c7eb84837aea4464230fe84502d3dbe62f85a3d5e4873e6137aa0c8feb1 wireshark-0.99.7-r1.ebuild 5107
+EBUILD wireshark-0.99.7-r2.ebuild 5253 RMD160 7d1d34d60fdb27851d75b90e8b84d547f52ebf0d SHA1 c66eddcce5771d0aeeb7abcfa4414d65042e8a79 SHA256 b00034793dae6f7f693227271abdc80c453531e77fe0729928d755e6ba9102fc
+MD5 6b441df67d6cf2e43f486f3073f0807a wireshark-0.99.7-r2.ebuild 5253
+RMD160 7d1d34d60fdb27851d75b90e8b84d547f52ebf0d wireshark-0.99.7-r2.ebuild 5253
+SHA256 b00034793dae6f7f693227271abdc80c453531e77fe0729928d755e6ba9102fc wireshark-0.99.7-r2.ebuild 5253
 EBUILD wireshark-0.99.7.ebuild 4895 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 SHA1 b15e2155e3903fc902bda4cb43ecec6b30771279 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f
 MD5 7a87dcdcc02f245ef61dd10359c19072 wireshark-0.99.7.ebuild 4895
 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 wireshark-0.99.7.ebuild 4895
 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f wireshark-0.99.7.ebuild 4895
-MISC ChangeLog 11826 RMD160 e40b73da03c1fb93b94694b9875a92cd5e908ec9 SHA1 138c7a55dfd1b4dafa5f93d5f136f669bd5e48f2 SHA256 a94c5ca7cc9e8ebd131de4f832b9b91bcface5121b89d8bf781e06fd6693ae72
-MD5 4b3401f0c03e3fd49bb7c53f1c66f4e7 ChangeLog 11826
-RMD160 e40b73da03c1fb93b94694b9875a92cd5e908ec9 ChangeLog 11826
-SHA256 a94c5ca7cc9e8ebd131de4f832b9b91bcface5121b89d8bf781e06fd6693ae72 ChangeLog 11826
+MISC ChangeLog 12058 RMD160 93633af7227719cbb8f3545126a73465f0d747df SHA1 453cce677aaa8c23c292ba7e1785b9cb18a9771d SHA256 1c12b206fd1da3c184da678574505ba00982ec61b03c8eedc10ee86961e52a59
+MD5 298a854fe26f745eec3d4f48f9b56c03 ChangeLog 12058
+RMD160 93633af7227719cbb8f3545126a73465f0d747df ChangeLog 12058
+SHA256 1c12b206fd1da3c184da678574505ba00982ec61b03c8eedc10ee86961e52a59 ChangeLog 12058
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -41,3 +49,6 @@ SHA256 9a175f9dac1b3e2b2026334da35eda454d7ed799faf3315a873ec90e31a73406 files/di
 MD5 74b1c59684c65e7a25186de45dfbe58d files/digest-wireshark-0.99.7-r1 259
 RMD160 92424b8b0fc6f6d75ff5796b10f37680134ee3e0 files/digest-wireshark-0.99.7-r1 259
 SHA256 9a175f9dac1b3e2b2026334da35eda454d7ed799faf3315a873ec90e31a73406 files/digest-wireshark-0.99.7-r1 259
+MD5 74b1c59684c65e7a25186de45dfbe58d files/digest-wireshark-0.99.7-r2 259
+RMD160 92424b8b0fc6f6d75ff5796b10f37680134ee3e0 files/digest-wireshark-0.99.7-r2 259
+SHA256 9a175f9dac1b3e2b2026334da35eda454d7ed799faf3315a873ec90e31a73406 files/digest-wireshark-0.99.7-r2 259
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r2 b/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r2
new file mode 100644
index 000000000000..3dbb61dac57c
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r2
@@ -0,0 +1,3 @@
+MD5 ef04dfac3e7acc4a9cb2b107dd2a2f8a wireshark-0.99.7.tar.bz2 13179467
+RMD160 558611675aa23313acbdb46650cf471959204bd0 wireshark-0.99.7.tar.bz2 13179467
+SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82 wireshark-0.99.7.tar.bz2 13179467
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-glib-1.2-compile-fix.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-glib-1.2-compile-fix.patch
new file mode 100644
index 000000000000..93ee1a79b782
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-glib-1.2-compile-fix.patch
@@ -0,0 +1,12 @@
+--- epan/wslua/wslua.h.orig	2008-01-27 18:47:07.000000000 +0300
++++ epan/wslua/wslua.h	2008-01-27 18:46:27.000000000 +0300
+@@ -53,6 +53,9 @@
+ #include <epan/funnel.h>
+ #include <epan/tvbparse.h>
+ #include <epan/epan.h>
++#if GLIB_MAJOR_VERSION < 2
++#include <dirent.h>
++#endif
+ 
+ #include "declare_wslua.h"
+ 
diff --git a/net-analyzer/wireshark/wireshark-0.99.7-r2.ebuild b/net-analyzer/wireshark/wireshark-0.99.7-r2.ebuild
new file mode 100644
index 000000000000..bab211b9099b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-0.99.7-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.7-r2.ebuild,v 1.1 2008/01/26 15:52:12 pva Exp $
+
+WANT_AUTOMAKE="1.9"
+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/all-versions/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns gtk ipv6 lua portaudio snmp ssl kerberos threads selinux"
+
+RDEPEND="sys-libs/zlib
+	snmp? ( net-analyzer/net-snmp )
+	gtk? ( >=dev-libs/glib-2.0.4
+		=x11-libs/gtk+-2*
+		x11-libs/pango
+		dev-libs/atk )
+	!gtk? ( =dev-libs/glib-1.2* )
+	ssl? ( dev-libs/openssl )
+	!ssl? (	net-libs/gnutls )
+	net-libs/libpcap
+	dev-libs/libpcre
+	sys-libs/libcap
+	adns? ( net-libs/adns )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	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
+	sys-apps/sed"
+
+pkg_setup() {
+	# bug 119208
+	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
+		ewarn "wireshark will not build if dev-lang/perl is compiled with"
+		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
+		ebeep 5
+		die "dev-lang/perl compiled with USE=minimal"
+	fi
+
+	if ! use gtk; then
+		ewarn "USE=-gtk will mean 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 || die "Failed to create wireshark group"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99.7-libgcrypt.patch
+	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
+
+	cd "${S}"/epan
+	epatch "${FILESDIR}"/wireshark-except-double-free.diff
+
+	cd "${S}"
+	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2012
+	epatch "${FILESDIR}"/${P}-crash-emem.c.patch
+	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2177
+	epatch "${FILESDIR}"/${P}-exit.patch
+
+	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2224
+	epatch "${FILESDIR}"/${P}-glib-1.2-compile-fix.patch
+	AT_M4DIR="${S}/aclocal-fallback"
+	eautoreconf
+}
+
+src_compile() {
+	# 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
+
+	# see bug #133092
+	filter-flags -fstack-protector
+
+	local myconf
+
+	if use gtk; then
+		einfo "Building with gtk support"
+	else
+		einfo "Building without gtk support"
+		myconf="${myconf} --disable-wireshark --disable-warnings-as-errors"
+		# the asn1 plugin needs gtk
+		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
+		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
+	fi
+
+	econf $(use_with ssl) \
+		$(use_enable ipv6) \
+		$(use_with lua) \
+		$(use_with adns) \
+		$(use_with kerberos krb5) \
+		$(use_with snmp net-snmp) \
+		$(use_with portaudio) \
+		$(use_enable gtk gtk2) \
+		$(use_enable threads) \
+		--with-libcap \
+		--enable-setuid-install \
+		--without-ucd-snmp \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/wireshark \
+		--enable-editcap \
+		--enable-capinfos \
+		--enable-text2pcap \
+		${myconf} || die "econf failed"
+
+	# fixes an access violation caused by libnetsnmp - see bug 79068
+	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	for file in /usr/bin/tshark /usr/bin/dumpcap
+	do
+		fowners 0:wireshark ${file}
+		fperms 6550 ${file}
+	done
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	dodoc AUTHORS ChangeLog NEWS README*
+
+	if use gtk ; then
+		insinto /usr/share/icons/hicolor/16x16/apps
+		newins image/hi16-app-wireshark.png wireshark.png
+		insinto /usr/share/icons/hicolor/32x32/apps
+		newins image/hi32-app-wireshark.png wireshark.png
+		insinto /usr/share/icons/hicolor/48x48/apps
+		newins image/hi48-app-wireshark.png wireshark.png
+		insinto /usr/share/applications
+		# Wireshark should not be ran as root in KDE.
+		# Bug: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2127
+		sed -i '/X-KDE-SubstituteUID/d' wireshark.desktop
+		doins wireshark.desktop
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "With version 0.99.7, all function calls that require elevated privileges"
+	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
+	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
+	ewarn
+	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
+}