Bump development version.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

5 files changed, 58 insertions, 31 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index e51c030ff8b0..e74a13cb923a 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.120 2008/09/10 14:14:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.121 2008/09/17 14:27:38 pva Exp $
+
+*wireshark-1.1.0 (17 Sep 2008)
+
+  17 Sep 2008; Peter Volkov <pva@gentoo.org>
+  +files/wireshark-1.1.0-as-needed.patch, metadata.xml,
+  -wireshark-1.0.2.ebuild, +wireshark-1.1.0.ebuild:
+  Bump development version.
 
   10 Sep 2008; Olivier Crête <tester@gentoo.org> wireshark-1.0.3.ebuild:
   amd64 stable, bug #236515
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f82ac41f2137..d0cb1578b9c7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
+AUX wireshark-1.1.0-as-needed.patch 739 RMD160 effa6acd050262f946aa71185e41e2304cfb2bb0 SHA1 4b6b2dea833fcd15badd6e7344d7eed08cbd1732 SHA256 cc027586970b0cb9a0e23e08a71cd2ef88e9e245781b0d28ebe63316ced01a2b
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST gtk-2.0-for-wireshark.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6 SHA1 c72993fdb224ffba6afeca43a60303ed0350c56f SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba
-DIST wireshark-1.0.2.tar.bz2 13064896 RMD160 bd42952c87c412b4395485cbaaf8698d26e03137 SHA1 6d5736096efde3507a900942bfb21c492a42a057 SHA256 5ca4175be433e6b16658763f4f914787e09d6ed0141af13109989bf5544d26eb
 DIST wireshark-1.0.3.tar.bz2 13104737 RMD160 02714cf78ddc8aefb3506509ceb31d35b4402686 SHA1 4094c2ce9f49730e640b677ebb57dc33427e4517 SHA256 77896f306b56979243df95966d57d2a361f251f2cabf872bfaf9f897015eb3f2
-EBUILD wireshark-1.0.2.ebuild 5122 RMD160 9ede2a8f0a68da840421773b6a757c0e083eafcf SHA1 2476e90a905ee79b07a09b1ab91595604d86aae5 SHA256 1bfa6bf2e9cf974b73d85cc95ee6f69b5def5db6e85576e8bdb1b74ee585df92
+DIST wireshark-1.1.0.tar.gz 17750269 RMD160 c1dded7e37ae41b0283fcefc8243d13a9365afe3 SHA1 3a9301be54df22b5f6dc9262dd7d11046cd91c9d SHA256 3175f9b1f34c62c84c079f71170c6d86b603cc093452e5768bc5887f93430f38
 EBUILD wireshark-1.0.3.ebuild 4981 RMD160 3011fd330a111acf197b1f535d855dc796a738ff SHA1 20f351fbeb0d2aea981155cfcd129adefbd3b386 SHA256 4849cdd99f2d1212667ec7d6004711821e15e24ea06f9305ae9c527fe7777a44
