From 228b5da2b6c801abd9df738063ebc90c1cd34da8 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Feb 01 2021 12:39:38 +0000
Subject: Merged update from upstream sources


This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dosfstools.git#27137b5a3fd1a2494d6e702548f2f22070ed67e4

---

diff --git a/.gitignore b/.gitignore
index ceeadde..b2fa0b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dosfstools-*.tar.xz
 /dosfstools-3.0.25.tar.gz
+/dosfstools-4.2.tar.gz
diff --git a/dosfstools-4.1-fix-cluster-size-auto-detect-for-4k-disks.patch b/dosfstools-4.1-fix-cluster-size-auto-detect-for-4k-disks.patch
deleted file mode 100644
index 9eab04c..0000000
--- a/dosfstools-4.1-fix-cluster-size-auto-detect-for-4k-disks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
-index 5843550..29fbf55 100644
---- a/src/mkfs.fat.c
-+++ b/src/mkfs.fat.c
-@@ -507,6 +507,7 @@ static void establish_params(struct device_info *info)
-     unsigned int heads = 255;
-     unsigned int media = 0xf8;
-     unsigned int cluster_size = 4;  /* starting point for FAT12 and FAT16 */
-+    unsigned int sector_size_mult = 1; /* x 512 == sector_size */
-     int def_root_dir_entries = 512;
- 
-     if (info->size < 512 * 1024 * 1024) {
-@@ -580,11 +581,15 @@ static void establish_params(struct device_info *info)
- 	 * fs size >   32G:  32k clusters
- 	 *
- 	 * This only works correctly for 512 byte sectors!
-+	 * For other sector sizes it tries to approximate.
- 	 */
- 	uint32_t sz_mb = info->size / (1024 * 1024);
-+	if (info->sector_size > 0)
-+	    sector_size_mult = info->sector_size / 512;
- 	cluster_size =
--	    sz_mb > 32 * 1024 ? 64 : sz_mb > 16 * 1024 ? 32 : sz_mb >
--	    8 * 1024 ? 16 : sz_mb > 260 ? 8 : 1;
-+	    sz_mb > 32 * 1024 * sector_size_mult ? 64 : sz_mb >
-+	    16 * 1024 * sector_size_mult ? 32 : sz_mb >
-+	    8 * 1024 * sector_size_mult ? 16 : sz_mb > 260 * sector_size_mult ? 8 : 1;
-     }
- 
-     if (info->geom_heads > 0) {
diff --git a/dosfstools.spec b/dosfstools.spec
index f43f24d..8f08075 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,14 +1,13 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 4.1
-Release: 12%{?dist}
+Version: 4.2
+Release: 1%{?dist}
 License: GPLv3+
-Source0: http://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-URL: http://github.com/dosfstools/dosfstools
-# https://github.com/dosfstools/dosfstools/issues/111
-Patch0: dosfstools-4.1-fix-cluster-size-auto-detect-for-4k-disks.patch
+Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+URL: https://github.com/dosfstools/dosfstools
 
 BuildRequires: gcc
+BuildRequires: make
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -17,7 +16,6 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-cluster-size-auto-detect-for-4k-disks
 
 %build
 %configure --enable-compat-symlinks
@@ -26,14 +24,24 @@ drives or on floppies.
 %install
 %make_install PREFIX=%{_prefix}
 
+# license file is in the licenses not in the doc
+rm -f %{buildroot}%{_docdir}/%{name}/COPYING
+
 %files
 %license COPYING
-%doc ChangeLog doc/*
+%doc NEWS README ChangeLog doc/*
 %{_sbindir}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Feb  1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2-1
+- New version
+  Resolves: rhbz#1922767
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 031f20d..d2f7a41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dosfstools-4.1.tar.xz) = e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
+SHA512 (dosfstools-4.2.tar.gz) = 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156