[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a2634ecb8ddbc2883fb9304b2effccc76e3b5881 - IPFire-SCM

15 Mar 2013

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  a2634ecb8ddbc2883fb9304b2effccc76e3b5881 (commit)
       via  e06c06a1174552ee2f434c7f55f54b6694fbc2c1 (commit)
       via  c63a3d2f6870d9fcdd5c8e3b44e2a4cf2432e8ff (commit)
       via  ed1822cd2c9fae3e0316333652bad42d55902eb3 (commit)
       via  baaebbe846e2dcc71b6d3156c435eb3203cf70ea (commit)
      from  084d572b5e33ddfddb297e75a271a76ee031b8a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a2634ecb8ddbc2883fb9304b2effccc76e3b5881
Merge: e06c06a 084d572
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 15 15:47:37 2013 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit e06c06a1174552ee2f434c7f55f54b6694fbc2c1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 15 15:46:57 2013 +0100
gummiboot: New package.
commit c63a3d2f6870d9fcdd5c8e3b44e2a4cf2432e8ff
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 15 15:34:28 2013 +0100
gnu-efi: New package.
Requirement for gummiboot.
commit ed1822cd2c9fae3e0316333652bad42d55902eb3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 15 13:26:52 2013 +0100
grub: Remove EFI version.
Don't build the EFI version of GRUB any more, because we don't
    want to use GRUB for this.
commit baaebbe846e2dcc71b6d3156c435eb3203cf70ea
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 15 13:23:14 2013 +0100
bridge-utils: Fix compilation error with kernel 3.8.
Also move brctl from /sbin to /usr/sbin (UsrMove).
-----------------------------------------------------------------------
Summary of changes:
 bridge-utils/bridge-utils.nm                       |  3 -
 .../patches/bridge-utils-1.5-linux_3.8_fix-1.patch | 54 ++++++++++++++++
 gnu-efi/gnu-efi.nm                                 | 45 ++++++++++++++
 .../patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch | 25 ++++++++
 ...ix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch | 66 ++++++++++++++++++++
 gnu-efi/patches/gnu-efi-3.0q-machine-types.patch   | 66 ++++++++++++++++++++
 grub/grub.nm                                       | 72 +++-------------------
 .../grub-2.00-ignore-gnulib-gets-stupidity.patch   | 26 ++++++++
 gummiboot/gummiboot.nm                             | 69 +++++++++++++++++++++
 9 files changed, 361 insertions(+), 65 deletions(-)
 create mode 100644 bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
 create mode 100644 gnu-efi/gnu-efi.nm
 create mode 100644 gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
 create mode 100644 gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
 create mode 100644 gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
 create mode 100644 grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
 create mode 100644 gummiboot/gummiboot.nm
Difference in files:

diff --git a/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm
index 65f0175..09bfc7b 100644
--- a/bridge-utils/bridge-utils.nm
+++ b/bridge-utils/bridge-utils.nm
@@ -28,9 +28,6 @@ build
    	automake
    end
-	configure_options += \
-		--sbindir=/sbin
-
    prepare_cmds
    	autoconf
    end
diff --git a/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch b/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
new file mode 100644
index 0000000..292cc83
--- /dev/null
+++ b/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
@@ -0,0 +1,54 @@
+Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
+Date:                    2013-03-10
+Initial Package Version: 1.5
+Upstream Status:         Unknown
+Origin:                  LFS
+Description:             This patch contains fixes a problem with 
+the omission of a needed include file in the kernel's linux/if_bridge.h.
+It also fixes some autoconf warnings.
+
+
+diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in
+--- bridge-utils-1.5.orig/Makefile.in	2011-03-28 19:52:54.000000000 -0500
++++ bridge-utils-1.5/Makefile.in	2013-03-10 13:44:41.000000000 -0500
+@@ -9,6 +9,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+ distdir = $(PACKAGE)-$(VERSION)
+ 
+ SUBDIRS=libbridge brctl doc
+diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in
+--- bridge-utils-1.5.orig/brctl/Makefile.in	2011-03-28 19:52:54.000000000 -0500
++++ bridge-utils-1.5/brctl/Makefile.in	2013-03-10 13:44:15.000000000 -0500
+@@ -12,6 +12,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+ 
+ INSTALL=@INSTALL@
+ 
+diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in
+--- bridge-utils-1.5.orig/doc/Makefile.in	2011-03-28 19:52:54.000000000 -0500
++++ bridge-utils-1.5/doc/Makefile.in	2013-03-10 13:43:39.000000000 -0500
+@@ -9,6 +9,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+ 
+ SUBDIRS=libbridge brctl
+ 
+diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h
+--- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-28 19:52:54.000000000 -0500
++++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-10 13:46:23.000000000 -0500
+@@ -21,6 +21,7 @@
+ 
+ #include <sys/socket.h>
+ #include <linux/if.h>
++#include <netinet/ip6.h>
+ #include <linux/if_bridge.h>
+ 
+ /* defined in net/if.h but that conflicts with linux/if.h... */
diff --git a/gnu-efi/gnu-efi.nm b/gnu-efi/gnu-efi.nm
new file mode 100644
index 0000000..6a29a44
--- /dev/null
+++ b/gnu-efi/gnu-efi.nm
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = gnu-efi
+version    = 3.0q
+release    = 1
+sup_arches = x86_64 i686
+
+groups     = Development/System
+url        = ftp://ftp.hpl.hp.com/pub/linux-ia64
+license    = BSD
+summary    = Development Libraries and headers for EFI
+
+description
+	This package contains development headers and libraries for developing
+	applications that run under EFI (Extensible Firmware Interface).
+end
+
+source_dl  = %{url}
+
+build
+	# Disable hardening.
+	CFLAGS += -fno-stack-protector
+
+	make_build_targets += CFLAGS="%{CFLAGS}"
+
+	install
+		make PREFIX=%{prefix} INSTALLROOT=%{BUILDROOT} \
+			LIBDIR=%{libdir} CFLAGS="%{CFLAGS}" install
+
+		mkdir -pv %{BUILDROOT}%{libdir}/gnuefi
+		mv -v %{BUILDROOT}%{libdir}/*.{lds,o} %{BUILDROOT}%{libdir}/gnuefi
+	end
+
+	keep_libraries
+		%{libdir}/libefi.a
+		%{libdir}/libgnuefi.a
+	end
+end
+
+packages
+	package %{name}
+end
diff --git a/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch b/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
new file mode 100644
index 0000000..b6fdfaf
--- /dev/null
+++ b/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
@@ -0,0 +1,25 @@
+From bb12d86aceb7d9ea6748f45a17f719a8e18c81c8 Mon Sep 17 00:00:00 2001
+From: Peter Jones pjones@redhat.com
+Date: Tue, 9 Aug 2011 12:30:49 -0400
+Subject: [PATCH 7/7] Add %.S and %.E rules to make debugging easier.
+
+---
+ Make.rules |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Make.rules b/Make.rules
+index eab12d7..65fb612 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -44,3 +44,8 @@
+ %.o: %.c
+ 	$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
++%.S: %.c
++	$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -S $< -o $@
++
++%.E: %.c
++	$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@
+-- 
+1.7.10.4
+
diff --git a/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch b/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
new file mode 100644
index 0000000..ecb5c56
--- /dev/null
+++ b/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
@@ -0,0 +1,66 @@
+From 3f40a425e763edfde77a9a6e05ed09b0676d8fa9 Mon Sep 17 00:00:00 2001
+From: Peter Jones pjones@cutlet.install.bos.redhat.com
+Date: Fri, 3 Oct 2008 14:40:56 -0400
+Subject: [PATCH 1/7] Fix usage of INSTALLROOT, PREFIX, and LIBDIR.
+
+I screwed it up last time.
+---
+ Make.defaults |    6 +++---
+ inc/Makefile  |   16 ++++++++--------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index bf162c5..6278fa7 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -38,8 +38,9 @@
+ # Where to install the package. GNU-EFI will create and access
+ # lib and include under the root
+ #
+-INSTALLROOT=/usr/local
+-LIBDIR=lib
++INSTALLROOT:= /
++PREFIX := /usr/local
++LIBDIR := ${PREFIX}/lib
+ 
+ TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+ 
+@@ -73,7 +74,6 @@ endif
+ 
+ ifeq ($(ARCH), x86_64)
+   CFLAGS += -mno-red-zone
+-  LIBDIR = lib
+   ifeq ($(HOSTARCH), ia32)
+     ARCH3264 = -m64
+   endif
+diff --git a/inc/Makefile b/inc/Makefile
+index 9683be5..71fded5 100644
+--- a/inc/Makefile
++++ b/inc/Makefile
+@@ -13,15 +13,15 @@ all:
+ clean:
+ 
+ install:
+-	mkdir -p $(INSTALLROOT)/include/efi
+-	mkdir -p $(INSTALLROOT)/include/efi/protocol
+-	mkdir -p $(INSTALLROOT)/include/efi/$(ARCH)
+-	$(INSTALL) -m 644 *.h $(INSTALLROOT)/include/efi
+-	$(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)/include/efi/protocol
+-	$(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)/include/efi/$(ARCH)
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++	$(INSTALL) -m 644 *.h $(INSTALLROOT)$(PREFIX)/include/efi
++	$(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++	$(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
+ ifeq ($(ARCH),ia64)
+-	mkdir -p $(INSTALLROOT)/include/efi/protocol/ia64
+-	$(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)/include/efi/protocol/ia64
++	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++	$(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
+ endif
+ 
+ include $(SRCDIR)/../Make.rules
+-- 
+1.7.10.4
+
diff --git a/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch b/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
new file mode 100644
index 0000000..8c0aa72
--- /dev/null
+++ b/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
@@ -0,0 +1,66 @@
+From 9ab3fefd9b86c567ba6b0ea1429ce932572040c1 Mon Sep 17 00:00:00 2001
+From: Peter Jones pjones@redhat.com
+Date: Tue, 26 Apr 2011 13:25:26 -0400
+Subject: [PATCH 5/7] Add more machine type defines.
+
+Add machine type defines for i386, arm/thumb, ia64, ebc, and x86_64.
+---
+ inc/ia32/pe.h   |    4 ++++
+ inc/ia64/pe.h   |    4 ++++
+ inc/x86_64/pe.h |    4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/inc/ia32/pe.h b/inc/ia32/pe.h
+index 16e40ef..979b936 100644
+--- a/inc/ia32/pe.h
++++ b/inc/ia32/pe.h
+@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
+ #define IMAGE_FILE_MACHINE_R3000             0x162   // MIPS little-endian, 0540 big-endian
+ #define IMAGE_FILE_MACHINE_R4000             0x166   // MIPS little-endian
+ #define IMAGE_FILE_MACHINE_ALPHA             0x184   // Alpha_AXP
++#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED    0x1c2   // Arm/Thumb
+ #define IMAGE_FILE_MACHINE_POWERPC           0x1F0   // IBM PowerPC Little-Endian
++#define IMAGE_FILE_MACHINE_IA64              0x200   // IA-64
+ #define IMAGE_FILE_MACHINE_TAHOE             0x7cc   // Intel EM machine
++#define IMAGE_FILE_MACHINE_EBC               0xebc   // EFI Byte Code
++#define IMAGE_FILE_MACHINE_X64               0x8664  // x86_64
+ //
+ // Directory format.
+ //
+diff --git a/inc/ia64/pe.h b/inc/ia64/pe.h
+index f67128d..b1cade2 100644
+--- a/inc/ia64/pe.h
++++ b/inc/ia64/pe.h
+@@ -113,8 +113,12 @@ typedef struct _IMAGE_FILE_HEADER {
+ #define IMAGE_FILE_MACHINE_R3000             0x162   // MIPS little-endian, 0540 big-endian
+ #define IMAGE_FILE_MACHINE_R4000             0x166   // MIPS little-endian
+ #define IMAGE_FILE_MACHINE_ALPHA             0x184   // Alpha_AXP
++#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED    0x1c2   // Arm/Thumb
+ #define IMAGE_FILE_MACHINE_POWERPC           0x1F0   // IBM PowerPC Little-Endian
++#define IMAGE_FILE_MACHINE_IA64              0x200   // IA-64
+ #define IMAGE_FILE_MACHINE_TAHOE             0x7cc   // Intel EM machine
++#define IMAGE_FILE_MACHINE_EBC               0xebc   // EFI Byte Code
++#define IMAGE_FILE_MACHINE_X64               0x8664  // x86_64
+ //
+ // Directory format.
+ //
+diff --git a/inc/x86_64/pe.h b/inc/x86_64/pe.h
+index 16e40ef..979b936 100644
+--- a/inc/x86_64/pe.h
++++ b/inc/x86_64/pe.h
+@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
+ #define IMAGE_FILE_MACHINE_R3000             0x162   // MIPS little-endian, 0540 big-endian
+ #define IMAGE_FILE_MACHINE_R4000             0x166   // MIPS little-endian
+ #define IMAGE_FILE_MACHINE_ALPHA             0x184   // Alpha_AXP
++#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED    0x1c2   // Arm/Thumb
+ #define IMAGE_FILE_MACHINE_POWERPC           0x1F0   // IBM PowerPC Little-Endian
++#define IMAGE_FILE_MACHINE_IA64              0x200   // IA-64
+ #define IMAGE_FILE_MACHINE_TAHOE             0x7cc   // Intel EM machine
++#define IMAGE_FILE_MACHINE_EBC               0xebc   // EFI Byte Code
++#define IMAGE_FILE_MACHINE_X64               0x8664  // x86_64
+ //
+ // Directory format.
+ //
+-- 
+1.7.10.4
+
diff --git a/grub/grub.nm b/grub/grub.nm
index ceabf1e..e8fb985 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
name       = grub
 version    = 2.00
-release    = 2
+release    = 3
 sup_arches = x86_64 i686
groups     = System/Boot
@@ -46,10 +46,6 @@ build
    prepare_cmds
    	cp -vf %{unifont} unifont.pcf.gz
    	./autogen.sh
-
-		# Create a copy of the source tree to build
-		# an EFI enabled version of grub.
-		cp -pR . %{DIR_SRC}/%{thisapp}-efi
    end
# As the modules contain always 32 bit code, they
@@ -62,51 +58,17 @@ build
    	--program-transform-name=s,grub,grub, \
    	--disable-werror \
    	CFLAGS="$(echo %{CFLAGS} | sed \
+			-e 's/-Wp,-D_FORTIFY_SOURCE=2//g' \
+			-e 's/-fstack-protector-all//g' \
    		-e 's/-fstack-protector//g' \
+			-e 's/-fPIC//g' \
    		-e 's/--param=ssp-buffer-size=4//g' \
    		-e 's/-mregparm=3/-mregparm=4/g' \
    		-e 's/-fexceptions//g' \
    		-e 's/-m64//g' \
    		-e 's/-fasynchronous-unwind-tables//g' )"
-	build_cmds
-		cd ../%{thisapp}-efi
-		./configure \
-			%{configure_options} \
-			--with-platform=efi \
-			CFLAGS="$(echo %{CFLAGS} | sed \
-				-e 's/-O.//g' \
-				-e 's/-fstack-protector//g' \
-				-e 's/--param=ssp-buffer-size=4//g' \
-				-e 's/-mregparm=3/-mregparm=4/g' \
-				-e 's/-fexceptions//g' \
-				-e 's/-m64//g' \
-				-e 's/-fasynchronous-unwind-tables//g' )"
-
-		make %{PARALLELISMFLAGS}
-
-		./grub-mkimage \
-			-O i386-efi \
-			-p /EFI/%{DISTRO_SNAME}/grub-efi \
-			-o grub.efi \
-			-d grub-core part_gpt hfsplus fat ext2 btrfs normal chain \
-			boot configfile linux appleldr minicmd loadbios reboot halt \
-			search font gfxterm echo video all_video
-	end
-
-	install
-		cd ../%{thisapp}-efi
-		make install DESTDIR=%{BUILDROOT}
-
-		install -m 755 -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/
-		install -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi
-		touch %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg
-		ln -svf ../boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg %{BUILDROOT}/etc/grub-efi.cfg
-		install -m 755 grub.efi %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.efi
-
-		cd -
-		make install DESTDIR=%{BUILDROOT}
-
+	install_cmds
    	# Install empty configuration file.
    	mkdir -pv %{BUILDROOT}/boot/grub
    	touch %{BUILDROOT}/boot/grub/grub.cfg
@@ -148,28 +110,14 @@ packages
    		system-logos >= 2
    	end
-		configfiles
-			/boot/grub/grub.cfg
-			/etc/default/grub
+		# An EFI version of grub does not exist any more.
+		obsoletes
+			grub-efi <= 2.0.0-2
    	end
-	end
-
-	package %{name}-efi
-		description
-			EFI version of GRUB, the Grand Unified Boot Loader.
-		end
-		summary = %{description}
-
-		requires += grub = %{thisver}
configfiles
-			/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg
-		end
-
-		files
-			/boot/efi
-			/etc/grub-efi.cfg
-			/usr/lib/grub/i386-efi
+			/boot/grub/grub.cfg
+			/etc/default/grub
    	end
    end
diff --git a/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch b/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
new file mode 100644
index 0000000..345c19d
--- /dev/null
+++ b/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
@@ -0,0 +1,26 @@
+From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001
+From: Peter Jones pjones@redhat.com
+Date: Fri, 25 May 2012 15:28:19 -0400
+Subject: [PATCH] gnulib accused in build breaking shocker.
+
+---
+ grub-core/gnulib/stdio.in.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
+index 80b9dbf..69932d9 100644
+--- a/grub-core/gnulib/stdio.in.h
++++ b/grub-core/gnulib/stdio.in.h
+@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if 0
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+-- 
+1.7.10.1
+
diff --git a/gummiboot/gummiboot.nm b/gummiboot/gummiboot.nm
new file mode 100644
index 0000000..956affc
--- /dev/null
+++ b/gummiboot/gummiboot.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = gummiboot
+version    = 26
+release    = 1
+sup_arches = x86_64 i686
+
+groups     = System/Boot
+url        = http://freedesktop.org/wiki/Software/gummiboot
+license    = LGPLv2+
+summary    = Simple EFI Boot Manager
+
+description
+	gummiboot is a simple UEFI boot manager which executes configured EFI
+	images. The default entry is selected by a configured pattern (glob)
+	or an on-screen menu.
+
+	gummiboot operates on the EFI System Partition (ESP) only. gummiboot
+	reads simple and entirely generic boot loader configuration files;
+	one file per boot loader entry to select from.
+
+	Configuration file fragments, kernels, initrds, other EFI images need
+	to reside on the ESP.
+end
+
+source_dl  = http://cgit.freedesktop.org/gummiboot/snapshot/
+
+build
+	requires
+		autoconf
+		automake
+		gnu-efi
+		libblkid-devel
+		libxslt
+		docbook-xsl
+	end
+
+	prepare_cmds
+		./autogen.sh
+	end
+
+	configure_options += \
+		--libexecdir=%{prefix}/lib
+
+	make_build_targets += V=1
+end
+
+packages
+	package %{name}
+		provides
+			bundled(gnu-efi)
+		end
+
+		script postin
+			%{bindir}/gummiboot update >/dev/null 2>&1 || :
+		end
+
+		script postup
+			%{bindir}/gummiboot update >/dev/null 2>&1 || :
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
hooks/post-receive
--
IPFire 3.x development tree

    