Better way to get CC version when no CC= is set ( bug #36988 ). Added ssp filtering for gcc CFLAGS as gradm requires static linking and ssp+static is known to break with some versions of gcc-3.3.{1,2}

5 files changed, 37 insertions, 14 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index d60cbccb4321..39e2b7598dfc 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.25 2003/12/01 22:56:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.26 2004/01/02 20:19:09 solar Exp $
+
+  02 Jan 2004; <solar@gentoo.org> gradm-1.9.11.ebuild, gradm-1.9.12.ebuild,
+  gradm-1.9.13.ebuild:
+  Better way to get CC version when no CC= is set ( bug #36988 ). Added ssp
+  filtering for gcc CFLAGS as gradm requires static linking and ssp+static is
+  known to break with some versions of gcc-3.3.{1,2}
 
 *gradm-1.9.13 (01 Dec 2003)
 
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index d1e1087e5434..812ca02a0bcd 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,8 +1,8 @@
-MD5 bd78fc6b1509bac21a2267f06f4a6fdf ChangeLog 3416
-MD5 94c52f9a167aea9b04aba32249ca8820 gradm-1.9.13.ebuild 1561
-MD5 f6806daf161b560f85a01dcd08a068d8 gradm-1.9.11.ebuild 987
+MD5 326a5c21ffb9f2fe1da24db2176f0c9a ChangeLog 3606
+MD5 f8e67fc05c375473d026ae6875692843 gradm-1.9.13.ebuild 1637
+MD5 d0b52ba94215846ce8696abd67d81a5f gradm-1.9.11.ebuild 987
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 690eb295c6c74d40894cff11e0bcb54b gradm-1.9.12.ebuild 987
+MD5 0ce3caff6bb6b43d264ad48d5cf5e331 gradm-1.9.12.ebuild 987
 MD5 6f65d72fd28be60fec03949a96a0431b files/digest-gradm-1.9.13 63
 MD5 056158b3d525f5c9408814b8de558aff files/digest-gradm-1.9.11 63
 MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
diff --git a/sys-apps/gradm/gradm-1.9.11.ebuild b/sys-apps/gradm/gradm-1.9.11.ebuild
index 4121ce0d0761..b49fff0f228d 100644
--- a/sys-apps/gradm/gradm-1.9.11.ebuild
+++ b/sys-apps/gradm/gradm-1.9.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.11.ebuild,v 1.3 2003/09/26 09:15:40 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.11.ebuild,v 1.4 2004/01/02 20:19:09 solar Exp $
 
 DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
 SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
diff --git a/sys-apps/gradm/gradm-1.9.12.ebuild b/sys-apps/gradm/gradm-1.9.12.ebuild
index a5e3b67d8066..fdb0d328914c 100644
--- a/sys-apps/gradm/gradm-1.9.12.ebuild
+++ b/sys-apps/gradm/gradm-1.9.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.12.ebuild,v 1.1 2003/09/26 09:15:40 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.12.ebuild,v 1.2 2004/01/02 20:19:09 solar Exp $
 
 DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
 SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
diff --git a/sys-apps/gradm/gradm-1.9.13.ebuild b/sys-apps/gradm/gradm-1.9.13.ebuild
index baac359020e7..6b33b6e0300e 100644
--- a/sys-apps/gradm/gradm-1.9.13.ebuild
+++ b/sys-apps/gradm/gradm-1.9.13.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.13.ebuild,v 1.1 2003/12/01 22:56:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.13.ebuild,v 1.2 2004/01/02 20:19:09 solar Exp $
+
+inherit gcc flag-o-matic
 
 DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
 SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
@@ -22,12 +24,27 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gradm_parse.c-1.9.x.patch
-	mv Makefile{,.orig}
-	sed -e "s|-O2|${CFLAGS}|" Makefile.orig > Makefile
+
+	# (Jan 2 2004) - <solar@gentoo>
+	# static linking required for proper operation of gradm
+	# however ssp is known to break static linking when it's enabled
+	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed. 
+	gmicro=$(gcc-micro-version)
+	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
+		# extract out gentoo revision
+		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
+		gentoo_gcc_r=${gentoo_gcc_r/,/}
+		gentoo_gcc_r=${gentoo_gcc_r/-/ }
+		gentoo_gcc_r=${gentoo_gcc_r:7}
+		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
+			filter-flags -fstack-protector -fstack-protector-all
+	fi
+
+	sed -i -e "s|-O2|${CFLAGS}|" Makefile
 }
 
 src_compile() {
-	emake CC="${CC}" || die "compile problem"
+	emake CC="$(gcc-getCC)" || die "compile problem"
 }
 
 src_install() {