From b09992d61687b9c7e1c67058d414f1fa92ab8ca5 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 15 Nov 2008 09:07:59 -0500 Subject: [PATCH] Version 1.15. --- NEWS | 26 ++++++++++++++ configure.ac | 2 +- debian/changelog | 6 ++++ po/pwmd.pot | 102 ++++++++++++++++++++++++++++--------------------------- 4 files changed, 85 insertions(+), 51 deletions(-) diff --git a/NEWS b/NEWS index b8cdb9ca..c7507490 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,29 @@ +PWMD v1.15 +---------- +Since the previous version I've lost some data including the gpg key used to +sign the archives and have no way of revoking it. I've generated a new key +0xF2B33BEF which will be used for future signings. Key 0x40D5FA7E should be +considered revoked. + +pwmd_strerror() will return gpg_strerror() when the error code isn't related +to pwmd. This fixes some error descriptions. + +Symbolic links are no longer allowed as data files. This prevents backups from +being created on different (e.g., non-encrypted) partitions. + +Fixed checking new elements for whitespace as the first character. + +Allow unicode filenames. Only '/' and whitespace are rejected. + +Fixed an important bug when importing an XML file with -I. If no iterations +were specified, the output wasn't getting encrypted from the configuration +setting. + +Added command line option -k to specify a keyfile when importing. + +A few other bug fixes. See ChangeLog for details. + + PWMD v1.14 ---------- OPTION TIMEOUT will no longer be considered with the SAVE command. This should diff --git a/configure.ac b/configure.ac index 10a5d8f6..f02882c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(pwmd, 1.14, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 1.15, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign]) diff --git a/debian/changelog b/debian/changelog index a640aa37..408154b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (1.15-1) testing; urgency=low + + * New upstream. + + -- Ben Kibbey Sat, 15 Nov 2008 08:16:33 -0500 + pwmd (1.14-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index 61127a2f..0ec21128 100644 --- a/po/pwmd.pot +++ b/po/pwmd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bjk@luxsci.net\n" -"POT-Creation-Date: 2008-09-28 17:55-0400\n" +"POT-Creation-Date: 2008-11-15 08:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,18 +52,20 @@ msgstr "" #: src/pwmd.c:228 #, c-format msgid "" -"Usage: %s [-hvDn] [-f ] [-I [-i ]] [file1] [...]\n" +"Usage: %s [-hvDn] [-f ] [-I [-i ] [-k ]]\n" +" [file1] [...]\n" " -n run as a foreground process\n" " -f load the specified rcfile (~/.pwmd/config)\n" " -I import an XML file and write the encrypted data to stdout\n" " -i encrypt with the specified number of iterations when importing\n" " (config default in the \"global\" section)\n" +" -k when importing, obtain the key from the specified file\n" " -D disable use of the LIST and DUMP commands\n" " -v version\n" " -h this help text\n" msgstr "" -#: src/pwmd.c:259 +#: src/pwmd.c:260 msgid "Required AES cipher not supported by libgcrypt." msgstr "" @@ -72,129 +74,129 @@ msgstr "" msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:777 +#: src/pwmd.c:518 src/pwmd.c:1402 +msgid "pth_spawn() failed" +msgstr "" + +#: src/pwmd.c:814 #, c-format -msgid "%s: skipping empty file" +msgid "%s: Skipping empty file" msgstr "" -#: src/pwmd.c:793 +#: src/pwmd.c:830 #, c-format -msgid "Password for '%s': " +msgid "Passphrase for '%s': " msgstr "" -#: src/pwmd.c:797 +#: src/pwmd.c:834 #, c-format -msgid "%s: skipping file" +msgid "%s: Skipping file" msgstr "" -#: src/pwmd.c:807 src/pwmd.c:1242 src/pwmd.c:1261 +#: src/pwmd.c:844 src/pwmd.c:1315 src/pwmd.c:1334 #, c-format -msgid "%s: invalid password, skipping" +msgid "%s: Invalid passphrase, skipping" msgstr "" -#: src/pwmd.c:812 +#: src/pwmd.c:849 #, c-format -msgid "%s: invalid password" +msgid "%s: Invalid passphrase" msgstr "" -#: src/pwmd.c:854 -msgid "New password: " +#: src/pwmd.c:971 +msgid "New passphrase: " msgstr "" -#: src/pwmd.c:855 -msgid "Invalid password." +#: src/pwmd.c:972 +msgid "Invalid passphrase" msgstr "" -#: src/pwmd.c:860 -msgid "Verify password: " +#: src/pwmd.c:977 +msgid "Verify passphrase: " msgstr "" -#: src/pwmd.c:861 src/pwmd.c:868 -msgid "Passwords do not match." +#: src/pwmd.c:978 src/pwmd.c:985 +msgid "Passphrases do not match" msgstr "" -#: src/pwmd.c:1161 +#: src/pwmd.c:1234 #, c-format msgid "%s: invalid characters in filename" msgstr "" -#: src/pwmd.c:1170 +#: src/pwmd.c:1243 #, c-format msgid "%s: file already cached, skipping" msgstr "" -#: src/pwmd.c:1247 -msgid "Incorrect password. Please try again." +#: src/pwmd.c:1320 +msgid "Incorrect passphrase, try again" msgstr "" -#: src/pwmd.c:1277 +#: src/pwmd.c:1350 #, c-format msgid "%s: file added to the cache" msgstr "" -#: src/pwmd.c:1328 -msgid "pth_spawn() failed" -msgstr "" - -#: src/pwmd.c:1333 +#: src/pwmd.c:1408 #, c-format msgid "new tid=%s, fd=%i" msgstr "" -#: src/pwmd.c:1423 +#: src/pwmd.c:1497 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:1457 +#: src/pwmd.c:1531 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1475 +#: src/pwmd.c:1549 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1500 +#: src/pwmd.c:1574 msgid "waiting for all threads to terminate" msgstr "" -#: src/pwmd.c:1506 +#: src/pwmd.c:1580 #, c-format msgid "%i threads remain" msgstr "" -#: src/pwmd.c:1682 +#: src/pwmd.c:1759 #, c-format msgid "%s: socket_path not defined" msgstr "" -#: src/pwmd.c:1694 +#: src/pwmd.c:1771 #, c-format msgid "%s: data_directory not defined" msgstr "" -#: src/pwmd.c:1715 +#: src/pwmd.c:1792 #, c-format msgid "cache size must be in multiples of %li" msgstr "" -#: src/pwmd.c:1779 +#: src/pwmd.c:1856 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:1779 +#: src/pwmd.c:1856 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:1806 +#: src/pwmd.c:1883 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:1914 +#: src/pwmd.c:1991 msgid "pwmd exiting normally" msgstr "" @@ -223,7 +225,7 @@ msgid "File modified" msgstr "" #: src/pinentry.c:243 -msgid "Password mismatch, please try again." +msgid "Passphrase mismatch, please try again." msgstr "" #: src/pinentry.c:245 @@ -231,25 +233,25 @@ msgid "Password Manager Daemon" msgstr "" #: src/pinentry.c:250 -msgid "Password:" +msgid "Passphrase:" msgstr "" #: src/pinentry.c:254 #, c-format msgid "" -"A password is required to open the file \"%s\". Please%%0Aenter the password " -"below." +"A passphrase is required to open the file \"%s\". Please%%0Aenter the " +"passphrase below." msgstr "" #: src/pinentry.c:255 #, c-format msgid "" -"A password is required to save to the file \"%s\". Please%%0Aenter the " -"password below." +"A passphrase is required to save to the file \"%s\". Please%%0Aenter a " +"passphrase below." msgstr "" #: src/pinentry.c:259 -msgid "Please type the password again for confirmation." +msgid "Please type the passphrase again for confirmation." msgstr "" #: src/pinentry.c:666 -- 2.11.4.GIT