From 3473943f06454c2388b14427fa4a3af16df71d3a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:08:49 +0000
Subject: import dosfstools-3.0.20-10.el7


---

diff --git a/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch b/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch
new file mode 100644
index 0000000..cf31f6a
--- /dev/null
+++ b/SOURCES/dosfstools-3.0.20-allow-lowercase-labels.patch
@@ -0,0 +1,35 @@
+diff --git a/src/fatlabel.c b/src/fatlabel.c
+index 8397a97..d45fb95 100644
+--- a/src/fatlabel.c
++++ b/src/fatlabel.c
+@@ -119,8 +119,8 @@ int main(int argc, char *argv[])
+ 	    /* don't know if here should be more strict !uppercase(label[i]) */
+ 	    if (islower(label[i])) {
+ 		fprintf(stderr,
+-			"fatlabel: labels cannot contain lower case characters\n");
+-		exit(1);
++			"fatlabel: warning - lowercase labels might not work properly with DOS or Windows\n");
++		break;
+ 	    }
+ 	rw = 1;
+     }
+diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
+index cfa3288..9e960ba 100644
+--- a/src/mkfs.fat.c
++++ b/src/mkfs.fat.c
+@@ -1536,8 +1536,13 @@ int main(int argc, char **argv)
+ 
+ 	case 'n':		/* n : Volume name */
+ 	    sprintf(volume_name, "%-11.11s", optarg);
+-	    for (i = 0; i < 11; i++)
+-		volume_name[i] = toupper(volume_name[i]);
++	    for (i = 0; volume_name[i] && i < 11; i++)
++		/* don't know if here should be more strict !uppercase(label[i]) */
++		if (islower(volume_name[i])) {
++		    fprintf(stderr,
++		            "mkfs.fat: warning - lowercase labels might not work properly with DOS or Windows\n");
++		    break;
++		}
+ 
+ 	    break;
+ 
diff --git a/SPECS/dosfstools.spec b/SPECS/dosfstools.spec
index e7220af..32eed9c 100644
--- a/SPECS/dosfstools.spec
+++ b/SPECS/dosfstools.spec
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.20
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz
@@ -9,6 +9,8 @@ URL: http://www.daniel-baumann.ch/software/dosfstools/
 # Sent upstream
 Patch0: dosfstools-3.0.20-manpage-fix.patch
 Patch1: dosfstools-3.0.20-fix-big-endian.patch
+# Backported from upstream
+Patch2: dosfstools-3.0.20-allow-lowercase-labels.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,6 +22,7 @@ drives or on floppies.
 %setup -q
 %patch0 -p1 -b .manpage-fix
 %patch1 -p1 -b .fix-big-endian
+%patch2 -p1 -b .allow-lowercase-labels
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@@ -39,6 +42,10 @@ rm -rf %{buildroot}
 %{_mandir}/de/man8/*
 
 %changelog
+* Fri Apr 27 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.20-10
+- Backported fix to allow lowercase labels
+  Resolves: rhbz#1553860
+
 * Tue Mar  4 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.20-9
 - Fixed bogus dates in changelog (best effort)
 - Fixed man pages packaging