added new hppa dependent hardened-gcc flags

4 files changed, 53 insertions, 14 deletions

diff --git a/sys-fs/devfsd/Manifest b/sys-fs/devfsd/Manifest
index 72a9fd36be57..148617774fb9 100644
--- a/sys-fs/devfsd/Manifest
+++ b/sys-fs/devfsd/Manifest
@@ -1,8 +1,8 @@
-MD5 1f26a3cd4cabf5de7154a4b68fae3ed5 devfsd-1.3.25-r4.ebuild 1569
-MD5 c68f9738a197cb476871fee8d028e533 devfsd-1.3.25-r3.ebuild 1562
+MD5 b34005ce2227176e74e3e137cfe7b7ba devfsd-1.3.25-r4.ebuild 1569
+MD5 98c849a528dedfa1838335d014877e1e devfsd-1.3.25-r3.ebuild 1560
 MD5 31cb9c2bfe7cfa9604edbfba5539258d devfsd-1.3.24.ebuild 999
-MD5 a48f1ab37b7a0a6524ec7132615de412 devfsd-1.3.25-r5.ebuild 1567
-MD5 aed09a1a921dd0e75570ad0d6a6fd96f ChangeLog 3427
+MD5 434eb14696021e937814cee1fe097760 devfsd-1.3.25-r5.ebuild 1566
+MD5 b00e0a2a6e21a2eba7ff2857ed1865eb ChangeLog 3426
 MD5 b64f47136c8298cec42e00df32c4276f files/devfsd-1.3.25-kernel-2.5.patch.bz2 1556
 MD5 d580e9efc3658a0e71a165b3b531d415 files/devfsd 245
 MD5 f59c1fb784ac9e8f41530ecd2036e33e files/digest-devfsd-1.3.24 65
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
index 98eef57ae028..19fb03b5d892 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild,v 1.1 2003/09/15 17:46:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild,v 1.2 2003/10/09 19:51:36 pappy Exp $
 
 IUSE=""
 
@@ -20,9 +20,22 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
-
+    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
+    then
+        append-flags "-yet_exec -fstack-protector"
+    fi
+
+    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
+
+    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
+	
 	cd ${S}
 	cp GNUmakefile GNUmakefile.orig
 	sed -e "s:-O2:${CFLAGS}:g" \
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
index c5f74017ceca..bace95e7ddf3 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild,v 1.2 2003/09/18 00:52:00 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild,v 1.3 2003/10/09 19:51:36 pappy Exp $
 
 IUSE=""
 
@@ -20,8 +20,21 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
+    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
+    then
+        append-flags "-yet_exec -fstack-protector"
+    fi
+
+    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
+
+    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch.bz2
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
index 31003555d9fe..20b2290383ac 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild,v 1.1 2003/09/21 00:16:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild,v 1.2 2003/10/09 19:51:36 pappy Exp $
 
 IUSE=""
 
@@ -20,8 +20,21 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
+    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
+    then
+        append-flags "-yet_exec -fstack-protector"
+    fi
+
+    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
+
+    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
+    then
+        append-flags "-yet_exec"
+    fi
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch