version added for security bug #116943 thanks ChazeFroy. removed older vulnerable versions too

(Portage version: 2.1_pre2)

10 files changed, 24 insertions, 288 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 662044ede182..0a3a5c2033e9 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.158 2005/12/13 20:19:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.159 2005/12/28 22:41:41 dragonheart Exp $
+
+*ethereal-0.10.14 (28 Dec 2005)
+
+  28 Dec 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/ethereal-0.10.12-fix-encrypted-conflict.diff,
+  -ethereal-0.10.12.ebuild, -ethereal-0.10.13.ebuild,
+  -ethereal-0.10.13-r1.ebuild, +ethereal-0.10.14.ebuild:
+  version added for security bug #116943 thanks ChazeFroy. removed older
+  vulnerable versions too
 
   13 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
   ethereal-0.10.13-r2.ebuild:
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 62b9f5646a7d..d5d0f3ddd94c 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6e19df66ac8b4d04c4512a5873314b00 ChangeLog 13696
-MD5 8254382d79bbfa4ae10fcf3ed648c525 ethereal-0.10.13-r1.ebuild 3462
 MD5 f8df469837b3a964d556a54c89c4dd7e ethereal-0.10.12.ebuild 3472
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 8254382d79bbfa4ae10fcf3ed648c525 ethereal-0.10.13-r1.ebuild 3462
 MD5 5f3d88072d2dfab31a28b37171489024 ethereal-0.10.13-r2.ebuild 3500
 MD5 c16f032434a7d0c2a906ab70e3392abe ethereal-0.10.13.ebuild 3359
-MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13 70
-MD5 e58b082ef143490cd14bbd423d5e7f4d files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff 612
-MD5 c334d7d6daae506c1e3a9a61d892a00c files/ethereal-0.10.13-packet-ospf.diff 18115
+MD5 6283e2c0b9c3e2000b54082284020ed3 ethereal-0.10.14.ebuild 3291
 MD5 34bd8a0285aea402be479f40304aa947 files/digest-ethereal-0.10.12 70
-MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
+MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13 70
 MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13-r1 70
 MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13-r2 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnzs8ugEuf3OQ0akRAu+fAJwPXbwWmGH0Binj8ZQMiE0P1phDZQCcCMUw
