Merging upstream version 2.40.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

25 files changed, 65 insertions, 65 deletions

diff --git a/disk-utils/addpart.8 b/disk-utils/addpart.8
index 3e2852d..3be8852 100644
--- a/disk-utils/addpart.8
+++ b/disk-utils/addpart.8
@@ -2,12 +2,12 @@
 .\"     Title: addpart
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "ADDPART" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "ADDPART" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 2885d64..cb56d2a 100644
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -2,12 +2,12 @@
 .\"     Title: blockdev
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-03-27
+.\"      Date: 2024-05-06
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "BLOCKDEV" "8" "2024-03-27" "util\-linux 2.40" "System Administration"
+.TH "BLOCKDEV" "8" "2024-05-06" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
index f54c577..9f867c7 100644
--- a/disk-utils/cfdisk.8
+++ b/disk-utils/cfdisk.8
@@ -2,12 +2,12 @@
 .\"     Title: cfdisk
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "CFDISK" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "CFDISK" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/delpart.8 b/disk-utils/delpart.8
index 37e5ea6..9c59577 100644
--- a/disk-utils/delpart.8
+++ b/disk-utils/delpart.8
@@ -2,12 +2,12 @@
 .\"     Title: delpart
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "DELPART" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "DELPART" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8
index e026d23..0ff5f42 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -2,12 +2,12 @@
 .\"     Title: fdformat
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "FDFORMAT" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "FDFORMAT" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fdisk.8 b/disk-utils/fdisk.8
index 7f4b11f..ccc0d6f 100644
--- a/disk-utils/fdisk.8
+++ b/disk-utils/fdisk.8
@@ -2,12 +2,12 @@
 .\"     Title: fdisk
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-03-20
+.\"      Date: 2024-05-01
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "FDISK" "8" "2024-03-20" "util\-linux 2.40" "System Administration"
+.TH "FDISK" "8" "2024-05-01" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fsck.8 b/disk-utils/fsck.8
index 07f8771..8984a7d 100644
--- a/disk-utils/fsck.8
+++ b/disk-utils/fsck.8
@@ -2,12 +2,12 @@
 .\"     Title: fsck
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-03-20
+.\"      Date: 2024-05-01
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "FSCK" "8" "2024-03-20" "util\-linux 2.40" "System Administration"
+.TH "FSCK" "8" "2024-05-01" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fsck.8.adoc b/disk-utils/fsck.8.adoc
index c2908b0..355253f 100644
--- a/disk-utils/fsck.8.adoc
+++ b/disk-utils/fsck.8.adoc
@@ -1,7 +1,7 @@
 //po4a: entry man manual
 ////
 Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
-This file may be copied under the terms of the GNU Public License.
+This file may be copied under the terms of the GNU General Public License.
 ////
 = fsck(8)
 :doctype: manpage
diff --git a/disk-utils/fsck.cramfs.8 b/disk-utils/fsck.cramfs.8
index 96cd652..a60b33e 100644
--- a/disk-utils/fsck.cramfs.8
+++ b/disk-utils/fsck.cramfs.8
@@ -2,12 +2,12 @@
 .\"     Title: fsck.cramfs
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "FSCK.CRAMFS" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "FSCK.CRAMFS" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fsck.minix.8 b/disk-utils/fsck.minix.8
index d91e4b9..8887072 100644
--- a/disk-utils/fsck.minix.8
+++ b/disk-utils/fsck.minix.8
@@ -2,12 +2,12 @@
 .\"     Title: fsck.minix
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "FSCK.MINIX" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "FSCK.MINIX" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 03a4746..0890358 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -548,7 +548,7 @@ get_dirsize(void) {
 		block = Inode[ROOT_INO].i_zone[0];
 	read_block(block, blk);
 
-	for (size = 16; size < MINIX_BLOCK_SIZE; size <<= 1) {
+	for (size = 16; size + 2 < MINIX_BLOCK_SIZE; size <<= 1) {
 		if (strcmp(blk + size + 2, "..") == 0) {
 			dirsize = size;
 			namelen = size - 2;
diff --git a/disk-utils/isosize.8 b/disk-utils/isosize.8
index 8e8cec2..fbadcd7 100644
--- a/disk-utils/isosize.8
+++ b/disk-utils/isosize.8
@@ -2,12 +2,12 @@
 .\"     Title: isosize
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "ISOSIZE" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "ISOSIZE" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index c17f014..29d013d 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -2,12 +2,12 @@
 .\"     Title: mkfs
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "MKFS" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "MKFS" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8
index 5496a8b..e7b05f3 100644
--- a/disk-utils/mkfs.bfs.8
+++ b/disk-utils/mkfs.bfs.8
@@ -2,12 +2,12 @@
 .\"     Title: mkfs.bfs
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "MKFS.BFS" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "MKFS.BFS" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/mkfs.cramfs.8 b/disk-utils/mkfs.cramfs.8
index 4f39779..302869b 100644
--- a/disk-utils/mkfs.cramfs.8
+++ b/disk-utils/mkfs.cramfs.8
@@ -2,12 +2,12 @@
 .\"     Title: mkfs.cramfs
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "MKFS.CRAMFS" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "MKFS.CRAMFS" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 2d420dd..57f1c42 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -2,12 +2,12 @@
 .\"     Title: mkfs.minix
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "MKFS.MINIX" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "MKFS.MINIX" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index dd53233..8b1d25b 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -2,12 +2,12 @@
 .\"     Title: mkswap
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-03-20
+.\"      Date: 2024-05-01
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "MKSWAP" "8" "2024-03-20" "util\-linux 2.40" "System Administration"
+.TH "MKSWAP" "8" "2024-05-01" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/partx.8 b/disk-utils/partx.8
index dee567d..dcbc341 100644
--- a/disk-utils/partx.8
+++ b/disk-utils/partx.8
@@ -2,12 +2,12 @@
 .\"     Title: partx
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "PARTX" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "PARTX" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index b37f2ba..c4b2311 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -2,12 +2,12 @@
 .\"     Title: raw
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "RAW" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "RAW" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/raw.8.deps b/disk-utils/raw.8.deps
index de76d6c..b3ed934 100644
--- a/disk-utils/raw.8.deps
+++ b/disk-utils/raw.8.deps
@@ -1 +1 @@
-/home/proj-me/util-linux/util-linux/util-linux-2.40/disk-utils/raw.8: /home/proj-me/util-linux/util-linux/man-common/help-version.adoc /home/proj-me/util-linux/util-linux/man-common/bugreports.adoc /home/proj-me/util-linux/util-linux/man-common/footer.adoc
\ No newline at end of file
+/home/proj-me/util-linux/util-linux/util-linux-2.40.1/disk-utils/raw.8: /home/proj-me/util-linux/util-linux/man-common/help-version.adoc /home/proj-me/util-linux/util-linux/man-common/bugreports.adoc /home/proj-me/util-linux/util-linux/man-common/footer.adoc
\ No newline at end of file
diff --git a/disk-utils/resizepart.8 b/disk-utils/resizepart.8
index 2a46754..9e22cc0 100644
--- a/disk-utils/resizepart.8
+++ b/disk-utils/resizepart.8
@@ -2,12 +2,12 @@
 .\"     Title: resizepart
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-04-24
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "RESIZEPART" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "RESIZEPART" "8" "2024-04-24" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8
index 5cda4f9..1281d16 100644
--- a/disk-utils/sfdisk.8
+++ b/disk-utils/sfdisk.8
@@ -2,12 +2,12 @@
 .\"     Title: sfdisk
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-03-20
+.\"      Date: 2024-05-01
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "SFDISK" "8" "2024-03-20" "util\-linux 2.40" "System Administration"
+.TH "SFDISK" "8" "2024-05-01" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/swaplabel.8 b/disk-utils/swaplabel.8
index 5614b51..096ffba 100644
--- a/disk-utils/swaplabel.8
+++ b/disk-utils/swaplabel.8
@@ -2,12 +2,12 @@
 .\"     Title: swaplabel
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2024-01-31
+.\"      Date: 2024-05-01
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.40
+.\"    Source: util-linux 2.40.1
 .\"  Language: English
 .\"
-.TH "SWAPLABEL" "8" "2024-01-31" "util\-linux 2.40" "System Administration"
+.TH "SWAPLABEL" "8" "2024-05-01" "util\-linux 2.40.1" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
diff --git a/disk-utils/swaplabel.8.adoc b/disk-utils/swaplabel.8.adoc
index 14ab6c4..de440d3 100644
--- a/disk-utils/swaplabel.8.adoc
+++ b/disk-utils/swaplabel.8.adoc
@@ -1,7 +1,7 @@
 //po4a: entry man manual
 ////
 Copyright 2010 Jason Borden <jborden@bluehost.com>
-This file may be copied under the terms of the GNU Public License.
+This file may be copied under the terms of the GNU General Public License.
 ////
 = swaplabel(8)
 :doctype: manpage
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 6b50786..2c56e15 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -8,7 +8,7 @@
  *
  * Usage: swaplabel [-L label] [-U UUID] device
  *
- * This file may be redistributed under the terms of the GNU Public License
+ * This file may be redistributed under the terms of the GNU General Public License
  * version 2 or later.
  *
  */