Disable automatic ssp flags -- this is the realm of user flags.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 46 insertions, 10 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 42040736aac2..2bbea31489af 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.137 2012/04/17 19:44:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.138 2012/04/24 00:14:32 vapier Exp $
+
+  24 Apr 2012; Mike Frysinger <vapier@gentoo.org> pure-ftpd-1.0.29-r1.ebuild,
+  pure-ftpd-1.0.32-r2.ebuild, pure-ftpd-1.0.35.ebuild, pure-ftpd-1.0.36.ebuild:
+  Disable automatic ssp flags -- this is the realm of user flags.
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> pure-ftpd-1.0.35.ebuild:
   Marking pure-ftpd-1.0.35 ppc64 for bug 410129
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 7d5cb71af4b8..44f0689f2954 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
 AUX pure-ftpd.conf_d-2 3778 RMD160 4e7d6c5fffd56ee3b0dffc6e5873f3d854b9bfaa SHA1 631030ed9249101594c1cb08e549bf34c99c5105 SHA256 8e48df3365bd74a1d8fa7c394e035c69bf7953a70ccc417377c9c881097bddca
 AUX pure-ftpd.conf_d-3 3728 RMD160 b5ebccffeb17232819bf794348549d0400e930ae SHA1 5ae244dacc725d617444dd1712a22399f1f02cb7 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b25edb7a85f1bb88e5fa
@@ -8,9 +11,26 @@ DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae574
 DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4b8ef SHA1 589f5e35771f6b481d3b56b466282bd1f50da7c9 SHA256 f1b99a9b238c330a3efea03af2f15d56b2447e6028e3b68ce9a2d261c0d520a4
 DIST pure-ftpd-1.0.35.tar.bz2 482387 RMD160 525ae8c4564b7a8f29ec09b882eacaa7a025a911 SHA1 e470bd886af68903ffba61832002fe90611f5756 SHA256 cbbdf6185480491618817710ba4a19bd58e2854c61e643967bd0841f89d0e79c
 DIST pure-ftpd-1.0.36.tar.bz2 487746 RMD160 9a6ecc35adc427f21df3f57c8e8b5f3717af061d SHA1 54d7e25ad4dd3d0ae29032705401e56467b122d5 SHA256 16e3cff004c80d752ff85e8a011a523867c7f2ab99af0f9c170891118e0fcc6b
