From 0a06d42a310823ef40a4865cbee2e107ee9352ee Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 20 Mar 2010 09:35:31 -0400 Subject: [PATCH] Version 2.9. --- NEWS | 14 ++++++++++ README | 3 --- configure.ac | 2 +- debian/changelog | 6 +++++ po/pwmd.pot | 80 ++++++++++++++++++++++++++++---------------------------- 5 files changed, 61 insertions(+), 44 deletions(-) diff --git a/NEWS b/NEWS index 4a781835..681c75c1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +PWMD v2.9 +---------- +Don't require libassuan 2.0 anymore. Use the static library included in the +archive like was done before pwmd 2.2. This is needed for use with libpwmd +and fixes a bug with libgpg-error return codes. + +Fixed another stupid bug with the RENAME command. + +Added SET option LOCK_ON_OPEN to lock the file mutex after a successful OPEN +as if the LOCK command had been sent. + +Added the LS protocol command to list files in data_directory. + + PWMD v2.8 ---------- Fixed the RENAME command to handle target attributes and ambiguities. diff --git a/README b/README index d99ee116..ce1d2adc 100644 --- a/README +++ b/README @@ -29,9 +29,6 @@ Requirements: C99 compiler - http://www.gnu.org/software/gcc Is a good choice. - libassuan - ftp://ftp.gnupg.org/gcrypt/libassuan - Protocol. Version 2.0.0 or later is required. - libpth2 - http://www.gnu.org/software/pth/pth.html Portable multi-threading library. diff --git a/configure.ac b/configure.ac index a509ae74..4aa6ec84 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.60) -AC_INIT(pwmd, 2.8, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 2.9, [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 cf1963ad..f5ea2ac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (2.9-1) testing; urgency=low + + * New upstream. + + -- Ben Kibbey Fri, 19 Mar 2010 19:45:54 -0400 + pwmd (2.8-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index dc2544ed..462c6628 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: 2010-03-06 14:25-0500\n" +"POT-Creation-Date: 2010-03-20 09:35-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,47 +65,47 @@ msgstr "" msgid "it is too simplistic/systematic" msgstr "" -#: src/pinentry.c:266 +#: src/pinentry.c:261 msgid "Passphrase mismatch, please try again." msgstr "" -#: src/pinentry.c:268 +#: src/pinentry.c:263 #, c-format msgid "Password Manager Daemon%s%s" msgstr "" -#: src/pinentry.c:274 +#: src/pinentry.c:269 msgid "Passphrase:" msgstr "" -#: src/pinentry.c:278 +#: src/pinentry.c:273 #, c-format msgid "" "A passphrase is required to open the file \"%s\". Please%%0Aenter the " "passphrase below." msgstr "" -#: src/pinentry.c:279 +#: src/pinentry.c:274 #, c-format msgid "" "A passphrase is required to save to the file \"%s\". Please%%0Aenter the " "passphrase below." msgstr "" -#: src/pinentry.c:283 +#: src/pinentry.c:278 msgid "Please enter the passphrase again for confirmation." msgstr "" -#: src/pinentry.c:822 +#: src/pinentry.c:817 msgid "read(): short byte count" msgstr "" -#: src/pwmd.c:96 +#: src/pwmd.c:95 #, c-format msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:269 +#: src/pwmd.c:268 #, c-format msgid "" "Usage: %s [options] [file1] [...]\n" @@ -133,112 +133,112 @@ msgid "" " --help\n" msgstr "" -#: src/pwmd.c:300 +#: src/pwmd.c:299 #, c-format msgid "gcry_check_version(): Incompatible libgcrypt. Wanted %s, got %s." msgstr "" -#: src/pwmd.c:395 +#: src/pwmd.c:396 msgid "accepted" msgstr "" -#: src/pwmd.c:395 +#: src/pwmd.c:396 msgid "rejected" msgstr "" -#: src/pwmd.c:582 +#: src/pwmd.c:576 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:798 +#: src/pwmd.c:787 #, c-format msgid "New passphrase for file %s: " msgstr "" -#: src/pwmd.c:803 src/pwmd.c:812 src/pwmd.c:829 +#: src/pwmd.c:792 src/pwmd.c:801 src/pwmd.c:818 #, c-format msgid "%s: Skipping file" msgstr "" -#: src/pwmd.c:807 +#: src/pwmd.c:796 msgid "Repeat passphrase: " msgstr "" -#: src/pwmd.c:817 +#: src/pwmd.c:806 #, c-format msgid "%s: Passphrase mismatch" msgstr "" -#: src/pwmd.c:826 +#: src/pwmd.c:815 #, c-format msgid "Passphrase required for %s: " msgstr "" -#: src/pwmd.c:941 +#: src/pwmd.c:930 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:957 +#: src/pwmd.c:946 #, c-format msgid "%s. Maybe disabling pinentry (-P) will help?" msgstr "" -#: src/pwmd.c:1045 +#: src/pwmd.c:1034 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1077 +#: src/pwmd.c:1066 #, c-format msgid "Adding '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1125 +#: src/pwmd.c:1114 #, c-format msgid "File '%s' now cached" msgstr "" -#: src/pwmd.c:1164 +#: src/pwmd.c:1153 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1385 +#: src/pwmd.c:1374 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:1386 +#: src/pwmd.c:1375 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:1435 +#: src/pwmd.c:1424 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1448 +#: src/pwmd.c:1437 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1476 +#: src/pwmd.c:1465 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:1482 +#: src/pwmd.c:1471 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:1655 +#: src/pwmd.c:1644 #, c-format msgid "Converting version 1 data file '%s' to version 2 ..." msgstr "" -#: src/pwmd.c:1826 +#: src/pwmd.c:1811 #, c-format msgid "" "%s\n" @@ -249,36 +249,36 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:1881 +#: src/pwmd.c:1866 msgid "invalid iteration count" msgstr "" -#: src/pwmd.c:1964 +#: src/pwmd.c:1949 #, c-format msgid "%s: socket_path not defined" msgstr "" -#: src/pwmd.c:1970 +#: src/pwmd.c:1955 #, c-format msgid "%s: data_directory not defined" msgstr "" -#: src/pwmd.c:2031 +#: src/pwmd.c:2016 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:2031 +#: src/pwmd.c:2016 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:2058 +#: src/pwmd.c:2043 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:2135 +#: src/pwmd.c:2120 msgid "pwmd exiting normally" msgstr "" -- 2.11.4.GIT