Merge pull request #3287 from suvari/master

syslinux: patched

system/boot/syslinux/files/syslinux-6.02-add-fno-stack-protector.patch

@@ -0,0 +1,20 @@
+diff -Naur syslinux-6.02/mk/efi.mk syslinux-6.02-hardened/mk/efi.mk
+--- syslinux-6.02/mk/efi.mk	2013-10-13 13:59:03.000000000 -0400
++++ syslinux-6.02-hardened/mk/efi.mk	2014-02-09 12:56:47.036409135 -0500
+@@ -23,6 +23,7 @@
+ 	EFI_SUBARCH = $(ARCH)
+ endif
+ 
++GCCOPT := $(call gcc_ok,-fno-stack-protector,)
+ EFIINC = $(shell $(topdir)/efi//find-gnu-efi.sh include $(EFI_SUBARCH))
+ $(if $(EFIINC),, \
+ 	$(error Missing $(EFI_SUBARCH) gnu-efi header files))
+@@ -42,7 +43,7 @@
+ 		-DELF_DEBUG -DSYSLINUX_EFI -I$(objdir) \
+ 		$(GCCWARN) -D__COM32__ -mno-red-zone \
+ 		-DLDLINUX=\"$(LDLINUX)\" -fvisibility=hidden \
+-		-Wno-unused-parameter
++		-Wno-unused-parameter $(GCCOPT)
+ 
+ # gnuefi sometimes installs these under a gnuefi/ directory, and sometimes not
+ CRT0 := $(shell find $(LIBDIR) -name crt0-efi-$(EFI_SUBARCH).o 2>/dev/null | tail -n1)

system/boot/syslinux/files/syslinux-6.03-sysmacros.patch

@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/579928
+
+From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 01:56:41 -0400
+Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
+
+These functions are defined in sys/sysmacros.h, so add the include to
+main.c.  This is already handled correctly in mountinfo.c.  Otherwise
+we get build failures like:
+
+main.o: In function 'find_device_sysfs':
+extlinux/main.c:1131: undefined reference to 'minor'
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ extlinux/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extlinux/main.c b/extlinux/main.c
+index a7ebd49..ebff7ea 100644
+--- a/extlinux/main.c
++++ b/extlinux/main.c
+@@ -38,6 +38,7 @@
+ #include <sysexits.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/vfs.h>
+-- 
+2.7.4

system/boot/syslinux/pspec.xml

@@ -33,6 +33,8 @@
             <Patch>syslinux.git-138e850fab106b5235178848b3e0d33e25f4d3a2.patch</Patch><!--kbd patch-->
             <Patch>syslinux.git-83aad4f.patch</Patch><!--set-base patch-->
             <Patch>syslinux.git-0a2dbb3.patch</Patch><!--set-mod patch-->
+            <Patch>syslinux-6.03-sysmacros.patch</Patch>
+<!--             <Patch>syslinux-6.02-add-fno-stack-protector.patch</Patch> -->
         </Patches>
     </Source>