Version bump of development version, remove old.

(Portage version: 2.1.6.6/cvs/Linux 2.6.26-gentoo-r4 x86_64)

7 files changed, 38 insertions, 358 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index c7382675507d..49fcb475e4c4 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,16 @@
 # 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.144 2008/12/26 09:02:51 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.145 2009/01/19 09:40:18 pva Exp $
+
+*wireshark-1.1.2 (19 Jan 2009)
+
+  19 Jan 2009; Peter Volkov <pva@gentoo.org>
+  -files/wireshark-1.0.4-zlib-build.patch,
+  -files/wireshark-1.1.1--as-needed.patch,
+  -files/wireshark-1.1.1-misc-warnings.patch,
+  +files/wireshark-1.1.2--as-needed.patch, -wireshark-1.0.4.ebuild,
+  -wireshark-1.1.1.ebuild, +wireshark-1.1.2.ebuild:
+  Version bump of development version, remove old.
 
   26 Dec 2008; Mike Frysinger <vapier@gentoo.org>
   +files/wireshark-1.0.5-text2pcap-protos.patch, wireshark-1.0.5.ebuild:
diff --git a/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch b/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch
deleted file mode 100644
index ccc8b60bf128..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://anonsvn.wireshark.org/viewvc?view=rev&revision=26524
-
---- trunk-1.0/wiretap/file_access.c	2008/10/23 14:30:35	26523
-+++ trunk-1.0/wiretap/file_access.c	2008/10/23 16:38:52	26524
-@@ -978,6 +978,7 @@
- static FILE *wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd)
- {
- 	return fdopen(fd, "wb");
-+}
- #endif
- 
- /* internally writing raw bytes (compressed or not) */
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch
deleted file mode 100644
index bf708c5b98f8..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.1.1--as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./epan/wslua/Makefile.am.orig	2008-10-17 12:08:43.000000000 +0400
-+++ ./epan/wslua/Makefile.am	2008-10-17 12:08:48.000000000 +0400
-@@ -47,7 +47,7 @@
- 	init_wslua.c \
- 	wslua.h
- 
--libwslua_la_LIBADD = @LUA_LIBS@
-+libwslua_la_LIBADD = @LUA_LIBS@ ../../wiretap/libwiretap.la
- 
- BUILT_SOURCES = \
- 	taps_wslua.c \
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch
deleted file mode 100644
index 8e6d339b7c69..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.1.1-misc-warnings.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- ./epan/dissectors/packet-ldp.c.orig	2008-10-16 22:58:47.000000000 +0400
-+++ ./epan/dissectors/packet-ldp.c	2008-10-16 22:59:03.000000000 +0400
-@@ -2484,7 +2484,7 @@
- 	int length_remaining;
- 	guint16 plen;
- 	int length;
--	tvbuff_t *next_tvb;
-+	tvbuff_t *volatile next_tvb;
- 
- 	while (tvb_reported_length_remaining(tvb, offset) != 0) {
- 		length_remaining = tvb_length_remaining(tvb, offset);
---- ./epan/dissectors/packet-tpkt.c.orig	2008-10-16 23:24:58.000000000 +0400
-+++ ./epan/dissectors/packet-tpkt.c	2008-10-16 23:25:27.000000000 +0400
-@@ -217,7 +217,7 @@
-     int mgcp_version = 0;
-     int mgcp_reserved = 0;
-     volatile int length;
--    tvbuff_t *next_tvb;
-+    tvbuff_t *volatile next_tvb;
-     const char *saved_proto;
-     guint8 string[4];
-     /*
-@@ -372,7 +372,7 @@
- 	int length_remaining;
- 	int data_len;
- 	volatile int length;
--	tvbuff_t *next_tvb;
-+	tvbuff_t *volatile next_tvb;
- 	const char *saved_proto;
- 
- 	/*
---- ./epan/dissectors/packet-gssapi.c.orig	2008-10-16 22:55:09.000000000 +0400
-+++ ./epan/dissectors/packet-gssapi.c	2008-10-16 22:56:06.000000000 +0400
-@@ -172,8 +172,8 @@
- dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     gboolean is_verifier)
- {
--	proto_item *item;
--	proto_tree *subtree;
-+	proto_item *volatile item;
-+	proto_tree *volatile subtree;
- 	volatile int return_offset = 0;
- 	gssapi_conv_info_t *volatile gss_info;
- 	gssapi_oid_value *oidvalue;
---- ./epan/dissectors/packet-tds.c.orig	2008-10-16 23:22:27.000000000 +0400
-+++ ./epan/dissectors/packet-tds.c	2008-10-16 23:22:40.000000000 +0400
-@@ -1725,7 +1725,7 @@
- 	guint8 type;
- 	guint16 plen;
- 	guint length;
--	tvbuff_t *next_tvb;
-+	tvbuff_t *volatile next_tvb;
- 	proto_item *tds_item = NULL;
- 	proto_tree *tds_tree = NULL;
- 
---- ./epan/dissectors/packet-isl.c.orig	2008-10-16 22:57:53.000000000 +0400
-+++ ./epan/dissectors/packet-isl.c	2008-10-16 22:58:15.000000000 +0400
-@@ -149,7 +149,7 @@
- {
-   proto_tree *volatile fh_tree = NULL;
-   proto_item *ti, *hidden_item;
--  guint8 type;
-+  volatile guint8 type;
-   volatile guint16 length;
-   gint captured_length;
-   tvbuff_t *volatile payload_tvb = NULL;
---- ./epan/dissectors/packet-ieee802154.c.orig	2008-10-16 22:56:53.000000000 +0400
-+++ ./epan/dissectors/packet-ieee802154.c	2008-10-16 22:57:23.000000000 +0400
-@@ -484,7 +484,7 @@
- static void
- dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options)
- {
--    tvbuff_t            *payload_tvb;
-+    tvbuff_t            *volatile payload_tvb;
-     proto_tree          *volatile ieee802154_tree = NULL;
-     proto_item          *volatile proto_root = NULL;
-     proto_item          *ti;
---- ./epan/dissectors/packet-tr.c.orig	2008-10-16 23:25:37.000000000 +0400
-+++ ./epan/dissectors/packet-tr.c	2008-10-16 23:26:20.000000000 +0400
-@@ -326,10 +326,10 @@
- {
- 	proto_tree	*tr_tree, *bf_tree;
- 	proto_item	*ti, *hidden_item;
--	int		frame_type;
- 	guint8		rcf1, rcf2;
- 	tvbuff_t	*next_tvb;
- 
-+	volatile int		frame_type;
- 	volatile int		fixoffset = 0;
- 	volatile int		source_routed = 0;
- 	volatile guint8		trn_rif_bytes;
---- ./epan/dissectors/packet-bgp.c.orig	2008-10-16 22:40:35.000000000 +0400
-+++ ./epan/dissectors/packet-bgp.c	2008-10-16 22:49:31.000000000 +0400
-@@ -2623,7 +2623,7 @@
- }
- 
- static void
--dissect_bgp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-+dissect_bgp_pdu(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
-     gboolean first)
- {
-     guint16       bgp_len;       /* Message length             */
-@@ -2740,7 +2740,7 @@
-     guint         length_remaining;
-     guint         length;
-     volatile gboolean first = TRUE;  /* TRUE for the first BGP message in packet */
--    tvbuff_t      *next_tvb;
-+    tvbuff_t *volatile next_tvb;
- 
-     if (check_col(pinfo->cinfo, COL_PROTOCOL))
- 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP");
---- ./epan/dissectors/packet-ethertype.c.orig	2008-10-16 22:51:48.000000000 +0400
-+++ ./epan/dissectors/packet-ethertype.c	2008-10-16 22:52:25.000000000 +0400
-@@ -193,7 +193,7 @@
- 	guint			length_before;
- 	gint			captured_length, reported_length;
- 	volatile gboolean	dissector_found = FALSE;
--	const char		*saved_proto;
-+	const char		*volatile saved_proto;
- 
- 	/* Add the Ethernet type to the protocol tree */
- 	if (tree) {
---- ./epan/dissectors/packet-vlan.c.orig	2008-10-16 23:26:42.000000000 +0400
-+++ ./epan/dissectors/packet-vlan.c	2008-10-16 23:27:07.000000000 +0400
-@@ -74,7 +74,8 @@
- dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
- {
-   proto_tree *ti;
--  guint16 tci,encap_proto;
-+  guint16 tci;
-+  volatile guint16 encap_proto;
-   volatile gboolean is_802_2;
-   proto_tree *volatile vlan_tree;
- 
-=== modified file 'epan/dissectors/packet-scsi.h'
---- epan/dissectors/packet-scsi.h	2008-11-22 14:42:31 +0000
-+++ epan/dissectors/packet-scsi.h	2008-11-22 14:45:00 +0000
-@@ -241,7 +241,7 @@
-  */
- #define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length)		\
-     {									\
--	gboolean short_packet;						\
-+	volatile gboolean short_packet;						\
- 	tvbuff_t *new_tvb;						\
- 	guint32 end_data_offset=0;					\
- 									\
-
-=== modified file 'epan/dissectors/packet-x11.c'
---- epan/dissectors/packet-x11.c	2008-11-22 14:42:31 +0000
-+++ epan/dissectors/packet-x11.c	2008-11-22 14:50:41 +0000
-@@ -4066,7 +4066,7 @@
-       conversation_t *conversation;
-       x11_conv_data_t *volatile state;
-       int length;
--      tvbuff_t *next_tvb;
-+      tvbuff_t *volatile next_tvb;
- 
-       while (tvb_reported_length_remaining(tvb, offset) != 0) {
- 	    /*
-
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch
new file mode 100644
index 000000000000..7da659c099fe
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.1.2--as-needed.patch
@@ -0,0 +1,20 @@
+diff --git a/epan/Makefile.am b/epan/Makefile.am
+index b2a569d..717e233 100644
+--- a/epan/Makefile.am
++++ b/epan/Makefile.am
+@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \
+ 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+ 	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
+ 	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
++	${top_builddir}/wiretap/libwiretap.la \
+ 	${top_builddir}/wsutil/libwsutil.la -lm
+ 
+ libwireshark_la_DEPENDENCIES = \
+@@ -137,6 +138,7 @@ libwireshark_la_DEPENDENCIES = \
+ 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
+ 	dfilter/libdfilter.la dissectors/libdissectors.la \
+ 	dissectors/libdirtydissectors.la $(wslua_lib) \
++	${top_builddir}/wiretap/libwiretap.la \
+ 	${top_builddir}/wsutil/libwsutil.la
+ 
+ #EXTRA_PROGRAMS = reassemble_test
diff --git a/net-analyzer/wireshark/wireshark-1.0.4.ebuild b/net-analyzer/wireshark/wireshark-1.0.4.ebuild
deleted file mode 100644
index c85f797ea9d9..000000000000
--- a/net-analyzer/wireshark/wireshark-1.0.4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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-1.0.4.ebuild,v 1.8 2008/11/15 17:42:03 dertobi123 Exp $
-
-EAPI=1
-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 gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=dev-libs/glib-2.0.4
-		=x11-libs/gtk+-2*
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	gnutls? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( 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"
-
-pkg_setup() {
-	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}
-
-	# Try to drop --as-needed patches for 1.0.1. All problems are supposed to be
-	# fixed there...
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch
-	epatch "${FILESDIR}"/${P}-zlib-build.patch #244931
-
-	cd "${S}"/epan
-	epatch "${FILESDIR}"/wireshark-except-double-free.diff
-
-	cd "${S}"
-	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; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-	# our hardened toolchain bug
-	filter-flags -fstack-protector
-
-	# profile and -fomit-frame-pointer are incompatible, bug #215806
-	use profile && filter-flags -fomit-frame-pointer
-
-	local myconf
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-	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 gtk2) \
-		$(use_enable profile profile-build) \
-		$(use_with gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with portaudio) \
-		$(use_with caps libcap) \
-		$(use_enable pcap setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	fowners 0:wireshark /usr/bin/tshark
-	fperms 6550 /usr/bin/tshark
-	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
-		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
-}
diff --git a/net-analyzer/wireshark/wireshark-1.1.1.ebuild b/net-analyzer/wireshark/wireshark-1.1.2.ebuild
index 2054ed7031a4..003b1f9f7f75 100644
--- a/net-analyzer/wireshark/wireshark-1.1.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.1.ebuild,v 1.3 2008/10/21 05:51:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.2.ebuild,v 1.1 2009/01/19 09:40:18 pva Exp $
 
 EAPI=1
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -17,7 +17,7 @@ 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 +gtk ipv6 lua portaudio gnutls ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
+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 )
@@ -34,6 +34,7 @@ RDEPEND=">=dev-libs/glib-2.4.0:2
 	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 )"
 
@@ -69,9 +70,7 @@ src_unpack() {
 	epatch "${FILESDIR}/wireshark-except-double-free.diff"
 
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-misc-warnings.patch"
-	# made dependent on lua as generally dissectors shouldn't depend on wiretap
-	use lua && epatch "${FILESDIR}/${P}--as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
 	eautoreconf
 }
 
@@ -113,6 +112,7 @@ src_compile() {
 		$(use_with pcap) \
 		$(use_with zlib) \
 		$(use_with pcre) \
+		$(use_with geoip) \
 		$(use_with portaudio) \
 		$(use_with caps libcap) \
 		$(use_enable pcap setuid-install) \