diff options
| author | root <root@rshg054.dnsready.net> | 2013-06-16 01:26:25 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-06-16 01:26:25 -0700 |
| commit | 44c10f274ec720a1512b15457b9eeffea28c6041 (patch) | |
| tree | 48d27d6116dfd4fdce957af918c3d62385fd9226 /core/dosfstools | |
| parent | 0a069ede63336b105cda051cebe136f2592847d2 (diff) | |
Sun Jun 16 01:25:28 PDT 2013
Diffstat (limited to 'core/dosfstools')
| -rw-r--r-- | core/dosfstools/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 |
2 files changed, 5 insertions, 30 deletions
diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index ad0747bee..4abe0670b 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ +# $Id: PKGBUILD 188529 2013-06-15 09:26:56Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.17 +pkgver=3.0.19 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -10,6 +10,8 @@ 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') +md5sums=('a083ca4a2a937c8cec07c63176fb125f' + 'SKIP') build() { cd $srcdir/$pkgname-$pkgver @@ -18,7 +20,5 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install } -md5sums=('468b953ddc8baf66e9881d1a5eae03e2' - 'SKIP') diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -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); |