CVS commit: pkgsrc/sysutils/solid

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 13 10:46:10 UTC 2021

Modified Files:
        pkgsrc/sysutils/solid: distinfo
Added Files:
        pkgsrc/sysutils/solid/patches:
            patch-src_solid_devices_backends_fstab_fstabhandling.cpp

Log Message:
solid: SunOS getmntent compat.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/solid/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp

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

Modified files:

Index: pkgsrc/sysutils/solid/distinfo
diff -u pkgsrc/sysutils/solid/distinfo:1.12 pkgsrc/sysutils/solid/distinfo:1.13
--- pkgsrc/sysutils/solid/distinfo:1.12 Sun Jun  7 11:51:59 2020
+++ pkgsrc/sysutils/solid/distinfo      Wed Jan 13 10:46:10 2021
@@ -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

Added files:

Index: pkgsrc/sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp
diff -u /dev/null pkgsrc/sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp:1.1
--- /dev/null   Wed Jan 13 10:46:10 2021
+++ pkgsrc/sysutils/solid/patches/patch-src_solid_devices_backends_fstab_fstabhandling.cpp      Wed Jan 13 10:46:10 2021
@@ -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