CVS commit: pkgsrc/sysutils/mtools

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Oct 31 15:38:23 UTC 2026

Modified Files:
        pkgsrc/sysutils/mtools: Makefile PLIST distinfo
        pkgsrc/sysutils/mtools/patches: patch-aa

Log Message:
mtools: update to 4.0.50.

Security fix release; this adds a new TODO:
- ${WRKSRC} is in all binaries - investigate and fix

v4_0_50
        - Fix CVE-2026-118384
v4_0_49
        - Correctly detect overlong file names, especially when
          multibyte (UTF-8) strings are concerned
        - Fix off-by-one error in 2 calls to native_to_wchar
        - When changing disk label, ignore any plain file which would
          match label
        - Added missing newlines in error messages about disk geometry
        - Do not print error message if getting geometry is simply not
          supported by device type (such as for loop devices)
        - If full geometry of a device is not available (such as for
          loop devices), at least make use of the size
v4_0_48
        - portability fixes, mostly for Watcom compiler
        - cleaned up some other warnings
        - various runtime fixes for windows (/dev/tty vs CONIN$)
        - use correct mtools (sub)command name in usage() when using -c
        - other usage() spelling/wording fixes
        - fix mtype'ing multiple files at once
        - integrate mkmanpages into make system, clean it, and credit
          texi2roff's original developer and others
        - document compilation on less usual environments in INSTALL
        - uninitialized buffer fix in mformat
        - fix parameter counting error in mcd, and document that image
          file name is not remembered

v4_0_47
        - fixed some of the manpage issues reported by manpage-l10n
        - unix-dir copying on Windows fix
        - new no-daemon mode for floppyd to make testing easier
        - make floppyd independant of XauFileName (portability)
        - autoconf fixes
v4_0_46
        - iconv buffer overflow fixes
        - removed references to mread and mwrite (obsolete subcommands
          from mcopy)
        - documented mdoctorfat, and addressed 2 bugs/oversights
        - removed references to obsolete mread and mwrite
        - portability fixes (dietlibc and MacOS X) & simplification
v4_0_45
        - Fixed iconv descriptor leak
        - Fixed size of error message buffer
v4_0_44
        - Added documentation for size parameters
        - Fix parsing of fat_start (reserved sectors) in mformat.c so
          as to allow more than 255
        - Rewrite autorename in vfat.c such that it doesn't
          (temporarily) overwrite byte after name string
        - Switch statement fall-through fixes (size parsing, and bios disk in
          mformat.c)
        - Compilation warning fixes, mostly for CLANG


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/sysutils/mtools/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/mtools/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/mtools/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/mtools/patches/patch-aa

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

Modified files:

Index: pkgsrc/sysutils/mtools/Makefile
diff -u pkgsrc/sysutils/mtools/Makefile:1.64 pkgsrc/sysutils/mtools/Makefile:1.65
--- pkgsrc/sysutils/mtools/Makefile:1.64        Wed Mar 29 13:07:10 2023
+++ pkgsrc/sysutils/mtools/Makefile     Sat Oct 31 15:38:22 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2023/03/29 13:07:10 rhialto Exp $
+# $NetBSD: Makefile,v 1.65 2026/10/31 15:38:22 wiz Exp $
 
-DISTNAME=      mtools-4.0.43
+DISTNAME=      mtools-4.0.50
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNU:=mtools/}
 EXTRACT_SUFX=  .tar.bz2
