samba: build with needed packages

[people/amarx/ipfire-3.x.git] / grub / grub.nm

diff --git a/grub/grub.nm b/grub/grub.nm
index ceabf1ebd03aee2f8dd2e8e73dfb718e2ab7256d..cd3974347ceb303eba38eaf0a0bd21adea54b848 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
 
 name       = grub
 version    = 2.00
-release    = 2
+release    = 5.1
 sup_arches = x86_64 i686
 
 groups     = System/Boot
@@ -39,6 +39,7 @@ build
                gettext
                libdevmapper-devel
                ncurses-devel
+               paxctl
                zlib-devel
                %{unifont}
        end
@@ -46,10 +47,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 +59,18 @@ 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-strong//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
@@ -129,6 +93,14 @@ build
                %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-Bold-14.pf2 \
                        -s 14 %{datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
                popd
+
+               # Disable hardening.
+               paxctl -mpes \
+                       %{BUILDROOT}%{sbindir}/grub-bios-setup \
+                       %{BUILDROOT}%{sbindir}/grub-probe
+
+               paxctl -mpex \
+                       %{BUILDROOT}%{bindir}/grub-script-check
        end
 
        debuginfo_strict_build_id = false
@@ -136,7 +108,7 @@ end
 
 quality-agent
        whitelist_nx
-               /usr/bin/*|/usr/sbin/*
+               %{bindir}/*|%{sbindir}/*
        end
 end
 
@@ -148,28 +120,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