From 46c81c8a6ba01f5ef5314ba56fa3e66d9dd25fe1 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 11 Jan 2014 16:00:55 -0500 Subject: [PATCH] Version 3.0.6. --- NEWS | 18 ++++- configure.ac | 2 +- debian/changelog | 6 ++ po/pwmd.pot | 195 ++++++++++++++++++++++++++++--------------------------- 4 files changed, 124 insertions(+), 97 deletions(-) diff --git a/NEWS b/NEWS index 81643c84..116ea37d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +PWMD v3.0.6 +----------- +Write a PID file upon startup to detect a stale socket when running another +instance. + +Bind to the local socket before doing cache pushing. + +Added command line option --force as an alias to --ignore. + +Fixed a few cppcheck(1) warnings. + +Fixed a bug that ignored the return value from launch_pinentry(). + +Added configuration parameter "log_keepopen" for use when logging to a file. + + PWMD v3.0.5 ----------- More strict element and attribute names. Conform to the XML naming spec. @@ -158,4 +174,4 @@ Added tests. Run them with 'make tests' in the tests/ directory. More portable: *BSD, SunOS/Solaris/OpenSolaris, Android and Linux and 32 and 64 bit versions of these as well as little and big endian. -Removed the libglib-2.0 dependency. \ No newline at end of file +Removed the libglib-2.0 dependency. diff --git a/configure.ac b/configure.ac index 25b85a9e..b7071540 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, 3.0.6-dev, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 3.0.6, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET diff --git a/debian/changelog b/debian/changelog index a8e5d2c7..b3add71b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pwmd (3.0.6-1) testing; urgency=medium + + * New upstream. + + -- Ben Kibbey Sat, 11 Jan 2014 16:00:08 -0500 + pwmd (3.0.5-1) testing; urgency=low * New upstream. diff --git a/po/pwmd.pot b/po/pwmd.pot index 2edbe397..9f638770 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: 2013-06-22 15:41-0400\n" +"POT-Creation-Date: 2014-01-11 15:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,22 +48,22 @@ msgstr "" msgid "passphrase" msgstr "" -#: src/agent.c:652 +#: src/agent.c:653 #, c-format msgid "Signed with keygrip %s" msgstr "" -#: src/agent.c:750 +#: src/agent.c:751 #, c-format msgid "Encrypted with keygrip %s" msgstr "" -#: src/agent.c:866 +#: src/agent.c:867 #, c-format msgid "Keygrip is %s" msgstr "" -#: src/agent.c:902 +#: src/agent.c:903 #, c-format msgid "WARNING: keylen=%i, truncated to %i." msgstr "" @@ -73,153 +73,153 @@ msgstr "" msgid "The passphrase is too large: have=%u, max=%u." msgstr "" -#: src/agent.c:1086 +#: src/agent.c:1087 msgid "Generating a new keypair ..." msgstr "" -#: src/agent.c:1089 +#: src/agent.c:1090 #, c-format msgid "Using passphrase obtained from file '%s'" msgstr "" -#: src/agent.c:1124 +#: src/agent.c:1125 #, c-format msgid "Success! Keygrip is %s." msgstr "" -#: src/agent.c:1132 +#: src/agent.c:1133 #, c-format msgid "Signed with keygrip %s." msgstr "" -#: src/pwmd.c:285 +#: src/pwmd.c:299 #, c-format msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:521 +#: src/pwmd.c:523 msgid "unknown" msgstr "" -#: src/pwmd.c:579 +#: src/pwmd.c:589 #, c-format msgid "gcry_check_version(): Incompatible libgcrypt. Wanted %s, got %s.\n" msgstr "" -#: src/pwmd.c:763 +#: src/pwmd.c:785 msgid "accepted" msgstr "" -#: src/pwmd.c:763 +#: src/pwmd.c:785 msgid "rejected" msgstr "" -#: src/pwmd.c:968 +#: src/pwmd.c:995 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:1178 +#: src/pwmd.c:1205 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:1220 +#: src/pwmd.c:1247 msgid "Could not find root \"pwmd\" element." msgstr "" -#: src/pwmd.c:1243 +#: src/pwmd.c:1270 msgid "Success!" msgstr "" -#: src/pwmd.c:1283 +#: src/pwmd.c:1310 #, c-format msgid "Trying to add datafile '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1288 +#: src/pwmd.c:1315 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1356 +#: src/pwmd.c:1383 #, c-format msgid "Successfully added '%s' to the cache." msgstr "" -#: src/pwmd.c:1408 +#: src/pwmd.c:1435 #, c-format msgid "new connection: tid=%p, fd=%i, addr=%s" msgstr "" -#: src/pwmd.c:1411 +#: src/pwmd.c:1438 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1850 +#: src/pwmd.c:1877 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1858 +#: src/pwmd.c:1885 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1879 +#: src/pwmd.c:1906 #, c-format msgid "Caught signal %i (%s). Exiting." msgstr "" -#: src/pwmd.c:1902 +#: src/pwmd.c:1929 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:1925 +#: src/pwmd.c:1952 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:2004 +#: src/pwmd.c:2031 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:2008 +#: src/pwmd.c:2035 #, c-format msgid "Listening on %s and TCP port %i" msgstr "" -#: src/pwmd.c:2011 src/pwmd.c:2013 +#: src/pwmd.c:2038 src/pwmd.c:2040 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:2095 +#: src/pwmd.c:2122 msgid "Received second termination request. Exiting." msgstr "" -#: src/pwmd.c:2143 +#: src/pwmd.c:2170 msgid "" "Failed to add a file to the cache. Use --ignore to force startup. Exiting." msgstr "" -#: src/pwmd.c:2238 +#: src/pwmd.c:2265 #, c-format msgid "Converting version 2 data file \"%s\" ..." msgstr "" -#: src/pwmd.c:2248 +#: src/pwmd.c:2275 #, c-format msgid "Using passphrase file \"%s\" for decryption ..." msgstr "" -#: src/pwmd.c:2325 +#: src/pwmd.c:2350 #, c-format msgid "Output written to \"%s\"." msgstr "" -#: src/pwmd.c:2347 +#: src/pwmd.c:2372 #, c-format msgid "" "Usage: %s [OPTIONS] [file1] [...]\n" @@ -229,7 +229,7 @@ msgid "" " --use-agent enable use of gpg-agent\n" " -n, --no-fork run as a foreground process\n" " -D, --disable-dump disable the LIST, XPATH and DUMP commands\n" -" --ignore ignore file errors during startup\n" +" --ignore, --force ignore file errors during startup\n" " --debug-level=keywords log protocol output (see manual for details)\n" " -o, --outfile=filename output file when importing or converting\n" " -C, --convert=filename convert a version 2 data file to version 3\n" @@ -249,12 +249,22 @@ msgid "" " --version show version and compile time features\n" msgstr "" -#: src/pwmd.c:2595 +#: src/pwmd.c:2405 +#, c-format +msgid "removing stale socket %s" +msgstr "" + +#: src/pwmd.c:2471 +#, c-format +msgid "an instance for socket %s is already running" +msgstr "" + +#: src/pwmd.c:2703 #, c-format msgid "" "%s\n" "\n" -"Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013\n" +"Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014\n" "%s\n" "Released under the terms of the GPL v2. Use at your own risk.\n" "\n" @@ -262,26 +272,26 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:2712 +#: src/pwmd.c:2820 msgid "incompatible gpg-agent version: 2.1.0 or later required" msgstr "" -#: src/pwmd.c:2840 -msgid "Done. Daemonizing..." -msgstr "" - -#: src/pwmd.c:2841 -msgid "Done. Waiting for connections..." -msgstr "" - -#: src/pwmd.c:2877 +#: src/pwmd.c:2936 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:2990 +#: src/pwmd.c:3025 +msgid "Done. Daemonizing..." +msgstr "" + +#: src/pwmd.c:3026 +msgid "Done. Waiting for connections..." +msgstr "" + +#: src/pwmd.c:3106 msgid "pwmd exiting normally" msgstr "" @@ -294,17 +304,12 @@ msgstr "" msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/commands.c:639 -#, c-format -msgid "client validation failed for file '%s'" -msgstr "" - -#: src/commands.c:3952 +#: src/commands.c:3961 #, c-format msgid "command completed: rc=%u" msgstr "" -#: src/commands.c:3968 +#: src/commands.c:3977 msgid "" "Usage: HELP []\n" "For commands that take an element path as an argument, each element is " @@ -312,25 +317,25 @@ msgid "" "COMMANDS:" msgstr "" -#: src/commands.c:4000 +#: src/commands.c:4009 #, c-format msgid "Usage: %s" msgstr "" -#: src/commands.c:4357 +#: src/commands.c:4366 msgid "" "HELP []\n" "Show available commands or command specific help text." msgstr "" -#: src/commands.c:4362 +#: src/commands.c:4371 msgid "" "AGENT \n" "Send a @command{gpg-agent} protocol @var{command} directly to the " "@command{gpg-agent}." msgstr "" -#: src/commands.c:4368 +#: src/commands.c:4377 msgid "" "GETINFO [--data] CACHE | CLIENTS | PID | LAST_ERROR | VERSION\n" "Get server and other information: @var{cache} returns the number of cached " @@ -344,7 +349,7 @@ msgid "" "via a data response rather than a status message." msgstr "" -#: src/commands.c:4382 +#: src/commands.c:4391 msgid "" "PASSWD [--reset] [--s2k-count=N] [--no-passphrase]\n" "Changes the passphrase of the secret key required to open the current file " @@ -361,7 +366,7 @@ msgid "" "the data file, although a passphrase may be required when changing it." msgstr "" -#: src/commands.c:4400 +#: src/commands.c:4409 msgid "" "KEYGRIP [--sign] \n" "Returns the hex encoded keygrip of the specified @var{filename} with a data " @@ -372,7 +377,7 @@ msgid "" "GPG_ERR_NOT_SUPPORTED." msgstr "" -#: src/commands.c:4412 +#: src/commands.c:4421 msgid "" "OPEN [--lock] []\n" "Opens @var{filename} using @var{passphrase}. When the filename is not found " @@ -386,7 +391,7 @@ msgid "" "has been opened." msgstr "" -#: src/commands.c:4427 +#: src/commands.c:4436 msgid "" "SAVE [--no-passphrase] [--reset] [--no-agent] [--s2k-count=N] [--" "cipher=] [--cipher-iterations=N] [--inquire-keyparam] [--" @@ -431,7 +436,7 @@ msgid "" "effect with symmetrically encrypted data files." msgstr "" -#: src/commands.c:4475 +#: src/commands.c:4484 msgid "" "ISCACHED [--lock] \n" "An @emph{OK} response is returned if the specified @var{filename} is found " @@ -442,13 +447,13 @@ msgid "" "file exists; it does not need to be opened nor cached." msgstr "" -#: src/commands.c:4486 +#: src/commands.c:4495 msgid "" "CLEARCACHE []\n" "Clears a file cache entry for all or the specified @var{filename}." msgstr "" -#: src/commands.c:4491 +#: src/commands.c:4500 msgid "" "CACHETIMEOUT \n" "The time in @var{seconds} until @var{filename} will be removed from the " @@ -457,7 +462,7 @@ msgid "" "@pxref{SAVE}). @xref{Configuration}, and the @code{cache_timeout} parameter." msgstr "" -#: src/commands.c:4500 +#: src/commands.c:4509 msgid "" "LIST [--inquire] [--no-recurse] [--verbose] [--with-target] [--all] " "[[!]element[[!]child[..]]]\n" @@ -491,7 +496,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4537 +#: src/commands.c:4546 msgid "" "REALPATH [--inquire] [!]element[[!]child[..]]\n" "Resolves all @code{target} attributes of the specified element path and " @@ -501,7 +506,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4546 +#: src/commands.c:4555 msgid "" "STORE [!]element[[!]child[..]][content]\n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -519,7 +524,7 @@ msgid "" "to prevent @abbr{XML} parsing and @command{pwmd} syntax errors." msgstr "" -#: src/commands.c:4565 +#: src/commands.c:4574 msgid "" "RENAME [--inquire] [!]element[[!]child[..]] \n" "Renames the specified @var{element} to the new @var{value}. If an element of " @@ -528,7 +533,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4574 +#: src/commands.c:4583 msgid "" "COPY [--inquire] [!]source[[!]child[..]] [!]dest[[!]child[..]]\n" "Copies the entire element tree starting from the child node of the source " @@ -542,7 +547,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4590 +#: src/commands.c:4599 msgid "" "MOVE [--inquire] [!]source[[!]child[..]] [[!]dest[[!]child[..]]]\n" "Moves the source element path to the destination element path. If the " @@ -554,7 +559,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4602 +#: src/commands.c:4611 msgid "" "DELETE [--inquire] [!]element[[!]child[..]]\n" "Removes the specified element path and all of its children. This may break " @@ -564,7 +569,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4612 +#: src/commands.c:4621 msgid "" "GET [--inquire] [!]element[[!]child[..]]\n" "Retrieves the content of the specified element. The content is returned with " @@ -573,7 +578,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4621 +#: src/commands.c:4630 msgid "" "ATTR [--inquire] SET|GET|DELETE|LIST [] " "[!]element[[!]child[..]] ..\n" @@ -606,7 +611,7 @@ msgid "" "@xref{Target Attribute}, for details about this special attribute." msgstr "" -#: src/commands.c:4658 +#: src/commands.c:4667 msgid "" "XPATH [--inquire] [[value]]\n" "Evaluates an XPath @var{expression}. If no @var{value} argument is specified " @@ -626,7 +631,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4681 +#: src/commands.c:4690 msgid "" "XPATHATTR [--inquire] SET|DELETE [[]]\n" "Like the @code{XPATH} command (@pxref{XPATH}) but operates on element " @@ -644,7 +649,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4702 +#: src/commands.c:4711 msgid "" "IMPORT [--root [!]element[[!]child[..]]] \n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -657,14 +662,14 @@ msgid "" "for details." msgstr "" -#: src/commands.c:4716 +#: src/commands.c:4725 msgid "" "DUMP\n" "Shows the in memory @abbr{XML} document with indenting. @xref{XPATH}, for " "dumping a specific node." msgstr "" -#: src/commands.c:4722 +#: src/commands.c:4731 msgid "" "LOCK\n" "Locks the mutex associated with the opened file. This prevents other clients " @@ -673,7 +678,7 @@ msgid "" "@xref{UNLOCK}." msgstr "" -#: src/commands.c:4730 +#: src/commands.c:4739 msgid "" "UNLOCK\n" "Unlocks the file mutex which was locked with the @code{LOCK} command or a " @@ -681,7 +686,7 @@ msgid "" "@pxref{ISCACHED})." msgstr "" -#: src/commands.c:4737 +#: src/commands.c:4746 msgid "" "GETCONFIG [filename] \n" "Returns the value of a @command{pwmd} configuration @var{parameter} with a " @@ -691,7 +696,7 @@ msgid "" "with the @code{OPTION} command (@pxref{OPTION}) will be returned." msgstr "" -#: src/commands.c:4746 +#: src/commands.c:4755 msgid "" "OPTION =\n" "Sets a client option @var{name} to @var{value}. The value for an option is " @@ -741,20 +746,20 @@ msgid "" "An integer specifiying the logging level.@end table\n" msgstr "" -#: src/commands.c:4800 +#: src/commands.c:4809 msgid "" "LS\n" "Lists the available data files stored in the data directory (@file{~/.pwmd/" "data}). The result is a newline separated list of filenames." msgstr "" -#: src/commands.c:4806 +#: src/commands.c:4815 msgid "" "RESET\n" "Closes the currently opened file but keeps any previously set client options." msgstr "" -#: src/commands.c:4811 +#: src/commands.c:4820 msgid "" "NOP\n" "Does nothing. Always returns successfully." @@ -775,35 +780,35 @@ msgstr "" msgid "Decrypting ...\n" msgstr "" -#: src/xml.c:1425 src/xml.c:1500 +#: src/xml.c:1475 src/xml.c:1549 #, c-format msgid "" "An existing \"_name\" attribute already exists. Please rename this attribute " "before converting. Path is: %s" msgstr "" -#: src/xml.c:1486 +#: src/xml.c:1536 #, c-format msgid "" "An existing \"element\" already exists. Please rename this element before " "converting. Path is: %s" msgstr "" -#: src/xml.c:1548 +#: src/xml.c:1597 msgid "Converting pre 2.12 data file..." msgstr "" -#: src/xml.c:1572 +#: src/xml.c:1621 #, c-format msgid "Missing attribute '_name' at %s." msgstr "" -#: src/xml.c:1581 +#: src/xml.c:1630 #, c-format msgid "'%s' is not a valid element name at %s." msgstr "" -#: src/xml.c:1603 +#: src/xml.c:1652 #, c-format msgid "Warning: unknown element '%s' at %s. Ignoring." msgstr "" -- 2.11.4.GIT