Skip to Content.
Sympa Menu

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

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 (6d923f2df7b5f7794b8a1cbde7c1993da7423211)
  • Date: Fri, 3 Jun 2011 04:32:04 -0500

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

disk/fuse/DETAILS | 2 +-
disk/fuse/HISTORY | 4 ++++
disk/fuse/PRE_BUILD | 3 +++
libs/sip/DETAILS | 4 ++--
libs/sip/HISTORY | 3 +++
5 files changed, 13 insertions(+), 3 deletions(-)

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

fix fuse with glibc-2.14

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

sip: => 4.12.3

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 278be17..87e230e 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,7 +1,7 @@
SPELL=fuse
if [ "$CVS" != "y" ]; then
VERSION=2.8.5
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:83f668c5c02f591a1f6e5cb6f95abb7227248ba80fab940395ee5ec07ce44743dae07c3cfd865327143fe5cbe3bbee4aa1c4e856e55aa80cb8b6892f9683efad
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index c93d9bf..fa68082 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2011-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: fix for latest glibc
+
2011-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index 8dd8ec1..d635a2a 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -4,6 +4,9 @@ cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/init.patch" &&

+# glibc-2.14 fix
+sed -i "/sched/s|<|<linux/|" util/fusermount.c &&
+
if [ "$CVS" = "y" ]; then
./makeconf.sh
fi
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 9b53905..3db16df 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.12.2
-
SOURCE_HASH=sha512:3f31ffea4da7b1a366db77fdfc731949753741b26905c5f585db8e1cdef080a6fc020e6623b51ddf62e2b82c970d91c074401aa2f449c1eb324d42a4c99e0562
+ VERSION=4.12.3
+
SOURCE_HASH=sha512:2bb03d3d1a136dc7e8df95f7dc25dbbf997b658118d20ffd5878c7e712f429fc97066822087adab06e621f2e3a0e8eadb94aaa9afaa8d0d35c6dd8d603475e00
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index 237fd15..0007966 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2011-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.12.3
+
2011-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.12.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6d923f2df7b5f7794b8a1cbde7c1993da7423211), Treeve Jelbert, 06/03/2011

Archive powered by MHonArc 2.6.24.

Top of Page