CVS commit: pkgsrc/sysutils/grub2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Nov 25 15:51:01 UTC 2018

Modified Files:
        pkgsrc/sysutils/grub2: distinfo
Added Files:
        pkgsrc/sysutils/grub2/patches: patch-util_getroot.c

Log Message:
grub2: be consistent about ifdef macros to fix the build for the weird case
of netbsd current broken zfs userland exposure.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/grub2/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/sysutils/grub2/patches/patch-util_getroot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/grub2/distinfo
diff -u pkgsrc/sysutils/grub2/distinfo:1.7 pkgsrc/sysutils/grub2/distinfo:1.8
--- pkgsrc/sysutils/grub2/distinfo:1.7  Wed May 23 07:56:53 2018
+++ pkgsrc/sysutils/grub2/distinfo      Sun Nov 25 15:51:01 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2018/05/23 07:56:53 triaxx Exp $
+$NetBSD: distinfo,v 1.8 2018/11/25 15:51:01 maya Exp $
 
 SHA1 (grub-2.02.tar.gz) = 2f778cf62a3126bae71ce428b512bffc964cf7d0
 RMD160 (grub-2.02.tar.gz) = 8428eba6ddd26cd36a852c99d343b2b7650e90ac
@@ -9,3 +9,4 @@ RMD160 (unifont-5.1.20080820.pcf.gz) = d
 SHA512 (unifont-5.1.20080820.pcf.gz) = 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649
 Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
 SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 4cd60bf75811c3f72ed47ccc6dd2dec7bc77f991
+SHA1 (patch-util_getroot.c) = 7c2f148ffa778872de4f59b6fcf365bd1a497acf

Added files:

Index: pkgsrc/sysutils/grub2/patches/patch-util_getroot.c
diff -u /dev/null pkgsrc/sysutils/grub2/patches/patch-util_getroot.c:1.3
--- /dev/null   Sun Nov 25 15:51:01 2018
+++ pkgsrc/sysutils/grub2/patches/patch-util_getroot.c  Sun Nov 25 15:51:01 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-util_getroot.c,v 1.3 2018/11/25 15:51:01 maya Exp $
+
+Be consistent about macros. The required headers are only
+included if both libzfs and libnvpair are detected.
+
+--- util/getroot.c.orig        2017-04-24 09:16:00.000000000 +0000
++++ util/getroot.c
+@@ -456,7 +456,7 @@ grub_util_biosdisk_is_present (const cha
+   return ret;
+ }
+ 
+-#ifdef HAVE_LIBZFS
++#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+ static libzfs_handle_t *__libzfs_handle;
+ 
+ static void