[arch-commits] Commit in dosfstools/trunk (2 files)

[Tobias Powalowski]

    Date: Friday, June 7, 2013 @ 08:34:13
  Author: tpowa
Revision: 187849

upgpkg: dosfstools 3.0.18-1

bump to latest version

Modified:
  dosfstools/trunk/PKGBUILD
Deleted:
  dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch

-------------------------------------------------+
 PKGBUILD                                        |    8 +++----
 dosfstools-3.0.12-fix-alloc-rootdir-entry.patch |   25 ----------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-07 04:30:36 UTC (rev 187848)
+++ PKGBUILD	2013-06-07 06:34:13 UTC (rev 187849)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.17
+pkgver=3.0.18
 pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64)
@@ -10,6 +10,8 @@
 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=('a80aab6aac9e56e937b0392a85bfadb9'
+         'SKIP')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -18,7 +20,5 @@
 
 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')

Deleted: dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
===================================================================
--- dosfstools-3.0.12-fix-alloc-rootdir-entry.patch	2013-06-07 04:30:36 UTC (rev 187848)
+++ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch	2013-06-07 06:34:13 UTC (rev 187849)
@@ -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);