Version bump, bug #230411, thank 7v5w7go9ub0o for report.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-ovz005 i686

4 files changed, 20 insertions, 44 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 7ca008a81a2e..57b81b881fd8 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.100 2008/04/10 05:54:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.101 2008/07/03 09:51:16 pva Exp $
+
+*wireshark-1.0.1 (03 Jul 2008)
+
+  03 Jul 2008; Peter Volkov <pva@gentoo.org>
+  -files/wireshark-0.99.8-libpcap-compile.patch, -wireshark-0.99.8.ebuild,
+  +wireshark-1.0.1.ebuild:
+  Version bump, bug #230411, thank 7v5w7go9ub0o for report.
 
   10 Apr 2008; Peter Volkov <pva@gentoo.org> wireshark-1.0.0.ebuild:
   cap_kill is not required in wireshark-1.0.0, bug #217061, thank Justin
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 61e177864ec9..f2a7028fe096 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,10 +1,9 @@
 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-0.99.8-libpcap-compile.patch 892 RMD160 29548906e6ffe619c45deee1378953c63fa57a06 SHA1 f892354fc96f5bd009e8123ab14ac3d338029d8b SHA256 9e19ee7518dd3e1dcd9dbf37485590a7b42de727da301472decc15125241bb2f
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-0.99.8.tar.bz2 13243168 RMD160 3d7a4fdd9e2c9b9abaa0c9fe0c3e76fa86ec9aea SHA1 a33c7fd8d73bcbf843d3e3a96fd44489212c51e5 SHA256 ee9d2e7a75bc1ed80ef5faf9debca51ac238996a544f60314b7028f2f3140c22
 DIST wireshark-1.0.0.tar.bz2 13413951 RMD160 12016f80d30954bdc89163958e7d007543b3327e SHA1 4f53f526359a072665812deca980999bd26e6ab0 SHA256 b54713e146a7277cf05f309d3c706884b0e0ef5a7794e48a4251c4e17acd9fd0
-EBUILD wireshark-0.99.8.ebuild 4757 RMD160 002d57f5a347e72f97d432cf4344785050aee11a SHA1 b9b45f7a7d95367974bf7d2fcb3a344686c4b40e SHA256 3fa8c2a19e0b52fc131f9c99944e54d6cb04f82f312b63cab241fd3278f4ecf3
+DIST wireshark-1.0.1.tar.bz2 13087502 RMD160 2e53cfda4cd7b831c19463ebfa88c74cb625b1a1 SHA1 828efc186bc7eb4872628952598cd38389d8d5b0 SHA256 6a0419bc7e5c0f0a5610007a050a50b0fd796a2c99efbf0bdf0608e19e23bb87
 EBUILD wireshark-1.0.0.ebuild 4916 RMD160 04fff36a3a4f0e5ecd093406c2dde1bedcfd49a2 SHA1 aaacde6cb8dcd1ad90cc6f529e997178703fb011 SHA256 bc7a1b43d38e12db18c0623f74720e37e26a475fa2ac6ba63e74ae8dc5e64616
-MISC ChangeLog 16090 RMD160 38d9245df0660745560fd99f1227197f9a04b280 SHA1 4178efd1817491668c10a733a7742a04110ee51b SHA256 7cf620578a5439387a7ddaa3419d382b37e7a340a0301f2f3e3d0d472e16d41f
+EBUILD wireshark-1.0.1.ebuild 4986 RMD160 eaee321c14650c5e6e4d35ddca3c4d6cf7edcbc1 SHA1 5222b1c290440e47b5ec5e476baf132c1cfc8c2b SHA256 41de79be3bccaaa71f1bb95e7e10bc93234024efa0749414305154989150e113
+MISC ChangeLog 16330 RMD160 3a573c395f3c91f6b28054ef9aef10b9d02cdb06 SHA1 6c9e70815076fccd245a5fa1be7d74ef21f04e73 SHA256 7553f23c317a2d6306b4e32ff3c0b297888aa663c2a323f85a0656315073c19d
 MISC metadata.xml 1730 RMD160 0c29f85b78106162ac35419f8bc01d1539c3eb6d SHA1 93881ba93a2f1fb8b153887ce7e6a022ce95085f SHA256 d722982a52a578876257954779aa8e14dbf4c0eff0dba0e4b82db551f4a964bd
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch b/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch
deleted file mode 100644
index 287b36f040e7..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: gtk/packet_list.c
-===================================================================
---- gtk/packet_list.c	(revision 24415)
-+++ gtk/packet_list.c	(revision 24416)
-@@ -790,11 +790,11 @@
-     if (adj->value >= adj->upper - adj->page_size) {
-         at_end = TRUE;
-     }
--
-+#ifdef HAVE_LIBPCAP
-     if (adj->value > 0 && at_end != last_at_end && at_end != auto_scroll_live) {
-         menu_auto_scroll_live_changed(at_end);
-     }
--
-+#endif
-     last_at_end = at_end;
-     return at_end;
- }
-Index: gtk/main.c
-===================================================================
---- gtk/main.c	(revision 24415)
-+++ gtk/main.c	(revision 24416)
-@@ -3048,9 +3048,10 @@
-   packet_list_set_column_titles();
- 
-   menu_recent_read_finished();
-+#ifdef HAVE_LIBPCAP
-   menu_auto_scroll_live_changed(auto_scroll_live);
-+#endif
- 
--
-   switch (user_font_apply()) {
-   case FA_SUCCESS:
-       break;
diff --git a/net-analyzer/wireshark/wireshark-0.99.8.ebuild b/net-analyzer/wireshark/wireshark-1.0.1.ebuild
index f01b0515ed0d..2219af47ade7 100644
--- a/net-analyzer/wireshark/wireshark-0.99.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.0.1.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-0.99.8.ebuild,v 1.10 2008/03/19 11:44:57 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.1.ebuild,v 1.1 2008/07/03 09:51:16 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -17,7 +17,7 @@ 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"
+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 )
@@ -58,16 +58,16 @@ pkg_setup() {
 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}-libpcap-compile.patch
 
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
 
 	cd "${S}"
-	AT_M4DIR="${S}/aclocal-fallback"
 	eautoreconf
 }
 
@@ -85,6 +85,9 @@ src_compile() {
 	# 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"
@@ -136,7 +139,8 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	dodoc AUTHORS ChangeLog NEWS README*
+	# 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