pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/grub2 grub2: build-tested fixes for netbsd



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1329ea972dea
branches:  trunk
changeset: 379969:1329ea972dea
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed May 09 01:18:06 2018 +0000

description:
grub2: build-tested fixes for netbsd

don't -Werror
try to paxctl +m grub-script-check, because it tries to enable
executable stack (?!)
assume ssp/fortify won't work, typical in bootloaders. not tested if necessary.

bump PKGREVISION.

diffstat:

 sysutils/grub2/Makefile |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r a9851686be36 -r 1329ea972dea sysutils/grub2/Makefile
--- a/sysutils/grub2/Makefile   Wed May 09 00:32:59 2018 +0000
+++ b/sysutils/grub2/Makefile   Wed May 09 01:18:06 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/05/17 10:32:09 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/09 01:18:06 maya Exp $
 
 DISTNAME=              grub-2.00
 PKGNAME=               ${DISTNAME:S/grub/grub2/}
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.gnu.org/gnu/grub/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
@@ -16,7 +16,7 @@
 
 ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64
 
-USE_TOOLS+=            gmake flex bison gettext:run
+USE_TOOLS+=            gmake flex bison gettext:run awk
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
@@ -24,9 +24,13 @@
 CONFIGURE_ARGS+=       --disable-grub-emu-usb
 CONFIGURE_ARGS+=       --disable-grub-emu-sdl
 CONFIGURE_ARGS+=       --disable-grub-emu-pci
+CONFIGURE_ARGS+=       --disable-werror
 INFO_FILES=            yes
 USE_PKGLOCALEDIR=      yes
 
+SSP_SUPPORTED=         no
+FORTIFY_SUPPORTED=     no
+
 .include "../../mk/bsd.prefs.mk"
 
 #
@@ -139,6 +143,14 @@
 SUBST_SED.fix-sed-tabs=                -e 's,\\t,      ,g'
 
 #
+# grub-script-check crashes from enabling executable stack, paxctl +m it if possible.
+#
+post-configure:
+       ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
+       ${RUN}${AWK} '/^grub-script-check.1:/{print;print "\t-paxctl +m grub-script-check";next}1' \
+               ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
+
+#
 # Remove executable bit from non-executable files.
 #
 post-install:



Home | Main Index | Thread Index | Old Index