CVS commit: pkgsrc/sysutils/dosfstools

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/dosfstools
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 4 Mar 2021 10:02:44 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar  4 10:02:44 UTC 2021

Modified Files:
        pkgsrc/sysutils/dosfstools: Makefile PLIST distinfo
        pkgsrc/sysutils/dosfstools/patches: patch-src_device__info.c
Added Files:
        pkgsrc/sysutils/dosfstools/patches: patch-src_blkdev_blkdev.c

Log Message:
dosfstools: Update to 4.2

dosfstools 4.2 - released 2021-01-31
====================================

fatlabel now accepts two new options. When given the -i or --volume-id option,
fatlabel changes to an alternate mode where it displays or changes the volume
serial number instead of the volume label. With the -r or --reset option, it
will remove the label or (in the alternate mode) generate a new volume serial
number.

The user prompting for interactive fsck has been overhauled. Now it will
directly react to a pressed key without the user having to additionally press
enter. The changed prompting is also consistently repeating the prompt when
invalid input is given.

The legacy check whether it is running on Atari hardware when compiled for 68k
in order to automatically switch to Atari mode is now disabled by default. It
can be compiled in with the new configure switch --enable-atari-check.

Both mkfs and fsck now have a new option --variant=TYPE where TYPE can be
'standard' or 'atari' to explicitly select one of those variants rather than
having to toggle between them with -A.

fsck, mkfs and fatlabel were fixed to process volume label correctly. Previously
there were many issues during processing labels. Fixes issues are: leading byte
0xE5 of root label needs to be handled in special way, label cannot contain some
special characters, label itself is stored according to the current DOS codepage
which may be specified by a new --codepage option. fatlabel now reads volume
label only from the root directory to be compatible with existing systems like
MS-DOS 5.00, MS-DOS 6.22, MS-DOS 7.10, Windows 98, Windows XP, Windows 7, 8, 10
and also with the Linux mlabel from mtools project. fsck was extended to fix
incorrect volume labels and ensure that volume label from the root directory is
same as the volume label stored in boot sector. Old versions of dosfslabel read
label only from the boot sector. So with all these changes fsck now ensures
compatibility with both MS-DOS/Windows and old Linux/dosfslabel world.

fsck now allows spaces in the middle of SFNs. Previous behavior (when spaces
are disallowed) can be achieved by a new option -S.

Both mkfs and fsck now have fixed Year 2038 Bug. mkfs may still set filesystem
timestamp to 1980-01-01 00:00:00 (beginning of the FAT era) in case operating
system has Year 2038 Bug and cannot provide current time in time_t variable.

Some memory leaks were fixed in fatlabel and fsck to make valgrind happy.

Processing of command line arguments in all tools were fixed to ensure that
invalid options are not accepted anymore and proper error message is thrown
instead of trying to continue with uninitialized or undefined value.

In fsck and fatlabel were fixed issues that faulty filesystems were able to
trigger integer overflows during reading them.

mkfs now has a new option --offset for specifying offset at which filesystem
would start. This is useful when formatting FAT filesystem on disk image with
MBR table without need to use loopback kernel driver with partx to access only
specific partition.

All tools now can be compiled without iconv library and in this case they
support only CP850 codepage which is integrated into tools. This internal
CP850 codepage can be used also when tools were compiled with iconv library
which do not support CP850 (e.g. iconv from GNU libc without installed gconv
shared libraries).

Manual pages were updated to clarify some ambiguous options and descriptions.
fatlabel has a new section with details about volume label and codepage issues.

mkfs now has a new option --mbr which fills (fake) MBR table with one partition
which spans whole disk device. This (fake) MBR table is needed only for
non-removable disks used on Microsoft Windows systems and only when formatting
whole unpartitioned disk.

mkfs now calculates CHS geometry according to the SD Card Part 2 File System
Specification. For SD cards with more than 256MB capacity is this new CHS
calculation same as CHS calculation defined for hard disks via LBA-Assist
Translation. So CHS geometry calculation in mkfs is now compatible with both
SD Card specification and also LBA-Assist Translation. Moreover mkfs now has
also a new option -g for specifying CHS geometry manually if it is needed for
compatibility with some SD card readers. CHS geometry is part of FAT boot
sector which mkfs.fat must fill.

fsck now checks for DOS Clean Shutdown bit and marks filesystem as clean after
successful run. This is for compatibility with Microsft Windows 98 and also with
Windows NT-based variants.

Dependency on systemd/udev was completely removed from mkfs tool. But there is
no lost or removed functionality. Existing systemd/udev code was rewritten to
directly access sysfs and new implementation has less lines of code as previous
implementation which used systemd/udev libraries.

mkfs was fixed to setup FAT32 backup boot sector correctly.

mkfs's -D option (BIOS drive number) was relaxed to support also higher level
hard disk and floppy devices (second, third, ...).

fsck now preserve reserved fields in info sector. They are used by other systems
(e.g. FSIBOOT stage of lDOS boot32.asm), hence why are reserved.

fsck was extended to check and fix that first two entires in directory
structures are . and ..

mkfs now aligns total number of sectors to be multiple of the value of sectors
per track which is stored in FAT boot sector. This requirement is needed by DOS
systems and also by Linux FAT tools from mtools project. Alignment can be turned
off by -a option.

mkfs is now able to calculate FAT32 cluster size also for disks which have
sector size different than 512 bytes. Note that this calculation is not optimal.
It is just first step which ensures that mkfs does not fail during formatting
Native 4K disks.

mkfs cluster calculation was fixed to correctly handle differences between
FAT12 and FAT16 variants. mkfs now explicitly disallow to create FAT filesystem
with 4085 or 4086 clusters because Windows fastfat.sys detects such filesystem
as FAT12 but Linux msdos.ko/vfat.ko detects it as FAT16. mkfs now avoids this
situation to happen by fully automatic increasing or decreasing cluster size.

fsck now has a new option -F which can be used to specify FAT table used for
reading whole FAT filesystem. It can be useful in situation when user wants
to do recovery and filesystem repairing from second FAT table independently
of what fsck thinks that is the best.

fsck was extended to try fixing first FAT cluster but only when -F option is
specified. Previously when first FAT cluster was broken, fsck just printed
error: "Both FATs appear to be corrupt. Giving up." and failed.

fatlabel was fixed to not call parts of fsck procedure and to not print
warning or log messages on stdout as it conflicts with expected label
output on stdout.

A test suite was heavily extended and now it also checks that fsck repairs
broken filesystem into the expected state.

List of fixed issues:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803391
https://github.com/dosfstools/dosfstools/issues/13
https://github.com/dosfstools/dosfstools/issues/18
https://github.com/dosfstools/dosfstools/issues/22
https://github.com/dosfstools/dosfstools/issues/29
https://github.com/dosfstools/dosfstools/issues/32
https://github.com/dosfstools/dosfstools/issues/38
https://github.com/dosfstools/dosfstools/issues/39
https://github.com/dosfstools/dosfstools/issues/43
https://github.com/dosfstools/dosfstools/issues/45
https://github.com/dosfstools/dosfstools/issues/52
https://github.com/dosfstools/dosfstools/issues/53
https://github.com/dosfstools/dosfstools/issues/54
https://github.com/dosfstools/dosfstools/issues/64
https://github.com/dosfstools/dosfstools/issues/66
https://github.com/dosfstools/dosfstools/issues/69
https://github.com/dosfstools/dosfstools/issues/70
https://github.com/dosfstools/dosfstools/issues/74
https://github.com/dosfstools/dosfstools/issues/88
https://github.com/dosfstools/dosfstools/issues/99
https://github.com/dosfstools/dosfstools/issues/111
https://github.com/dosfstools/dosfstools/issues/139
https://github.com/dosfstools/dosfstools/issues/151


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/dosfstools/Makefile \
    pkgsrc/sysutils/dosfstools/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/dosfstools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/dosfstools/patches/patch-src_blkdev_blkdev.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.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/dosfstools/Makefile
diff -u pkgsrc/sysutils/dosfstools/Makefile:1.1 pkgsrc/sysutils/dosfstools/Makefile:1.2
--- pkgsrc/sysutils/dosfstools/Makefile:1.1     Sun Jun 24 11:13:58 2018
+++ pkgsrc/sysutils/dosfstools/Makefile Thu Mar  4 10:02:44 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2018/06/24 11:13:58 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/04 10:02:44 nia Exp $
 
-DISTNAME=      dosfstools-4.1
+DISTNAME=      dosfstools-4.2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dosfstools/}
-GITHUB_RELEASE=        v4.1
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    bsiegert%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/dosfstools/dosfstools/
+HOMEPAGE=      https://github.com/dosfstools/dosfstools
 COMMENT=       Tools for working with FAT filesystems
 LICENSE=       gnu-gpl-v3
 
Index: pkgsrc/sysutils/dosfstools/PLIST
diff -u pkgsrc/sysutils/dosfstools/PLIST:1.1 pkgsrc/sysutils/dosfstools/PLIST:1.2
--- pkgsrc/sysutils/dosfstools/PLIST:1.1        Sun Jun 24 11:13:58 2018
+++ pkgsrc/sysutils/dosfstools/PLIST    Thu Mar  4 10:02:44 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/24 11:13:58 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/03/04 10:02:44 nia Exp $
 man/man8/fatlabel.8
 man/man8/fsck.fat.8
 man/man8/mkfs.fat.8
@@ -6,9 +6,13 @@ sbin/fatlabel
 sbin/fsck.fat
 sbin/mkfs.fat
 share/doc/dosfstools/ANNOUNCE.mkdosfs