-QBW2NzFwQyHm3JWqxUqcuVk=
-=wHzv
------END PGP SIGNATURE-----
+MD5 006b9cf78002e82c2bb4e279f50e3429 files/digest-ethereal-0.10.14 70
+MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
+MD5 e58b082ef143490cd14bbd423d5e7f4d files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff 612
+MD5 c334d7d6daae506c1e3a9a61d892a00c files/ethereal-0.10.13-packet-ospf.diff 18115
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
diff --git a/net-analyzer/ethereal/ethereal-0.10.12.ebuild b/net-analyzer/ethereal/ethereal-0.10.12.ebuild
deleted file mode 100644
index 6dcc147824b6..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.12.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.10 2005/09/21 21:21:44 vanquirius Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="adns gtk ipv6 snmp ssl kerberos"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	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 )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-encrypted-conflict.diff"
-}
-
-src_compile() {
-
-	replace-flags -O? -O
-
-	# Fix gcc-3.4 segfault #49238
-	#[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf
-
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-ethereal"
-		# 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 adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		$(use_enable gtk gtk2) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		--enable-editcap \
-		--enable-capinfos \
-		--enable-text2pcap \
-		--enable-dftest \
-		--enable-randpkt \
-		${myconf} || die "bad ./configure"
-
-	# fixes an access violation caused by libnetsnmp - see bug 79068
-	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-ethereal.png ethereal.png
-	make_desktop_entry ethereal "Ethereal" 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 ethereal in an untrusted environment:"
-	ewarn "do no 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 the contents offline running ethereal as a the least privileged user;"
-	ewarn "and subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild
deleted file mode 100644
index a220bfe532c5..000000000000
--- a/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild,v 1.8 2005/12/03 20:06:42 vapier Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-#SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="adns gtk ipv6 snmp ssl kerberos"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-	>=dev-util/pkgconfig-0.15.0
-	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 )
-	virtual/libpcap
-	>=dev-libs/libpcre-4.2
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-irc-loop-DoS-CVE-2005-3313.diff
-}
-
-src_compile() {
-
-	replace-flags -O? -O
-
-	# Fix gcc-3.4 segfault #49238
-	#[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-	local myconf
-
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-ethereal"
-		# 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 adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		$(use_enable gtk gtk2) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/ethereal \
-		--enable-editcap \
-		--enable-capinfos \
-		--enable-text2pcap \
-		--enable-dftest \
-		--enable-randpkt \
-		${myconf} || die "bad ./configure"
-
-	# fixes an access violation caused by libnetsnmp - see bug 79068
-	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-ethereal.png ethereal.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-ethereal.png ethereal.png
-	make_desktop_entry ethereal "Ethereal" 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 ethereal in an untrusted environment:"
-	ewarn "do no 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 the contents offline running ethereal as a the least privileged user;"
-	ewarn "and subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.13.ebuild b/net-analyzer/ethereal/ethereal-0.10.14.ebuild
index 388d7dd26164..bd97ac2037df 100644
--- a/net-analyzer/ethereal/ethereal-0.10.13.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.14.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13.ebuild,v 1.7 2005/12/03 20:06:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.14.ebuild,v 1.1 2005/12/28 22:41:41 dragonheart Exp $
 
 inherit libtool flag-o-matic eutils
 
 DESCRIPTION="A commercial-quality network protocol analyzer"
 HOMEPAGE="http://www.ethereal.com/"
-#SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="adns gtk ipv6 snmp ssl kerberos"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
@@ -81,7 +80,7 @@ src_install() {
 	dodir /usr/lib/ethereal/plugins/${PV}
 	make DESTDIR="${D}" install || die
 
-	dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
+	dodoc AUTHORS ChangeLog NEWS README*
 
 	insinto /usr/share/icons/hicolor/16x16/apps
 	newins "${S}"/image/hi16-app-ethereal.png ethereal.png
@@ -101,6 +100,6 @@ pkg_postinst() {
 	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 the contents offline running ethereal as a the least privileged user;"
+	ewarn "take a capture with tcpdump and analyze running ethereal as a least privileged user;"
 	ewarn "and subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
 }
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.12 b/net-analyzer/ethereal/files/digest-ethereal-0.10.12
deleted file mode 100644
index fb5c5267cbd9..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 372b60e6eca14b7e1cf3e789207027f7 ethereal-0.10.12.tar.bz2 7749174
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.13 b/net-analyzer/ethereal/files/digest-ethereal-0.10.13
deleted file mode 100644
index 5048d2238514..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9998cb4907a70925d33292bae89530d4 ethereal-0.10.13.tar.gz 10213459
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.13-r1 b/net-analyzer/ethereal/files/digest-ethereal-0.10.13-r1
deleted file mode 100644
index 5048d2238514..000000000000
--- a/net-analyzer/ethereal/files/digest-ethereal-0.10.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9998cb4907a70925d33292bae89530d4 ethereal-0.10.13.tar.gz 10213459
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.14 b/net-analyzer/ethereal/files/digest-ethereal-0.10.14
new file mode 100644
index 000000000000..2d5807181159
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.14
@@ -0,0 +1 @@
+MD5 297f678c037f88429250830e924b8fa0 ethereal-0.10.14.tar.bz2 8583324
diff --git a/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff b/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff
deleted file mode 100644
index b03d9ba68130..000000000000
--- a/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: epan/radius_dict.l
-===================================================================
---- epan/radius_dict.l	(revision 15119)
-+++ epan/radius_dict.l	(working copy)
-@@ -65,7 +65,7 @@
- 	static gchar* attr_vendor = NULL;
- 	static gchar* vendor_name = NULL;
- 	static gchar* value_repr = NULL;
--	static gboolean encrypt = FALSE;
-+	static gboolean encrypted = FALSE;
- 	static gboolean has_tag = FALSE;
- 	static gchar* current_vendor = NULL;
- 	
-@@ -97,7 +97,7 @@
- <VENDOR_W_NAME>[0-9]+   { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
- <VENDOR_W_NAME>0x[0-9a-f]+   { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
- 
--<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
-+<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypted = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
- <ATTR_W_NAME>[0-9]+					{ attr_id = g_strdup(yytext);  BEGIN ATTR_W_ID;}
- <ATTR_W_NAME>0x[0-9a-f]+			{ attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
- <ATTR_W_ID>integer					{ attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
-@@ -109,11 +109,11 @@
- <ATTR_W_ID>ifid						{ attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_ID>[0-9a-z_-]+				{ attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_TYPE>has_tag[,]?			{ has_tag = TRUE; attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>encrypt=1[,]?			{ encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
-+<ATTR_W_TYPE>encrypt=1[,]?			{ encrypted=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
- <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+)	{ /* ignore other parameters */  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
--<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
--<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-+<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag); attr_vendor = NULL;  BEGIN OUT; }
-+<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypted,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
-+<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
- 
- <VALUE>[0-9a-z-]+					{ attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
- <VALUE_W_ATTR>[^[:blank:]]+			{ value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }