Skip to Content.
Sympa Menu

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

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 (9d7d5da4add187d32527a9af36b35e43564e8d25)
  • Date: Sun, 11 Apr 2010 08:53:18 -0500

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

disk/ntfs-3g/DETAILS | 1
disk/ntfs-3g/HISTORY | 4 +++
disk/ntfs-3g/PRE_BUILD | 5 ++++
disk/partimage-ng/DEPENDS | 10 ++------
disk/partimage-ng/DETAILS | 19 +++++++---------
disk/partimage-ng/HISTORY | 8 ++++++
disk/partimage-ng/PREPARE | 7 +++++
disk/partimage-ng/PRE_BUILD | 22 ------------------
disk/partimage-ng/e2fs.diff | 23 -------------------
disk/partimage-ng/hal.diff | 52
--------------------------------------------
disk/partimage-ng/ntfs.diff | 27 ----------------------
utils/kbd/DETAILS | 4 +--
utils/kbd/HISTORY | 3 ++
13 files changed, 41 insertions(+), 144 deletions(-)

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

kbd: => 1.15.2

commit f111ec7601ae1bed001efc7f7b06ae680904b33c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partimage-ng: => bzr

commit b5a1a3effbc128cf7138d126552b1abe94097f83
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ntfs-3g - fix ntfstime.h file

diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index cd8630c..fa36e4a 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,5 +1,6 @@
SPELL=ntfs-3g
VERSION=2010.3.6
+ PATCHLEVEL=1

SOURCE_HASH=sha512:babc7aaeb823aba400e4f0750073b8bd3aa5e2b84927c1c5975cc5daaa12290b747b3d0c350d95ebb1e8cc644354c86a0621e4e469883dc0a37583fcd935475d
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 073879c..6146cff 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,7 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to avoid a duplicate definition of timespec with
glibc-2.11.1
+
2010-03-15 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE: added, optionally enable ACL or /etc/mtab support.
* DEPENDS: added a message explaining the fuse optional dependency
diff --git a/disk/ntfs-3g/PRE_BUILD b/disk/ntfs-3g/PRE_BUILD
new file mode 100755
index 0000000..5b688ba
--- /dev/null
+++ b/disk/ntfs-3g/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# avoid duplicate defination of timespec with glibc-2.11.1
+#patch -p0 -i $SPELL_DIRECTORY/nt.diff
+sed -i '/^struct/,/}/D' include/ntfs-3g/ntfstime.h
diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index a312d33..dacc9a4 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -1,14 +1,10 @@
if [[ $PART_VCS == y ]];then
- depends bzr &&
- depends boost &&
- depends $PART_NTFS &&
- depends pkgconfig &&
- optional_depends hal '' '-DNO_HAL=1' 'CD detection'
-else
- depends ntfsprogs
+ depends bzr
fi &&
depends cmake &&
depends g++ &&
depends parted &&
+depends boost &&
+depends $PART_NTFS &&
depends e2fsprogs

diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index 7d9da14..f51b7af 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -1,17 +1,16 @@
SPELL=partimage-ng
-if [[ $PART_VCS == y ]];then
- VERSION=vcs
+#if [[ $PART_VCS == y ]];then
+ VERSION=bzr
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=lp:~gene-czarc/partimage-ng/devel-gc2
+ SOURCE_URL[0]=lp:~vonami/partimage-ng/trunk
SOURCE_IGNORE=volatile
- PATCHLEVEL=1
# FORCE_DOWNL=on
-else
- VERSION=r80
-
SOURCE_HASH=sha512:7e2642fb957f58f9c17e50918b5d8a78266e56686fb0bb5cff6c2cc789b0835738d07c7f23c891a82098641a473c2646a9a12180315db683c14de24b52396cfd
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
-fi
+#else
+# VERSION=r80
+# SOURCE_HASH=sha512:
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
+#fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://launchpad.net/partimage-ng
LICENSE[0]=GPL
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 6a58f4b..0a4c0a4 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,11 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: switch to latest devel branch
+ no tarball yet
+ this version uses a different format for its backup files
+ * PRE_BUILD, {hal,ntfs}.diff: deleted
+ * DEPENDS: rearrange
+ * PREPARE: give warning message
+
2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* ntfs.diff: added
diff --git a/disk/partimage-ng/PREPARE b/disk/partimage-ng/PREPARE
index bdfbabd..9d177c1 100755
--- a/disk/partimage-ng/PREPARE
+++ b/disk/partimage-ng/PREPARE
@@ -1,2 +1,7 @@
-config_query PART_VCS 'use VCS version?' n
+if spell_ok $SPELL;then
+ if [[ `installed_version $SPELL` != bzr ]];then
+ message ${PROBLEM_COLOR}Beware - archive format has changed -old backups
will be unusable!${DEFAULT_COLOR}
+ fi
+fi &&
+config_query PART_VCS 'use BZR version?' y

diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD
deleted file mode 100755
index 172b63a..0000000
--- a/disk/partimage-ng/PRE_BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $PART_VCS == y ]];then
- if spell_ok ntfs-3g;then
-# make hal optional
- patch -p1 -i $SPELL_DIRECTORY/hal.diff &&
-# fix nr of parameters used for ntfs-3g-2009.11.14
- patch -p1 -i $SPELL_DIRECTORY/ntfs.diff &&
- sed -i '/set(NTFS3G_PREFERRED/s/0/1/' src/CMakeLists.txt
- fi
-else
-# fix compile with recent e2fsprogs
- patch -p1 -i $SPELL_DIRECTORY/e2fs.diff &&
-# fix glibc problem
-sed -i -e '/<fcntl.h>/ a\
-#include <langinfo.h>
-' src/imager.cpp
-fi &&
-#fix gcc4.4 problem
-sed -i -e '/<cstdlib>/ a\
-#include <stdint.h>
-' src/fat32partition.cpp
diff --git a/disk/partimage-ng/e2fs.diff b/disk/partimage-ng/e2fs.diff
deleted file mode 100644
index 38e2809..0000000
--- a/disk/partimage-ng/e2fs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr partimage-ng.orig/src/CMakeLists.txt
partimage-ng/src/CMakeLists.txt
- # check C library; need macro def HAVE_STDARG_H for libntfs
-diff -uNr partimage-ng.orig/src/ext2partition.h
partimage-ng/src/ext2partition.h
---- partimage-ng.orig/src/ext2partition.h 2008-09-26 08:55:12.000000000
+0200
-+++ partimage-ng/src/ext2partition.h 2008-10-26 09:50:55.000000000 +0100
-@@ -19,6 +19,17 @@
- #define PARTIMAGENG_EXT2PARTITION
-
- #include <ext2fs/ext2fs.h>
-+struct ext2fs_struct_generic_bitmap {
-+ errcode_t magic;
-+ ext2_filsys fs;
-+ __u32 start, end;
-+ __u32 real_end;
-+ char * description;
-+ char * bitmap;
-+ errcode_t base_error_code;
-+ __u32 reserved[7];
-+};
-+
- #include <sys/types.h>
-
- #include "partition.h"
diff --git a/disk/partimage-ng/hal.diff b/disk/partimage-ng/hal.diff
deleted file mode 100644
index 504e856..0000000
--- a/disk/partimage-ng/hal.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -uNr partimage-ng/doc/CMakeLists.txt partimage-ng.cp/doc/CMakeLists.txt
---- partimage-ng/doc/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
-+++ partimage-ng.cp/doc/CMakeLists.txt 2009-11-16 16:58:11.000000000 +0100
-@@ -1,3 +1,6 @@
- # install man pages
- INSTALL(FILES partimage-ng.8 DESTINATION share/man/man8/)
-+if (NOT NO_HAL)
- INSTALL(FILES ping-cdcat.8 DESTINATION share/man/man8/)
-+endif (NOT NO_HAL)
-+
-diff -uNr partimage-ng/src/CMakeLists.txt partimage-ng.cp/src/CMakeLists.txt
---- partimage-ng/src/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
-+++ partimage-ng.cp/src/CMakeLists.txt 2009-11-16 16:57:32.000000000 +0100
-@@ -51,7 +51,6 @@
- FIND_PACKAGE(Ntfs)
- FIND_PACKAGE(Ntfs3g)
- FIND_PACKAGE(Parted REQUIRED)
--FIND_PACKAGE(Hal REQUIRED)
-
- # OK, figure out which ntfs library to use
- IF(NTFS3G_PREFERRED)
-@@ -101,20 +100,26 @@
- ENDIF (NTFS3G_PREFERRED AND NTFS3G_FOUND)
-
- # Directories
--INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} ${NTFS3G_INCLUDE_DIR})
--LINK_DIRECTORIES(${HAL_LIBRARY_DIR} ${NTFS3G_LIBRARY_DIR})
-+INCLUDE_DIRECTORIES(${NTFS3G_INCLUDE_DIR})
-+LINK_DIRECTORIES(${NTFS3G_LIBRARY_DIR})
-
- # add the main target
- ADD_EXECUTABLE(partimage-ng ${partimage_ng_src})
--ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
-
-
- # link target libraries
- TARGET_LINK_LIBRARIES(partimage-ng parted ext2fs ${NTFS_LIBRARIES})
--TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
-
-
- # install application and scripts
- INSTALL(TARGETS partimage-ng DESTINATION "sbin")
-+
-+if (NOT NO_HAL)
-+FIND_PACKAGE(Hal REQUIRED)
-+INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} )
-+LINK_DIRECTORIES(${HAL_LIBRARY_DIR} )
-+TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
-+ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
- INSTALL(TARGETS ping-cdcat DESTINATION "sbin")
-+endif (NOT NO_HAL)
-
diff --git a/disk/partimage-ng/ntfs.diff b/disk/partimage-ng/ntfs.diff
deleted file mode 100644
index 87d3a92..0000000
--- a/disk/partimage-ng/ntfs.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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;
diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index 9c7cad0..62c6b45 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -1,9 +1,9 @@
SPELL=kbd
- VERSION=1.15.1
+ VERSION=1.15.2
+
SOURCE_HASH=sha512:8fd80e61699c6869a42e93a3c0833e054e3b8dfe9ec2999b2ba205b08b54ccb675af04eb75a2446ecdecc233e6dfa79f8475b11a75e3812a4afe4d3fc59c7b2e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.altlinux.org/pub/people/legion/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f5f8cd4673765e33dda57fb5dc6b0b478272717aff0cdf6408f9a92a56a62a1890b318b2e83b973d82d96a95629017a2c93d66ca886cb15595a6263f11ec6ad4
WEB_SITE=http://freshmeat.net/projects/kbd/
ENTERED=20011113
LICENSE[0]=GPL
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 0c8e9c8..8e09512 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version 1.15.2
+>
2009-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15.1
* DEPENDS, PRE_BUILD: added autoconf



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9d7d5da4add187d32527a9af36b35e43564e8d25), Treeve Jelbert, 04/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page