+share/doc/dosfstools/COPYING
+share/doc/dosfstools/ChangeLog
 share/doc/dosfstools/ChangeLog.dosfsck
 share/doc/dosfstools/ChangeLog.dosfstools-2.x
 share/doc/dosfstools/ChangeLog.mkdosfs
+share/doc/dosfstools/NEWS
+share/doc/dosfstools/README
 share/doc/dosfstools/README.dosfsck
 share/doc/dosfstools/README.dosfstools-2.x
 share/doc/dosfstools/README.mkdosfs

Index: pkgsrc/sysutils/dosfstools/distinfo
diff -u pkgsrc/sysutils/dosfstools/distinfo:1.2 pkgsrc/sysutils/dosfstools/distinfo:1.3
--- pkgsrc/sysutils/dosfstools/distinfo:1.2     Mon Sep  9 09:26:00 2019
+++ pkgsrc/sysutils/dosfstools/distinfo Thu Mar  4 10:02:44 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/09/09 09:26:00 nia Exp $
+$NetBSD: distinfo,v 1.3 2021/03/04 10:02:44 nia Exp $
 
-SHA1 (dosfstools-4.1.tar.gz) = db39f667c3cb51bdf321f07f9cf17c726ca50323
-RMD160 (dosfstools-4.1.tar.gz) = 537b5418e6a78728ff8b94023966ce2155d64d6a
-SHA512 (dosfstools-4.1.tar.gz) = c45b26779c126c128ff64668403d552b9ed70e9205ced968fa9c80e7220c2b24c3f24007ae41ee20e8993637ec2aca584142458d25db42df6488edf18fb6185b
-Size (dosfstools-4.1.tar.gz) = 233766 bytes
-SHA1 (patch-src_device__info.c) = c342d080fb1b64d71813516e0aef4736587e6a3a
+SHA1 (dosfstools-4.2.tar.gz) = 14efc68c64987a9067b6a919ad2870007247686b
+RMD160 (dosfstools-4.2.tar.gz) = 5f9ae26d49fbc5cefc26eab8b02313a1ebfd9e69
+SHA512 (dosfstools-4.2.tar.gz) = 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
+Size (dosfstools-4.2.tar.gz) = 320917 bytes
+SHA1 (patch-src_blkdev_blkdev.c) = dd39aa031b83429770a6164556f91d58bf88c3d5
+SHA1 (patch-src_device__info.c) = 46102c27a601de7297a4ce3488bf327e818b8fa6

Index: pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.c
diff -u pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.c:1.1 pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.c:1.2
--- pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.c:1.1     Mon Sep  9 09:26:00 2019
+++ pkgsrc/sysutils/dosfstools/patches/patch-src_device__info.c Thu Mar  4 10:02:44 2021
@@ -1,10 +1,24 @@
-$NetBSD: patch-src_device__info.c,v 1.1 2019/09/09 09:26:00 nia Exp $
+$NetBSD: patch-src_device__info.c,v 1.2 2021/03/04 10:02:44 nia Exp $
+
+https://github.com/dosfstools/dosfstools/commit/8a917ed2afb2dd2a165a93812b6f52b9060eec5f.patch
 
 Support netbsd's spelling for statfs.
 
---- src/device_info.c.orig     2016-09-15 23:17:27.000000000 +0000
+--- src/device_info.c.orig     2021-01-31 12:49:12.000000000 +0000
 +++ src/device_info.c
-@@ -318,7 +318,11 @@ int is_device_mounted(const char *path)
+@@ -24,7 +24,10 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+-#include <sys/sysmacros.h>
++
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ 
+ #ifdef HAVE_LINUX_LOOP_H
+ #include <linux/loop.h>
+@@ -334,7 +337,11 @@ int is_device_mounted(const char *path)
  #endif
  
  #if HAVE_DECL_GETMNTINFO

Added files:

Index: pkgsrc/sysutils/dosfstools/patches/patch-src_blkdev_blkdev.c
diff -u /dev/null pkgsrc/sysutils/dosfstools/patches/patch-src_blkdev_blkdev.c:1.1
--- /dev/null   Thu Mar  4 10:02:44 2021
+++ pkgsrc/sysutils/dosfstools/patches/patch-src_blkdev_blkdev.c        Thu Mar  4 10:02:44 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_blkdev_blkdev.c,v 1.1 2021/03/04 10:02:44 nia Exp $
+
+https://github.com/dosfstools/dosfstools/commit/8a917ed2afb2dd2a165a93812b6f52b9060eec5f.patch
+
+--- src/blkdev/blkdev.c.orig   2021-01-31 12:49:12.000000000 +0000
++++ src/blkdev/blkdev.c
+@@ -7,7 +7,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+-#include <sys/sysmacros.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include <stdint.h>
+ #include <stdio.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index