-MISC ChangeLog 18606 RMD160 933a691978cb572699f6f1498f1c309c5d80005c SHA1 1ff2da594e0251a0705ae65a22becdb56fa62265 SHA256 048a9471e18c00453bbb64e2d323482bfe403e1a6adfc0c3a6622b5a3d4fca25
-MISC metadata.xml 2066 RMD160 56a7f4445061ce0f9c3454185134e83d27cd2d2f SHA1 50cde8b11bf113acd8960f2b8734333999764011 SHA256 5031ffeb1e01415134e84124b07e43164f98a1ced31625f064a95f4af3e1636c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjH1joACgkQ+IXOQtHLm/hgqQCbBP/ok9IZXtK/jfhKHDGeX7H0
-WDgAniNNvpKWCKsXHd7lmAiSAvyFu745
-=nvwm
------END PGP SIGNATURE-----
+EBUILD wireshark-1.1.0.ebuild 5251 RMD160 8a0f8ca9377748c72ca8d6501c5d06a94027609a SHA1 4da4e8adc2935852b265e03b2f5e1903cd1b21de SHA256 91256ba0defe60e0d2ac9f89955fc26b5bac40c118ccc0bb91b7d4a718ac2a42
+MISC ChangeLog 18817 RMD160 6cb891e430363ae6619c6b8f69f02a05b7e41052 SHA1 bc4e80dc55908a9b37c161f473ea22436b414210 SHA256 419531e04fd823b2627a22667cf7a95149ed5e5ae04d37d0a6845d5b848965eb
+MISC metadata.xml 2156 RMD160 dee58252b20aa510c61b26c8dabbf0aab9c37510 SHA1 d1ecf86f364eac7823eb0b5e3783e76e3ec6090a SHA256 4dc0c16325d04c176466d003154f487b9ab4df24865f887ce418cbc66237212d
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch b/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch
new file mode 100644
index 000000000000..58bccc247618
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.1.0-as-needed.patch
@@ -0,0 +1,23 @@
+--- wiretap/Makefile.am	2008-09-16 15:03:24 +0000
++++ wiretap/Makefile.am	2008-09-16 15:12:01 +0000
+@@ -68,7 +68,7 @@
+ 	$(GENERATOR_FILES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
++libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+ libwiretap_la_DEPENDENCIES = libwiretap_generated.la
+ 
+ RUNLEX = $(top_srcdir)/tools/runlex.sh
+
+--- epan/dissectors/Makefile.am	2008-09-16 16:16:16 +0000
++++ epan/dissectors/Makefile.am	2008-09-16 16:27:30 +0000
+@@ -42,6 +42,7 @@
+ 	$(PIDL_DISSECTOR_SRC) \
+ 	$(DISSECTOR_SUPPORT_SRC)
+ libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
++libdissectors_la_LIBADD = $(top_builddir)/wiretap/libwiretap.la
+ 
+ 
+ EXTRA_DIST = \
+
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index cea3aab913e4..dd7231c7866d 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -30,6 +30,7 @@
 </longdescription>
 <use>
 <flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt SSL traffic</flag>
+<flag name='c-ares'>Use GNU <pkg>net-dns/c-ares</pkg> library 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>
 </use>
diff --git a/net-analyzer/wireshark/wireshark-1.0.2.ebuild b/net-analyzer/wireshark/wireshark-1.1.0.ebuild
index 6b783208f158..6114a92ea6df 100644
--- a/net-analyzer/wireshark/wireshark-1.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.7 2008/08/03 16:22:03 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.0.ebuild,v 1.1 2008/09/17 14:27:39 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -13,13 +13,12 @@ HOMEPAGE="http://www.wireshark.org/"
 [[ -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
-		mirror://gentoo/gtk-2.0-for-wireshark.m4.bz2"
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${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 gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns gtk ipv6 lua portaudio gnutls c-ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	smi? ( net-libs/libsmi )
@@ -33,7 +32,8 @@ RDEPEND="zlib? ( sys-libs/zlib )
 	pcap? ( net-libs/libpcap )
 	pcre? ( dev-libs/libpcre )
 	caps? ( sys-libs/libcap )
-	adns? ( net-libs/adns )
+	c-ares? ( net-dns/c-ares )
+	!c-ares? ( adns? ( net-libs/adns ) )
 	kerberos? ( virtual/krb5 )
 	portaudio? ( media-libs/portaudio )
 	lua? ( >=dev-lang/lua-5.1 )
@@ -52,8 +52,17 @@ pkg_setup() {
 		ewarn "only command line utils are available"
 	fi
 
+	if use c-ares && use adns; then
+		einfo "c-ares supersedes adns resolver. Using c-ares."
+		myconf="$(use_with c-ares) --without-adns"
+	elif use adns; then
+		myconf="$(use_with adns) --without-c-ares"
+	else
+		myconf="--without-adns --without-c-ares" # disable automatic detection
+	fi
+
 	# Add group for users allowed to sniff.
-	enewgroup wireshark || die "Failed to create wireshark group"
+	enewgroup wireshark
 }
 
 src_unpack() {
@@ -62,16 +71,15 @@ src_unpack() {
 	# 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}"/${PN}-0.99.7-asneeded.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 
+	# again our hardened toolchain bug...
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
 
 	cd "${S}"
-	# Add gtk m4 for bug #233158
-	mv "${WORKDIR}"/gtk-2.0-for-wireshark.m4 gtk-2.0.m4
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 }
 
 src_compile() {
@@ -91,7 +99,6 @@ src_compile() {
 	# 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
@@ -116,7 +123,6 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_with lua) \
-		$(use_with adns) \
 		$(use_with kerberos krb5) \
 		$(use_with smi libsmi) \
 		$(use_with pcap) \
@@ -126,7 +132,7 @@ src_compile() {
 		$(use_with caps libcap) \
 		$(use_enable pcap setuid-install) \
 		--sysconfdir=/etc/wireshark \
-		${myconf} || die "econf failed"
+		${myconf}
 
 	emake || die "emake failed"
 }