Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (594d599706e4f55b61e3a55f9fbc9eef93338d22)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (594d599706e4f55b61e3a55f9fbc9eef93338d22)
  • Date: Sat, 21 Nov 2009 11:05:57 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/partimage-ng/DETAILS | 1 +
disk/partimage-ng/HISTORY | 6 ++++++
disk/partimage-ng/PRE_BUILD | 2 +-
disk/partimage-ng/ntfs.diff | 27 +++++++++++++++++++++++++++
4 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit cd949e994326e41540928624764b2f7470fa66c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partimage-ng - better fix for ntfs problem

diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index f79d9aa..7d9da14 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -4,6 +4,7 @@ if [[ $PART_VCS == y ]];then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=lp:~gene-czarc/partimage-ng/devel-gc2
SOURCE_IGNORE=volatile
+ PATCHLEVEL=1
# FORCE_DOWNL=on
else
VERSION=r80
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 1e8241b..6a58f4b 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,9 @@
+2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * ntfs.diff: added
+ * PRE_BUILD: apply patch instead of sed
+ more elaborate fix for ntfs problem, base on ntfs logic
+
2009-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add pkgconfig. optional hal
* PRE_BUILD: fix for latest ntfs-3g
diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD
index 50bab0a..172b63a 100755
--- a/disk/partimage-ng/PRE_BUILD
+++ b/disk/partimage-ng/PRE_BUILD
@@ -5,7 +5,7 @@ if [[ $PART_VCS == y ]];then
# make hal optional
patch -p1 -i $SPELL_DIRECTORY/hal.diff &&
# fix nr of parameters used for ntfs-3g-2009.11.14
- sed -i '/ntfs_get_size_for_mapping_pairs/s/0/0,0/' src/ntfspartition_c.c
&&
+ patch -p1 -i $SPELL_DIRECTORY/ntfs.diff &&
sed -i '/set(NTFS3G_PREFERRED/s/0/1/' src/CMakeLists.txt
fi
else
diff --git a/disk/partimage-ng/ntfs.diff b/disk/partimage-ng/ntfs.diff
new file mode 100644
index 0000000..87d3a92
--- /dev/null
+++ b/disk/partimage-ng/ntfs.diff
@@ -0,0 +1,27 @@
+diff -uNr partimage-ng/src/ntfspartition_c.c
partimage-ng.cp/src/ntfspartition_c.c
+--- partimage-ng/src/ntfspartition_c.c 2009-01-23 14:44:55.000000000 +0100
++++ partimage-ng.cp/src/ntfspartition_c.c 2009-11-21 17:58:03.000000000
+0100
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <limits.h>
+ #include <errno.h>
+ #include <string.h>
+ #ifdef PING_USE_NTFS3G
+@@ -320,13 +321,13 @@
+ rl[1].lcn = -1;
+ rl[1].length = 0;
+
+- old_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl_bad, 0);
++ old_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl_bad, 0, INT_MAX);
+ if ( old_mp_size <= 0 ) {
+ fprintf(debugs(), "Cannot calculate the size of the old
mapping pairs\n");
+ return 1;
+ }
+
+- new_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl, 0);
++ new_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl, 0, INT_MAX);
+ if ( new_mp_size <= 0 ) {
+ fprintf(debugs(), "Cannot calculate the size of the new
mapping pairs\n");
+ return 1;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (594d599706e4f55b61e3a55f9fbc9eef93338d22), Treeve Jelbert, 11/21/2009

Archive powered by MHonArc 2.6.24.

Top of Page