From 3dfca5f8cd829a0399eccf4a0e9cc8c6a608e95b Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Thu, 11 Feb 2010 18:31:21 -0500 Subject: [PATCH] Version 2.5. --- NEWS | 11 +++++++++ configure.ac | 2 +- debian/changelog | 6 +++++ po/pwmd.pot | 70 +++++++++++++++++++++++++++++++------------------------- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/NEWS b/NEWS index 17f0d4f4..eb7cb4a2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +PWMD v2.5 +---------- +New configuration parameter "allowed" to specify which users are allowed to +connect to the unix domain socket. The default is the invoking user only. + +Fixed the IMPORT command to let it handle "target" attributes properly. + +Let "disable_list_and_dump" be resetable during SIGHUP but only if not +permissive (TRUE). + + PWMD v2.4 ---------- Reworked the IMPORT command to let it create root elements. The syntax has diff --git a/configure.ac b/configure.ac index 07c3c804..357aac14 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.4, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 2.5, [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 51b3a65f..072fadf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (2.5-1) testing; urgency=low + + * New upstream. + + -- me Thu, 11 Feb 2010 18:28:41 -0500 + pwmd (2.4-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index d6f9f103..d3cd541e 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-02-07 19:09-0500\n" +"POT-Creation-Date: 2010-02-11 18:31-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -100,12 +100,12 @@ msgstr "" msgid "read(): short byte count" msgstr "" -#: src/pwmd.c:110 +#: src/pwmd.c:113 #, c-format msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:280 +#: src/pwmd.c:286 #, c-format msgid "" "Usage: %s [options] [file1] [...]\n" @@ -133,104 +133,112 @@ msgid "" " --help\n" msgstr "" -#: src/pwmd.c:311 +#: src/pwmd.c:317 #, c-format msgid "gcry_check_version(): Incompatible libgcrypt. Wanted %s, got %s." msgstr "" -#: src/pwmd.c:496 +#: src/pwmd.c:406 +msgid "accepted" +msgstr "" + +#: src/pwmd.c:406 +msgid "rejected" +msgstr "" + +#: src/pwmd.c:593 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:864 +#: src/pwmd.c:965 #, c-format msgid "New passphrase for file %s: " msgstr "" -#: src/pwmd.c:869 src/pwmd.c:878 src/pwmd.c:895 +#: src/pwmd.c:970 src/pwmd.c:979 src/pwmd.c:996 #, c-format msgid "%s: Skipping file" msgstr "" -#: src/pwmd.c:873 +#: src/pwmd.c:974 msgid "Repeat passphrase: " msgstr "" -#: src/pwmd.c:883 +#: src/pwmd.c:984 #, c-format msgid "%s: Passphrase mismatch" msgstr "" -#: src/pwmd.c:892 +#: src/pwmd.c:993 #, c-format msgid "Passphrase required for %s: " msgstr "" -#: src/pwmd.c:1106 +#: src/pwmd.c:1207 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:1122 +#: src/pwmd.c:1223 #, c-format msgid "%s. Maybe disabling pinentry (-P) will help?" msgstr "" -#: src/pwmd.c:1380 +#: src/pwmd.c:1481 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1412 +#: src/pwmd.c:1513 #, c-format msgid "Adding '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1460 +#: src/pwmd.c:1561 #, c-format msgid "File '%s' now cached" msgstr "" -#: src/pwmd.c:1499 +#: src/pwmd.c:1600 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1709 +#: src/pwmd.c:1810 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:1710 +#: src/pwmd.c:1811 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:1759 +#: src/pwmd.c:1860 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1774 +#: src/pwmd.c:1875 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1802 +#: src/pwmd.c:1903 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:1808 +#: src/pwmd.c:1909 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:1981 +#: src/pwmd.c:2082 #, c-format msgid "Converting version 1 data file '%s' to version 2 ..." msgstr "" -#: src/pwmd.c:2153 +#: src/pwmd.c:2254 #, c-format msgid "" "%s\n" @@ -241,36 +249,36 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:2208 +#: src/pwmd.c:2309 msgid "invalid iteration count" msgstr "" -#: src/pwmd.c:2293 +#: src/pwmd.c:2392 #, c-format msgid "%s: socket_path not defined" msgstr "" -#: src/pwmd.c:2299 +#: src/pwmd.c:2398 #, c-format msgid "%s: data_directory not defined" msgstr "" -#: src/pwmd.c:2360 +#: src/pwmd.c:2459 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:2360 +#: src/pwmd.c:2459 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:2387 +#: src/pwmd.c:2486 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:2463 +#: src/pwmd.c:2562 msgid "pwmd exiting normally" msgstr "" -- 2.11.4.GIT