From 127f9ea6efe870266c0a1f3ce26baf0d2d76261c Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 26 Dec 2022 13:14:06 +0900 Subject: Imported Upstream version 3.0.24 --- ChangeLog | 25 +++++++++++++++++++++++-- VERSION | 2 +- manpages/de/fatlabel.de.8 | 2 +- manpages/de/fsck.fat.de.8 | 2 +- manpages/de/mkfs.fat.de.8 | 2 +- manpages/en/fatlabel.8 | 2 +- manpages/en/fsck.fat.8 | 2 +- manpages/en/mkfs.fat.8 | 2 +- manpages/po/de/fatlabel.8.po | 6 +++--- manpages/po/de/fsck.fat.8.po | 6 +++--- manpages/po/de/mkfs.fat.8.po | 6 +++--- manpages/pot/fatlabel.8.pot | 6 +++--- manpages/pot/fsck.fat.8.pot | 6 +++--- manpages/pot/mkfs.fat.8.pot | 6 +++--- src/boot.c | 2 +- src/version.h | 4 ++-- 16 files changed, 51 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ddb187..6b167af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,25 @@ -commit 07d85ff (HEAD, master) +commit 55bd7b7 (HEAD, master) +Author: Jaroslav Skarvada +Date: Sat Nov 23 10:34:48 2013 +0100 + + Fixed dosfsck on big endian platforms (Resolves: rhbz#1029695). + + It seems there is problem in the double conversion on big endians. + The first conversion is done by the explicit conversion to __u16 + in the GET_UNALIGNED_W macro, so the secondary conversion by le16toh + seems to be redundant (and wrong). + + Signed-off-by: Daniel Baumann + +commit 6debb4a (tag: v3.0.23, origin/master, origin/HEAD) +Author: Daniel Baumann +Date: Tue Oct 15 08:05:46 2013 +0200 + + Releasing version 3.0.23. + + Signed-off-by: Daniel Baumann + +commit 07d85ff Author: Daniel Baumann Date: Tue Oct 15 08:04:11 2013 +0200 @@ -6,7 +27,7 @@ Date: Tue Oct 15 08:04:11 2013 +0200 Signed-off-by: Daniel Baumann -commit 137552f (origin/master, origin/HEAD) +commit 137552f Author: Michael Shigorin Date: Tue Oct 15 01:29:33 2013 +0400 diff --git a/VERSION b/VERSION index 148fd54..03a04fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.23 +3.0.24 diff --git a/manpages/de/fatlabel.de.8 b/manpages/de/fatlabel.de.8 index 6edd780..6265b5a 100644 --- a/manpages/de/fatlabel.de.8 +++ b/manpages/de/fatlabel.de.8 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH FATLABEL 8 2013\-10\-15 3.0.23 dosfstools +.TH FATLABEL 8 2013\-11\-23 3.0.24 dosfstools .SH NAME \fBfatlabel\fP \- set or get MS\-DOS filesystem label diff --git a/manpages/de/fsck.fat.de.8 b/manpages/de/fsck.fat.de.8 index 5aaeeb1..5b9c95e 100644 --- a/manpages/de/fsck.fat.de.8 +++ b/manpages/de/fsck.fat.de.8 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH FSCK.FAT 8 2013\-10\-15 3.0.23 dosfstools +.TH FSCK.FAT 8 2013\-11\-23 3.0.24 dosfstools .SH NAME \fBfsck.fat\fP \- check and repair MS\-DOS filesystems diff --git a/manpages/de/mkfs.fat.de.8 b/manpages/de/mkfs.fat.de.8 index 0a0fac8..0c90055 100644 --- a/manpages/de/mkfs.fat.de.8 +++ b/manpages/de/mkfs.fat.de.8 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH MKFS.FAT 8 2013\-10\-15 3.0.23 dosfstools +.TH MKFS.FAT 8 2013\-11\-23 3.0.24 dosfstools .SH NAME \fBmkfs.fat\fP \- create an MS\-DOS filesystem under Linux diff --git a/manpages/en/fatlabel.8 b/manpages/en/fatlabel.8 index d4ef1cb..2478606 100644 --- a/manpages/en/fatlabel.8 +++ b/manpages/en/fatlabel.8 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH FATLABEL 8 2013\-10\-15 3.0.23 "dosfstools" +.TH FATLABEL 8 2013\-11\-23 3.0.24 "dosfstools" .SH NAME \fBfatlabel\fR \- set or get MS\-DOS filesystem label diff --git a/manpages/en/fsck.fat.8 b/manpages/en/fsck.fat.8 index d3fa785..d9f10d5 100644 --- a/manpages/en/fsck.fat.8 +++ b/manpages/en/fsck.fat.8 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH FSCK.FAT 8 2013\-10\-15 3.0.23 "dosfstools" +.TH FSCK.FAT 8 2013\-11\-23 3.0.24 "dosfstools" .SH NAME \fBfsck.fat\fR \- check and repair MS\-DOS filesystems diff --git a/manpages/en/mkfs.fat.8 b/manpages/en/mkfs.fat.8 index 520c6ed..653e247 100644 --- a/manpages/en/mkfs.fat.8 +++ b/manpages/en/mkfs.fat.8 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH MKFS.FAT 8 2013\-10\-15 3.0.23 "dosfstools" +.TH MKFS.FAT 8 2013\-11\-23 3.0.24 "dosfstools" .SH NAME \fBmkfs.fat\fR \- create an MS-DOS filesystem under Linux diff --git a/manpages/po/de/fatlabel.8.po b/manpages/po/de/fatlabel.8.po index 3087eae..6727949 100644 --- a/manpages/po/de/fatlabel.8.po +++ b/manpages/po/de/fatlabel.8.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/manpages/po/de/fsck.fat.8.po b/manpages/po/de/fsck.fat.8.po index 57e5c0d..b90ece5 100644 --- a/manpages/po/de/fsck.fat.8.po +++ b/manpages/po/de/fsck.fat.8.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -19,13 +19,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/manpages/po/de/mkfs.fat.8.po b/manpages/po/de/mkfs.fat.8.po index 8844e9a..92a85fd 100644 --- a/manpages/po/de/mkfs.fat.8.po +++ b/manpages/po/de/mkfs.fat.8.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -19,13 +19,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/manpages/pot/fatlabel.8.pot b/manpages/pot/fatlabel.8.pot index fdb2795..ee8c99e 100644 --- a/manpages/pot/fatlabel.8.pot +++ b/manpages/pot/fatlabel.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/manpages/pot/fsck.fat.8.pot b/manpages/pot/fsck.fat.8.pot index ec79381..16857ad 100644 --- a/manpages/pot/fsck.fat.8.pot +++ b/manpages/pot/fsck.fat.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,13 +19,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/manpages/pot/mkfs.fat.8.pot b/manpages/pot/mkfs.fat.8.pot index 260f94b..a180b29 100644 --- a/manpages/pot/mkfs.fat.8.pot +++ b/manpages/pot/mkfs.fat.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-10-15 08:04+0300\n" +"POT-Creation-Date: 2013-11-23 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,13 +19,13 @@ msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-10-15" +msgid "2013-11-23" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.23" +msgid "3.0.24" msgstr "" #. type: TH diff --git a/src/boot.c b/src/boot.c index 39add78..b56a5a3 100644 --- a/src/boot.c +++ b/src/boot.c @@ -62,7 +62,7 @@ static struct { /* Unaligned fields must first be accessed byte-wise */ #define GET_UNALIGNED_W(f) \ - le16toh( (__u16)f[0] | ((__u16)f[1]<<8) ) + ( (__u16)f[0] | ((__u16)f[1]<<8) ) static char *get_media_descr(unsigned char media) { diff --git a/src/version.h b/src/version.h index 04ca71d..7d8ac47 100644 --- a/src/version.h +++ b/src/version.h @@ -23,7 +23,7 @@ #ifndef _version_h #define _version_h -#define VERSION "3.0.23" -#define VERSION_DATE "2013-10-15" +#define VERSION "3.0.24" +#define VERSION_DATE "2013-11-23" #endif -- cgit v1.2.3