summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gabert <pappy@gentoo.org>2004-06-17 10:01:39 +0000
committerAlexander Gabert <pappy@gentoo.org>2004-06-17 10:01:39 +0000
commit0f2655f991c8297347d544ea0cecbcd0b3d3220a (patch)
treef8ce9caf6a9be35b7ab0f35d98a2594d18c6c5cc /sys-boot/silo
parentbuilding e2fsprogs on sparc results in silo failing because libext2 is linked... (diff)
downloadhistorical-0f2655f991c8297347d544ea0cecbcd0b3d3220a.tar.gz
historical-0f2655f991c8297347d544ea0cecbcd0b3d3220a.tar.bz2
historical-0f2655f991c8297347d544ea0cecbcd0b3d3220a.zip
added hardened exclude logic for PIE and SSP (needs guard-free libext2 from e2fsprogs)
Diffstat (limited to 'sys-boot/silo')
-rw-r--r--sys-boot/silo/ChangeLog6
-rw-r--r--sys-boot/silo/Manifest22
-rw-r--r--sys-boot/silo/silo-1.4.5.ebuild13
3 files changed, 26 insertions, 15 deletions
diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog
index 2e345a5ad457..3275ef13eeb3 100644
--- a/sys-boot/silo/ChangeLog
+++ b/sys-boot/silo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/silo
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.12 2004/05/24 18:44:54 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.13 2004/06/17 10:01:39 pappy Exp $
+
+ 17 Jun 2004; Alexander Gabert <pappy@gentoo.org> silo-1.4.5.ebuild:
+ added hardened exclude logic for PIE and SSP (needs guard-free libext2 from
+ e2fsprogs)
24 May 2004; Ferris McCormick <fmccor@gentoo.org> silo-1.4.5.ebuild:
Mark stable for sparc. Works for me on U2, U60, and ciaranm believes it
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 13e012a04b01..0132a90ef2b1 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,15 +1,15 @@
-MD5 49c0c0dd8e5a3ab0a84174112680a4ac silo-1.4.4.ebuild 1104
-MD5 8f984f9d78400af3bc2d29d1c0c7f83c ChangeLog 3805
-MD5 13a2adffe39dd9f685b572441ae5fc1d silo-1.3.1.ebuild 960
-MD5 e43023d78dbdeb9103a9b0129015afc8 silo-1.4.5.ebuild 1103
+MD5 0fcdeb6adc918863a16348fd8da87635 ChangeLog 3965
MD5 64e92dc3614963db8a397f670749b6cf metadata.xml 369
-MD5 b533607494efd39252c015c556218adf silo-1.3.1-r1.ebuild 1112
-MD5 efc08104b361e30d1f1e2601085fba9a silo-1.3.2-r1.ebuild 1113
-MD5 0ab45619cd6de4d3d4de3f6f027c2757 silo-1.3.2.ebuild 961
-MD5 34fafa5d363e6bf1bf3875cf8834fb3f files/digest-silo-1.4.4 62
-MD5 ba569526e64ff4aae31e2eb37150f62d files/digest-silo-1.3.2-r1 62
-MD5 d64a6c9a2051c74be817cf525ead4db5 files/digest-silo-1.3.1-r1 62
+MD5 d3e1a799b8079748e91ff4b7762248a1 silo-1.3.1-r1.ebuild 1111
+MD5 bae678152a62c42a10f44b4797812b3c silo-1.3.1.ebuild 959
+MD5 12957945bd11efd5f1b8d9036f63b644 silo-1.3.2-r1.ebuild 1112
+MD5 451bcad6fe1bfe46d7080133aedebf96 silo-1.3.2.ebuild 960
+MD5 fbbdf5f8c4386585d8fb979f5b4b58a7 silo-1.4.4.ebuild 1103
+MD5 a1ff9fa5c6e5913ab51bf593034f1976 silo-1.4.5.ebuild 1254
MD5 d64a6c9a2051c74be817cf525ead4db5 files/digest-silo-1.3.1 62
-MD5 a54b433747fe21133761326b98e17b47 files/digest-silo-1.4.5 62
+MD5 d64a6c9a2051c74be817cf525ead4db5 files/digest-silo-1.3.1-r1 62
MD5 ba569526e64ff4aae31e2eb37150f62d files/digest-silo-1.3.2 62
+MD5 ba569526e64ff4aae31e2eb37150f62d files/digest-silo-1.3.2-r1 62
+MD5 34fafa5d363e6bf1bf3875cf8834fb3f files/digest-silo-1.4.4 62
+MD5 a54b433747fe21133761326b98e17b47 files/digest-silo-1.4.5 62
MD5 fb91d749bdbdaee58c78d3da057f48fd files/silo_1.2.5-1.diff 20854
diff --git a/sys-boot/silo/silo-1.4.5.ebuild b/sys-boot/silo/silo-1.4.5.ebuild
index 263bbbbf37ef..a7731702e347 100644
--- a/sys-boot/silo/silo-1.4.5.ebuild
+++ b/sys-boot/silo/silo-1.4.5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.5.ebuild,v 1.2 2004/05/24 18:44:54 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.5.ebuild,v 1.3 2004/06/17 10:01:39 pappy Exp $
-inherit mount-boot
+inherit mount-boot flag-o-matic
S=${WORKDIR}/${P}
DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
@@ -19,7 +19,14 @@ DEPEND="sys-fs/e2fsprogs
sys-apps/sparc-utils"
src_compile() {
- make ${MAKEOPTS} || die
+ filter-flags "-fstack-protector"
+
+ if [ `use hardened` ]
+ then
+ make ${MAKEOPTS} CC="${CC:-gcc} -fno-stack-protector -fno-pic"
+ else
+ make ${MAKEOPTS} || die
+ fi
}
src_install() {