vapier 15/05/17 04:33:12
Modified: yaboot-nopiessp-gcc4.patch
yaboot-1.3.17-nopiessp-gcc4.patch
Log:
Add stub func for newer ssp builds #527974 by Agostino Sarubbo.
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.2 sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch?r1=1.1&r2=1.2
Index: yaboot-nopiessp-gcc4.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-nopiessp-gcc4.patch 24 Jun 2010 19:44:02 -0000 1.1
+++ yaboot-nopiessp-gcc4.patch 17 May 2015 04:33:12 -0000 1.2
@@ -1,6 +1,10 @@
-diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
---- yaboot-1.3.13.orig/Config.gentoo 1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/Config.gentoo 2005-06-12 00:41:14.889576152 +0000
+disable ssp usage in yaboot itself
+
+unfortunately, since we link against external libs that themselves were built
+with ssp turned on, we have to provide stubs to keep the linking from failing
+
+--- yaboot-1.3.13/Config.gentoo
++++ yaboot-1.3.13/Config.gentoo
@@ -0,0 +1,6 @@
+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null
2>&1; \
+ then echo "$(1)"; else echo "$(2)"; fi)
@@ -8,9 +12,8 @@
+CFLAGS += $(call check_gcc, -fno-stack-protector)
+CFLAGS += $(call check_gcc, --nopie)
+
-diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
---- yaboot-1.3.13.orig/Makefile 2004-07-11 20:12:03.000000000 +0000
-+++ yaboot-1.3.13/Makefile 2005-06-12 00:41:14.890576000 +0000
+--- yaboot-1.3.13/Makefile
++++ yaboot-1.3.13/Makefile
@@ -1,6 +1,7 @@
## Setup
@@ -28,15 +31,8 @@
ifeq ($(USE_MD5_PASSWORDS),y)
OBJS += second/md5.o
-diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c
---- yaboot-1.3.14.orig/lib/ssp.c 1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.14/lib/ssp.c 2010-06-20 18:50:57.000000000 +0000
-@@ -0,0 +1,7 @@
-+extern void __stack_chk_fail_local (void) ;
-+
-+void
-+__stack_chk_fail_local (void)
-+{
-+ return;
-+}
-
+--- yaboot-1.3.14/lib/ssp.c
++++ yaboot-1.3.14/lib/ssp.c
+@@ -0,0 +1,2 @@
++void __stack_chk_fail(void) {}
++void __stack_chk_fail_local(void) {}
1.2 sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch?r1=1.1&r2=1.2
Index: yaboot-1.3.17-nopiessp-gcc4.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.17-nopiessp-gcc4.patch 24 Feb 2012 15:15:33 -0000 1.1
+++ yaboot-1.3.17-nopiessp-gcc4.patch 17 May 2015 04:33:12 -0000 1.2
@@ -1,6 +1,10 @@
-diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
---- yaboot-1.3.13.orig/Config.gentoo 1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.13/Config.gentoo 2005-06-12 00:41:14.889576152 +0000
+disable ssp usage in yaboot itself
+
+unfortunately, since we link against external libs that themselves were built
+with ssp turned on, we have to provide stubs to keep the linking from failing
+
+--- yaboot-1.3.13/Config.gentoo
++++ yaboot-1.3.13/Config.gentoo
@@ -0,0 +1,6 @@
+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null
2>&1; \
+ then echo "$(1)"; else echo "$(2)"; fi)
@@ -8,9 +12,8 @@
+CFLAGS += $(call check_gcc, -fno-stack-protector)
+CFLAGS += $(call check_gcc, --nopie)
+
-diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
---- yaboot-1.3.13.orig/Makefile 2004-07-11 20:12:03.000000000 +0000
-+++ yaboot-1.3.13/Makefile 2005-06-12 00:41:14.890576000 +0000
+--- yaboot-1.3.13/Makefile
++++ yaboot-1.3.13/Makefile
@@ -1,6 +1,7 @@
## Setup
@@ -21,22 +24,15 @@
# Debug mode (spam/verbose)
@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
- second/iso_util.o \
- lib/nonstd.o \
+ second/iso_util.o \
+ lib/nonstd.o \
- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o
lib/malloc.o lib/strstr.o
+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o
lib/malloc.o lib/strstr.o lib/ssp.o
ifeq ($(USE_MD5_PASSWORDS),y)
OBJS += second/md5.o
-diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c
---- yaboot-1.3.14.orig/lib/ssp.c 1970-01-01 00:00:00.000000000 +0000
-+++ yaboot-1.3.14/lib/ssp.c 2010-06-20 18:50:57.000000000 +0000
-@@ -0,0 +1,7 @@
-+extern void __stack_chk_fail_local (void) ;
-+
-+void
-+__stack_chk_fail_local (void)
-+{
-+ return;
-+}
-
+--- yaboot-1.3.14/lib/ssp.c
++++ yaboot-1.3.14/lib/ssp.c
+@@ -0,0 +1,2 @@
++void __stack_chk_fail(void) {}
++void __stack_chk_fail_local(void) {}
