[arch-commits] Commit in dosfstools/repos (6 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Jan 2 14:44:17 UTC 2013
Date: Wednesday, January 2, 2013 @ 09:44:16
Author: tpowa
Revision: 174137
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
dosfstools/repos/extra-i686/PKGBUILD
(from rev 174136, dosfstools/trunk/PKGBUILD)
dosfstools/repos/extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
(from rev 174136, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
dosfstools/repos/extra-x86_64/PKGBUILD
(from rev 174136, dosfstools/trunk/PKGBUILD)
dosfstools/repos/extra-x86_64/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
(from rev 174136, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
Deleted:
dosfstools/repos/extra-i686/PKGBUILD
dosfstools/repos/extra-x86_64/PKGBUILD
--------------------------------------------------------------+
extra-i686/PKGBUILD | 54 +++++-----
extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 ++++
extra-x86_64/PKGBUILD | 54 +++++-----
extra-x86_64/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch | 25 ++++
4 files changed, 108 insertions(+), 50 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-02 14:43:48 UTC (rev 174136)
+++ extra-i686/PKGBUILD 2013-01-02 14:44:16 UTC (rev 174137)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
-pkgname=dosfstools
-pkgver=3.0.13
-pkgrel=1
-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://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz)
-url="http://www.daniel-baumann.ch/software/dosfstools/"
-license=('GPL2')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make
-}
-
-package () {
- cd $srcdir/$pkgname-$pkgver
- make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
-}
-md5sums=('c1d851e3fc065a935c7cf919545d239f')
Copied: dosfstools/repos/extra-i686/PKGBUILD (from rev 174136, dosfstools/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-02 14:44:16 UTC (rev 174137)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: dorphell <dorphell at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+pkgname=dosfstools
+pkgver=3.0.13
+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://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz
+ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
+url="http://www.daniel-baumann.ch/software/dosfstools/"
+license=('GPL2')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # fix https://bugs.archlinux.org/task/33248
+ patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
+ make
+}
+
+package () {
+ cd $srcdir/$pkgname-$pkgver
+ make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
+}
+md5sums=('c1d851e3fc065a935c7cf919545d239f'
+ 'c2be6f2cd1d47297b2d6a8ba237e04eb')
Copied: dosfstools/repos/extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (from rev 174136, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
===================================================================
--- extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (rev 0)
+++ extra-i686/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch 2013-01-02 14:44:16 UTC (rev 174137)
@@ -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);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-01-02 14:43:48 UTC (rev 174136)
+++ extra-x86_64/PKGBUILD 2013-01-02 14:44:16 UTC (rev 174137)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
-pkgname=dosfstools
-pkgver=3.0.13
-pkgrel=1
-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://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz)
-url="http://www.daniel-baumann.ch/software/dosfstools/"
-license=('GPL2')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make
-}
-
-package () {
- cd $srcdir/$pkgname-$pkgver
- make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
-}
-md5sums=('c1d851e3fc065a935c7cf919545d239f')
Copied: dosfstools/repos/extra-x86_64/PKGBUILD (from rev 174136, dosfstools/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-02 14:44:16 UTC (rev 174137)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: dorphell <dorphell at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+pkgname=dosfstools
+pkgver=3.0.13
+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://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz
+ dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
+url="http://www.daniel-baumann.ch/software/dosfstools/"
+license=('GPL2')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # fix https://bugs.archlinux.org/task/33248
+ patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
+ make
+}
+
+package () {
+ cd $srcdir/$pkgname-$pkgver
+ make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
+}
+md5sums=('c1d851e3fc065a935c7cf919545d239f'
+ 'c2be6f2cd1d47297b2d6a8ba237e04eb')
Copied: dosfstools/repos/extra-x86_64/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (from rev 174136, dosfstools/trunk/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
===================================================================
--- extra-x86_64/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch (rev 0)
+++ extra-x86_64/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch 2013-01-02 14:44:16 UTC (rev 174137)
@@ -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);
More information about the arch-commits
mailing list