+ cflags filtering wrt bug #158664, comment #31

(Portage version: 2.1.2.2)

5 files changed, 20 insertions, 5 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f1f84c5a33ef..4fd2140f355e 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.150 2007/03/02 09:21:09 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.151 2007/03/12 18:02:16 voxus Exp $
+
+*bind-9.4.0-r2 (12 Mar 2007)
+*bind-9.3.4-r2 (12 Mar 2007)
+
+  12 Mar 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -bind-9.3.4-r1.ebuild, +bind-9.3.4-r2.ebuild, -bind-9.4.0-r1.ebuild,
+  +bind-9.4.0-r2.ebuild:
+  Added CFLAGS filtering for ssp-enabled compilers, wrt to bug #158664, comment
+  #31.
 
 *bind-9.4.0-r1 (02 Mar 2007)
 
diff --git a/net-dns/bind/bind-9.3.4-r1.ebuild b/net-dns/bind/bind-9.3.4-r2.ebuild
index 140390f981d7..00c2f0ed380c 100644
--- a/net-dns/bind/bind-9.3.4-r1.ebuild
+++ b/net-dns/bind/bind-9.3.4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r1.ebuild,v 1.1 2007/02/22 11:12:46 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r2.ebuild,v 1.1 2007/03/12 18:02:16 voxus Exp $
 
-inherit eutils libtool autotools
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
 DLZ_VERSION="9.3.3"
 
@@ -111,6 +111,9 @@ src_compile() {
 		myconf="${myconf} --disable-linux-caps --disable-threads"
 	fi
 
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+
 	econf \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
diff --git a/net-dns/bind/bind-9.4.0-r1.ebuild b/net-dns/bind/bind-9.4.0-r2.ebuild
index 54797119020c..fb356ece1dcc 100644
--- a/net-dns/bind/bind-9.4.0-r1.ebuild
+++ b/net-dns/bind/bind-9.4.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.0-r1.ebuild,v 1.1 2007/03/02 09:21:09 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.0-r2.ebuild,v 1.1 2007/03/12 18:02:16 voxus Exp $
 
-inherit eutils libtool autotools
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
 DLZ_VERSION="9.3.3"
 
@@ -113,6 +113,9 @@ src_compile() {
 		myconf="${myconf} --with-randomdev=/dev/random"
 	fi
 
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+
 	econf \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
diff --git a/net-dns/bind/files/digest-bind-9.3.4-r1 b/net-dns/bind/files/digest-bind-9.3.4-r2
index 52fae07ad51b..52fae07ad51b 100644
--- a/net-dns/bind/files/digest-bind-9.3.4-r1
+++ b/net-dns/bind/files/digest-bind-9.3.4-r2
diff --git a/net-dns/bind/files/digest-bind-9.4.0-r1 b/net-dns/bind/files/digest-bind-9.4.0-r2
index 5dce4389cdd3..5dce4389cdd3 100644
--- a/net-dns/bind/files/digest-bind-9.4.0-r1
+++ b/net-dns/bind/files/digest-bind-9.4.0-r2