From: Michael Januszewski <spock@gentoo.org>
Date: Sun, 16 Jan 2005 13:57:27 +0000 (+0000)
Subject: Added hardened compilation fixes from bug #71193.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c35066193af2b5dc7b5ae9aa8f8ac25d487c0de5;p=gentoo.git

Added hardened compilation fixes from bug #71193.
Package-Manager: portage-2.0.51-r13
---

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 12300e233d2c..c54131a3615b 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.13 2005/01/12 00:02:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.14 2005/01/16 13:57:27 spock Exp $
+
+  16 Jan 2005; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_rc1.ebuild:
+  Added hardened compilation fixes from bug #71193.
 
   12 Jan 2005; Michal Januszewski <spock@gentoo.org>
   splashutils-0.9_rc1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 43f673bfff8d..995bfcbc027c 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA1
 
 MD5 a4ff7b47bcc0f5a14bbf4e0c6c34c9e7 splashutils-0.9_pre09.ebuild 2714
-MD5 68385ebdd4a784fc91ceba509d983127 splashutils-0.9_rc1.ebuild 2720
+MD5 76c4a426468f1c88307c2389f634d636 splashutils-0.9_rc1.ebuild 3390
 MD5 1d1897ce49b2fb346c15d8bfd4417b7d splashutils-0.9_pre10.ebuild 2878
 MD5 22e51b8404350ea173c7d2beec695be0 splashutils-0.9_pre08.ebuild 2669
-MD5 718c4dada9782ca0b1dbc5aa30445770 ChangeLog 2801
+MD5 43833b9ac683f901b26ad94f95c46a15 ChangeLog 2937
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 MD5 abc825d9d7824912ad783de0e22647d7 splashutils-0.9_pre07.ebuild 2220
 MD5 ebf22f53007c23687b34a3131f69b230 files/digest-splashutils-0.9_pre07 299
@@ -16,7 +16,7 @@ MD5 55f2bfa5c4fa1295f2308fea3b1bc6ca files/digest-splashutils-0.9_rc1 380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5Gktchej4aZK9/cRAuddAJwMB0cQ5UFLJkiH5+w0IfxeHdDRIACgiKpv
-sy1ANA5AH8tEiXd2FY6ynW4=
-=FOSr
+iD8DBQFB6nLZchej4aZK9/cRAsirAJkBAw7Jynh5y7FZYeInAm8SSbbb+QCffzy/
+0Aef+QujXHmd2CNHVuBny2c=
+=wyzJ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-0.9_rc1.ebuild b/media-gfx/splashutils/splashutils-0.9_rc1.ebuild
index 7d7175a101ca..73e060185554 100644
--- a/media-gfx/splashutils/splashutils-0.9_rc1.ebuild
+++ b/media-gfx/splashutils/splashutils-0.9_rc1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9_rc1.ebuild,v 1.3 2005/01/12 00:02:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9_rc1.ebuild,v 1.4 2005/01/16 13:57:27 spock Exp $
 
 MISCSPLASH="miscsplashutils-0.1.2"
 GENTOOSPLASH="splashutils-gentoo-0.1.3"
+KLIBC_VERSION="0.179"
 
 DESCRIPTION="Framebuffer splash utilities."
 HOMEPAGE="http://dev.gentoo.org/~spock/"
@@ -16,7 +17,7 @@ SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
-IUSE=""
+IUSE="hardened"
 RDEPEND=">=media-libs/freetype-2
 	media-libs/libpng
 	media-libs/jpeg
@@ -29,6 +30,15 @@ S="${WORKDIR}/${P/_/-}"
 SM="${WORKDIR}/${MISCSPLASH}"
 SG="${WORKDIR}/${GENTOOSPLASH}"
 
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the fbsplash kernel helper."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	ln -s /usr/src/linux ${S}/linux
@@ -52,9 +62,15 @@ src_unpack() {
 		else
 			t2=$(readlink ${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include/asm)
 			ln -s /usr/src/linux/include/${t2} ${T}/asm
-			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-0.179/klibc/makeerrlist.pl
+			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/makeerrlist.pl
 		fi
 	fi
+
+	# this should make this version of splashutils compile with hardened systems
+	if use hardened; then
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+		sed -e 's@CFLAGS  =@CFLAGS  = -fno-stack-protector@' -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/MCONFIG
+	fi
 }
 
 src_compile() {