From 42bcad4d8a89f4f6d95abdf688295e90e64b3e17 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 23 Jan 2011 20:24:41 -0500 Subject: [PATCH] Version 2.20. --- NEWS | 13 ++++++ configure.ac | 2 +- debian/changelog | 6 +++ po/pwmd.pot | 134 +++++++++++++++++++++++++++---------------------------- 4 files changed, 86 insertions(+), 69 deletions(-) diff --git a/NEWS b/NEWS index 7f703d66..b1dafb80 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +PWMD v2.20 +---------- +Do as the documentation says and let CLEARCACHE always return 0 even when a +filename is specified. + +Exit when there is a failure adding files to the cache on startup unless +the new option --ignore is passed on the command line. + +The VERSION command now appends compile time features to the version number. + +A few minor bugfixes. See ChangeLog for details. + + PWMD v2.19 ---------- Changed the HELP command to send parsable data to the client (data response). diff --git a/configure.ac b/configure.ac index d8da32e6..929942a0 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.20-git, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 2.20, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) diff --git a/debian/changelog b/debian/changelog index 68b6baa6..dee139c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (2.20-1) testing; urgency=low + + * New upstream. + + -- Ben Kibbey Sun, 23 Jan 2011 20:21:55 -0500 + pwmd (2.19-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index d8962de2..e04e48dd 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: 2011-01-22 09:51-0500\n" +"POT-Creation-Date: 2011-01-23 20:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -319,12 +319,12 @@ msgstr "" msgid "Waiting for lock" msgstr "" -#: src/commands.c:4131 +#: src/commands.c:4142 #, c-format msgid "command completed (rc=%u)" msgstr "" -#: src/commands.c:4144 +#: src/commands.c:4155 msgid "" "Usage: HELP []\n" " For commands that take an element path as an argument, each element is\n" @@ -346,18 +346,18 @@ msgid "" "COMMANDS:" msgstr "" -#: src/commands.c:4193 +#: src/commands.c:4204 #, c-format msgid "Usage: %s" msgstr "" -#: src/commands.c:4238 +#: src/commands.c:4264 msgid "" "HELP []\n" " Show available commands or command specific help text.\n" msgstr "" -#: src/commands.c:4243 +#: src/commands.c:4269 msgid "" "OPEN [--lock] [--inquire | --pinentry=[0|1]] [--base64] []\n" " Opens using . When the filename is not found on the\n" @@ -399,7 +399,7 @@ msgid "" " be used with --inquire. This option is ignored when a pinentry is used.\n" msgstr "" -#: src/commands.c:4274 +#: src/commands.c:4300 msgid "" "SAVE [--reset] [--inquire | --pinentry=[0|1]] [--cipher=[]]\n" " [--iterations=[N]] [--base64] []\n" @@ -408,7 +408,8 @@ msgid "" " opened using the OPEN command. If is not specified then the\n" " currently cached key will be used. If the file is a new file or the " "file\n" -" isn't found in the file cache then will be used. If both is\n" +" is not found in the file cache then will be used. If both " +"is\n" " not specified and the file is not cached then pinentry(1) will be used " "to\n" " retrieve the key (see below) unless the configured number of iterations " @@ -424,7 +425,7 @@ msgid "" " iterations for the opened file. When 0 no encryption will be performed.\n" " When this option is either not passed or is specified without a value " "then\n" -" previous setting obtained from the file header will be used.\n" +" the previous setting obtained from the file header will be used.\n" "\n" " You can specify an alternate cipher to encrypt with by specifying a " "cipher\n" @@ -467,7 +468,7 @@ msgid "" " be used with --inquire. This option is ignored when a pinentry is used.\n" msgstr "" -#: src/commands.c:4324 +#: src/commands.c:4350 msgid "" "ISCACHED \n" " An OK response is returned if the specified file is found in the file\n" @@ -476,7 +477,7 @@ msgid "" "returned.\n" msgstr "" -#: src/commands.c:4331 +#: src/commands.c:4357 msgid "" "CLEARCACHE []\n" " Clears a file cache entry. This will forget the timeout and key for all " @@ -484,7 +485,7 @@ msgid "" " the specified file. Always returns an OK response.\n" msgstr "" -#: src/commands.c:4337 +#: src/commands.c:4363 msgid "" "CACHETIMEOUT \n" " Specify the number of seconds the specified file will be cached. -1 " @@ -492,12 +493,12 @@ msgid "" " keep the cache entry forever, 0 will require the key each time the OPEN " "or\n" " SAVE commands are used. Also see the \"cache_timeout\" configuration\n" -" parameter. Returns ERR if the filename isn't cached or if the timeout " +" parameter. Returns ERR if the filename is not cached or if the timeout " "is\n" " invalid. OK otherwise.\n" msgstr "" -#: src/commands.c:4346 +#: src/commands.c:4372 msgid "" "LIST [--no-recurse] [--verbose] [[!]element[[!]element[...]]]\n" " If no element path is given then a newline separated list of root " @@ -521,7 +522,7 @@ msgid "" " useful to limit the amount of data transferred to the client.\n" msgstr "" -#: src/commands.c:4363 +#: src/commands.c:4389 msgid "" "REALPATH [!]element[[!]element[...]]\n" " Resolves all \"target\" attributes of the specified element path and " @@ -529,10 +530,10 @@ msgid "" " the result with a data response.\n" msgstr "" -#: src/commands.c:4369 +#: src/commands.c:4395 msgid "" "STORE [!]element[[[!]element[...]][content]]\n" -" Creates a new element tree or modifies the content of an existing " +" Creates a new element path or modifies the content of an existing " "element\n" " path. If only a single element is specified, a new root element is\n" " created. Otherwise, elements are TAB delimited and the content will be " @@ -540,7 +541,7 @@ msgid "" " to the last TAB delimited argument. If no content is specified after " "the\n" " last TAB then the content for the last specified element will be " -"removed\n" +"removed,\n" " or empty when creating a new element.\n" "\n" " The only restriction of an element name is that it not contain " @@ -553,21 +554,11 @@ msgid "" "parsing\n" " errors.\n" "\n" -" PWMD reads the element path from the client via the Assuan INQUIRE\n" -" protocol response: the STORE command is sent by itself without " -"arguments,\n" -" then the server responds with INQUIRE. The client then sends the " -"element\n" -" path prefixed with a \"D \" data response. The element path may extend\n" -" multiple lines but each must be prefixed with the data \"D \" response. " -"When\n" -" finished, the client sends \"END\" on an empty line. This is needed so " -"an\n" -" element path and value can be more than 1000 bytes long, the Assuan\n" -" protocol line limit.\n" +" This command uses a server INQUIRE to retrieve the data from the " +"client.\n" msgstr "" -#: src/commands.c:4395 +#: src/commands.c:4414 msgid "" "RENAME [!]element[[!]element[...]] \n" " Renames the specified element to the new value. If an element of the " @@ -575,14 +566,15 @@ msgid "" " name as the value exists then it will be overwritten.\n" msgstr "" -#: src/commands.c:4401 +#: src/commands.c:4420 msgid "" "COPY [!]element[[!]element[...]] [!]element[[!]element[...]]\n" " Copies the entire element tree starting from the child node of the " "source\n" " element path, to the destination element path. If the destination " "element\n" -" path doesn't exist then it is created; otherwise it is overwritten.\n" +" path does not exist then it will be created; otherwise it is " +"overwritten.\n" "\n" " Note that attributes from the source element path are merged into the\n" " destination element path when the destination element path exists. When " @@ -593,7 +585,7 @@ msgid "" " attribute value.\n" msgstr "" -#: src/commands.c:4414 +#: src/commands.c:4433 msgid "" "MOVE [!]element[[!]element[...]] [[!]element[[!]element[...]]]\n" " Moves the source element path to the destination element path. If the\n" @@ -602,35 +594,41 @@ msgid "" " overwritten; otherwise it will be created.\n" msgstr "" -#: src/commands.c:4422 +#: src/commands.c:4441 msgid "" "DELETE [!]element[[!]element[...]]\n" -" Removes the specified element path from the XML document.\n" +" Removes the specified element path and any children from the XML " +"document.\n" msgstr "" -#: src/commands.c:4427 +#: src/commands.c:4446 msgid "" "GET [!]element[[!]element[...]]\n" " Retrieves the content or XML text node of the specified element path. " "The\n" -" data is returned with a data response.\n" +" content is returned with a data response.\n" msgstr "" -#: src/commands.c:4433 +#: src/commands.c:4452 msgid "" "ATTR SET|GET|DELETE|LIST [] [!] [!][arg2]\n" " ATTR SET attribute [!]element[[!]element[...]] [attribute_value]\n" -" Stores or updates an attribute name and optional value of an element\n" -" path.\n" +" Stores or updates an attribute name and optional value of an " +"element\n" +" path.\n" "\n" " ATTR DELETE attribute [!]element[[!]element[...]]\n" -" Removes an attribute from an element path.\n" +" Removes an attribute from an element path.\n" "\n" " ATTR LIST [!]element[[!]element[...]]\n" -" Gets a newline separated list of attributes from an element path.\n" +" Retrieves a newline separated list of attributes names and values " +"from\n" +" the specified element path. The attribute names and values are " +"space\n" +" delimited.\n" "\n" " ATTR GET attribute [!]element[[!]element[...]]\n" -" Gets the value of an attribute from an element path.\n" +" Retrieves the value of an attribute from an element path.\n" "\n" " The \"_name\" attribute (case sensitive) cannot be removed with ATTR " "DELETE\n" @@ -640,15 +638,14 @@ msgid "" "exist.\n" " Use the RENAME command for that instead.\n" "\n" -" There is another special attribute \"_mtime\" which is updated each time " -"an\n" -" element is modified: either by storing content, editing attributes or\n" -" deleting a child element.\n" +" The \"_mtime\" attribute is updated each time an element is modified by\n" +" either storing content, editing attributes or by deleting a child " +"element.\n" "\n" " Also see THE TARGET ATTRIBUTE.\n" msgstr "" -#: src/commands.c:4460 +#: src/commands.c:4480 msgid "" "XPATH [[value]]\n" " Evaluates an XPath expression. If no value argument is specified, it is\n" @@ -659,7 +656,7 @@ msgid "" " and the document is updated.\n" msgstr "" -#: src/commands.c:4469 +#: src/commands.c:4489 msgid "" "XPATHATTR SET|DELETE [[]]\n" " Like the XPATH command but operates on element attributes and won't " @@ -669,7 +666,7 @@ msgid "" " required in which case the value will be empty.\n" msgstr "" -#: src/commands.c:4476 +#: src/commands.c:4496 msgid "" "IMPORT [[!]element[[!]element[...]]]\n" " Like the STORE command (an INQUIRE), but the content argument is raw " @@ -687,14 +684,14 @@ msgid "" " the imported content will be overwritten.\n" msgstr "" -#: src/commands.c:4489 +#: src/commands.c:4509 msgid "" "DUMP\n" " Shows the in memory XML document with indenting. To dump a specific\n" " element tree, use the XPATH command.\n" msgstr "" -#: src/commands.c:4495 +#: src/commands.c:4515 msgid "" "LOCK\n" " Locks the mutex associated with the opened file. This prevents other\n" @@ -702,19 +699,19 @@ msgid "" " that sent this command either disconnects or sends the UNLOCK command.\n" msgstr "" -#: src/commands.c:4502 +#: src/commands.c:4522 msgid "" "UNLOCK\n" " Unlocks the file mutex which was locked with the LOCK command.\n" msgstr "" -#: src/commands.c:4507 +#: src/commands.c:4527 msgid "" "GETPID\n" " Retrieves the process id of the server.\n" msgstr "" -#: src/commands.c:4512 +#: src/commands.c:4532 msgid "" "GETCONFIG [filename] \n" " Returns the value of a pwmd configuration variable with a data " @@ -726,18 +723,19 @@ msgid "" "SET\n" " command, if any, will be returned.\n" "\n" -" If there is no such configuration parameter defined, GPG_ERR_NO_VALUE " -"is\n" -" returned.\n" +" If there is no such configuration parameter defined, " +"GPG_ERR_UNKNOWN_OPTION\n" +" is returned.\n" msgstr "" -#: src/commands.c:4524 +#: src/commands.c:4544 msgid "" "VERSION\n" -" Returns the server version number with a data response.\n" +" Returns the server version number and compile-time features with a data\n" +" response with each being space delimited.\n" msgstr "" -#: src/commands.c:4529 +#: src/commands.c:4550 msgid "" "SET =\n" " Sets a client option NAME to VALUE. Use the UNSET command to reset an\n" @@ -813,10 +811,10 @@ msgid "" " RC_ON_LOCKED 0|1 If enabled then return an error code " "instead\n" "\t\t\t\t of a status message when the file mutex is\n" -" locked by another thread.\n" +" locked by another client.\n" msgstr "" -#: src/commands.c:4594 +#: src/commands.c:4615 msgid "" "UNSET \n" " Resets option NAME to the value specified in the server configuration\n" @@ -824,27 +822,27 @@ msgid "" " depending on the value type. See the SET command for available options.\n" msgstr "" -#: src/commands.c:4601 +#: src/commands.c:4622 msgid "" "LS\n" " Lists the contents of the configured data_directory. The result is a\n" " newline separated list of filenames.\n" msgstr "" -#: src/commands.c:4607 +#: src/commands.c:4628 msgid "" "RESET\n" " Closes the currently opened file but keeps any previously set client\n" " options.\n" msgstr "" -#: src/commands.c:4613 +#: src/commands.c:4634 msgid "" "BYE\n" " Closes the connection discarding any unsaved changes.\n" msgstr "" -#: src/commands.c:4618 +#: src/commands.c:4639 msgid "" "NOP\n" " Does nothing. Always returns successfully.\n" -- 2.11.4.GIT