-EBUILD pure-ftpd-1.0.29-r1.ebuild 3704 RMD160 43e6f38c244876260cbd738362b760960fb41a62 SHA1 710a3616a3b8a6cb1d0104d92d8bbe6374d74767 SHA256 3e83199db7739d90ad603eb007732514d25331350c8c6d8c21465de98a9a5c1f
-EBUILD pure-ftpd-1.0.32-r2.ebuild 3967 RMD160 02522542ca9afbfa9b8f1480c430bf07ce24d95f SHA1 1bc09ad48b412a413239d93873fa6b2442114f21 SHA256 d16d8d4393870d22a30ed8bb4a9b47094c8a125e17e91f6aa2509e6a1d9ad331
-EBUILD pure-ftpd-1.0.35.ebuild 3961 RMD160 6d74871e66c2c9a83f1aabdc4551b243bc6baa80 SHA1 8108da2f388a5e61735029da9fe0a24a6d5cee5a SHA256 a0cd32e6ddde67b9f4c11ecc08b4bb17e0e1c56cf498dfe30b4d0fba00d6284e
-EBUILD pure-ftpd-1.0.36.ebuild 3973 RMD160 e5067e94428e299408ec5751952a626aac187ac0 SHA1 442cd5a107b7f2b9967912b592e7181f798a5576 SHA256 5e8e0c060c4f97cf6aed4e36bd233d236c208e8b1c9efa5e3c6fb20ed839a9b3
-MISC ChangeLog 21578 RMD160 202e51f04ed5c506c7ad2eabbdc0865d5e9f3dab SHA1 b606299b07b96b317293daac15502918665f5839 SHA256 ea6a9b3f8e2ae60c5932a5b7acfb3f3046fce4c715044930a7e6711e4d346a4b
+EBUILD pure-ftpd-1.0.29-r1.ebuild 3804 RMD160 955764e452d3e7de170943964c924d2ada3f19bb SHA1 8762f0974b235acb1532d2e3d23ab7a00b37e137 SHA256 5efa62dc48498ccaf5cfd4ea73983044d51936fea7446af0f75a1d9fcda14255
+EBUILD pure-ftpd-1.0.32-r2.ebuild 4067 RMD160 e8b24280bdd51489c0af63762c4d790dcf635e4d SHA1 f39f742b2771bf8c60bebbeb1b3bf7db2e4c0f31 SHA256 319aa9b3511213a92cad8992bef8fccee3f2f78a4e1fec90957cfeb59aafcaee
+EBUILD pure-ftpd-1.0.35.ebuild 4067 RMD160 5ecef20fb7a7e27dc4ff3f7613d0b64c33a519bc SHA1 899e5324543391f41f8bd12efb23dee9fad8c88a SHA256 67705ca3042d8762ac550a6bc1bbd7c8e8deac09feda779b14d14c184e014c61
+EBUILD pure-ftpd-1.0.36.ebuild 4073 RMD160 ffa43dbaecc485b9b903640410ada880cd7d6cb6 SHA1 5f595368c80476b8156ac782d13d9650a183f80b SHA256 d993a13e1a40c3a3ee30990af467e6346938085aaa3fa9007d1e6939fcdd9140
+MISC ChangeLog 21803 RMD160 2ae143c26317704b855853ec0ba5d9ed5c4fdf30 SHA1 43ac276d42cfb0125e648008852e3e46dec9e13e SHA256 53f253fd7209974b64f246600764b2e20e36857f51badd91b6843264b43cd7f2
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPlfDHAAoJELEHsLL7fEFWIVUQAKKQoucuZSiaFlOcaPVlaPF/
+7PZPBaBKMqSelEfeg7I96+U3f4DqKAuyAguPUhGMBc8nd9vJEc5VeBQTWWQaNcBs
+AOsvLO0bvXAEA2d0Z4SnL/bMHby69qEsbwEFBJKoT/oj8lgGF3Egfvm8MvwUkMgi
+kx8xeBTZOpFEQzF/YNczxIJx9L4qA/f+bxYJt5giXPK3p0S6OGBMtdc2VyoKA0Lm
+Vu1oG5+vWsZIbm1Rmtj0FOJeeXgzQqm/pmI4BDuMGn+OIDVK8m+hiAjhXPzqk0sc
+DmwFIPOYh9NxVtH5CP4cn9xIRQVBF7OZBmPMv705u7LrKnzg7ISL/G06bgC84L6K
+tK6RfEnj3NjhDTS+K+4gkVbE03ATWTe21NNslBiKA0CLbR5jGnOHE6C9Ha2e0QQF
+JVRT3CAa8kGi/ZAyia8pMcvhDXPxvDiqFoghg4csrRJrhwl+41fA4rOLghY9aprT
+O15fFWdfcHlnIUc4T39wk3kysYPhLNiE5yEgeq02MAUGqBaSuck/Vh76+U0JuNlQ
+tn9kof0MXCAP0fn3CZ/biGlN7+88NRKXsqxTVYmkl5k6YNHIaaV51hbVQN4jPPGg
+S73UstrTvzvp+dF1RxCG2MjzHuzmippcWcC9LQycKk773H41WYyqslH86ICG3xPX
+bgiJWR1Ph//9uqkdsJSC
+=r0iu
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
index f4a1c2271489..0cc3dfcaf954 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.5 2012/03/29 11:33:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.6 2012/04/24 00:14:32 vapier Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -62,6 +62,9 @@ src_configure() {
 	use anonren && append-cppflags -DANON_CAN_RENAME
 	use anonres && append-cppflags -DANON_CAN_RESUME
 
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
 	econf \
 		--with-altlog \
 		--with-cookie \
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
index 42da2d6c06e3..5e44c6b35429 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild,v 1.8 2012/03/29 11:33:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild,v 1.9 2012/04/24 00:14:32 vapier Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -66,6 +66,9 @@ src_configure() {
 	use anonres && append-cppflags -DANON_CAN_RESUME
 	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
 
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
 	econf \
 		--with-altlog \
 		--with-cookie \
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
index 335b1814ebf6..688d808d20b9 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild,v 1.8 2012/04/17 19:44:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild,v 1.9 2012/04/24 00:14:32 vapier Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -66,6 +66,9 @@ src_configure() {
 	use anonres && append-cppflags -DANON_CAN_RESUME
 	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
 
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
 	econf \
 		--with-altlog \
 		--with-cookie \
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
index 407294de127b..d08eb9fd5d04 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.2 2012/03/29 11:33:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.3 2012/04/24 00:14:32 vapier Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -66,6 +66,9 @@ src_configure() {
 	use anonres && append-cppflags -DANON_CAN_RESUME
 	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
 
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
 	econf \
 		--with-altlog \
 		--with-cookie \