Accepting request 178932 from Base:System

- Update to new upstream release 3.0.20
* This release updates default sectors per cluster for FAT32.
- Remove ppc-reserved-sectors-fix.patch (implemented upstream)
  (use -a switch to disable aligning structures)
- Signature verification; more robust make install call

OBS-URL: https://build.opensuse.org/request/show/178932
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dosfstools?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2013-06-14 13:44:30 +00:00 committed by Git OBS Bridge
commit c81d836a97
7 changed files with 100 additions and 25 deletions

View File

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

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

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

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEABECAAYFAlG4TM8ACgkQ+C5cwEsrK56nbQCcDT/nsj+1a4P2siQviHsmORSb
pzYAnAtL5mEp+K6aIvOVR1XjzvtWky2g
=t7bq
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jun 13 13:46:58 UTC 2013 - jengelh@inai.de
- Update to new upstream release 3.0.20
* This release updates default sectors per cluster for FAT32.
- Remove ppc-reserved-sectors-fix.patch (implemented upstream)
(use -a switch to disable aligning structures)
- Signature verification; more robust make install call
-------------------------------------------------------------------
Wed Jun 12 08:06:17 UTC 2013 - pgajdos@suse.com

67
dosfstools.keyring Normal file
View File

@ -0,0 +1,67 @@
pub 1024D/4B2B2B9E 2004-06-20
uid Daniel Baumann <mail@daniel-baumann.ch>
uid [ opphevet] Daniel Baumann <daniel@127011.net>
uid [ opphevet] Daniel Baumann <daniel@debian.org>
uid [ opphevet] Daniel Baumann <daniel@free-law.ch>
uid [ opphevet] Daniel Baumann <daniel@undebian.org>
uid [ opphevet] Daniel Baumann <baumanda@phys.ethz.ch>
uid [ opphevet] Daniel Baumann <baumanda@student.ethz.ch>
uid [ opphevet] Daniel Baumann <daniel@debian-unofficial.org>
uid [ opphevet] Daniel Baumann <daniel@unable-to-package.org>
uid [ opphevet] Daniel Baumann <panthera@debian-unofficial.org>
uid [ opphevet] Daniel Baumann <daniel.baumann@students.unibe.ch>
uid [ opphevet] Daniel Baumann <daniel.baumann@panthera-systems.net>
sub 1024g/19ED1B2F 2004-06-20
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
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
k5WR
=d54W
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -17,20 +17,25 @@
Name: dosfstools
Provides: dosfsck
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.19
Version: 3.0.20
Release: 0
Url: http://daniel-baumann.ch/software/dosfstools/
Source: http://daniel-baumann.ch/files/software/dosfstools/dosfstools-%{version}.tar.xz
#Freecode-URL: http://freecode.com/projects/dosfstools
#Git-Clone: git://daniel-baumann.ch/git/software/dosfstools
Source: http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz
Source2: http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz.sig
Source3: %name.keyring
Patch0: %{name}-suse-dirs.patch
# workaround for
# https://bugs.launchpad.net/ubuntu/+source/dosfstools/+bug/746262
Patch100: ppc-reserved-sectors-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
Provides: dosfsck
Provides: mkdosfs
Supplements: filesystem(vfat)
%description
@ -39,15 +44,15 @@ which respectively make and check MS-DOS FAT file systems on hard
drives or on floppies.
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup
%patch0 -p1
%patch100 -p1
%build
make CC="%__cc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
%install
%makeinstall SBINDIR=%{_sbindir}
make install DESTDIR="%buildroot" SBINDIR=%{_sbindir}
#UsrMerge
mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos} $RPM_BUILD_ROOT/sbin

View File

@ -1,13 +0,0 @@
Index: dosfstools-3.0.17/src/mkfs.fat.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)
}
/* Adjust the reserved number of sectors for alignment */
- reserved_sectors = align_object(reserved_sectors, bs.cluster_size);
+ /* reserved_sectors = align_object(reserved_sectors, bs.cluster_size); */
bs.reserved = htole16(reserved_sectors);
/* Adjust the number of root directory entries to help enforce alignment */