[SM-Commit] GIT changes to stable-0.47 grimoire by George Sherwood (4c0f525f2b14855b18cfb44bcc7043a56e479045)

George Sherwood scm at sourcemage.org
Sat Sep 4 16:25:40 EDT 2010


GIT changes to stable-0.47 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 VERSION                       |    2 +-
 crypto/encfs/DETAILS          |    2 +-
 crypto/encfs/HISTORY          |    4 ++++
 crypto/encfs/TRIGGERS         |    1 +
 disk/grub/HISTORY             |    5 +++++
 disk/grub/INSTALL             |    4 +++-
 ftp-libs/libtorrent/HISTORY   |    3 +++
 ftp-libs/libtorrent/PRE_BUILD |    3 +--
 8 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 4c0f525f2b14855b18cfb44bcc7043a56e479045
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    VERSION: 0.47-2

commit 05ab5eb4c1bd5db5207f8e4814465173f2053288
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    libtorrent: PRE_BUILD: removed ./autogen.sh #15803
    (cherry picked from commit c0896537bb7b2d9c6827aed26dfc05284e5b759c)

commit f0b6efe959cb7b3357370a5fecc3a9d31073f134
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    grub: Copy i386-pc files to /boot/grub/
    grub> setup (device) requires the files in /boot/grub
    Fixes Bug #14634 and makes Bug #15223 not needed
    (cherry picked from commit 59d4eead1d38d6bd2815d5a11a1b71c2a5230de6)

commit 43c090a0c1a00980a41a09015b448b2d469da3ca
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    encfs 1.7.1
    (cherry picked from commit 15f66b19dd4d0381bfc67fd09d759673365fdd90)

commit 6a04be5c83c9162cea232c7fe87dea35a1cc9c5f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    encfs: added TRIGGERS, #15817
    (cherry picked from commit 57971fc36f14004368974cb9300b774015f59854)

diff --git a/VERSION b/VERSION
index 3f8e6ff..638cf64 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.47-1
+0.47-2
diff --git a/crypto/encfs/DETAILS b/crypto/encfs/DETAILS
index 122b848..4c0a60a 100755
--- a/crypto/encfs/DETAILS
+++ b/crypto/encfs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=encfs
-         VERSION=1.6-1
+         VERSION=1.7.1
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
    SOURCE_URL[0]=http://encfs.googlecode.com/files/$SOURCE
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 24ea0d4..84ff10b 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,7 @@
+2010-09-01 Ladislav Hagara <hgr at vabo.cz>
+	* TRIGGERS: added, #15817
+	* DETAILS: 1.7.1
+
 2010-06-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6-1
 	* PRE_BUILD, gcc4.4_fix: removed
diff --git a/crypto/encfs/TRIGGERS b/crypto/encfs/TRIGGERS
new file mode 100755
index 0000000..1696e74
--- /dev/null
+++ b/crypto/encfs/TRIGGERS
@@ -0,0 +1 @@
+on_cast boost check_self
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 268ca4f..ad39c9e 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,8 @@
+2010-08-27 Eric Sandall <sandalle at sourcemage.org>
+	* INSTALL: Copy i386-pc files to /boot/grub/
+	  grub> setup (device) requires the files in /boot/grub
+	  Fixes Bug #14634 and makes Bug #15223 not needed
+
 2009-01-16 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD: Apply grub-0.97-141.1-ext4.patch
diff --git a/disk/grub/INSTALL b/disk/grub/INSTALL
index 7eab73a..6666a22 100755
--- a/disk/grub/INSTALL
+++ b/disk/grub/INSTALL
@@ -8,5 +8,7 @@ chmod  750   ${INSTALL_ROOT}/sbin/grub*  &&
 #  Sample image, replace with SMGL image
 mkdir  -p  /boot/grub/images                &&
 cp  ${SCRIPT_DIRECTORY}/smgl-splash.xpm.gz  \
-     ${INSTALL_ROOT}/boot/grub/images
+     ${INSTALL_ROOT}/boot/grub/images &&
 # this will create a sensible menu.lst.skel in the future
+
+cp -v $INSTALL_ROOT/usr/lib/grub/i386-pc/* $INSTALL_ROOT/boot/grub
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index 427027f..a34426c 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2010-08-24 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD: removed ./autogen.sh #15803
+
 2009-12-08 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.12.6
 
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index 0be0c42..e040c99 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build                          &&
 cd ${SOURCE_DIRECTORY}                     &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch  &&
-./autogen.sh
+patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch



More information about the SM-Commit mailing list