- 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
This commit is contained in:
Petr Gajdos 2013-06-11 09:48:56 +00:00 committed by Git OBS Bridge
parent dbadbc6663
commit 7c959e6529
7 changed files with 44 additions and 12 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dade6b7c8ef06f7d679fcdc4524aa332ec7929837874b51c9bd490fbd4cb29f
size 73496

3
dosfstools-3.0.18.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9ee82da84d83e486c650384d2a4e8d2d38d22ef792eac79bd05caea2ee3a403
size 76364

View File

@ -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

View File

@ -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) {

View File

@ -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

View File

@ -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

View File

@ -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)
}