From bf7dae72de784fb5e940b76efb88d40ebd8eada0 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 16 Feb 2008 17:11:51 -0500 Subject: [PATCH] Version 1.7. --- NEWS | 9 +++++++ TODO | 20 +++----------- configure.ac | 2 +- debian/changelog | 6 +++++ po/pwmd.pot | 80 ++++++++++++++++++++++++++++---------------------------- 5 files changed, 59 insertions(+), 58 deletions(-) rewrite TODO (80%) diff --git a/NEWS b/NEWS index 1bff26fd..5c09d45e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +PWMD v1.7 +---------- +Added the LOCK and UNLOCK commands. + +$DISPLAY bugfix. Use the --display pinentry command line option. + +Fixed a xmlError segfault. + + PWMD v1.6 ---------- IMPORT command bugfix. It now overwrites the node of the same name as the root diff --git a/TODO b/TODO dissimilarity index 80% index 003348dc..973237bb 100644 --- a/TODO +++ b/TODO @@ -1,17 +1,3 @@ -Add "OPTION TIMEOUT=N" to specify a pinentry timeout. Need to wait for -pinentry to support this option itself because assuan_pipe_connect() calls -execv() to execute pinentry, which replaces the PID from pth_fork(). - -Instead of returning an error when a file is modified by another connected -client, use a rwlock for the in memory document which is a pointer stored in -the file cache. This way updates to the document by another client are visible -to the current client immediately. The 'shared' branch has some code that does -this but contains a few bugs and isn't up-to-date with the current version. -I'm also not sure whether to include this because the SAVE command is used to -commit any changes. When this feature is added, changes are visible -immediately, even without saving. Another feature of this is a new -configuration option "cache_persist" can be added to keep the document in -memory for the specified number of seconds after all clients have -disconnected. This can speed up opening a file with a large number of -iterations especially when the client needs to connect a few times in a short -interval. +Add "OPTION TIMEOUT=N" to specify a pinentry timeout. Need to wait for +pinentry to support this option itself because assuan_pipe_connect() calls +execv() to execute pinentry, which replaces the PID from pth_fork(). diff --git a/configure.ac b/configure.ac index 7243e0d0..31fd4e8d 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.6, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 1.7, [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 3e6be76a..fb703488 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (1.7-1) testing; urgency=low + + * New upstream. + + -- Ben Kibbey Sat, 16 Feb 2008 17:10:11 -0500 + pwmd (1.6-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index b186352e..95e3a8a2 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-01-27 10:39-0500\n" +"POT-Creation-Date: 2008-02-16 17:11-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" msgid "%s(): cache mutex LOCKED" msgstr "" -#: src/cache.h:36 src/commands.c:163 src/pinentry.c:365 +#: src/cache.h:36 src/commands.c:169 src/pinentry.c:375 msgid "Waiting for lock" msgstr "" @@ -45,11 +45,11 @@ msgstr "" msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:148 +#: src/pwmd.c:152 msgid "logfile" msgstr "" -#: src/pwmd.c:202 +#: src/pwmd.c:210 #, c-format msgid "" "Usage: %s [-hvDb] [-f ] [-I ] [file1] [...]\n" @@ -61,142 +61,142 @@ msgid "" " -h this help text\n" msgstr "" -#: src/pwmd.c:231 +#: src/pwmd.c:239 msgid "Required AES cipher not supported by libgcrypt." msgstr "" -#: src/pwmd.c:502 +#: src/pwmd.c:513 msgid "pth_read(): short byte count" msgstr "" -#: src/pwmd.c:531 +#: src/pwmd.c:542 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:726 +#: src/pwmd.c:737 #, c-format msgid "%s: skipping empty file" msgstr "" -#: src/pwmd.c:742 +#: src/pwmd.c:753 #, c-format msgid "Password for '%s': " msgstr "" -#: src/pwmd.c:746 +#: src/pwmd.c:757 #, c-format msgid "%s: skipping file" msgstr "" -#: src/pwmd.c:756 src/pwmd.c:1190 src/pwmd.c:1209 +#: src/pwmd.c:767 src/pwmd.c:1201 src/pwmd.c:1220 #, c-format msgid "%s: invalid password, skipping" msgstr "" -#: src/pwmd.c:761 +#: src/pwmd.c:772 #, c-format msgid "%s: invalid password" msgstr "" -#: src/pwmd.c:803 +#: src/pwmd.c:814 msgid "New password: " msgstr "" -#: src/pwmd.c:804 +#: src/pwmd.c:815 msgid "Invalid password." msgstr "" -#: src/pwmd.c:809 +#: src/pwmd.c:820 msgid "Verify password: " msgstr "" -#: src/pwmd.c:810 src/pwmd.c:817 +#: src/pwmd.c:821 src/pwmd.c:828 msgid "Passwords do not match." msgstr "" -#: src/pwmd.c:1110 +#: src/pwmd.c:1121 #, c-format msgid "%s: invalid characters in filename" msgstr "" -#: src/pwmd.c:1119 +#: src/pwmd.c:1130 #, c-format msgid "%s: file already cached, skipping" msgstr "" -#: src/pwmd.c:1195 +#: src/pwmd.c:1206 msgid "Incorrect password. Please try again." msgstr "" -#: src/pwmd.c:1225 +#: src/pwmd.c:1236 #, c-format msgid "%s: file added to the cache" msgstr "" -#: src/pwmd.c:1336 +#: src/pwmd.c:1347 msgid "pth_spawn() failed" msgstr "" -#: src/pwmd.c:1341 +#: src/pwmd.c:1352 #, c-format msgid "new tid=%s, fd=%i" msgstr "" -#: src/pwmd.c:1406 +#: src/pwmd.c:1417 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:1451 +#: src/pwmd.c:1462 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1468 +#: src/pwmd.c:1479 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1496 +#: src/pwmd.c:1507 msgid "waiting for all threads to terminate" msgstr "" -#: src/pwmd.c:1503 +#: src/pwmd.c:1514 #, c-format msgid "%i threads remain" msgstr "" -#: src/pwmd.c:1673 +#: src/pwmd.c:1684 #, c-format msgid "%s: socket_path not defined" msgstr "" -#: src/pwmd.c:1685 +#: src/pwmd.c:1696 #, c-format msgid "%s: data_directory not defined" msgstr "" -#: src/pwmd.c:1706 +#: src/pwmd.c:1717 #, c-format msgid "cache size must be in multiples of %li" msgstr "" -#: src/pwmd.c:1770 +#: src/pwmd.c:1781 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:1770 +#: src/pwmd.c:1781 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:1797 +#: src/pwmd.c:1808 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:1909 +#: src/pwmd.c:1920 msgid "pwmd exiting normally" msgstr "" @@ -224,32 +224,32 @@ msgstr "" msgid "File modified" msgstr "" -#: src/pinentry.c:172 +#: src/pinentry.c:182 msgid "Password mismatch, please try again." msgstr "" -#: src/pinentry.c:174 +#: src/pinentry.c:184 msgid "Password Manager Daemon" msgstr "" -#: src/pinentry.c:179 +#: src/pinentry.c:189 msgid "Password:" msgstr "" -#: src/pinentry.c:183 +#: src/pinentry.c:193 #, c-format msgid "" "A password is required to open the file \"%s\". Please%%0Aenter the password " "below." msgstr "" -#: src/pinentry.c:184 +#: src/pinentry.c:194 #, c-format msgid "" "A password is required to save to the file \"%s\". Please%%0Aenter the " "password below." msgstr "" -#: src/pinentry.c:188 +#: src/pinentry.c:198 msgid "Please type the password again for confirmation." msgstr "" -- 2.11.4.GIT