diff options
Diffstat (limited to 'sys-fs/encfs/files/encfs-1.7.4-r67:68.patch')
-rw-r--r-- | sys-fs/encfs/files/encfs-1.7.4-r67:68.patch | 248 |
1 files changed, 0 insertions, 248 deletions
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; |