* [gentoo-commits] dev/blueness:master commit in: sys-fs/encfs/files/, sys-fs/encfs/
@ 2011-11-24 20:44 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2011-11-24 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 714b5c20b721cb62bca5fee62c9f51b6f46628cc
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 20:44:47 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 20:44:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=714b5c20
sys-fs/encfs: added post release commits as patches
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
sys-fs/encfs/ChangeLog | 9 +
sys-fs/encfs/Manifest | 17 ++
sys-fs/encfs/encfs-1.7.4-r1.ebuild | 53 ++++++
sys-fs/encfs/files/encfs-1.7.4-r67:68.patch | 248 +++++++++++++++++++++++++++
sys-fs/encfs/files/encfs-1.7.4-r68:69.patch | 31 ++++
sys-fs/encfs/files/encfs-1.7.4-r69:70.patch | 10 +
sys-fs/encfs/metadata.xml | 8 +
7 files changed, 376 insertions(+), 0 deletions(-)
diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
new file mode 100644
index 0000000..393804c
--- /dev/null
+++ b/sys-fs/encfs/ChangeLog
@@ -0,0 +1,9 @@
+
+
+*encfs-1.7.4-r1 (24 Nov 2011)
+
+ 24 Nov 2011; Anthony G. Basile <blueness@gentoo.org> +encfs-1.7.4-r1.ebuild,
+ +files/encfs-1.7.4-r67:68.patch, +files/encfs-1.7.4-r68:69.patch,
+ +files/encfs-1.7.4-r69:70.patch, +metadata.xml:
+ added post release commits as patches
+
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
new file mode 100644
index 0000000..090b70b
--- /dev/null
+++ b/sys-fs/encfs/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX encfs-1.7.4-r67:68.patch 7910 RMD160 ea1bd2722e75834971b11f3950ce461652b9ea2e SHA1 6005f2364b26143612ff4a0fd1378c88ede0af55 SHA256 7d1d15132fc177583e00dd1c97cb40b3119dfc4716de2a245cecea778bb943be
+AUX encfs-1.7.4-r68:69.patch 787 RMD160 fe1df61436fa00eaf8057d3f0320e835b16762b0 SHA1 2afc09321b22774b0ecd94dfbc68f1fbc88ae6ec SHA256 33d7019e74bba6b3efdb3594d5fc773804436ea263416c73d60f63e61dd823fe
+AUX encfs-1.7.4-r69:70.patch 367 RMD160 a46062f3fccdb3bb2a2939dc30cb6f9401d8e67f SHA1 694078a6b291dd46c9bc96b7f2a54d1851754572 SHA256 8e14d5cef29e67e084553f41e44ae6b113bf8a83a869a0756d473a56a4f60a80
+DIST encfs-1.7.4.tgz 931048 RMD160 a54bbf1237f7071392cc2a6be11afeee0fcdf5e9 SHA1 3d824ba188dbaabdc9e36621afb72c651e6e2945 SHA256 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
+EBUILD encfs-1.7.4-r1.ebuild 1478 RMD160 ae9201a0c5088e16179512b248c1cc9bf922cd55 SHA1 8fddd0c26682a9bd7e9d4e410f8de0acb51c8a39 SHA256 9e424c67f7fb19a0c412429d8a88d236b514742dc056d18da098516aa3ffcac8
+MISC ChangeLog 271 RMD160 c78c27248ce7d04d39eb54192c5b0c7d0ffc1b94 SHA1 07e9396fd45ab6fb32de5e806867030e603905eb SHA256 ed14807026355a804507cb2c73b7a8ed73adc84652615b08387c0a4dd57a0d8b
+MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk7OrL8ACgkQl5yvQNBFVTV7ygCgjTCoed9F4nUoIvYUA37QzfH6
+ZKAAn1NCrGnSdI0CIr/eQuUQFnB+cGz0
+=A2JH
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/encfs/encfs-1.7.4-r1.ebuild b/sys-fs/encfs/encfs-1.7.4-r1.ebuild
new file mode 100644
index 0000000..4ba9608
--- /dev/null
+++ b/sys-fs/encfs/encfs-1.7.4-r1.ebuild
@@ -0,0 +1,53 @@
+# 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-r67:68.patch
+ epatch "${FILESDIR}"/${PN}-1.7.4-r68:69.patch
+ epatch "${FILESDIR}"/${PN}-1.7.4-r69:70.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-r67:68.patch b/sys-fs/encfs/files/encfs-1.7.4-r67:68.patch
new file mode 100644
index 0000000..81052f5
--- /dev/null
+++ b/sys-fs/encfs/files/encfs-1.7.4-r67:68.patch
@@ -0,0 +1,248 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 67)
++++ ChangeLog (revision 68)
+@@ -1,3 +1,7 @@
++
++Tue Dec 7 2010 Valient Gough <vgough@pobox.com>
++ * add annotation option, patch by Werner Koch.
++
+ Sun Sep 5 2010 Valient Gough <vgough@pobox.com>
+ * fix mount failures when using certain options, due to changes in
+ option passing mechanism in 1.7
+Index: encfs/FileUtils.cpp
+===================================================================
+--- encfs/FileUtils.cpp (revision 67)
++++ encfs/FileUtils.cpp (revision 68)
+@@ -314,15 +314,33 @@
+ return path.substr(0, last);
+ }
+
+-bool userAllowMkdir( const char *path, mode_t mode )
++bool userAllowMkdir(const char *path, mode_t mode )
+ {
++ return userAllowMkdir(0, path, mode);
++}
++
++bool userAllowMkdir(int promptno, const char *path, mode_t mode )
++{
+ // TODO: can we internationalize the y/n names? Seems strange to prompt in
+ // their own language but then have to respond 'y' or 'n'.
+ // xgroup(setup)
+ cerr << autosprintf( _("The directory \"%s\" does not exist. Should it be created? (y,n) "), path );
+ char answer[10];
+- char *res = fgets( answer, sizeof(answer), stdin );
++ char *res;
+
++ switch (promptno)
++ {
++ case 1:
++ cerr << endl << "$PROMPT$ create_root_dir" << endl;
++ break;
++ case 2:
++ cerr << endl << "$PROMPT$ create_mount_point" << endl;
++ break;
++ default:
++ break;
++ }
++ res = fgets( answer, sizeof(answer), stdin );
++
+ if(res != 0 && toupper(answer[0]) == 'Y')
+ {
+ int result = mkdir( path, mode );
+@@ -976,6 +994,7 @@
+ bool useStdin = opts->useStdin;
+ bool reverseEncryption = opts->reverseEncryption;
+ ConfigMode configMode = opts->configMode;
++ bool annotate = opts->annotate;
+
+ RootPtr rootInfo;
+
+@@ -994,6 +1013,9 @@
+ " anything else, or an empty line will select standard mode.\n"
+ "?> ");
+
++ if (annotate)
++ cerr << "$PROMPT$ config_option" << endl;
++
+ char *res = fgets( answer, sizeof(answer), stdin );
+ (void)res;
+ cout << "\n";
+@@ -1179,7 +1201,11 @@
+ CipherKey userKey;
+ rDebug( "useStdin: %i", useStdin );
+ if(useStdin)
++ {
++ if (annotate)
++ cerr << "$PROMPT$ new_passwd" << endl;
+ userKey = config->getUserKey( useStdin );
++ }
+ else if(!passwordProgram.empty())
+ userKey = config->getUserKey( passwordProgram, rootDir );
+ else
+@@ -1618,6 +1644,8 @@
+ if(opts->passwordProgram.empty())
+ {
+ rDebug( "useStdin: %i", opts->useStdin );
++ if (opts->annotate)
++ cerr << "$PROMPT$ passwd" << endl;
+ userKey = config->getUserKey( opts->useStdin );
+ } else
+ userKey = config->getUserKey( opts->passwordProgram, opts->rootDir );
+Index: encfs/main.cpp
+===================================================================
+--- encfs/main.cpp (revision 67)
++++ encfs/main.cpp (revision 68)
+@@ -104,6 +104,7 @@
+ if(opts->forceDecode) ss << "(forceDecode) ";
+ if(opts->ownerCreate) ss << "(ownerCreate) ";
+ if(opts->useStdin) ss << "(useStdin) ";
++ if(opts->annotate) ss << "(annotate) ";
+ if(opts->reverseEncryption) ss << "(reverseEncryption) ";
+ if(opts->mountOnDemand) ss << "(mountOnDemand) ";
+ for(int i=0; i<fuseArgc; ++i)
+@@ -196,6 +197,7 @@
+ out->opts->forceDecode = false;
+ out->opts->ownerCreate = false;
+ out->opts->useStdin = false;
++ out->opts->annotate = false;
+ out->opts->reverseEncryption = false;
+
+ bool useDefaultFlags = true;
+@@ -223,6 +225,7 @@
+ {"extpass", 1, 0, 'p'}, // external password program
+ // {"single-thread", 0, 0, 's'}, // single-threaded mode
+ {"stdinpass", 0, 0, 'S'}, // read password from stdin
++ {"annotate", 0, 0, 513}, // Print annotation lines to stderr
+ {"verbose", 0, 0, 'v'}, // verbose mode
+ {"version", 0, 0, 'V'}, //version
+ {"reverse", 0, 0, 'r'}, // reverse encryption
+@@ -263,6 +266,9 @@
+ case 'S':
+ out->opts->useStdin = true;
+ break;
++ case 513:
++ out->opts->annotate = true;
++ break;
+ case 'f':
+ out->isDaemon = false;
+ // this option was added in fuse 2.x
+@@ -411,13 +417,15 @@
+
+ // check that the directories exist, or that we can create them..
+ if(!isDirectory( out->opts->rootDir.c_str() ) &&
+- !userAllowMkdir( out->opts->rootDir.c_str() ,0700))
++ !userAllowMkdir( out->opts->annotate? 1:0,
++ out->opts->rootDir.c_str() ,0700))
+ {
+ rWarning(_("Unable to locate root directory, aborting."));
+ return false;
+ }
+ if(!isDirectory( out->mountPoint.c_str() ) &&
+- !userAllowMkdir( out->mountPoint.c_str(),0700))
++ !userAllowMkdir( out->opts->annotate? 2:0,
++ out->mountPoint.c_str(),0700))
+ {
+ rWarning(_("Unable to locate mount point, aborting."));
+ return false;
+@@ -630,7 +638,10 @@
+ try
+ {
+ time_t startTime, endTime;
+-
++
++ if (encfsArgs->opts->annotate)
++ cerr << "$STATUS$ fuse_main_start" << endl;
++
+ // FIXME: workaround for fuse_main returning an error on normal
+ // exit. Only print information if fuse_main returned
+ // immediately..
+@@ -642,6 +653,9 @@
+ &encfs_oper, (void*)ctx);
+
+ time( &endTime );
++
++ if (encfsArgs->opts->annotate)
++ cerr << "$STATUS$ fuse_main_end" << endl;
+
+ if(res == 0)
+ returnCode = EXIT_SUCCESS;
+Index: encfs/encfsctl.cpp
+===================================================================
+--- encfs/encfsctl.cpp (revision 67)
++++ encfs/encfsctl.cpp (revision 68)
+@@ -693,7 +693,7 @@
+ return EXIT_SUCCESS;
+ }
+
+-static int do_chpasswd( bool useStdin, int argc, char **argv )
++static int do_chpasswd( bool useStdin, bool annotate, int argc, char **argv )
+ {
+ (void)argc;
+ string rootDir = argv[1];
+@@ -721,6 +721,8 @@
+
+ // ask for existing password
+ cout << _("Enter current Encfs password\n");
++ if (annotate)
++ cerr << "$PROMPT$ passwd" << endl;
+ CipherKey userKey = config->getUserKey( useStdin );
+ if(!userKey)
+ return EXIT_FAILURE;
+@@ -742,7 +744,11 @@
+ config->kdfIterations = 0; // generate new
+
+ if( useStdin )
++ {
++ if (annotate)
++ cerr << "$PROMPT$ new_passwd" << endl;
+ userKey = config->getUserKey( true );
++ }
+ else
+ userKey = config->getNewUserKey();
+
+@@ -781,12 +787,12 @@
+
+ static int chpasswd( int argc, char **argv )
+ {
+- return do_chpasswd( false, argc, argv );
++ return do_chpasswd( false, false, argc, argv );
+ }
+
+ static int chpasswdAutomaticly( int argc, char **argv )
+ {
+- return do_chpasswd( true, argc, argv );
++ return do_chpasswd( true, false, argc, argv );
+ }
+
+
+Index: encfs/FileUtils.h
+===================================================================
+--- encfs/FileUtils.h (revision 67)
++++ encfs/FileUtils.h (revision 68)
+@@ -36,7 +36,8 @@
+
+ // ask the user for permission to create the directory. If they say ok, then
+ // do it and return true.
+-bool userAllowMkdir( const char *dirPath, mode_t mode );
++bool userAllowMkdir(const char *dirPath, mode_t mode );
++bool userAllowMkdir(int promptno, const char *dirPath, mode_t mode );
+
+ class Cipher;
+ class DirNode;
+@@ -72,6 +73,7 @@
+
+ std::string passwordProgram; // path to password program (or empty)
+ bool useStdin; // read password from stdin rather then prompting
++ bool annotate; // print annotation line prompt to stderr.
+
+ bool ownerCreate; // set owner of new files to caller
+
+@@ -87,6 +89,7 @@
+ checkKey = true;
+ forceDecode = false;
+ useStdin = false;
++ annotate = false;
+ ownerCreate = false;
+ reverseEncryption = false;
+ configMode = Config_Prompt;
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 0000000..0c27095
--- /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;
++ }
++ }
+ }
+ }
+
diff --git a/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch b/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch
new file mode 100644
index 0000000..3dee12a
--- /dev/null
+++ b/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch
@@ -0,0 +1,10 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 69)
++++ ChangeLog (revision 70)
+@@ -1,3 +1,5 @@
++Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
++ * fix for non-b64 conversions, issue 102 patch by gebart.
+
+ Tue Dec 7 2010 Valient Gough <vgough@pobox.com>
+ * add annotation option, patch by Werner Koch.
diff --git a/sys-fs/encfs/metadata.xml b/sys-fs/encfs/metadata.xml
new file mode 100644
index 0000000..1e75873
--- /dev/null
+++ b/sys-fs/encfs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-fs/encfs/files/, sys-fs/encfs/
@ 2014-12-09 18:27 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2014-12-09 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 99afe9d8936194d4fd81f714d9cad470be8ab858
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 9 18:31:06 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 9 18:31:06 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=99afe9d8
sys-fs/encfs: in the tree
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 0xF52D4BBA
---
sys-fs/encfs/ChangeLog | 9 -
sys-fs/encfs/Manifest | 17 --
sys-fs/encfs/encfs-1.7.4-r1.ebuild | 53 ------
sys-fs/encfs/files/encfs-1.7.4-r67:68.patch | 248 ----------------------------
sys-fs/encfs/files/encfs-1.7.4-r68:69.patch | 31 ----
sys-fs/encfs/files/encfs-1.7.4-r69:70.patch | 10 --
sys-fs/encfs/metadata.xml | 8 -
7 files changed, 376 deletions(-)
diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
deleted file mode 100644
index 393804c..0000000
--- a/sys-fs/encfs/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-*encfs-1.7.4-r1 (24 Nov 2011)
-
- 24 Nov 2011; Anthony G. Basile <blueness@gentoo.org> +encfs-1.7.4-r1.ebuild,
- +files/encfs-1.7.4-r67:68.patch, +files/encfs-1.7.4-r68:69.patch,
- +files/encfs-1.7.4-r69:70.patch, +metadata.xml:
- added post release commits as patches
-
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
deleted file mode 100644
index 107e452..0000000
--- a/sys-fs/encfs/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX encfs-1.7.4-r67:68.patch 7910 SHA256 7d1d15132fc177583e00dd1c97cb40b3119dfc4716de2a245cecea778bb943be SHA512 ade7ec1cfea890dc6e137f4eeef16583a59478592cde1cf6d15b10e5c2cd2b2a9d14b428394d0a8159e4a09b38ab25293a59580dd739ae4af2788f42f784fce0 WHIRLPOOL 230ebed14d1749a6d6d16dc9bb35f22ba589e63b1353188e8f988aa0d469e8b7a6c7c0be1cc3e19d2d7e60447f972dc6e2d3f5d3af3da3298e87afd8c6e72e9a
-AUX encfs-1.7.4-r68:69.patch 787 SHA256 33d7019e74bba6b3efdb3594d5fc773804436ea263416c73d60f63e61dd823fe SHA512 9a94af359a12c4b293e26dfe9ca55d43db8e82e1166edc7316ed592d8be5cc41046c0f6a165ca15dc5a7a9204c5d4265a9faf30be27c1d1639969bf22818599a WHIRLPOOL 6ba3741ef6e0918e3ec23e2cfc024e8be02751da06eeaa828c0d6ddb4af11daff5584e64e7bc761e2d877130271ce70071abe6b799f912a72a63f48b8182f65a
-AUX encfs-1.7.4-r69:70.patch 367 SHA256 8e14d5cef29e67e084553f41e44ae6b113bf8a83a869a0756d473a56a4f60a80 SHA512 487459c0ac94a3fe3b8fb2e79081c452e20d832a145dfd7fbcb67c92a13901d727b5246333a90620b87e0a0b813bc6071ca6af50428cd3d3e47dae51fd02b11a WHIRLPOOL d613dba15fed963cfa0b133b25817054400e9d4c591e7d881d99d12496e7a794aa722c601c4d06b510d0addb6379e54703051ecf2ad36df855aa73d75c184ca1
-DIST encfs-1.7.4.tgz 931048 SHA256 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
-EBUILD encfs-1.7.4-r1.ebuild 1478 SHA256 9e424c67f7fb19a0c412429d8a88d236b514742dc056d18da098516aa3ffcac8 SHA512 126f561f7ece58e1cd8601c481d99761d1cbc5455bd18302dfea592bac19ee0742834e213b8fa9cebdbc2ed3ec770c091ac1797c6bde71ffd43b3438f5f21ba1 WHIRLPOOL 2482074472ace8aa8aa01ca0f43699b31594bab22df0bc9dc8bb5511aa5a42c334618c2e9b2553a8b1e684b2ab110f21984cf6f63148d8372479f372b1c15356
-MISC ChangeLog 271 SHA256 ed14807026355a804507cb2c73b7a8ed73adc84652615b08387c0a4dd57a0d8b SHA512 fe95e726d4e299ead0b0e5499059baaf6237c5d9dd93e5d20f4838d168b12ed0054f7003e189d113c95a83be76afc657a7e4356645ee9b600a58f2eff4d3686e WHIRLPOOL a150f835e4ee3986fe8ac4da40e7da9617fd4947a16ed5168b14891a3f447aa0ae5b48f5753fd4473efcd6e1209b084618f5ddb4cff54bc20535f4fe6dea3835
-MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCJlHUACgkQl5yvQNBFVTW4BwCfeHiV+8DqZ4rcR32ms+Ss19zR
-z70An1KI08aOawPWb4AKvq7S2OQofNKp
-=6dI3
------END PGP SIGNATURE-----
diff --git a/sys-fs/encfs/encfs-1.7.4-r1.ebuild b/sys-fs/encfs/encfs-1.7.4-r1.ebuild
deleted file mode 100644
index 4ba9608..0000000
--- a/sys-fs/encfs/encfs-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-r67:68.patch
- epatch "${FILESDIR}"/${PN}-1.7.4-r68:69.patch
- epatch "${FILESDIR}"/${PN}-1.7.4-r69:70.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-r67:68.patch b/sys-fs/encfs/files/encfs-1.7.4-r67:68.patch
deleted file mode 100644
index 81052f5..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r67:68.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (revision 67)
-+++ ChangeLog (revision 68)
-@@ -1,3 +1,7 @@
-+
-+Tue Dec 7 2010 Valient Gough <vgough@pobox.com>
-+ * add annotation option, patch by Werner Koch.
-+
- Sun Sep 5 2010 Valient Gough <vgough@pobox.com>
- * fix mount failures when using certain options, due to changes in
- option passing mechanism in 1.7
-Index: encfs/FileUtils.cpp
-===================================================================
---- encfs/FileUtils.cpp (revision 67)
-+++ encfs/FileUtils.cpp (revision 68)
-@@ -314,15 +314,33 @@
- return path.substr(0, last);
- }
-
--bool userAllowMkdir( const char *path, mode_t mode )
-+bool userAllowMkdir(const char *path, mode_t mode )
- {
-+ return userAllowMkdir(0, path, mode);
-+}
-+
-+bool userAllowMkdir(int promptno, const char *path, mode_t mode )
-+{
- // TODO: can we internationalize the y/n names? Seems strange to prompt in
- // their own language but then have to respond 'y' or 'n'.
- // xgroup(setup)
- cerr << autosprintf( _("The directory \"%s\" does not exist. Should it be created? (y,n) "), path );
- char answer[10];
-- char *res = fgets( answer, sizeof(answer), stdin );
-+ char *res;
-
-+ switch (promptno)
-+ {
-+ case 1:
-+ cerr << endl << "$PROMPT$ create_root_dir" << endl;
-+ break;
-+ case 2:
-+ cerr << endl << "$PROMPT$ create_mount_point" << endl;
-+ break;
-+ default:
-+ break;
-+ }
-+ res = fgets( answer, sizeof(answer), stdin );
-+
- if(res != 0 && toupper(answer[0]) == 'Y')
- {
- int result = mkdir( path, mode );
-@@ -976,6 +994,7 @@
- bool useStdin = opts->useStdin;
- bool reverseEncryption = opts->reverseEncryption;
- ConfigMode configMode = opts->configMode;
-+ bool annotate = opts->annotate;
-
- RootPtr rootInfo;
-
-@@ -994,6 +1013,9 @@
- " anything else, or an empty line will select standard mode.\n"
- "?> ");
-
-+ if (annotate)
-+ cerr << "$PROMPT$ config_option" << endl;
-+
- char *res = fgets( answer, sizeof(answer), stdin );
- (void)res;
- cout << "\n";
-@@ -1179,7 +1201,11 @@
- CipherKey userKey;
- rDebug( "useStdin: %i", useStdin );
- if(useStdin)
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config->getUserKey( useStdin );
-+ }
- else if(!passwordProgram.empty())
- userKey = config->getUserKey( passwordProgram, rootDir );
- else
-@@ -1618,6 +1644,8 @@
- if(opts->passwordProgram.empty())
- {
- rDebug( "useStdin: %i", opts->useStdin );
-+ if (opts->annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- userKey = config->getUserKey( opts->useStdin );
- } else
- userKey = config->getUserKey( opts->passwordProgram, opts->rootDir );
-Index: encfs/main.cpp
-===================================================================
---- encfs/main.cpp (revision 67)
-+++ encfs/main.cpp (revision 68)
-@@ -104,6 +104,7 @@
- if(opts->forceDecode) ss << "(forceDecode) ";
- if(opts->ownerCreate) ss << "(ownerCreate) ";
- if(opts->useStdin) ss << "(useStdin) ";
-+ if(opts->annotate) ss << "(annotate) ";
- if(opts->reverseEncryption) ss << "(reverseEncryption) ";
- if(opts->mountOnDemand) ss << "(mountOnDemand) ";
- for(int i=0; i<fuseArgc; ++i)
-@@ -196,6 +197,7 @@
- out->opts->forceDecode = false;
- out->opts->ownerCreate = false;
- out->opts->useStdin = false;
-+ out->opts->annotate = false;
- out->opts->reverseEncryption = false;
-
- bool useDefaultFlags = true;
-@@ -223,6 +225,7 @@
- {"extpass", 1, 0, 'p'}, // external password program
- // {"single-thread", 0, 0, 's'}, // single-threaded mode
- {"stdinpass", 0, 0, 'S'}, // read password from stdin
-+ {"annotate", 0, 0, 513}, // Print annotation lines to stderr
- {"verbose", 0, 0, 'v'}, // verbose mode
- {"version", 0, 0, 'V'}, //version
- {"reverse", 0, 0, 'r'}, // reverse encryption
-@@ -263,6 +266,9 @@
- case 'S':
- out->opts->useStdin = true;
- break;
-+ case 513:
-+ out->opts->annotate = true;
-+ break;
- case 'f':
- out->isDaemon = false;
- // this option was added in fuse 2.x
-@@ -411,13 +417,15 @@
-
- // check that the directories exist, or that we can create them..
- if(!isDirectory( out->opts->rootDir.c_str() ) &&
-- !userAllowMkdir( out->opts->rootDir.c_str() ,0700))
-+ !userAllowMkdir( out->opts->annotate? 1:0,
-+ out->opts->rootDir.c_str() ,0700))
- {
- rWarning(_("Unable to locate root directory, aborting."));
- return false;
- }
- if(!isDirectory( out->mountPoint.c_str() ) &&
-- !userAllowMkdir( out->mountPoint.c_str(),0700))
-+ !userAllowMkdir( out->opts->annotate? 2:0,
-+ out->mountPoint.c_str(),0700))
- {
- rWarning(_("Unable to locate mount point, aborting."));
- return false;
-@@ -630,7 +638,10 @@
- try
- {
- time_t startTime, endTime;
--
-+
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_start" << endl;
-+
- // FIXME: workaround for fuse_main returning an error on normal
- // exit. Only print information if fuse_main returned
- // immediately..
-@@ -642,6 +653,9 @@
- &encfs_oper, (void*)ctx);
-
- time( &endTime );
-+
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_end" << endl;
-
- if(res == 0)
- returnCode = EXIT_SUCCESS;
-Index: encfs/encfsctl.cpp
-===================================================================
---- encfs/encfsctl.cpp (revision 67)
-+++ encfs/encfsctl.cpp (revision 68)
-@@ -693,7 +693,7 @@
- return EXIT_SUCCESS;
- }
-
--static int do_chpasswd( bool useStdin, int argc, char **argv )
-+static int do_chpasswd( bool useStdin, bool annotate, int argc, char **argv )
- {
- (void)argc;
- string rootDir = argv[1];
-@@ -721,6 +721,8 @@
-
- // ask for existing password
- cout << _("Enter current Encfs password\n");
-+ if (annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- CipherKey userKey = config->getUserKey( useStdin );
- if(!userKey)
- return EXIT_FAILURE;
-@@ -742,7 +744,11 @@
- config->kdfIterations = 0; // generate new
-
- if( useStdin )
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config->getUserKey( true );
-+ }
- else
- userKey = config->getNewUserKey();
-
-@@ -781,12 +787,12 @@
-
- static int chpasswd( int argc, char **argv )
- {
-- return do_chpasswd( false, argc, argv );
-+ return do_chpasswd( false, false, argc, argv );
- }
-
- static int chpasswdAutomaticly( int argc, char **argv )
- {
-- return do_chpasswd( true, argc, argv );
-+ return do_chpasswd( true, false, argc, argv );
- }
-
-
-Index: encfs/FileUtils.h
-===================================================================
---- encfs/FileUtils.h (revision 67)
-+++ encfs/FileUtils.h (revision 68)
-@@ -36,7 +36,8 @@
-
- // ask the user for permission to create the directory. If they say ok, then
- // do it and return true.
--bool userAllowMkdir( const char *dirPath, mode_t mode );
-+bool userAllowMkdir(const char *dirPath, mode_t mode );
-+bool userAllowMkdir(int promptno, const char *dirPath, mode_t mode );
-
- class Cipher;
- class DirNode;
-@@ -72,6 +73,7 @@
-
- std::string passwordProgram; // path to password program (or empty)
- bool useStdin; // read password from stdin rather then prompting
-+ bool annotate; // print annotation line prompt to stderr.
-
- bool ownerCreate; // set owner of new files to caller
-
-@@ -87,6 +89,7 @@
- checkKey = true;
- forceDecode = false;
- useStdin = false;
-+ annotate = false;
- ownerCreate = false;
- reverseEncryption = false;
- configMode = Config_Prompt;
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
deleted file mode 100644
index 0c27095..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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;
-+ }
-+ }
- }
- }
-
diff --git a/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch b/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch
deleted file mode 100644
index 3dee12a..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r69:70.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (revision 69)
-+++ ChangeLog (revision 70)
-@@ -1,3 +1,5 @@
-+Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
-+ * fix for non-b64 conversions, issue 102 patch by gebart.
-
- Tue Dec 7 2010 Valient Gough <vgough@pobox.com>
- * add annotation option, patch by Werner Koch.
diff --git a/sys-fs/encfs/metadata.xml b/sys-fs/encfs/metadata.xml
deleted file mode 100644
index 1e75873..0000000
--- a/sys-fs/encfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-09 18:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 20:44 [gentoo-commits] dev/blueness:master commit in: sys-fs/encfs/files/, sys-fs/encfs/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2014-12-09 18:27 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox