Version bump to pre-release. Took maintainance.

Package-Manager: portage-2.1.4.4

4 files changed, 202 insertions, 4 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index d83e18c12de7..0e624451c181 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2008/01/26 15:52:12 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.78 2008/02/20 07:56:38 pva Exp $
+
+*wireshark-0.99.8_rc1 (20 Feb 2008)
+
+  20 Feb 2008; <pva@gentoo.org> metadata.xml, +wireshark-0.99.8_rc1.ebuild:
+  Version bump to pre-release. Took maintainance.
 
 *wireshark-0.99.7-r2 (27 Jan 2008)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 25a023bdde43..9dcd170ea49e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,10 @@ AUX wireshark-0.99.7-glib-1.2-compile-fix.patch 308 RMD160 91e1779b76b152242527c
 AUX wireshark-0.99.7-libgcrypt.patch 1460 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 SHA1 c0aec79a244b1d9e133de903c6953493958d2ef0 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-0.99.7.tar.bz2 13179467 RMD160 558611675aa23313acbdb46650cf471959204bd0 SHA1 3cb6e11410d5151734db19d4fc03b42ecb226277 SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82
+DIST wireshark-0.99.8pre1.tar.gz 16815173 RMD160 86655c294ccb3f550f5f904e00c9d978ec1f3546 SHA1 4c46569f3d3112792f14b6e5a99997d6a25eb9f0 SHA256 9a5d1fe01fb9001fa673abb8eb9d5100285ac66ea44070f3421ce0ecc5e06bf5
 EBUILD wireshark-0.99.7-r1.ebuild 5107 RMD160 3709b61da94f61f119de71fa2ef53e7f2f36b710 SHA1 bcf5bfd55466cfebbc867942c40933c6f9a4f2e5 SHA256 c4789c7eb84837aea4464230fe84502d3dbe62f85a3d5e4873e6137aa0c8feb1
 EBUILD wireshark-0.99.7-r2.ebuild 5253 RMD160 7d1d34d60fdb27851d75b90e8b84d547f52ebf0d SHA1 c66eddcce5771d0aeeb7abcfa4414d65042e8a79 SHA256 b00034793dae6f7f693227271abdc80c453531e77fe0729928d755e6ba9102fc
 EBUILD wireshark-0.99.7.ebuild 4895 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 SHA1 b15e2155e3903fc902bda4cb43ecec6b30771279 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f
-MISC ChangeLog 12058 RMD160 93633af7227719cbb8f3545126a73465f0d747df SHA1 453cce677aaa8c23c292ba7e1785b9cb18a9771d SHA256 1c12b206fd1da3c184da678574505ba00982ec61b03c8eedc10ee86961e52a59
-MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
+EBUILD wireshark-0.99.8_rc1.ebuild 4723 RMD160 49be3ffdca1a899c0a359f0d0f3bd9cc6bf3f3a3 SHA1 025b865cf596e71c2ac3b0c306a4ce4b1da111eb SHA256 1ba99ad8e879fa953d5d76347f0839620eb100b3078d50ece7bb74c0a59006d7
+MISC ChangeLog 12222 RMD160 cff0e263a8c13c347d132f97a54788d4187a9ebf SHA1 e1a7208b916c659cf2d73f305a6c85e9f8e02723 SHA256 5118114ea4ab8952ad71b7699073bffd96b28ed4f76ab3c172a4c9dbfe7dfffb
+MISC metadata.xml 1730 RMD160 0c29f85b78106162ac35419f8bc01d1539c3eb6d SHA1 93881ba93a2f1fb8b153887ce7e6a022ce95085f SHA256 d722982a52a578876257954779aa8e14dbf4c0eff0dba0e4b82db551f4a964bd
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 57eb635f010e..768ee68ae1a8 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -2,5 +2,30 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>A commercial-quality network protocol analyzer</longdescription>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+</maintainer>
+<longdescription>
+	Wireshark is the world's foremost network protocol analyzer, and is the de
+	facto (and often de jure) standard across many industries and educational
+	institutions. Wireshark has a rich feature set which includes 1) deep
+	inspection of hundreds of protocols, with more being added all the time, 2)
+	live capture and offline analysis, 3) standard three-pane packet browser, 4)
+	captured network data can be browsed via a GUI, or via the TTY-mode TShark
+	utility, 5) the most powerful display filters in the industry, 6) rich VoIP
+	analysis, 7) read/write many different capture file formats: tcpdump
+	(libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network
+	Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer®
+	Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM
+	WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks
+	Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8)
+	capture files compressed with gzip can be decompressed on the fly, 9) live
+	data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB,
+	Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many
+	protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and
+	WPA/WPA2, 11) coloring rules can be applied to the packet list for quick,
+	intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or
+	plain text 
+</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild
new file mode 100644
index 000000000000..a9f0722043e2
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild
@@ -0,0 +1,166 @@
+# 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.8_rc1.ebuild,v 1.1 2008/02/20 07:56:38 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-asneeded.patch
+
+	cd "${S}"/epan
+	epatch "${FILESDIR}"/wireshark-except-double-free.diff
+
+	cd "${S}"
+	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
+		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
+}