Date: Wednesday, May 22, 2013 @ 02:01:51 Author: eric Revision: 186196
archrelease: copy trunk to extra-i686 Added: dosfstools/repos/extra-i686/PKGBUILD (from rev 186195, dosfstools/trunk/PKGBUILD) dosfstools/repos/extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (from rev 186195, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch) Deleted: dosfstools/repos/extra-i686/PKGBUILD dosfstools/repos/extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch -------------------------------------------------+ PKGBUILD | 50 ++++++++++------------ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 50 +++++++++++----------- 2 files changed, 49 insertions(+), 51 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-05-21 22:02:56 UTC (rev 186195) +++ PKGBUILD 2013-05-22 00:01:51 UTC (rev 186196) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: dorphell <dorph...@archlinux.org> -# Committer: Judd Vinet <jvi...@zeroflux.org> -pkgname=dosfstools -pkgver=3.0.16 -pkgrel=2 -pkgdesc="DOS filesystem utilities" -arch=(i686 x86_64) -depends=('glibc') -#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) -# using debian source, main page is down since quite some time -source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig}) -url="http://www.daniel-baumann.ch/software/dosfstools/" -license=('GPL2') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package () { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install -} -md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' - 'e8b460ab9c27279e652ddbd1ce7fa4b2') Copied: dosfstools/repos/extra-i686/PKGBUILD (from rev 186195, dosfstools/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-05-22 00:01:51 UTC (rev 186196) @@ -0,0 +1,24 @@ +# $Id$ +# Maintainer: dorphell <dorph...@archlinux.org> +# Committer: Judd Vinet <jvi...@zeroflux.org> +pkgname=dosfstools +pkgver=3.0.16 +pkgrel=2 +pkgdesc="DOS filesystem utilities" +arch=(i686 x86_64) +depends=('glibc') +source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +url="http://www.daniel-baumann.ch/software/dosfstools/" +license=('GPL2') + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package () { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install +} +md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' + 'e8b460ab9c27279e652ddbd1ce7fa4b2') Deleted: dosfstools-3.0.12-fix-alloc-rootdir-entry.patch =================================================================== --- dosfstools-3.0.12-fix-alloc-rootdir-entry.patch 2013-05-21 22:02:56 UTC (rev 186195) +++ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch 2013-05-22 00:01:51 UTC (rev 186196) @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); Copied: dosfstools/repos/extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (from rev 186195, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch) =================================================================== --- dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (rev 0) +++ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch 2013-05-22 00:01:51 UTC (rev 186196) @@ -0,0 +1,25 @@ +--- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 ++++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 +@@ -174,7 +174,10 @@ + offset = fs->root_start + next_free * sizeof(DIR_ENT); + memset(de, 0, sizeof(DIR_ENT)); + while (1) { +- sprintf((char *)de->name, pattern, curr_num); ++ char expanded[12]; ++ sprintf(expanded, pattern, curr_num); ++ memcpy(de->name, expanded, 8); ++ memcpy(de->ext, expanded + 8, 3); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp((const char *)root[scan].name, +--- dosfstools-3.0.12/src/fat.c ++++ dosfstools-3.0.12/src/fat.c +@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) + DIR_ENT de; + loff_t offset; + files++; +- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); ++ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); + de.start = CT_LE_W(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = CT_LE_W(i >> 16);