summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-12-21 01:02:30 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-12-21 01:02:30 +0000
commitf5030e3913af375cb62a0fb8fb9e5c6b951250fd (patch)
tree481c3f00a6dd2d87f034c2913d23695fead8cdda /sys-boot/syslinux/files
parentRemove duplicate ewarn. (diff)
downloadhistorical-f5030e3913af375cb62a0fb8fb9e5c6b951250fd.tar.gz
historical-f5030e3913af375cb62a0fb8fb9e5c6b951250fd.tar.bz2
historical-f5030e3913af375cb62a0fb8fb9e5c6b951250fd.zip
Bug #244775, version bump.
Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64
Diffstat (limited to 'sys-boot/syslinux/files')
-rw-r--r--sys-boot/syslinux/files/syslinux-3.72-nopie.patch12
-rw-r--r--sys-boot/syslinux/files/syslinux-3.72-nostrip.patch36
2 files changed, 48 insertions, 0 deletions
diff --git a/sys-boot/syslinux/files/syslinux-3.72-nopie.patch b/sys-boot/syslinux/files/syslinux-3.72-nopie.patch
new file mode 100644
index 000000000000..ea92b8fb5c60
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.72-nopie.patch
@@ -0,0 +1,12 @@
+diff -ur a/com32/MCONFIG b/com32/MCONFIG
+--- a/com32/MCONFIG 2008-09-26 01:46:02.000000000 +0200
++++ b/com32/MCONFIG 2008-10-28 16:10:16.107964907 +0100
+@@ -19,6 +19,8 @@
+ GCCOPT := $(call gcc_ok,-std=gnu99,) \
+ $(call gcc_ok,-m32,) \
+ $(call gcc_ok,-fno-stack-protector,) \
++ $(call gcc_ok,-nopie,) \
++ $(call gcc_ok,-fnopie,) \
+ -mregparm=3 -DREGPARM=3 -march=i386 -Os
+
+ com32 = $(topdir)/com32
diff --git a/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch b/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch
new file mode 100644
index 000000000000..a8d0270500a8
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch
@@ -0,0 +1,36 @@
+diff -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile 2008-09-26 01:46:02.000000000 +0200
++++ b/linux/Makefile 2008-10-28 15:56:25.818399544 +0100
+@@ -20,7 +20,7 @@
+ OPTFLAGS = -g -Os
+ INCLUDES = -I. -I.. -I../libinstaller
+ CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
+-LDFLAGS = -s
++LDFLAGS =
+
+ SRCS = syslinux.c \
+ ../libinstaller/syslxmod.c \
+diff -ur a/mtools/Makefile b/mtools/Makefile
+--- a/mtools/Makefile 2008-09-26 01:46:02.000000000 +0200
++++ b/mtools/Makefile 2008-10-28 15:56:45.113477480 +0100
+@@ -4,7 +4,7 @@
+ OPTFLAGS = -g -Os
+ INCLUDES = -I. -I.. -I../libfat -I../libinstaller
+ CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
+-LDFLAGS = -s
++LDFLAGS =
+
+ SRCS = syslinux.c \
+ ../libinstaller/syslxmod.c \
+diff -ur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile 2008-09-26 01:46:02.000000000 +0200
++++ b/utils/Makefile 2008-10-28 15:56:55.843968018 +0100
+@@ -18,7 +18,7 @@
+ include $(topdir)/MCONFIG
+
+ CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+-LDFLAGS = -O2 -s
++LDFLAGS = -O2
+
+ TARGETS = mkdiskimage isohybrid gethostip
+ ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi