Filtering out -fstack-protector because of bug #115285

(Portage version: 2.1_pre3-r1)

5 files changed, 21 insertions, 110 deletions

diff --git a/net-mail/tpop3d/ChangeLog b/net-mail/tpop3d/ChangeLog
index a9de2317b900..9d970a1cf148 100644
--- a/net-mail/tpop3d/ChangeLog
+++ b/net-mail/tpop3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/tpop3d
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.17 2005/03/04 17:55:01 griffon26 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.18 2006/02/14 18:38:33 griffon26 Exp $
+
+  13 Feb 2006; Maurice van der Pot <griffon26@gentoo.org>
+  -tpop3d-1.4.2.ebuild, tpop3d-1.5.3-r1.ebuild:
+  Temporarily filtering out -fstack-protector because of bug #115285
+  reported by Alexander Stoll <as@ha-networks.com>.
+  Also removed old ebuild.
 
 *tpop3d-1.5.3-r1 (04 Mar 2005)
 
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index dad43db31803..45fc8305dc10 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fdee8ea25743becb983807795ea997d3 metadata.xml 222
-MD5 3eb10e22f92be077144bf6d431204571 ChangeLog 2877
-MD5 6c2ef0682b765d8d9e05f9dcc622849e tpop3d-1.4.2.ebuild 2510
-MD5 54110dd1c9339b9c8c9b84b39201c7be tpop3d-1.5.3.ebuild 2701
-MD5 6023644567212eec59be3cc83bddd2b8 tpop3d-1.5.3-r1.ebuild 2865
-MD5 70073dfbe2bd93a7922b97c4f4cd3af2 files/digest-tpop3d-1.4.2 145
+MD5 f09d3c847e6d8094d34abd66ff796f8f ChangeLog 3083
 MD5 4a64dc0452c80fd14ebdfe21d889d235 files/digest-tpop3d-1.5.3 64
-MD5 723ad41d7f5485e972db927a7e43ee6c files/tpop3d-init 688
+MD5 4a64dc0452c80fd14ebdfe21d889d235 files/digest-tpop3d-1.5.3-r1 64
 MD5 b4b77ee1eecb8a83a5edeaea1be8fc89 files/tpop3d-1.5.3-invalid-user-message.patch 1098
 MD5 248f2db7e7a34de9f006bafae84c36de files/tpop3d-1.5.3-variable-name-clash.patch 2215
