sys-fs/encfs: Bump to 1.7.4 (bug #346299)

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

4 files changed, 98 insertions, 7 deletions

diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
index d1304f4344e4..414eb4950307 100644
--- a/sys-fs/encfs/ChangeLog
+++ b/sys-fs/encfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/encfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.57 2011/11/22 22:36:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.58 2011/11/22 23:05:54 sping Exp $
+
+*encfs-1.7.4 (22 Nov 2011)
+
+  22 Nov 2011; Sebastian Pipping <sping@gentoo.org> +encfs-1.7.4.ebuild,
+  +files/encfs-1.7.4-r68:69.patch:
+  Bump to 1.7.4, looks trivial. Post-release upstream bugfix patch included.
 
   22 Nov 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Added myself as maintainer
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index f9d9524f7eaf..92de2b88ea00 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX encfs-1.7.4-r68:69.patch 787 RMD160 fe1df61436fa00eaf8057d3f0320e835b16762b0 SHA1 2afc09321b22774b0ecd94dfbc68f1fbc88ae6ec SHA256 33d7019e74bba6b3efdb3594d5fc773804436ea263416c73d60f63e61dd823fe
 DIST encfs-1.7.2.tgz 930420 RMD160 6a90b8f7677b3e12b771a0b433fa1d4480c64a2d SHA1 739514a89b7ad8398ff6320042995947f7fb37f8 SHA256 8c0c18011438c1816be5e3cf3e573e38773dc09bf7f8e0ecee3426eadb3e8284
+DIST encfs-1.7.4.tgz 931048 RMD160 a54bbf1237f7071392cc2a6be11afeee0fcdf5e9 SHA1 3d824ba188dbaabdc9e36621afb72c651e6e2945 SHA256 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
 EBUILD encfs-1.7.2.ebuild 1309 RMD160 8693e9906c74828d769f9339f3b4e548d79f629a SHA1 9ec1d75bb0eee849a6f240f2fc3a596e4a62ce30 SHA256 582e3e5bf3e938e8e630f85bbc2790e2814a5685a52d449d9fb2579576f79c38
-MISC ChangeLog 9065 RMD160 a5d57bb70ad0b9e54e0e273fb15e3c33a5b9db2a SHA1 71f85cea0c6e980417ef85b9f92f694eabc733a7 SHA256 f1f21ad7a01b736291e6c269f6648dc65629018e96d0a523d88ac25ef9e56eca
+EBUILD encfs-1.7.4.ebuild 1384 RMD160 be7f3b566b1ce403d08969f948ac01e57c80b060 SHA1 e1b504f9d65dffb9aac009598987acff10f46144 SHA256 2ed71c2db828c1f4f0302de26eff97d28f612a0bd71b7b496be8bb1042369676
+MISC ChangeLog 9276 RMD160 493e733653e1ec879e089b6a9d96eaa3c371816c SHA1 eec6957e5092d37ef8c000637ad0624e9371780d SHA256 96f8e34e1c739df73da17a6324a56fec43b955cd26677b523301d3348fe1f3fe
 MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk7MI+8ACgkQl5yvQNBFVTUtKgCgn7qRKBhLQCu2gxdYnXgDUNnV
-j40An2AXYCzqHLYdfUKUcYHFfl178eUN
-=ahxD
+iEYEARECAAYFAk7MKtEACgkQsAvGakAaFgB1BACbBJanyENxAZ5DI2A6y/osiUGr
+QyQAoIjOZAsEJfvqJa1NgYJx1NfIZ4Ch
+=Gqsc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/encfs/encfs-1.7.4.ebuild b/sys-fs/encfs/encfs-1.7.4.ebuild
new file mode 100644
index 000000000000..71215351d753
--- /dev/null
+++ b/sys-fs/encfs/encfs-1.7.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.7.4.ebuild,v 1.1 2011/11/22 23:05:54 sping Exp $
+
+EAPI=2
+inherit eutils multilib versionator
+
+DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
+HOMEPAGE="http://www.arg0.net/encfs/"
+SRC_URI="http://encfs.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="xattr"
+
+RDEPEND=">=dev-libs/boost-1.34
+	>=dev-libs/openssl-0.9.7
+	>=dev-libs/rlog-1.4
+	>=sys-fs/fuse-2.7.0"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/pkgconfig
+	xattr? ( sys-apps/attr )
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.4-r68:69.patch
+}
+
+src_configure() {
+	BOOST_PKG="$(best_version dev-libs/boost)"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="/usr/include/boost-${BOOST_VER}"
+	BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}"
+	einfo "Building against ${BOOST_PKG}."
+
+	use xattr || export ac_cv_header_attr_xattr_h=no
+
+	econf \
+		--with-boost=${BOOST_INC} \
+		--with-boost-libdir=${BOOST_LIB} \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+	find "${D}" -name '*.la' -delete
+}
diff --git a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch b/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
new file mode 100644
index 000000000000..0c27095fff16
--- /dev/null
+++ b/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
@@ -0,0 +1,31 @@
+Index: encfs/base64.cpp
+===================================================================
+--- encfs/base64.cpp	(revision 68)
++++ encfs/base64.cpp	(revision 69)
+@@ -80,7 +80,7 @@
+     }
+ 
+     // we have at least one value that can be output
+-    char outVal = work & mask;
++    unsigned char outVal = work & mask;
+     work >>= dst2Pow;
+     workBits -= dst2Pow;
+ 
+@@ -96,8 +96,15 @@
+ 	*outLoc++ = outVal;
+ 
+ 	// we could have a partial value left in the work buffer..
+-	if(workBits && outputPartialLastByte)
+-	    *outLoc = work & mask;
++        if(outputPartialLastByte)
++        {
++            while(workBits > 0)
++            {
++                *outLoc++ = work & mask;
++                work >>= dst2Pow;
++                workBits -= dst2Pow;
++            }
++        }
+     }
+ }
+