4 files changed, 68 insertions, 0 deletions
diff --git a/sysutils/sbsigntool/files/patch-configure b/sysutils/sbsigntool/files/patch-configure
new file mode 100644
index 000000000000..0275fef319db
--- /dev/null
+++ b/sysutils/sbsigntool/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	2012-10-12 02:16:35.000000000 +0200
++++ configure	2014-11-30 19:14:24.000000000 +0100
+@@ -5496,7 +5496,11 @@ $as_echo "yes" >&6; }
+ fi
+ 
+ EFI_ARCH=$(uname -m)
+-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
++if [ "$EFI_ARCH" = "amd64" ]; then
++	EFI_ARCH="x86_64"
++fi
++
++EFI_CPPFLAGS="-I$LOCALBASE/include/efi -I$LOCALBASE/include/efi/$EFI_ARCH \
+  -DEFI_FUNCTION_WRAPPER"
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
diff --git a/sysutils/sbsigntool/files/patch-src-coff-external.h b/sysutils/sbsigntool/files/patch-src-coff-external.h
new file mode 100644
index 000000000000..51ecda84507c
--- /dev/null
+++ b/sysutils/sbsigntool/files/patch-src-coff-external.h
@@ -0,0 +1,29 @@
+--- src/coff/external.h.orig	2014-11-30 17:11:35.000000000 +0100
++++ src/coff/external.h	2014-11-30 17:12:19.000000000 +0100
+@@ -51,7 +51,7 @@ typedef struct external_aouthdr
+     char entry[4];	/* entry pt.				*/
+     char text_start[4];	/* base of text used for this file 	*/
+     char data_start[4];	/* base of data used for this file 	*/
+-  } ATTRIBUTE_PACKED
++  } __attribute__((packed))
+ AOUTHDR;
+ 
+ #define AOUTHDRSZ 28
+@@ -165,7 +165,7 @@ struct external_syment 
+   char e_type[2];
+   char e_sclass[1];
+   char e_numaux[1];
+-} ATTRIBUTE_PACKED ;
++} __attribute__((packed));
+ 
+ #define	SYMENT	struct external_syment
+ #define	SYMESZ	18	
+@@ -257,7 +257,7 @@ union external_auxent
+     char x_tvlen[2];	/* length of .tv */
+     char x_tvran[2][2];	/* tv range */
+   } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
+-} ATTRIBUTE_PACKED ;
++} __attribute__((packed));
+ 
+ #define	AUXENT	union external_auxent
+ #define	AUXESZ	18
diff --git a/sysutils/sbsigntool/files/patch-src-image.h b/sysutils/sbsigntool/files/patch-src-image.h
new file mode 100644
index 000000000000..18c42c738fdb
--- /dev/null
+++ b/sysutils/sbsigntool/files/patch-src-image.h
@@ -0,0 +1,12 @@
+--- src/image.h.orig	2015-01-15 19:43:49.000000000 +0100
++++ src/image.h	2015-01-15 19:49:04.000000000 +0100
+@@ -34,6 +34,9 @@
+ 
+ #include <stdint.h>
+ 
++#define	ATTRIBUTE_UNUSED __unused
++#define	ENUM_BITFIELD(X) enum X
++
+ #include <bfd.h>
+ #define DO_NOT_DEFINE_LINENO
+ 
diff --git a/sysutils/sbsigntool/files/patch-src-sbkeysync.c b/sysutils/sbsigntool/files/patch-src-sbkeysync.c
new file mode 100644
index 000000000000..c1eba1cc889c
--- /dev/null
+++ b/sysutils/sbsigntool/files/patch-src-sbkeysync.c
@@ -0,0 +1,12 @@
+--- src/sbkeysync.c.orig	2014-11-30 19:18:11.000000000 +0100
++++ src/sbkeysync.c	2014-11-30 19:18:32.000000000 +0100
+@@ -38,7 +38,8 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <sys/statfs.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+ #include <sys/types.h>
+ 
+ #include <getopt.h>