-MD5 4a64dc0452c80fd14ebdfe21d889d235 files/digest-tpop3d-1.5.3-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCKKD/MGnpIbeahxwRAs49AKC/UfV+zXdFB5ipEV2tVb3MtcZJbACfYo2O
-ee4ydShisfj0tWTqQMbV8aA=
-=Usp0
------END PGP SIGNATURE-----
+MD5 723ad41d7f5485e972db927a7e43ee6c files/tpop3d-init 688
+MD5 fdee8ea25743becb983807795ea997d3 metadata.xml 222
+MD5 e3873b8b8e0aa207bfb59732e3bf7c4e tpop3d-1.5.3-r1.ebuild 3007
+MD5 54110dd1c9339b9c8c9b84b39201c7be tpop3d-1.5.3.ebuild 2701
diff --git a/net-mail/tpop3d/files/digest-tpop3d-1.4.2 b/net-mail/tpop3d/files/digest-tpop3d-1.4.2
deleted file mode 100644
index d483169b02fc..000000000000
--- a/net-mail/tpop3d/files/digest-tpop3d-1.4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 30d6d7956a0bedb9f99a1b1c24585a02 tpop3d-1.4.2.tar.gz 183385
-MD5 b9bb96133f4958d2f97937917e5f5b21 tpop3d-1.4.2-auth-flatfile-broken.patch 572
diff --git a/net-mail/tpop3d/tpop3d-1.4.2.ebuild b/net-mail/tpop3d/tpop3d-1.4.2.ebuild
deleted file mode 100644
index e4b30a0bcf02..000000000000
--- a/net-mail/tpop3d/tpop3d-1.4.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.4.2.ebuild,v 1.16 2005/02/16 16:45:36 slarti Exp $
-
-inherit eutils
-
-DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support."
-HOMEPAGE="http://www.ex-parrot.com/~chris/tpop3d/"
-SRC_URI="http://www.ex-parrot.com/~chris/tpop3d/${P}.tar.gz
-	http://www.ex-parrot.com/~chris/tpop3d/${P}-auth-flatfile-broken.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="ssl ldap mysql perl pam tcpd maildir debug"
-
-DEPEND="virtual/libc
-	ssl?	( >=dev-libs/openssl-0.9.6 )
-	ldap? 	( >=net-nds/openldap-2.0.7 )
-	mysql? 	( >=dev-db/mysql-3.23.28 )
-	perl?	( >=dev-lang/perl-5.6.1 )
-	pam?	( >=sys-libs/pam-0.75 )
-	tcpd?	( >=sys-apps/tcp-wrappers-7.6 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${DISTDIR}/${P}-auth-flatfile-broken.patch
-}
-
-src_compile() {
-	local myconf
-	use mysql		&& myconf="--enable-auth-mysql"
-	use ldap		&& myconf="${myconf} --enable-auth-ldap"
-	use perl		&& myconf="${myconf} --enable-auth-perl"
-	use tcpd		&& myconf="${myconf} --enable-tcp-wrappers"
-	use pam			|| myconf="${myconf} --disable-auth-pam"
-	use maildir		&& myconf="${myconf} --enable-mbox-maildir"
-	use ssl			&& myconf="${myconf} --enable-tls"
-	# If you want plaintext /etc/passwd authentication
-	if [ ! -z $ENABLE_PASSWD ]; then
-		myconf="${myconf} --enable-auth-passwd"
-	fi
-	# If you want to use /etc/shadow instead.
-	# Make sure you also set $ENABLE_PASSWD
-	if [ ! -z $ENABLE_SHADOW ]; then
-		myconf="${myconf} --enable-shadow-passwords"
-	fi
-	# authenticate against any passwd-like file
-	if [ ! -z $ENABLE_FLATFILE ]; then
-		myconf="${myconf} --enable-auth-flatfile"
-	fi
-	# authenticate via an external program
-	if [ ! -z $ENABLE_OTHER ]; then
-		myconf="${myconf} --enable-auth-other"
-	fi
-	# Make it Rated G and safe for the kids
-	if [ ! -z $BE_NICE ]; then
-		myconf="${myconf} --disable-snide-comments"
-	fi
-	# Install mail-client/drac for integration with tpop3d
-	if [ ! -a $ENABLE_DRAC ]; then
-		myconf="${myconf} --enable-drac"
-	fi
-	if use debug; then
-		myconf="${myconf} --enable-electric-fence --enable-backtrace"
-	fi
-	econf ${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodir /etc/tpop3d
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/tpop3d-init tpop3d
-
-}
-
-pkg_postinst() {
-	einfo "Read the tpop3d.conf manpage"
-	einfo "Please create /etc/tpop3d/tpop3d.conf to fit your Configuration"
-}
diff --git a/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild
index 803d4ad0f848..8c617ce2cc6e 100644
--- a/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild,v 1.1 2005/03/04 17:55:01 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.5.3-r1.ebuild,v 1.2 2006/02/14 18:38:33 griffon26 Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support."
 HOMEPAGE="http://www.ex-parrot.com/~chris/tpop3d/"
@@ -71,6 +71,10 @@ src_compile() {
 	fi
 	econf ${myconf} || die "./configure failed"
 
+	# Causes crash with "stack smashing attack" on connect, because of bug in
+	# SSP (bug #115285)
+	filter-flags -fstack-protector
+
 	# Add in custom CFLAGS to the makefile...
 	sed -i "s/CFLAGS =/CFLAGS = ${CFLAGS} /" Makefile