summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-04-04 22:07:09 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-04-04 22:07:09 +0000
commit89ee7f682169ac7170805c1ab94871c09f767456 (patch)
tree12351feb9e5376795d0da8af227a15f61f77cdbb /sys-boot
parentDelete calls to deprecated python_version(). (diff)
downloadgentoo-2-89ee7f682169ac7170805c1ab94871c09f767456.tar.gz
gentoo-2-89ee7f682169ac7170805c1ab94871c09f767456.tar.bz2
gentoo-2-89ee7f682169ac7170805c1ab94871c09f767456.zip
sys-boot/syslinux: update nopie patch for 3.86
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/syslinux/ChangeLog6
-rw-r--r--sys-boot/syslinux/files/syslinux-3.86-nopie.patch12
-rw-r--r--sys-boot/syslinux/syslinux-3.86.ebuild4
3 files changed, 19 insertions, 3 deletions
diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index 4da15340b630..64e95520dec3 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/syslinux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.58 2010/04/04 21:51:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.59 2010/04/04 22:07:07 chithanh Exp $
+
+ 04 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ syslinux-3.86.ebuild, +files/syslinux-3.86-nopie.patch:
+ update nopie patch for syslinux-3.86
*syslinux-4.00_pre38 (04 Apr 2010)
*syslinux-3.86 (04 Apr 2010)
diff --git a/sys-boot/syslinux/files/syslinux-3.86-nopie.patch b/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
new file mode 100644
index 000000000000..efe939e43d34
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
@@ -0,0 +1,12 @@
+diff -ur a/com32/MCONFIG b/com32/MCONFIG
+--- a/com32/MCONFIG 2010-03-31 18:24:25.000000000 +0200
++++ b/com32/MCONFIG 2010-04-05 00:03:55.612973516 +0200
+@@ -20,6 +20,8 @@
+ GCCOPT := $(call gcc_ok,-std=gnu99,) \
+ $(call gcc_ok,-m32,) \
+ $(call gcc_ok,-fno-stack-protector,) \
++ $(call gcc_ok,-nopie,) \
++ $(call gcc_ok,-fno-pie,) \
+ $(call gcc_ok,-falign-functions=0,-malign-functions=0) \
+ $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) \
+ $(call gcc_ok,-falign-loops=0,-malign-loops=0) \
diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
index 4a5b35ecbaa1..0cb5a438358a 100644
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ b/sys-boot/syslinux/syslinux-3.86.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.86.ebuild,v 1.1 2010/04/04 21:51:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.86.ebuild,v 1.2 2010/04/04 22:07:07 chithanh Exp $
inherit eutils toolchain-funcs
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${PN}-3.72-nopie.patch
+ epatch "${FILESDIR}"/${PN}-3.86-nopie.patch
rm -f gethostip #bug 137081