@@ -16,6 +16,10 @@ INFO_FILES=          yes
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+# ${WRKSRC} is in all binaries
+# TODO: investigate and fix
+CHECK_WRKREF_SKIP=     bin/*
+
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/sysutils/mtools/PLIST
diff -u pkgsrc/sysutils/mtools/PLIST:1.11 pkgsrc/sysutils/mtools/PLIST:1.12
--- pkgsrc/sysutils/mtools/PLIST:1.11   Sun Apr  3 15:51:42 2022
+++ pkgsrc/sysutils/mtools/PLIST        Sat Oct 31 15:38:22 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2022/04/03 15:51:42 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.12 2026/10/31 15:38:22 wiz Exp $
 bin/amuFormat.sh
 ${PLIST.floppyd}bin/floppyd
 ${PLIST.floppyd}bin/floppyd_installtest
@@ -13,6 +13,7 @@ bin/mcopy
 bin/mdel
 bin/mdeltree
 bin/mdir
+bin/mdoctorfat
 bin/mdu
 bin/mformat
 bin/minfo
@@ -44,6 +45,7 @@ man/man1/mcopy.1
 man/man1/mdel.1
 man/man1/mdeltree.1
 man/man1/mdir.1
+man/man1/mdoctorfat.1
 man/man1/mdu.1
 man/man1/mformat.1
 man/man1/minfo.1

Index: pkgsrc/sysutils/mtools/distinfo
diff -u pkgsrc/sysutils/mtools/distinfo:1.30 pkgsrc/sysutils/mtools/distinfo:1.31
--- pkgsrc/sysutils/mtools/distinfo:1.30        Wed Mar 29 13:07:10 2023
+++ pkgsrc/sysutils/mtools/distinfo     Sat Oct 31 15:38:22 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2023/03/29 13:07:10 rhialto Exp $
+$NetBSD: distinfo,v 1.31 2026/10/31 15:38:22 wiz Exp $
 
-BLAKE2s (mtools-4.0.43.tar.bz2) = e01b8d76c78886ff0270161b7d429bd3c58d8b37fc3bf8978b5fa0d0fbb5e43e
-SHA512 (mtools-4.0.43.tar.bz2) = b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410
-Size (mtools-4.0.43.tar.bz2) = 443673 bytes
-SHA1 (patch-aa) = 493b06455ee3169e6db916a9d535dad5a124edbc
+BLAKE2s (mtools-4.0.50.tar.bz2) = b62386870089cfb1c2e01078ee2317b1dae2045a7afa9a393d459336973cc274
+SHA512 (mtools-4.0.50.tar.bz2) = 4c895b4d9d84d885c1dbcaf394712ed063298347f60fb5abe0fe518918eae5ca17397850c3b600dcc6df130c19fe3e83a16aa57d49dadf1e5c33f51429837d8d
+Size (mtools-4.0.50.tar.bz2) = 465818 bytes
+SHA1 (patch-aa) = 1fa600780ecd37b7b0d7ca3f5df2dccf9664d3e5
 SHA1 (patch-ae) = 0142fa2fccfc81da0daab2a3caee2dbcb107f895

Index: pkgsrc/sysutils/mtools/patches/patch-aa
diff -u pkgsrc/sysutils/mtools/patches/patch-aa:1.12 pkgsrc/sysutils/mtools/patches/patch-aa:1.13
--- pkgsrc/sysutils/mtools/patches/patch-aa:1.12        Wed Mar  9 20:25:08 2011
+++ pkgsrc/sysutils/mtools/patches/patch-aa     Sat Oct 31 15:38:23 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2011/03/09 20:25:08 asau Exp $
+$NetBSD: patch-aa,v 1.13 2026/10/31 15:38:23 wiz Exp $
 
---- Makefile.in.orig   2010-10-17 02:23:20.000000000 +0400
-+++ Makefile.in        2011-03-09 23:09:25.000000000 +0300
-@@ -26,7 +26,6 @@
+--- Makefile.in.orig   2025-02-05 12:30:43.000000000 +0000
++++ Makefile.in
+@@ -26,7 +26,6 @@ USERLDLIBS =
  USERLDFLAGS =
  USERLDLIBS =
  
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.12 2011/03/09 20:2
  TEXI2DVI = texi2dvi
  TEXI2PDF = texi2pdf
  TEXI2HTML = texi2html
-@@ -65,6 +64,7 @@
+@@ -64,6 +63,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -18,8 +18,8 @@ $NetBSD: patch-aa,v 1.12 2011/03/09 20:2
  INSTALL_DATA    = @INSTALL_DATA@
  INSTALL_INFO  = @INSTALL_INFO@
  
-@@ -277,7 +277,7 @@
- install-scripts: $(DESTDIR)$(bindir)/mtools
+@@ -267,7 +267,7 @@ install-scripts: $(DESTDIR)$(bindir)/mtools$(EXEEXT)
+ install-scripts: $(DESTDIR)$(bindir)/mtools$(EXEEXT)
        @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        @for j in $(SCRIPTS) ; do \
 -              $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \