Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99abffc75a220e7024a2598d8ab07032a428b074
commit 99abffc75a220e7024a2598d8ab07032a428b074 Author: crazy <[EMAIL PROTECTED]> Date: Mon May 19 20:38:54 2008 +0200 encfs-1.4.2-1-x86_64 * Version bump * added gcc43 patch * added an patch and LDFLAGS hack to fix * build , configure is missing boost_system checks diff --git a/source/apps-extra/encfs/FrugalBuild b/source/apps-extra/encfs/FrugalBuild index 579ccef..a9a9224 100644 --- a/source/apps-extra/encfs/FrugalBuild +++ b/source/apps-extra/encfs/FrugalBuild @@ -2,16 +2,21 @@ # Maintainer: crazy <[EMAIL PROTECTED]> pkgname=encfs -pkgver=1.3.2_1 +pkgver=1.4.2 pkgrel=1 pkgdesc="EncFS provides an encrypted filesystem in user-space." url="http://arg0.net/encfs"; -depends=('fuse' 'openssl' 'rlog') +depends=('fuse' 'openssl' 'rlog' 'libboost-mt') +makedepends=('boost') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://arg0.net/encfs#download|grep -m1 '.tgz'|sed 's/.*fs-\(.*\).t.*/\1/;s/-/_/'" -source=(http://arg0.net/vgough/download/$pkgname-`echo $pkgver|sed 's/_/-/'`.tgz) +source=(http://encfs.googlecode.com/files/$pkgname-`echo $pkgver|sed 's/_/-/'`.tgz gcc43.patch build-fix.patch) _F_cd_path="$pkgname-`echo $pkgver|sed 's|_.*||g'`" +sha1sums=('f4d115a0b356b2ffe01eb403a60fef8136df617b' \ + 'e14c528bf3fd4c129b3e6137d323db91abe9dbd7' \ + 'ebb4c2c84740569a979182286ae1408ab556fbeb') + +export LDFLAGS="$LDFLAGS -lboost_system-mt" -sha1sums=('6b200c9f7e0118e974384a5daa6c9b3301df076e') # optimization OK diff --git a/source/apps-extra/encfs/build-fix.patch b/source/apps-extra/encfs/build-fix.patch new file mode 100644 index 0000000..1779d4d --- /dev/null +++ b/source/apps-extra/encfs/build-fix.patch @@ -0,0 +1,62 @@ +--- encfs-1.4.2/encfs/FileUtils.cpp 2008-04-14 01:13:23.000000000 +0200 ++++ encfs-read-only/encfs/FileUtils.cpp 2008-05-19 20:25:21.000000000 +0200 +@@ -46,11 +46,11 @@ + #include <sys/wait.h> + #include <fcntl.h> + #include <unistd.h> +-#include <ctype.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <errno.h> +-#include <string.h> ++#include <cctype> ++#include <cstdio> ++#include <cstdlib> ++#include <cerrno> ++#include <cstring> + + #include <iostream> + #include <sstream> +@@ -61,12 +61,14 @@ + #include <boost/archive/xml_iarchive.hpp> + #include <boost/archive/xml_oarchive.hpp> + #include <boost/serialization/split_free.hpp> ++#include <boost/serialization/binary_object.hpp> + + using namespace rel; + using namespace rlog; + using namespace std; + using namespace gnu; + namespace fs = boost::filesystem; ++namespace serial = boost::serialization; + + static const int DefaultBlockSize = 1024; + // The maximum length of text passwords. If longer are needed, +@@ -137,7 +139,8 @@ + ar << make_nvp("encodedKeySize", keyLen); + char key[keyLen]; + memcpy(key, cfg.keyData.data(), keyLen); +- ar << make_nvp("encodedKeyData", make_binary_object(key, keyLen)); ++ ar << make_nvp("encodedKeyData", ++ serial::make_binary_object(key, keyLen)); + } + + template<class Archive> +@@ -161,7 +164,7 @@ + ar >> make_nvp("encodedKeySize", encodedKeySize); + char key[encodedKeySize]; + ar >> make_nvp("encodedKeyData", +- make_binary_object(key, encodedKeySize)); ++ serial::make_binary_object(key, encodedKeySize)); + cfg.keyData.assign( (char*)key, encodedKeySize ); + } + +@@ -318,7 +321,7 @@ + { + (void)info; + +- fs::ifstream st(configFile); ++ fs::ifstream st( configFile ); + if(st.is_open()) + { + try diff --git a/source/apps-extra/encfs/gcc43.patch b/source/apps-extra/encfs/gcc43.patch new file mode 100644 index 0000000..666af84 --- /dev/null +++ b/source/apps-extra/encfs/gcc43.patch @@ -0,0 +1,161 @@ +--- encfs/CipherFileIO.cpp ++++ encfs/CipherFileIO.cpp +@@ -23,7 +23,7 @@ + #include <rlog/rlog.h> + + #include <fcntl.h> +-#include <errno.h> ++#include <cerrno> + + using boost::shared_ptr; + +--- encfs/ConfigVar.h ++++ encfs/ConfigVar.h +@@ -19,6 +19,7 @@ + #define _ConfigVar_incl_ + + #include <string> ++#include <cstring> + #include <boost/shared_ptr.hpp> + + using boost::shared_ptr; +--- encfs/DirNode.cpp ++++ encfs/DirNode.cpp +@@ -22,9 +22,9 @@ + + #include <sys/stat.h> + #include <sys/types.h> +-#include <errno.h> +-#include <stdio.h> +-#include <stdlib.h> ++#include <cerrno> ++#include <cstdio> ++#include <cstdlib> + #include <pthread.h> + #include <unistd.h> + #ifdef linux +--- encfs/FileNode.cpp ++++ encfs/FileNode.cpp +@@ -19,7 +19,7 @@ + // of sys/stat.h or other system headers (to be safe) + #include "encfs.h" + +-#include <errno.h> ++#include <cerrno> + #include <sys/stat.h> + #include <sys/types.h> + #include <fcntl.h> +--- encfs/MemoryPool.cpp ++++ encfs/MemoryPool.cpp +@@ -19,7 +19,7 @@ + #include "MemoryPool.h" + #include <rlog/rlog.h> + +-#include <stdlib.h> ++#include <cstdlib> + #include <string.h> + + #include "config.h" +--- encfs/NameIO.h ++++ encfs/NameIO.h +@@ -19,6 +19,7 @@ + #define _NameIO_incl_ + + #include <string> ++#include <cstring> + #include <list> + + #include <inttypes.h> +--- encfs/RawFileIO.cpp ++++ encfs/RawFileIO.cpp +@@ -29,7 +29,7 @@ + #include <fcntl.h> + #include <string.h> + +-#include <errno.h> ++#include <cerrno> + + using namespace std; + +--- encfs/encfs.cpp ++++ encfs/encfs.cpp +@@ -17,12 +17,12 @@ + + #include "encfs.h" + +-#include <stdio.h> ++#include <cstdio> + #include <string.h> + #include <unistd.h> + #include <fcntl.h> + #include <dirent.h> +-#include <errno.h> ++#include <cerrno> + #include <sys/statvfs.h> + #include <sys/time.h> + +--- encfs/encfs.h ++++ encfs/encfs.h +@@ -28,7 +28,7 @@ + #endif + + #ifndef linux +-#include <errno.h> ++#include <cerrno> + + static __inline int setfsuid(uid_t uid) + { +--- encfs/main.cpp ++++ encfs/main.cpp +@@ -25,10 +25,10 @@ + #include <sstream> + + #include <assert.h> +-#include <stdio.h> ++#include <cstdio> + #include <unistd.h> + #include <sys/time.h> +-#include <errno.h> ++#include <cerrno> + #include <string.h> + + #include <getopt.h> +--- encfs/readpassphrase.cpp ++++ encfs/readpassphrase.cpp +@@ -36,8 +36,8 @@ + #ifndef HAVE_READPASSPHRASE + + #include <signal.h> +-#include <stdio.h> +-#include <errno.h> ++#include <cstdio> ++#include <cerrno> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +--- encfs/test.cpp ++++ encfs/test.cpp +@@ -22,7 +22,7 @@ + + #include <iostream> + +-#include <stdlib.h> ++#include <cstdlib> + + #include "Cipher.h" + #include "DirNode.h" +--- intl/autosprintf.cpp ++++ intl/autosprintf.cpp +@@ -28,10 +28,10 @@ + #include "autosprintf.h" + + #include <stdarg.h> +-#include <stdlib.h> ++#include <cstdlib> + #include <string.h> + //#include "lib-asprintf.h" +-#include <stdio.h> ++#include <cstdio> + + namespace gnu + { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
