+ cflags filtering wrt bug #158664, comment #31

Package-Manager: portage-2.1.2.2

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f1f84c5a33effd09cad660f9842f6259470457ca..4fd2140f355e3061967153ce5f54c82fa9cd4579 100644 (file)
--- 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/Manifest b/net-dns/bind/Manifest
index 44b85535e052fce70e42bf111b89461c215185c7..87790edca0ce6426035d6713b70622596d33de95 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -171,22 +171,22 @@ EBUILD bind-9.3.3.ebuild 8715 RMD160 3d6471e55d6c98bfad047e6bda199baeb00d5cf0 SH
 MD5 8492a44d2acfef4889f8f21fe5d18b5b bind-9.3.3.ebuild 8715
 RMD160 3d6471e55d6c98bfad047e6bda199baeb00d5cf0 bind-9.3.3.ebuild 8715
 SHA256 847014311a46b3ac1c196fd6d31692cf12c3758300d24deefd8c54eb039a4ef6 bind-9.3.3.ebuild 8715
-EBUILD bind-9.3.4-r1.ebuild 8448 RMD160 2fa2450e96d4041011f50901996ef53d444219fa SHA1 5a64d9d1833e873e5f1f5bcbfa23f7cd56b1b03f SHA256 4eb25eb2242935af0ecdb3324e251e766bdf8ac78f2da7351e14740642a54152
-MD5 d44e0fd7b25801eab8299d14ab5a90bc bind-9.3.4-r1.ebuild 8448
-RMD160 2fa2450e96d4041011f50901996ef53d444219fa bind-9.3.4-r1.ebuild 8448
-SHA256 4eb25eb2242935af0ecdb3324e251e766bdf8ac78f2da7351e14740642a54152 bind-9.3.4-r1.ebuild 8448
+EBUILD bind-9.3.4-r2.ebuild 8536 RMD160 f5a4ac13b3153c21a8a1d0207d85f71b4910ca48 SHA1 413e395ab7b7bed98e660a25b785c2ffccfa56f8 SHA256 5e58190219e46035e8a2621505a0bd1423c6ad77ddf865ddcfd49e9528102b1d
+MD5 f08dac9e700424b5b08944b20586813d bind-9.3.4-r2.ebuild 8536
+RMD160 f5a4ac13b3153c21a8a1d0207d85f71b4910ca48 bind-9.3.4-r2.ebuild 8536
+SHA256 5e58190219e46035e8a2621505a0bd1423c6ad77ddf865ddcfd49e9528102b1d bind-9.3.4-r2.ebuild 8536
 EBUILD bind-9.3.4.ebuild 8383 RMD160 dd9cc4295f7e46e8035c482ec359f912b989f88c SHA1 047bdb82f00e9dd899b0c4ee19e460b9c286121e SHA256 c328559d719129fdc46e5371decd721e64868ac520f364d6e076daad3b37a6c9
 MD5 e3cb180c8885c49dd194836783921fc6 bind-9.3.4.ebuild 8383
 RMD160 dd9cc4295f7e46e8035c482ec359f912b989f88c bind-9.3.4.ebuild 8383
 SHA256 c328559d719129fdc46e5371decd721e64868ac520f364d6e076daad3b37a6c9 bind-9.3.4.ebuild 8383
-EBUILD bind-9.4.0-r1.ebuild 8346 RMD160 7799ffdfe745ca8e6af37f24db8ca68bc61fafec SHA1 2d7a547f478e1bfb09054bc79631bf3f97ceac73 SHA256 f4fe466b47cbf8eab82afd47028b3d9679a0acd05ff6ee4b922fbd02b295faff
-MD5 55f74138a14927cc5540accc03e46f07 bind-9.4.0-r1.ebuild 8346
-RMD160 7799ffdfe745ca8e6af37f24db8ca68bc61fafec bind-9.4.0-r1.ebuild 8346
-SHA256 f4fe466b47cbf8eab82afd47028b3d9679a0acd05ff6ee4b922fbd02b295faff bind-9.4.0-r1.ebuild 8346
-MISC ChangeLog 24805 RMD160 53022866e498bf1009d07b7ecbb84ad2a4f06033 SHA1 b1e9ca59d025e8babcd6e1db7a27c1bfcd8e66bd SHA256 9a925aece38f704654e22080be8d5d779510cfcb031ddeb9e0c642d96baf72e6
-MD5 4d9f7965049c2ac2ea209016db752e6e ChangeLog 24805
-RMD160 53022866e498bf1009d07b7ecbb84ad2a4f06033 ChangeLog 24805
-SHA256 9a925aece38f704654e22080be8d5d779510cfcb031ddeb9e0c642d96baf72e6 ChangeLog 24805
+EBUILD bind-9.4.0-r2.ebuild 8434 RMD160 72e3fc99429be048388e0524f4424ab95c35e396 SHA1 c74e78a89a34af18f9a008a181175c489dc05c1d SHA256 de44766460788097dc019566f350a46ef60e25a5699b6ed6892c3174a05d6b13
+MD5 32dd387722a32a589dc2ed84589f36f5 bind-9.4.0-r2.ebuild 8434
+RMD160 72e3fc99429be048388e0524f4424ab95c35e396 bind-9.4.0-r2.ebuild 8434
+SHA256 de44766460788097dc019566f350a46ef60e25a5699b6ed6892c3174a05d6b13 bind-9.4.0-r2.ebuild 8434
+MISC ChangeLog 25105 RMD160 ea82952faeee0979cd50a46d462a8b1e1b5d42ec SHA1 5175654e668843a1e692dbcde0bd2f53303a3910 SHA256 d22ed9932ed1d3d98c6a318f408e7bba4ec2e72ea1b00deaaf5dd96f2765a9e4
+MD5 da0920fbdbef827fbc88e64ff5f01e68 ChangeLog 25105
+RMD160 ea82952faeee0979cd50a46d462a8b1e1b5d42ec ChangeLog 25105
+SHA256 d22ed9932ed1d3d98c6a318f408e7bba4ec2e72ea1b00deaaf5dd96f2765a9e4 ChangeLog 25105
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 metadata.xml 352
@@ -230,16 +230,16 @@ SHA256 cc51007f0fa03b13918828aa657dce1b820003ed8dbaf49313a1a4735c9314f9 files/di
 MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4 723
 RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4 723
 SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4 723
-MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4-r1 723
-RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4-r1 723
-SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4-r1 723
-MD5 a7601db3e24eedf4c3108e1c7df587ff files/digest-bind-9.4.0-r1 470
-RMD160 f8084be93974d89d44f6410f3bae57c8f34d0189 files/digest-bind-9.4.0-r1 470
-SHA256 0729d99d566d077c321e7ec4100c1d4c5b0e0e37e380c2cfb035bb85da6351c4 files/digest-bind-9.4.0-r1 470
+MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4-r2 723
+RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4-r2 723
+SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4-r2 723
+MD5 a7601db3e24eedf4c3108e1c7df587ff files/digest-bind-9.4.0-r2 470
+RMD160 f8084be93974d89d44f6410f3bae57c8f34d0189 files/digest-bind-9.4.0-r2 470
+SHA256 0729d99d566d077c321e7ec4100c1d4c5b0e0e37e380c2cfb035bb85da6351c4 files/digest-bind-9.4.0-r2 470
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF5+xBbwxeDFj+ScoRAmrxAJ4rnXN/CdO+Yocet4VXt++E4kcDJwCfZ8pP
-BKuwGINb5znSZQEteW9TyHE=
-=s8yh
+iD8DBQFF9ZWbbwxeDFj+ScoRAgiiAJ9qCKLiWUeN23/LYzagV7JTApPQNQCdELh4
+cEb7MEhudt/cYpa+Y2wnUTA=
+=cUaX
 -----END PGP SIGNATURE-----

diff --git a/net-dns/bind/bind-9.3.4-r1.ebuild b/net-dns/bind/bind-9.3.4-r2.ebuild
similarity index 97%
rename from net-dns/bind/bind-9.3.4-r1.ebuild
rename to net-dns/bind/bind-9.3.4-r2.ebuild
index 140390f981d7d49fef21c989d3329a091e509be6..00c2f0ed380cda87d193b00f8f5ead6b12563cd8 100644 (file)
--- 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
similarity index 97%
rename from net-dns/bind/bind-9.4.0-r1.ebuild
rename to net-dns/bind/bind-9.4.0-r2.ebuild
index 54797119020c129cb4a9b773ccf7445eecdec541..fb356ece1dccb1430160161b3925ed513f733eef 100644 (file)
--- 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
similarity index 100%
rename from net-dns/bind/files/digest-bind-9.3.4-r1
rename to 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
similarity index 100%
rename from net-dns/bind/files/digest-bind-9.4.0-r1
rename to net-dns/bind/files/digest-bind-9.4.0-r2