dosfstools: update to 3.0.11

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3436 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dosfstools/dosfstools-vl.spec

@@ -1,14 +1,19 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Summary(ja): LinuxでMS-DOS FAT filesystemsを作成/チェックするユーティリティ
-Version: 2.11
+Version: 3.0.11
-Release: 6%{?_dist_release}
+Release: 1%{?_dist_release}
-License: GPL
+
+License: GPLv3+
 Group: Applications/System
-Source: ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz
+URL: http://www.daniel-baumann.ch/software/dosfstools/
-Patch1: dosfstools-2.7-argfix.patch
+
-Patch2: dosfstools-2.11-assumeKernel26.patch
+Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
-Patch4: dosfstools-2.11-fortify.patch
+# Fix buffer overflow in alloc_rootdir_entry (#674095)
+Patch0: dosfstools-3.0.9-fix-alloc-rootdir-entry.patch
+# Fix dosfslable on FAT32 (#693662)
+Patch1: dosfstools-3.0.11-dosfslabel-fat32.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: mkdosfs-ygg
 
@@ -24,54 +29,31 @@ dosfstools パッケージには mkdosfs と dosfsck のユーティリティが
 
 %prep
 %setup -q
-%patch1 -p1 -b .argfix
+%patch0 -p1 -b .fix-alloc-rootdir-entry
-%patch2 -p1 -b .assumeKernel26
+%patch1 -p1 -b .dosfslabel-fat32
-%patch4 -p1 -b .fortify
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_syssbindir}
+make DESTDIR=%{buildroot} install-bin install-man PREFIX=%{_prefix} SBINDIR=/sbin
-mkdir -p %{buildroot}/%{_mandir}/man8
-
-install -m755 -s mkdosfs/mkdosfs %{buildroot}%{_syssbindir}/mkdosfs
-ln %{buildroot}%{_syssbindir}/mkdosfs %{buildroot}%{_syssbindir}/mkfs.msdos
-ln %{buildroot}%{_syssbindir}/mkdosfs %{buildroot}%{_syssbindir}/mkfs.vfat
-
-install -m755 -s dosfsck/dosfsck %{buildroot}%{_syssbindir}/dosfsck
-ln %{buildroot}%{_syssbindir}/dosfsck %{buildroot}%{_syssbindir}/fsck.msdos
-ln %{buildroot}%{_syssbindir}/dosfsck %{buildroot}%{_syssbindir}/fsck.vfat
-
-install -m 644 mkdosfs/mkdosfs.8 %{buildroot}%{_mandir}/man8
-ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.msdos.8.gz
-ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.vfat.8.gz
-
-install -m 644 dosfsck/dosfsck.8 %{buildroot}%{_mandir}/man8
-ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.msdos.8.gz
-ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz
-
-# Prepare for packed documents
-cp -p dosfsck/CHANGES CHANGES.dosfsck
-cp -p dosfsck/COPYING COPYING.dosfsck
-cp -p dosfsck/README README.dosfsck
-
-cp -p mkdosfs/ANNOUNCE ANNOUNCE.mkdosfs
-cp -p mkdosfs/COPYING COPYING.mkdosfs
-cp -p mkdosfs/ChangeLog ChangeLog.mkdosfs
-cp -p mkdosfs/README README.mkdosfs
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc *.dosfsck *.mkdosfs
+%doc ChangeLog COPYING doc/*-2.x
-%{_syssbindir}/*
+/sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Thu Apr 07 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.0.11-1
+- update to 3.0.11
+  - update URL
+  - License: GPLv3+
+
 * Sat Jul 26 2008 Shu KONNO <owa@bg.wakwak.com> 2.11-6vl5
 - applied new versioning policy and spec in utf-8