From f96b1e15d326251f2da8408e3289340e85b07fac Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 27 Jan 2008 10:39:21 -0500 Subject: [PATCH] Version 5.0.2. --- Makefile.am | 2 +- NEWS | 12 ++++++++++++ configure.ac | 2 +- debian/changelog | 6 ++++++ debian/copyright | 4 ++-- po/libpwmd.pot | 29 ++++++++++++++++------------- 6 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index a5572602..53c85d1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libpwmd.la libpwmd_ladir = $(includedir) libpwmd_la_SOURCES = libpwmd.c libpwmd.h types.h gettext.h libpwmd_la_HEADERS = libpwmd.h -libpwmd_la_LDFLAGS = -version-info 5:1:0 @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ +libpwmd_la_LDFLAGS = -version-info 5:2:0 @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ libpwmd_la_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ dist_man1_MANS = pwmc.1 diff --git a/NEWS b/NEWS index d60e70b8..90b243e1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +libPWMD v5.0.2 +-------------- +Added pwmd_open_async(), pwmd_save_async(), pwmd_process(), pwmd_finalize() +and pwmd_async_t. This will replace pwmd_open_nb(), pwmd_open_nb_finalize(), +pwmd_save_nb(), pwmd_save_nb_finalize() and pwmd_nb_state_t in a future +version. These new functions allow pwmd to use its pinentry method rather than +having libpwmd fork() and launch pinentry for nonblocking IO. + +When DEBUG is defined, a few new command line options are available to pwmc to +test password retrieval methods. + + libPWMD v5.0.1 -------------- Let pwmc handle the new IMPORT command. diff --git a/configure.ac b/configure.ac index fd019d0d..7ff5b611 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(libpwmd, 5.0.1, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(libpwmd, 5.0.2, [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 0953ff96..f745da6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libpwmd (5.0.2-1) testing; urgency=low + + * New upstream. + + -- Ben Kibbey Sun, 27 Jan 2008 08:32:04 -0500 + libpwmd (5.0.1-1) testing; urgency=low * New upstream. diff --git a/debian/copyright b/debian/copyright index 69f0569e..7122f346 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ Upstream Author: Copyright: - Copyright (C) 2007 Ben Kibbey + Copyright (C) 2008 Ben Kibbey License: @@ -27,5 +27,5 @@ License: License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -The Debian packaging is (C) 2007, Ben Kibbey and +The Debian packaging is (C) 2008, Ben Kibbey and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/po/libpwmd.pot b/po/libpwmd.pot index 21dff742..8356ca6f 100644 --- a/po/libpwmd.pot +++ b/po/libpwmd.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-05 12:19-0500\n" +"POT-Creation-Date: 2008-01-27 10:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,47 +16,47 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: libpwmd.c:82 +#: libpwmd.c:83 msgid "Unknown error" msgstr "" -#: libpwmd.c:84 +#: libpwmd.c:85 msgid "No cache slots available" msgstr "" -#: libpwmd.c:86 +#: libpwmd.c:87 msgid "Recursion loop" msgstr "" -#: libpwmd.c:88 +#: libpwmd.c:89 msgid "No file is open" msgstr "" -#: libpwmd.c:90 +#: libpwmd.c:91 msgid "General LibXML error" msgstr "" -#: libpwmd.c:92 +#: libpwmd.c:93 msgid "File modified" msgstr "" -#: libpwmd.c:308 +#: libpwmd.c:447 msgid "LibPWMD" msgstr "" -#: libpwmd.c:311 +#: libpwmd.c:450 msgid "Password:" msgstr "" -#: libpwmd.c:314 +#: libpwmd.c:453 msgid "Enter a password." msgstr "" -#: libpwmd.c:317 +#: libpwmd.c:456 msgid "Invalid password, please try again." msgstr "" -#: libpwmd.c:321 +#: libpwmd.c:460 msgid "Please type the password again for confirmation." msgstr "" @@ -65,12 +65,15 @@ msgstr "" msgid "%s: %p not found" msgstr "" -#: pwmc.c:59 +#: pwmc.c:63 msgid "" "Reads PWMD protocol commands from standard input.\n" "\n" +"Usage: pwmc [-hvX] [-s ] [-E -P -T -N -D | -p ] [-S] \n" "Usage: pwmc [-hvX] [-s ] [-P -T -N -D | -p ] [-S] \n" " [-c ] [-d ] [-I ] [filename]\n" +" -E pinentry method (0=pwmd, 1=pwmd async, 2=libpwmd, 3=libpwmd nb)\n" +" -M pinentry timeout (method 3 only)\n" " -X disable showing of status messages from the server\n" " -c set the client name\n" " -s socket path (~/.pwmd/socket)\n" -- 2.11.4.GIT