[pkgsrc/trunk]: pkgsrc/sysutils/solid solid: SunOS getmntent compat.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e59e56779890
branches:  trunk
changeset: 444809:e59e56779890
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jan 13 10:46:10 2021 +0000

description:
solid: SunOS getmntent compat.

diffstat:

 sysutils/solid/distinfo                                                         |   3 +-
 sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp |  18 ++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 89575e94b90f -r e59e56779890 sysutils/solid/distinfo
--- a/sysutils/solid/distinfo   Wed Jan 13 09:55:42 2021 +0000
+++ b/sysutils/solid/distinfo   Wed Jan 13 10:46:10 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2020/06/07 11:51:59 markd Exp $
+$NetBSD: distinfo,v 1.13 2021/01/13 10:46:10 jperkin Exp $
 
 SHA1 (solid-5.70.0.tar.xz) = 03e38056edb59640d4fadd086acf0e802984046a
 RMD160 (solid-5.70.0.tar.xz) = bb258f5c9d9a6a186a1d454ba1a2faf962c6e19f
 SHA512 (solid-5.70.0.tar.xz) = 31e7de3cd726d07452d40d43c6280a95f54abcccc63858e7af198ec0a5f01754b721539e26feb5f5cb16c07e58b6029b0a660d55d1efb3887a658ed93c5fe33f
 Size (solid-5.70.0.tar.xz) = 267924 bytes
+SHA1 (patch-src_solid_devices_backends_fstab_fstabhandling.cpp) = 93c094ba7d0396d80c00f5c044029a2d567ad9c8
diff -r 89575e94b90f -r e59e56779890 sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp   Wed Jan 13 10:46:10 2021 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_solid_devices_backends_fstab_fstabhandling.cpp,v 1.1 2021/01/13 10:46:10 jperkin Exp $
+
+Fix SunOS getmntent return value.
+
+--- src/solid/devices/backends/fstab/fstabhandling.cpp.orig    2020-05-02 22:25:33.000000000 +0000
++++ src/solid/devices/backends/fstab/fstabhandling.cpp
+@@ -82,7 +82,11 @@
+ #define ENDMNTENT fclose
+ #define STRUCT_MNTENT struct mnttab
+ #define STRUCT_SETMNTENT FILE *
++#ifdef __sun
++#define GETMNTENT(file, var) (getmntent(file, &var) == 0)
++#else
+ #define GETMNTENT(file, var) (getmntent(file, &var) == nullptr)
++#endif
+ #define MOUNTPOINT(var) var.mnt_mountp
+ #define MOUNTTYPE(var) var.mnt_fstype
+ #define MOUNTOPTIONS(var) var.mnt_mntopts