Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97da6a0ac4205c83fd404098d63ee6873c916477

commit 97da6a0ac4205c83fd404098d63ee6873c916477
Author: Devil505 <devil505li...@gmail.com>
Date:   Thu Nov 4 13:01:30 2010 +0100

encfs-1.7.3-1-i686
* version bump
* fixing up2date
* removed useless patches

diff --git a/source/apps-extra/encfs/FrugalBuild 
b/source/apps-extra/encfs/FrugalBuild
index 2a8008c..5cc9b52 100644
--- a/source/apps-extra/encfs/FrugalBuild
+++ b/source/apps-extra/encfs/FrugalBuild
@@ -2,22 +2,18 @@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=encfs
-pkgver=1.4.2
-pkgrel=3
+pkgver=1.7.3
+pkgrel=1
pkgdesc="EncFS provides an encrypted filesystem in user-space."
url="http://arg0.net/encfs";
depends=('fuse' 'openssl>=1.0.0' 'rlog' 'libboost-mt>=1.37.0')
makedepends=('boost>=1.37.0')
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://encfs.googlecode.com/files/$pkgname-`echo $pkgver|sed 
's/_/-/'`.tgz \
-       gcc43.patch build-fix.patch openssl-1.0.diff)
+_F_googlecode_ext=".tgz"
+Finclude googlecode
_F_cd_path="$pkgname-`echo $pkgver|sed 's|_.*||g'`"
-sha1sums=('f4d115a0b356b2ffe01eb403a60fef8136df617b' \
-          'e14c528bf3fd4c129b3e6137d323db91abe9dbd7' \
-          'ebb4c2c84740569a979182286ae1408ab556fbeb' \
-          'dc3d444569fc89d2571220fc38b88467daafd43a')
+sha1sums=('a17b1be51737d2bd170e6556cdb7d540a892bed2')

export LDFLAGS="$LDFLAGS -lboost_system-mt"

diff --git a/source/apps-extra/encfs/build-fix.patch 
b/source/apps-extra/encfs/build-fix.patch
deleted file mode 100644
index 1779d4d..0000000
--- a/source/apps-extra/encfs/build-fix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
deleted file mode 100644
index 666af84..0000000
--- a/source/apps-extra/encfs/gcc43.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- 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
- {
diff --git a/source/apps-extra/encfs/openssl-1.0.diff 
b/source/apps-extra/encfs/openssl-1.0.diff
deleted file mode 100644
index 1d01060..0000000
--- a/source/apps-extra/encfs/openssl-1.0.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur encfs-1.4.2/encfs/NameIO.cpp fw_encfs-1.4.2//encfs/NameIO.cpp
---- encfs-1.4.2/encfs/NameIO.cpp       2008-01-05 23:39:12.000000000 +0100
-+++ fw_encfs-1.4.2//encfs/NameIO.cpp   2010-06-12 00:49:49.000000000 +0200
-@@ -189,7 +189,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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to