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 e8fb98538d99b63c4135e551aaa7a63986951a53..cd3974347ceb303eba38eaf0a0bd21adea54b848 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
 
 name       = grub
 version    = 2.00
-release    = 3
+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
@@ -59,6 +60,7 @@ build
                --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' \
@@ -91,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
@@ -98,7 +108,7 @@ end
 
 quality-agent
        whitelist_nx
-               /usr/bin/*|/usr/sbin/*
+               %{bindir}/*|%{sbindir}/*
        end
 end