Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (346675acb5ddfb2f271e14ebeceebd4a78127c10)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (346675acb5ddfb2f271e14ebeceebd4a78127c10)
  • Date: Thu, 1 Apr 2010 04:05:31 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/encfs/HISTORY | 4 ++++
crypto/encfs/PRE_BUILD | 3 +++
crypto/encfs/gcc4.4_fix | 13 +++++++++++++
3 files changed, 20 insertions(+)

New commits:
commit d95db7692bb598f29d2d235d401ecf70f0530118
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/encfs: fixed build with gcc 4.4

diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 4fba416..6321983 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,7 @@
+2010-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * gcc4.4_fix, PRE_BUILD: added patch from ubuntu to fix build
+ with gcc 4.4
+
2008-10-08 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DEPENDS: Now requires boost

diff --git a/crypto/encfs/PRE_BUILD b/crypto/encfs/PRE_BUILD
new file mode 100755
index 0000000..a480a1d
--- /dev/null
+++ b/crypto/encfs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc4.4_fix
diff --git a/crypto/encfs/gcc4.4_fix b/crypto/encfs/gcc4.4_fix
new file mode 100644
index 0000000..6877515
--- /dev/null
+++ b/crypto/encfs/gcc4.4_fix
@@ -0,0 +1,13 @@
+Index: encfs-1.5.2/encfs/NameIO.cpp
+===================================================================
+--- encfs-1.5.2.orig/encfs/NameIO.cpp 2009-09-12 23:25:14.968555890 +0200
++++ encfs-1.5.2/encfs/NameIO.cpp 2009-09-12 23:25:30.576536972 +0200
+@@ -190,7 +190,7 @@
+ } else
+ {
+ bool isDotFile = (*path == '.');
+- char *next = strchr( path, '/' );
++ const char *next = strchr( path, '/' );
+ int len = next ? next - path : strlen( path );
+
+ // at this point we know that len > 0



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (346675acb5ddfb2f271e14ebeceebd4a78127c10), Florian Franzmann, 04/01/2010

Archive powered by MHonArc 2.6.24.

Top of Page