diff options
author | Daniel Black <dragonheart@gentoo.org> | 2008-05-04 00:48:32 +0000 |
---|---|---|
committer | Daniel Black <dragonheart@gentoo.org> | 2008-05-04 00:48:32 +0000 |
commit | c248d4eee83f432faf39ee8ea633a5aa9b1acc26 (patch) | |
tree | 8da549a7eb69bf4ded7366d8b56007100c74006a /sys-fs/encfs | |
parent | gtk-engines-qtcurve version bump (diff) | |
download | historical-c248d4eee83f432faf39ee8ea633a5aa9b1acc26.tar.gz historical-c248d4eee83f432faf39ee8ea633a5aa9b1acc26.tar.bz2 historical-c248d4eee83f432faf39ee8ea633a5aa9b1acc26.zip |
gcc-4.3 bug fix as per bug #216227
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'sys-fs/encfs')
-rw-r--r-- | sys-fs/encfs/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/encfs/Manifest | 14 | ||||
-rw-r--r-- | sys-fs/encfs/encfs-1.3.2.1-r1.ebuild | 41 | ||||
-rw-r--r-- | sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch | 324 |
4 files changed, 375 insertions, 12 deletions
diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog index 0efe5ed98ef8..e2703c6da25e 100644 --- a/sys-fs/encfs/ChangeLog +++ b/sys-fs/encfs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/encfs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.29 2008/02/13 07:46:00 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.30 2008/05/04 00:48:32 dragonheart Exp $ + +*encfs-1.3.2.1-r1 (04 May 2008) + + 04 May 2008; Daniel Black <dragonheart@gentoo.org> encfs-1.3.2.1-r1.ebuild, + files/encfs-1.3.2.1-gcc-4.3.patch: + added gcc4.3 patch provided by Martin Vath in bug #216227. 13 Feb 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml: add no-herd diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 51dd5e51433e..4d0b035b86ba 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -1,18 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX encfs-1.3.2.1-gcc-4.3.patch 6126 RMD160 6a5d61cc965f57f3baf5a2fc1dec0bf7f30187b4 SHA1 f757a6f768e1624ea3d7b6b40445857d0990220c SHA256 f5cb234c916810ef8a89e42b77397e08c528c49825120a3e873ed12e0f3a61e2 DIST encfs-1.2.5-1.tgz 695712 RMD160 996387cfb1f3b10299a4ef59a7282e5ad4055bff SHA1 d9637b77dd218f8e58b8b3bdfaaa6d14a6358dee SHA256 319c563bcc34e2845413eb57b3b38d02b4149be4e6f2a3d2ce901da01eaf5d17 DIST encfs-1.3.1-1.tgz 702028 RMD160 122fd8169a669f9d732e5d1e757a551b38b85d4e SHA1 5da44d148788bad8bf5de1ab01f432e169f60a63 SHA256 d9070c859c64a697573353c03bfe99c2910e05aa6d660f5a6cd9ca645f486369 DIST encfs-1.3.2-1.tgz 711838 RMD160 bfdbb8c0da65139eedbff0a0e40c0e7a181e4cf3 SHA1 6b200c9f7e0118e974384a5daa6c9b3301df076e SHA256 3825cf0724fcfdc4bd8073227f4437c3b25056571fb94709ba463fb1f70d0a85 EBUILD encfs-1.2.5.1.ebuild 959 RMD160 13b17cba927b2eac61a38a555f88aab4743a8a36 SHA1 f291bf7573733cc78d705059434c89616e28e069 SHA256 39e8a9fb5f1b928112c9f94d90623f8b966178ffebd417870db87e1c8e8ac6e9 EBUILD encfs-1.3.1.1.ebuild 962 RMD160 55495d2f93a5ca0ef2ec8ceada5ecd085b954a7f SHA1 1a398acde5f376246eb4c86963dfb01ef4bd86d7 SHA256 4a118d6b10193c2153c1bf000fe42c6439b9da03890ca5e0431590dd5b53970e +EBUILD encfs-1.3.2.1-r1.ebuild 1046 RMD160 745164b10f4e13d9bac149a9f7abd681140e9079 SHA1 5f33fd0606b3133a63690453c98bfb6ae46829e7 SHA256 bb2230cb1049188c09e15925505191ae6b9502aa14e121ec45ad7b22d80936f5 EBUILD encfs-1.3.2.1.ebuild 949 RMD160 1de1adbfe2facac35a4567c080ad7b6fd4ae94ab SHA1 efb9e86f0bef21c8330b053057b8ac422d774d68 SHA256 5d3771ab748b6b500065e65f4789f9a7945b2404ceb7cc1b693ec68d03cb2e1c -MISC ChangeLog 4731 RMD160 8c5a8c355595e6071f0d30ae8b2d5c02d4ead899 SHA1 0f3d3b85e94b6f7d045bac278453b5755c8d8b59 SHA256 97304dde7eb9f6faea25c14137e21078bb75b36d7133b5dd30f08e76099a0dbe +MISC ChangeLog 4947 RMD160 182c994e234ff90b6935cc8e3457e2dca01f2a33 SHA1 2cd6c38ff691dcb8200c9640cda8982626000032 SHA256 d6829858403511c029033fcdbb52b2b29444a2f40637916868d2a433e1f071ff MISC metadata.xml 262 RMD160 f3d8d0dd73230dfdca175ef66a091c78e44d0f98 SHA1 f08c61f42ce181c625ddaf232ba6e2c86af06250 SHA256 d90fbcb5c6704d3d97dc2cceb80fee7acde549638a4f0270b0d87f64fcee82fa ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHsqCRNQqtfCuFneMRAvENAJ0Q9/EOoApUhU0GTCA0CMbaRelsNgCfeIjE -NUKiiyEHv+8NooJGOpbQdNk= -=l32M ------END PGP SIGNATURE----- diff --git a/sys-fs/encfs/encfs-1.3.2.1-r1.ebuild b/sys-fs/encfs/encfs-1.3.2.1-r1.ebuild new file mode 100644 index 000000000000..4d9db5edd4f9 --- /dev/null +++ b/sys-fs/encfs/encfs-1.3.2.1-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.3.2.1-r1.ebuild,v 1.1 2008/05/04 00:48:32 dragonheart Exp $ + +inherit versionator eutils + +DESCRIPTION="Encrypted Filesystem module for Linux" +SRC_URI="http://arg0.net/users/vgough/download/${PN}-$(replace_version_separator 3 '-').tgz" +HOMEPAGE="http://arg0.net/encfs" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~sparc ~x86" +SLOT="0" +IUSE="nls" + +DEPEND=">=dev-libs/openssl-0.9.7 + >=sys-fs/fuse-2.5 + >=dev-libs/rlog-1.3.6 + nls? ( >=sys-devel/gettext-0.14.1 )" + +S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc-4.3.patch +} + +src_compile() { + econf `use_enable nls` || die + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog README +} + +pkg_postinst() { + einfo "Please see http://arg0.net/wiki/encfs/intro2" + einfo "if this is your first time using encfs." +} diff --git a/sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch b/sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch new file mode 100644 index 000000000000..7a5652825f6d --- /dev/null +++ b/sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch @@ -0,0 +1,324 @@ +--- encfs/BlockFileIO.cpp ++++ encfs/BlockFileIO.cpp +@@ -20,6 +20,7 @@ + #include "MemoryPool.h" + + #include <rlog/rlog.h> ++#include <cstring> + + #include "i18n.h" + +--- encfs/BlockNameIO.cpp ++++ encfs/BlockNameIO.cpp +@@ -23,6 +23,7 @@ + #include <rlog/rlog.h> + #include <rlog/Error.h> + #include <rlog/RLogChannel.h> ++#include <cstring> + + #include "i18n.h" + +--- encfs/CipherFileIO.cpp ++++ encfs/CipherFileIO.cpp +@@ -23,7 +23,7 @@ + #include <rlog/rlog.h> + + #include <fcntl.h> +-#include <errno.h> ++#include <cerrno> + + /* + - Version 2:0 adds support for a per-file initialization vector with a +--- encfs/CipherV3.cpp ++++ encfs/CipherV3.cpp +@@ -22,7 +22,7 @@ + + #include "../config.h" + +-#include <string.h> ++#include <cstring> + + #define NO_DES + +--- encfs/Config.cpp ++++ encfs/Config.cpp +@@ -23,6 +23,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> ++#include <cstring> + + + using namespace std; +--- encfs/ConfigVar.cpp ++++ encfs/ConfigVar.cpp +@@ -17,6 +17,7 @@ + + #include "ConfigVar.h" + #include <rlog/rlog.h> ++#include <cstring> + + using namespace rlog; + +--- encfs/DirNode.cpp ++++ encfs/DirNode.cpp +@@ -22,9 +22,10 @@ + + #include <sys/stat.h> + #include <sys/types.h> +-#include <errno.h> +-#include <stdio.h> +-#include <stdlib.h> ++#include <cerrno> ++#include <cstring> ++#include <cstdio> ++#include <cstdlib> + #include <pthread.h> + #include <unistd.h> + #ifdef linux +--- encfs/FileNode.cpp ++++ encfs/FileNode.cpp +@@ -19,7 +19,8 @@ + // of sys/stat.h or other system headers (to be safe) + #include "encfs.h" + +-#include <errno.h> ++#include <cstring> ++#include <cerrno> + #include <sys/stat.h> + #include <sys/types.h> + #include <fcntl.h> +--- encfs/FileUtils.cpp ++++ encfs/FileUtils.cpp +@@ -45,9 +45,10 @@ + #include <fcntl.h> + #include <unistd.h> + #include <ctype.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <errno.h> ++#include <cstdio> ++#include <cstdlib> ++#include <cerrno> ++#include <cstring> + + #include <iostream> + #include <sstream> +--- encfs/MACFileIO.cpp ++++ encfs/MACFileIO.cpp +@@ -22,6 +22,7 @@ + #include <rlog/rlog.h> + #include <rlog/Error.h> + #include <rlog/RLogChannel.h> ++#include <cstring> + + #include "i18n.h" + +--- encfs/MACFileIOCompat.cpp ++++ encfs/MACFileIOCompat.cpp +@@ -21,6 +21,7 @@ + + #include <rlog/rlog.h> + #include <rlog/Error.h> ++#include <cstring> + + #include "i18n.h" + +--- encfs/MemoryPool.cpp ++++ encfs/MemoryPool.cpp +@@ -19,8 +19,8 @@ + #include "MemoryPool.h" + #include <rlog/rlog.h> + +-#include <stdlib.h> +-#include <string.h> ++#include <cstdlib> ++#include <cstring> + + #include "config.h" + #include <pthread.h> +--- encfs/NameIO.cpp ++++ encfs/NameIO.cpp +@@ -26,6 +26,7 @@ + // for static build. Need to reference the modules which are registered at + // run-time, to ensure that the linker doesn't optimize them away. + #include <iostream> ++#include <cstring> + #include "BlockNameIO.h" + #include "StreamNameIO.h" + #include "NullNameIO.h" +--- encfs/NullCipher.cpp ++++ encfs/NullCipher.cpp +@@ -21,6 +21,7 @@ + #include "Interface.h" + + #include <rlog/rlog.h> ++#include <cstring> + + using namespace std; + using namespace rel; +--- encfs/NullNameIO.cpp ++++ encfs/NullNameIO.cpp +@@ -19,6 +19,7 @@ + + #include "Cipher.h" + #include "base64.h" ++#include <cstring> + + using namespace rel; + +--- encfs/OpaqueValue.cpp ++++ encfs/OpaqueValue.cpp +@@ -20,7 +20,7 @@ + #include "PtrImpl.h" + #include <rlog/rlog.h> + +-#include <stdlib.h> ++#include <cstdlib> + + using namespace std; + using namespace rel; +--- encfs/Ptr.cpp ++++ encfs/Ptr.cpp +@@ -20,7 +20,7 @@ + + #include "Ptr.h" + +-#include <stdlib.h> ++#include <cstdlib> + + using namespace rel; + +--- encfs/RawFileIO.cpp ++++ encfs/RawFileIO.cpp +@@ -28,7 +28,8 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <errno.h> ++#include <cerrno> ++#include <cstring> + + using namespace std; + +--- encfs/SSL_Cipher.cpp ++++ encfs/SSL_Cipher.cpp +@@ -31,7 +31,7 @@ + #include "MemoryPool.h" + #include "Mutex.h" + +-#include <string.h> ++#include <cstring> + + #include <sys/mman.h> + +--- encfs/StreamNameIO.cpp ++++ encfs/StreamNameIO.cpp +@@ -22,6 +22,7 @@ + + #include <rlog/rlog.h> + #include <rlog/Error.h> ++#include <cstring> + + #include "i18n.h" + +--- encfs/encfs.cpp ++++ encfs/encfs.cpp +@@ -17,12 +17,12 @@ + + #include "encfs.h" + +-#include <stdio.h> +-#include <string.h> ++#include <cstdio> ++#include <cstring> + #include <unistd.h> + #include <fcntl.h> + #include <dirent.h> +-#include <errno.h> ++#include <cerrno> + #include <sys/statvfs.h> + + #include <sys/types.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 <getopt.h> + +--- encfs/readpassphrase.cpp ++++ encfs/readpassphrase.cpp +@@ -36,14 +36,14 @@ + #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> + #include <unistd.h> + #include <paths.h> +-#include <string.h> ++#include <cstring> + #include <ctype.h> + + #include <termios.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 +@@ -17,7 +17,7 @@ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +-/* Tell glibc's <stdio.h> to provide a prototype for vasprintf(). ++/* Tell glibc's <cstdio> to provide a prototype for vasprintf(). + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ + #ifndef _GNU_SOURCE +@@ -28,10 +28,10 @@ + #include "autosprintf.h" + + #include <stdarg.h> +-#include <stdlib.h> +-#include <string.h> ++#include <cstdlib> ++#include <cstring> + //#include "lib-asprintf.h" +-#include <stdio.h> ++#include <cstdio> + + namespace gnu + { |