CVS commit: pkgsrc/shells/ksh93

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 14 10:22:23 UTC 2026

Modified Files:
        pkgsrc/shells/ksh93: distinfo
Added Files:
        pkgsrc/shells/ksh93/patches: patch-src_lib_libast_features_fs

Log Message:
ksh93: fix build on -current

>From Kevin Bowling in PR 59915.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/shells/ksh93/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/ksh93/patches/patch-src_lib_libast_features_fs

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

Modified files:

Index: pkgsrc/shells/ksh93/distinfo
diff -u pkgsrc/shells/ksh93/distinfo:1.14 pkgsrc/shells/ksh93/distinfo:1.15
--- pkgsrc/shells/ksh93/distinfo:1.14   Tue Nov  4 18:21:46 2025
+++ pkgsrc/shells/ksh93/distinfo        Wed Jan 14 10:22:23 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2025/11/04 18:21:46 vins Exp $
+$NetBSD: distinfo,v 1.15 2026/01/14 10:22:23 wiz Exp $
 
 BLAKE2s (ksh93-1.0.10.tar.gz) = 489a3bdc3f5325c1750cf0056a278a9c8c60037103c9691a28f3c3f6b2c06542
 SHA512 (ksh93-1.0.10.tar.gz) = 055bd2cf188c825ed684e6f95991a70f8b672e31a94a2294b8791de96be7d9dbf49e2d1eddb3490559c15736a2e0f40839529253481f1217e5e134f046cbe41f
 Size (ksh93-1.0.10.tar.gz) = 2019536 bytes
 SHA1 (patch-bin_package) = 0f001a0d02891976d95328dab1b09ce3a5ef2388
 SHA1 (patch-src_cmd_ksh93_SHOPT.sh) = 0e604d5c36649dd1560e61df00e1103bee6dd1b1
+SHA1 (patch-src_lib_libast_features_fs) = 7168c4cbfecc333f279fab7335cf34ab5875645b
 SHA1 (patch-src_lib_libast_features_syscall) = 3da58a2876db9171378574fcf772978db2cd57e0

Added files:

Index: pkgsrc/shells/ksh93/patches/patch-src_lib_libast_features_fs
diff -u /dev/null pkgsrc/shells/ksh93/patches/patch-src_lib_libast_features_fs:1.1
--- /dev/null   Wed Jan 14 10:22:23 2026
+++ pkgsrc/shells/ksh93/patches/patch-src_lib_libast_features_fs        Wed Jan 14 10:22:23 2026
@@ -0,0 +1,112 @@
+$NetBSD: patch-src_lib_libast_features_fs,v 1.1 2026/01/14 10:22:23 wiz Exp $
+
+Fix statvfs feature test, see PR 59915.
+
+--- src/lib/libast/features/fs.orig    2026-01-14 06:42:40.670523512 +0000
++++ src/lib/libast/features/fs
+@@ -107,7 +107,7 @@ lib        statfs4 sys/types.h - sys/statfs.h - sys/vfs.h - s
+       }
+ }end
+ 
+-lib   getmntinfo_statvfs note{ getmntinfo uses statvfs -- since when? }end compile{
++lib   getmntinfo_statvfs note{ getmntinfo uses statvfs }end compile{
+       #include <sys/types.h>
+       #include <sys/mount.h>
+       int
+@@ -118,45 +118,59 @@ lib      getmntinfo_statvfs note{ getmntinfo uses statvfs -
+       }
+ }end
+ 
+-lib   getfsstat_statvfs note{ getfsstat uses statvfs -- just in case it is confused like getmntinfo }end compile{
+-      #include <sys/types.h>
+-      #if _sys_mount
+-      #include <sys/mount.h>
+-      #endif
+-      int
+-      gfs(struct statvfs* fs)
+-      {
+-              fs->f_flag = 0;
+-              return getfsstat(fs, sizeof(struct statvfs), MNT_WAIT);
++if lib getfsstat_getvfsstat note{ getvfsstat (NetBSD) compiles }end compile{
++              #include <sys/types.h>
++              #if _sys_statvfs
++              #include <sys/statvfs.h>
++              #endif
++              int
++              gfs(struct statvfs* fs)
++              {
++                      fs->f_flag = 0;
++                      return getvfsstat(fs, sizeof(struct statvfs), ST_WAIT);
++              }
++      }end {
++              #define getfsstat               getvfsstat
++              #define MNT_WAIT                ST_WAIT
++              #define MNT_NOWAIT              ST_NOWAIT
++              #define _lib_getfsstat          1       /* getfsstat() is actually getvfsstat()  */
++              #define _lib_getfsstat_statvfs  1       /* ...and it uses statvfs */
+       }
+-}end pass{
+-      cat <<!
+-      #define _lib_getfsstat 1        /* getfsstat() uses statvfs and compiles successfully */
+-      !
+-}end
+-
+-lib   getfsstat_statfs note{ getfsstat uses statfs }end compile{
+-      #include <sys/types.h>
+-      #if _sys_mount
+-      #include <sys/mount.h>
+-      #endif
+-      #if _sys_param
+-      #include <sys/param.h>
+-      #endif
+-      #if _sys_ucred
+-      #include <sys/ucred.h>
+-      #endif
+-      int
+-      gfs(struct statfs* fs)
+-      {
+-              fs->f_flags = 0;
+-              return getfsstat(fs, sizeof(struct statfs), MNT_WAIT);
++elif lib getfsstat_statvfs note{ getfsstat uses statvfs }end compile{
++              #include <sys/types.h>
++              #if _sys_mount
++              #include <sys/mount.h>
++              #endif
++              int
++              gfs(struct statvfs* fs)
++              {
++                      fs->f_flag = 0;
++                      return getfsstat(fs, sizeof(struct statvfs), MNT_WAIT);
++              }
++      }end {
++              #define _lib_getfsstat          1       /* getfsstat() uses statvfs */
+       }
+-}end pass{
+-      cat <<!
+-      #define _lib_getfsstat 1        /* getfsstat() uses statfs and compiles successfully */
+-      !
+-}end
++elif lib getfsstat_statfs note{ getfsstat uses statfs }end compile{
++              #include <sys/types.h>
++              #if _sys_mount
++              #include <sys/mount.h>
++              #endif
++              #if _sys_param
++              #include <sys/param.h>
++              #endif
++              #if _sys_ucred
++              #include <sys/ucred.h>
++              #endif
++              int
++              gfs(struct statfs* fs)
++              {
++                      fs->f_flags = 0;
++                      return getfsstat(fs, sizeof(struct statfs), MNT_WAIT);
++              }
++      }end {
++              #define _lib_getfsstat          1       /* getfsstat() uses statfs */
++      }
++endif
+ 
+ cat{
+       #if _sys_statvfs