[maemo-commits] [maemo-commits] r12307 - in projects/haf/trunk/dosfstools/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-15 12:50:28 +0300 (Fri, 15 Jun 2007)
New Revision: 12307

Added:
   projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch
Modified:
   projects/haf/trunk/dosfstools/debian/changelog
Log:
added patch to fix logical sector calculation


Modified: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2007-06-15 08:00:16 UTC (rev 12306)
+++ projects/haf/trunk/dosfstools/debian/changelog	2007-06-15 09:50:28 UTC (rev 12307)
@@ -1,3 +1,11 @@
+dosfstools (2.11-0osso3) unstable; urgency=low
+
+  * UNRELEASED
+  * Patch for correct logical sector size. Thanks to Tilman Vogel for
+    reporting the problem. Fixes: MB#1537
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 15 Jun 2007 12:46:30 +0300
+
 dosfstools (2.11-0osso2) unstable; urgency=low
 
   * Added patch for dosfsck to print progress indication.

Added: projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch	2007-06-15 08:00:16 UTC (rev 12306)
+++ projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch	2007-06-15 09:50:28 UTC (rev 12307)
@@ -0,0 +1,18 @@
+--- dosfstools-2.11/dosfsck/boot.c.orig 2007-06-13 15:15:36.000000000 +0200
++++ dosfstools-2.11/dosfsck/boot.c      2007-06-13 15:16:41.000000000 +0200
+@@ -34,13 +34,13 @@ static struct {
+     { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" },
+ };
+
+-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
++#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ || __arm__
+ /* Unaligned fields must first be copied byte-wise */
+ #define GET_UNALIGNED_W(f)                     \
+     ({                                         \
+        unsigned short __v;                     \
+        memcpy( &__v, &f, sizeof(__v) );        \
+-       CF_LE_W( *(unsigned short *)&f );       \
++       CF_LE_W( *(unsigned short *)&__v );     \
+     })
+ #else
+ #define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f )