Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do some cleanup as well

(Portage version: 2.1.2.3)

6 files changed, 24 insertions, 286 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 388419db42c9..17dfbf8671e9 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.54 2007/04/17 22:17:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.55 2007/04/18 11:58:31 jokey Exp $
+
+  18 Apr 2007; Markus Ullmann <jokey@gentoo.org> -wireshark-0.99.4.ebuild,
+  -wireshark-0.99.4-r1.ebuild, wireshark-0.99.5.ebuild:
+  Fix gcc 3.4 bug #165340 thanks to Guenther Brunthaler for the solution, do
+  some cleanup as well
 
   17 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   wireshark-0.99.5.ebuild:
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.4 b/net-analyzer/wireshark/files/digest-wireshark-0.99.4
deleted file mode 100644
index 361cdfcb7f4d..000000000000
--- a/net-analyzer/wireshark/files/digest-wireshark-0.99.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2 10472441
-RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 wireshark-0.99.4.tar.bz2 10472441
-SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e wireshark-0.99.4.tar.bz2 10472441
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1
deleted file mode 100644
index 361cdfcb7f4d..000000000000
--- a/net-analyzer/wireshark/files/digest-wireshark-0.99.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2 10472441
-RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 wireshark-0.99.4.tar.bz2 10472441
-SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e wireshark-0.99.4.tar.bz2 10472441
diff --git a/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild b/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild
deleted file mode 100644
index cea7a22a09df..000000000000
--- a/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.4-r1.ebuild,v 1.3 2007/02/24 11:33:43 dragonheart Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
-SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	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-0.9.6e )
-	!ssl? (	net-libs/gnutls )
-	net-libs/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25	
-#	lua? ( >=dev-lang/lua-5.1 )"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/epan
-	epatch "${FILESDIR}"/wireshark-except-double-free.diff
-}
-
-src_compile() {
-	replace-flags -O? -O
-	filter-flags -fstack-protector # see bug #133092
-
-	local myconf
-
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-		# 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
-
-	#	$(use_with lua) \
-	econf $(use_with ssl) \
-		$(use_enable ipv6) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		$(use_with portaudio) \
-		$(use_enable gtk gtk2) \
-		$(use_enable threads) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/wireshark \
-		--enable-editcap \
-		--enable-capinfos \
-		--enable-text2pcap \
-		--enable-dftest \
-		--enable-randpkt \
-		${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"
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	dodoc AUTHORS ChangeLog NEWS README*
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
-	make_desktop_entry wireshark "Wireshark" wireshark
-	dosym tshark /usr/bin/tethereal
-	use gtk && dosym wireshark /usr/bin/ethereal
-}
-
-pkg_postinst() {
-	ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws."
-	ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend"
-	ewarn "you take the following security precautions when running wireshark in an untrusted environment:"
-	ewarn "do not run any longer than you need to;"
-	ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;"
-	ewarn "use a hardened operating system;"
-	ewarn "do not listen to addition interfaces;"
-	ewarn "if possible, run behind a firewall;"
-	ewarn "take a capture with tcpdump and analyze running wireshark as a least privileged user;"
-	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered vulnerabilities."
-}
-
diff --git a/net-analyzer/wireshark/wireshark-0.99.4.ebuild b/net-analyzer/wireshark/wireshark-0.99.4.ebuild
deleted file mode 100644
index e1ac730c775f..000000000000
--- a/net-analyzer/wireshark/wireshark-0.99.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.4.ebuild,v 1.11 2007/02/24 11:33:43 dragonheart Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
-SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	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-0.9.6e )
-	!ssl? (	net-libs/gnutls )
-	net-libs/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25	
-#	lua? ( >=dev-lang/lua-5.1 )"
-
-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
-}
-
-src_compile() {
-	replace-flags -O? -O
-	filter-flags -fstack-protector # see bug #133092
-
-	local myconf
-
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-		# 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
-
-	#	$(use_with lua) \
-	econf $(use_with ssl) \
-		$(use_enable ipv6) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		$(use_with portaudio) \
-		$(use_enable gtk gtk2) \
-		$(use_enable threads) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/wireshark \
-		--enable-editcap \
-		--enable-capinfos \
-		--enable-text2pcap \
-		--enable-dftest \
-		--enable-randpkt \
-		${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"
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	dodoc AUTHORS ChangeLog NEWS README*
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
-	make_desktop_entry wireshark "Wireshark" wireshark
-	dosym tshark /usr/bin/tethereal
-	use gtk && dosym wireshark /usr/bin/ethereal
-}
-
-pkg_postinst() {
-	ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws."
-	ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend"
-	ewarn "you take the following security precautions when running wireshark in an untrusted environment:"
-	ewarn "do not run any longer than you need to;"
-	ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;"
-	ewarn "use a hardened operating system;"
-	ewarn "do not listen to addition interfaces;"
-	ewarn "if possible, run behind a firewall;"
-	ewarn "take a capture with tcpdump and analyze running wireshark as a least privileged user;"
-	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered vulnerabilities."
-}
-
diff --git a/net-analyzer/wireshark/wireshark-0.99.5.ebuild b/net-analyzer/wireshark/wireshark-0.99.5.ebuild
index 64a332f917b4..8c19f9ba0cb7 100644
--- a/net-analyzer/wireshark/wireshark-0.99.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.5.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.11 2007/04/17 22:17:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.12 2007/04/18 11:58:31 jokey Exp $
 
-inherit libtool flag-o-matic eutils
+inherit libtool flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
 SRC_URI="mirror://sourceforge/wireshark/${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 portaudio snmp ssl kerberos threads selinux"
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
+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-0.9.6e )
+	ssl? ( dev-libs/openssl )
 	!ssl? (	net-libs/gnutls )
 	net-libs/libpcap
-	>=dev-libs/libpcre-4.2
+	dev-libs/libpcre
 	adns? ( net-libs/adns )
 	kerberos? ( virtual/krb5 )
 	portaudio? ( media-libs/portaudio )
 	selinux? ( sec-policy/selinux-wireshark )"
-# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25
-#	lua? ( >=dev-lang/lua-5.1 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15.0
@@ -63,8 +60,17 @@ src_unpack() {
 }
 
 src_compile() {
-	replace-flags -O? -O
-	filter-flags -fstack-protector # see bug #133092
+	# optimization bug, see bug #165340
+	if [[ "$(gcc-version)" == "3.4" ]] ; then
+		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
+		replace-flags -O? -O3
+	else
+		elog "Forcing -O into CFLAGS"
+		replace-flags -O? -O
+	fi
+
+	# see bug #133092
+	filter-flags -fstack-protector
 
 	local myconf
 
@@ -135,4 +141,3 @@ pkg_postinst() {
 	ewarn "take a capture with tcpdump and analyze running wireshark as a least privileged user;"
 	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered vulnerabilities."
 }
-