From 7c959e65295698b126ca400a35eb6f5ff58b9644e6ffeaae106889f93a1ab286 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 11 Jun 2013 09:48:56 +0000
Subject: [PATCH 1/2] - update to 3.0.18:   * Adding initial i18n support for
 manpages with po4a.   * Renaming tools to sane namespace and keeping legacy
 symlinks in place.     | dosfslabel becomes fatlabel,     | dosfsck becomes
 fsck.fat,     | and mkdosfs becomes mkfs.fat.   * Correcting spelling typo in
 boot.c.   * dosfslabel: Do not read beyond string length (Closes: #709587). -
 refreshed both dosfstools-suse-dirs.patch and  
 ppc-reserved-sectors-fix.patch - added dosfstools-system_id-overflow.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=40
---
 dosfstools-3.0.17.tar.xz            |  3 ---
 dosfstools-3.0.18.tar.xz            |  3 +++
 dosfstools-suse-dirs.patch          | 10 +++++-----
 dosfstools-system_id-overflow.patch | 13 +++++++++++++
 dosfstools.changes                  | 15 +++++++++++++++
 dosfstools.spec                     |  6 +++++-
 ppc-reserved-sectors-fix.patch      |  6 +++---
 7 files changed, 44 insertions(+), 12 deletions(-)
 delete mode 100644 dosfstools-3.0.17.tar.xz
 create mode 100644 dosfstools-3.0.18.tar.xz
 create mode 100644 dosfstools-system_id-overflow.patch

diff --git a/dosfstools-3.0.17.tar.xz b/dosfstools-3.0.17.tar.xz
deleted file mode 100644
index 954f585..0000000
--- a/dosfstools-3.0.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9dade6b7c8ef06f7d679fcdc4524aa332ec7929837874b51c9bd490fbd4cb29f
-size 73496
diff --git a/dosfstools-3.0.18.tar.xz b/dosfstools-3.0.18.tar.xz
new file mode 100644
index 0000000..8fb8661
--- /dev/null
+++ b/dosfstools-3.0.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9ee82da84d83e486c650384d2a4e8d2d38d22ef792eac79bd05caea2ee3a403
+size 76364
diff --git a/dosfstools-suse-dirs.patch b/dosfstools-suse-dirs.patch
index 3594ed1..d6654c6 100644
--- a/dosfstools-suse-dirs.patch
+++ b/dosfstools-suse-dirs.patch
@@ -1,9 +1,9 @@
-Index: dosfstools-3.0.15/Makefile
+Index: dosfstools-3.0.18/Makefile
 ===================================================================
---- dosfstools-3.0.15.orig/Makefile
-+++ dosfstools-3.0.15/Makefile
-@@ -20,9 +20,9 @@
- 
+--- dosfstools-3.0.18.orig/Makefile
++++ dosfstools-3.0.18/Makefile
+@@ -22,9 +22,9 @@ SHELL := sh -e
+ LANGUAGES = $(shell cd manpages/po && ls)
  
  DESTDIR =
 -PREFIX = /usr/local
diff --git a/dosfstools-system_id-overflow.patch b/dosfstools-system_id-overflow.patch
new file mode 100644
index 0000000..ebf92b2
--- /dev/null
+++ b/dosfstools-system_id-overflow.patch
@@ -0,0 +1,13 @@
+Index: dosfstools-3.0.18/src/mkfs.fat.c
+===================================================================
+--- dosfstools-3.0.18.orig/src/mkfs.fat.c
++++ dosfstools-3.0.18/src/mkfs.fat.c
+@@ -746,7 +746,7 @@ static void setup_tables(void)
+ 	strcpy((char *)bs.system_id, "kdosf");
+     }
+     else
+-	strcpy((char *)bs.system_id, "mkfs.fat");
++	strncpy((char *)bs.system_id, "mkfs.fat", 8);
+     if (sectors_per_cluster)
+ 	bs.cluster_size = (char)sectors_per_cluster;
+     if (size_fat == 32) {
diff --git a/dosfstools.changes b/dosfstools.changes
index a668235..14f24d7 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jun 11 09:20:20 UTC 2013 - pgajdos@suse.com
+
+- update to 3.0.18:
+  * Adding initial i18n support for manpages with po4a.
+  * Renaming tools to sane namespace and keeping legacy symlinks in place.
+    | dosfslabel becomes fatlabel,
+    | dosfsck becomes fsck.fat,
+    | and mkdosfs becomes mkfs.fat.
+  * Correcting spelling typo in boot.c.
+  * dosfslabel: Do not read beyond string length (Closes: #709587).
+- refreshed both dosfstools-suse-dirs.patch and 
+  ppc-reserved-sectors-fix.patch
+- added dosfstools-system_id-overflow.patch
+
 -------------------------------------------------------------------
 Mon Jun  3 13:44:15 UTC 2013 - pgajdos@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index 6f07983..7a7a2cc 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -22,11 +22,13 @@ Provides:       mkdosfs
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
 License:        GPL-3.0+
 Group:          System/Filesystems
-Version:        3.0.17
+Version:        3.0.18
 Release:        0
 Url:            http://daniel-baumann.ch/software/dosfstools/
 Source:         http://daniel-baumann.ch/files/software/dosfstools/dosfstools-%{version}.tar.xz
 Patch0:         %{name}-suse-dirs.patch
+# sent 2013-06-11 upstream:
+Patch1:         %{name}-system_id-overflow.patch
 # workaround for 
 # https://bugs.launchpad.net/ubuntu/+source/dosfstools/+bug/746262
 Patch100:       ppc-reserved-sectors-fix.patch
@@ -41,6 +43,7 @@ drives or on floppies.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 
 %build
@@ -61,5 +64,6 @@ ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos} $RPM_BUILD
 #EndUsrMerge
 %{_sbindir}/*
 %{_mandir}/man8/*.gz
+%{_mandir}/de/man8/*.gz
 
 %changelog
diff --git a/ppc-reserved-sectors-fix.patch b/ppc-reserved-sectors-fix.patch
index 05dac87..e792524 100644
--- a/ppc-reserved-sectors-fix.patch
+++ b/ppc-reserved-sectors-fix.patch
@@ -1,7 +1,7 @@
-Index: dosfstools-3.0.17/src/mkdosfs.c
+Index: dosfstools-3.0.17/src/mkfs.fat.c
 ===================================================================
---- dosfstools-3.0.17.orig/src/mkdosfs.c
-+++ dosfstools-3.0.17/src/mkdosfs.c
+--- dosfstools-3.0.17.orig/src/mkfs.fat.c
++++ dosfstools-3.0.17/src/mkfs.fat.c
 @@ -995,7 +995,7 @@ static void setup_tables(void)
  	}
  

From 3be637697c4e0c900ed3ed211b8e429a3acb5982ebf829b91f55c8111b027a00 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 12 Jun 2013 08:08:36 +0000
Subject: [PATCH 2/2] - update to 3.0.19:   * This release fixes  a  segfault
 with fortify. - removed dosfstools-system_id-overflow.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=41
---
 dosfstools-3.0.18.tar.xz            |  3 ---
 dosfstools-3.0.19.tar.xz            |  3 +++
 dosfstools-system_id-overflow.patch | 13 -------------
 dosfstools.changes                  |  7 +++++++
 dosfstools.spec                     |  5 +----
 5 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 dosfstools-3.0.18.tar.xz
 create mode 100644 dosfstools-3.0.19.tar.xz
 delete mode 100644 dosfstools-system_id-overflow.patch

diff --git a/dosfstools-3.0.18.tar.xz b/dosfstools-3.0.18.tar.xz
deleted file mode 100644
index 8fb8661..0000000
--- a/dosfstools-3.0.18.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9ee82da84d83e486c650384d2a4e8d2d38d22ef792eac79bd05caea2ee3a403
-size 76364
diff --git a/dosfstools-3.0.19.tar.xz b/dosfstools-3.0.19.tar.xz
new file mode 100644
index 0000000..ae1d6d1
--- /dev/null
+++ b/dosfstools-3.0.19.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db8cba57e7d7fd1fda4950581e2bb44fba07a76c6cbe9284d5d80a3d9cde17e3
+size 76428
diff --git a/dosfstools-system_id-overflow.patch b/dosfstools-system_id-overflow.patch
deleted file mode 100644
index ebf92b2..0000000
--- a/dosfstools-system_id-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dosfstools-3.0.18/src/mkfs.fat.c
-===================================================================
---- dosfstools-3.0.18.orig/src/mkfs.fat.c
-+++ dosfstools-3.0.18/src/mkfs.fat.c
-@@ -746,7 +746,7 @@ static void setup_tables(void)
- 	strcpy((char *)bs.system_id, "kdosf");
-     }
-     else
--	strcpy((char *)bs.system_id, "mkfs.fat");
-+	strncpy((char *)bs.system_id, "mkfs.fat", 8);
-     if (sectors_per_cluster)
- 	bs.cluster_size = (char)sectors_per_cluster;
-     if (size_fat == 32) {
diff --git a/dosfstools.changes b/dosfstools.changes
index 14f24d7..c6fdebe 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 12 08:06:17 UTC 2013 - pgajdos@suse.com
+
+- update to 3.0.19:
+  * This release fixes  a  segfault with fortify.
+- removed dosfstools-system_id-overflow.patch
+
 -------------------------------------------------------------------
 Tue Jun 11 09:20:20 UTC 2013 - pgajdos@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index 7a7a2cc..f45b179 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -22,13 +22,11 @@ Provides:       mkdosfs
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
 License:        GPL-3.0+
 Group:          System/Filesystems
-Version:        3.0.18
+Version:        3.0.19
 Release:        0
 Url:            http://daniel-baumann.ch/software/dosfstools/
 Source:         http://daniel-baumann.ch/files/software/dosfstools/dosfstools-%{version}.tar.xz
 Patch0:         %{name}-suse-dirs.patch
-# sent 2013-06-11 upstream:
-Patch1:         %{name}-system_id-overflow.patch
 # workaround for 
 # https://bugs.launchpad.net/ubuntu/+source/dosfstools/+bug/746262
 Patch100:       ppc-reserved-sectors-fix.patch
@@ -43,7 +41,6 @@ drives or on floppies.
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
 %patch100 -p1
 
 %build