dirmngr (ChangeLog configure.ac po/dirmngr.pot)
cvs user wk
cvs at cvs.gnupg.org
Tue Jan 4 20:13:26 CET 2005
Date: Tuesday, January 4, 2005 @ 20:19:49
Author: wk
Path: /cvs/dirmngr/dirmngr
Modified: ChangeLog configure.ac po/dirmngr.pot
(PTH_LIBS): Die if Pth is not available. There is
not way to build it anymore without Pth support.
----------------+
ChangeLog | 3
configure.ac | 40 +++++++-----
po/dirmngr.pot | 172 ++++++++++++++++++++++++++++---------------------------
3 files changed, 115 insertions(+), 100 deletions(-)
Index: dirmngr/ChangeLog
diff -u dirmngr/ChangeLog:1.83 dirmngr/ChangeLog:1.84
--- dirmngr/ChangeLog:1.83 Tue Jan 4 15:16:39 2005
+++ dirmngr/ChangeLog Tue Jan 4 20:19:49 2005
@@ -1,5 +1,8 @@
2005-01-04 Werner Koch <wk at g10code.com>
+ * configure.ac (PTH_LIBS): Die if Pth is not available. There is
+ not way to build it anymore without Pth support.
+
* doc/dirmngr.texi: Cleaned up. Use @copying.
2005-01-03 Werner Koch <wk at g10code.com>
Index: dirmngr/configure.ac
diff -u dirmngr/configure.ac:1.68 dirmngr/configure.ac:1.69
--- dirmngr/configure.ac:1.68 Sat Dec 18 09:50:39 2004
+++ dirmngr/configure.ac Tue Jan 4 20:19:49 2005
@@ -49,6 +49,7 @@
have_libassuan=no
have_ksba=no
have_ldap=no
+have_pth=no
AM_MAINTAINER_MODE
@@ -183,24 +184,17 @@
PTH_CONFIG="$pth_config_prefix/bin/pth-config"
fi
AC_PATH_PROG(PTH_CONFIG, pth-config, no)
-if test "$PTH_CONFIG" = "no"; then
- AC_MSG_WARN([[
-***
-*** GNU Portable Threads Library not found.
-*** The --daemon mode won't work.
-*** Download GNU Pth from ftp://ftp.gnu.org/gnu/pth/
-*** On a Debian GNU/Linux system you might want to try
-*** apt-get install libpth-dev
-***]])
-else
- GNUPG_PTH_VERSION_CHECK(1.3.7)
- if test $have_pth = yes; then
- PTH_CFLAGS=`$PTH_CONFIG --cflags`
- PTH_LIBS=`$PTH_CONFIG --ldflags`
- PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs`"
- AC_DEFINE(USE_GNU_PTH, 1,
- [Defined if the GNU Portable Thread Library should be used])
- fi
+if test "$PTH_CONFIG" != "no"; then
+ if test -x "$PTH_CONFIG"; then
+ GNUPG_PTH_VERSION_CHECK(1.3.7)
+ if test $have_pth = yes; then
+ PTH_CFLAGS=`$PTH_CONFIG --cflags`
+ PTH_LIBS=`$PTH_CONFIG --ldflags`
+ PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs`"
+ AC_DEFINE(USE_GNU_PTH, 1,
+ [Defined if the GNU Portable Thread Library should be used])
+ fi
+ fi
fi
AC_SUBST(PTH_CFLAGS)
AC_SUBST(PTH_LIBS)
@@ -384,6 +378,16 @@
*** for a suitable implementation.
***]])
fi
+if test "$have_pth" = "no"; then
+ die=yes
+ AC_MSG_NOTICE([[
+***
+*** GNU Portable Threads Library not found.
+*** Download GNU Pth from ftp://ftp.gnu.org/gnu/pth/
+*** On a Debian GNU/Linux system you might want to try
+*** apt-get install libpth-dev
+***]])
+fi
if test "$die" = "yes"; then
AC_MSG_ERROR([[
Index: dirmngr/po/dirmngr.pot
diff -u dirmngr/po/dirmngr.pot:1.8 dirmngr/po/dirmngr.pot:1.9
--- dirmngr/po/dirmngr.pot:1.8 Fri Dec 17 11:55:41 2004
+++ dirmngr/po/dirmngr.pot Tue Jan 4 20:19:49 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2004-12-17 11:40+0100\n"
+"POT-Creation-Date: 2005-01-04 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: jnlib/logging.c:624
+#: jnlib/logging.c:625
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr ""
@@ -46,7 +46,7 @@
msgid "can't access directory `%s': %s\n"
msgstr ""
-#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:615
+#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:625
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -91,7 +91,7 @@
msgid " runtime cached certificates: %u\n"
msgstr ""
-#: src/certcache.c:457 src/dirmngr-client.c:317
+#: src/certcache.c:457 src/dirmngr-client.c:365
msgid "certificate already cached\n"
msgstr ""
@@ -99,7 +99,7 @@
msgid "certificate cached\n"
msgstr ""
-#: src/certcache.c:461 src/dirmngr-client.c:321
+#: src/certcache.c:461 src/dirmngr-client.c:369
#, c-format
msgid "error caching certificate: %s\n"
msgstr ""
@@ -216,7 +216,7 @@
msgid "unsupported record type in `%s' line %u skipped\n"
msgstr ""
-#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1203
+#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1210
#, c-format
msgid "error reading `%s': %s\n"
msgstr ""
@@ -573,7 +573,7 @@
msgid "End CRL dump\n"
msgstr ""
-#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:683
+#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:693
#, c-format
msgid "error initializing reader object: %s\n"
msgstr ""
@@ -663,11 +663,11 @@
" "
msgstr ""
-#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:76
+#: src/dirmngr.c:119 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
msgid "verbose"
msgstr ""
-#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:77
+#: src/dirmngr.c:120 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
msgid "be somewhat more quiet"
msgstr ""
@@ -767,7 +767,7 @@
msgid "|FILE|listen on socket FILE"
msgstr ""
-#: src/dirmngr.c:218 src/dirmngr-client.c:128 src/dirmngr_ldap.c:140
+#: src/dirmngr.c:218 src/dirmngr-client.c:143 src/dirmngr_ldap.c:140
msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
msgstr ""
@@ -797,162 +797,162 @@
#: src/dirmngr.c:360
#, c-format
-msgid "error spawning ldap wrapper ripper thread: %s\n"
+msgid "error spawning ldap wrapper reaper thread: %s\n"
msgstr ""
-#: src/dirmngr.c:490 src/dirmngr.c:500
+#: src/dirmngr.c:495 src/dirmngr.c:505
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: src/dirmngr.c:597
+#: src/dirmngr.c:602
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: src/dirmngr.c:602 src/dirmngr.c:1260
+#: src/dirmngr.c:607 src/dirmngr.c:1267
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:610
+#: src/dirmngr.c:615
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: src/dirmngr.c:710
+#: src/dirmngr.c:715
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr ""
-#: src/dirmngr.c:786
+#: src/dirmngr.c:792
msgid "colons are not allowed in the socket name\n"
msgstr ""
-#: src/dirmngr.c:791
+#: src/dirmngr.c:797
msgid "name of socket too long\n"
msgstr ""
-#: src/dirmngr.c:798
+#: src/dirmngr.c:804
#, c-format
msgid "can't create socket: %s\n"
msgstr ""
-#: src/dirmngr.c:817
+#: src/dirmngr.c:823
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:826
+#: src/dirmngr.c:832
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:832
+#: src/dirmngr.c:838
#, c-format
msgid "listening on socket `%s'\n"
msgstr ""
-#: src/dirmngr.c:838
+#: src/dirmngr.c:844
#, c-format
msgid "fork failed: %s\n"
msgstr ""
-#: src/dirmngr.c:856
+#: src/dirmngr.c:862
msgid "out of core\n"
msgstr ""
-#: src/dirmngr.c:895
+#: src/dirmngr.c:901
#, c-format
msgid "setsid() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:905
+#: src/dirmngr.c:911
#, c-format
msgid "chdir to / failed: %s\n"
msgstr ""
-#: src/dirmngr.c:954
+#: src/dirmngr.c:961
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:960
+#: src/dirmngr.c:967
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1107
+#: src/dirmngr.c:1114
#, c-format
msgid "error opening `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:1124
+#: src/dirmngr.c:1131
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr ""
-#: src/dirmngr.c:1152
+#: src/dirmngr.c:1159
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: src/dirmngr.c:1171
+#: src/dirmngr.c:1178
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: src/dirmngr.c:1192
+#: src/dirmngr.c:1199
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr ""
-#: src/dirmngr.c:1292
+#: src/dirmngr.c:1299
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
-#: src/dirmngr.c:1306
+#: src/dirmngr.c:1313
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1311
+#: src/dirmngr.c:1318
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
-#: src/dirmngr.c:1313
+#: src/dirmngr.c:1320
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
-#: src/dirmngr.c:1318
+#: src/dirmngr.c:1325
msgid "shutdown forced\n"
msgstr ""
-#: src/dirmngr.c:1326
+#: src/dirmngr.c:1333
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
-#: src/dirmngr.c:1333
+#: src/dirmngr.c:1340
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1347
+#: src/dirmngr.c:1354
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: src/dirmngr.c:1352
+#: src/dirmngr.c:1359
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: src/dirmngr.c:1408
+#: src/dirmngr.c:1415
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr ""
-#: src/dirmngr.c:1415
+#: src/dirmngr.c:1422
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr ""
@@ -1032,47 +1032,47 @@
msgid "ldap wrapper %d stalled - killing\n"
msgstr ""
-#: src/ldap.c:390 src/ldap.c:411
+#: src/ldap.c:401 src/ldap.c:422
#, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
msgstr ""
-#: src/ldap.c:556 src/ldap.c:562
+#: src/ldap.c:566 src/ldap.c:572
#, c-format
msgid "error creating a pipe: %s\n"
msgstr ""
-#: src/ldap.c:572
+#: src/ldap.c:582
#, c-format
msgid "error forking process: %s\n"
msgstr ""
-#: src/ldap.c:620 src/ldap.c:627 src/ldap.c:634
+#: src/ldap.c:630 src/ldap.c:637 src/ldap.c:644
#, c-format
msgid "dup2 failed in child: %s\n"
msgstr ""
-#: src/ldap.c:652
+#: src/ldap.c:662
#, c-format
msgid "error running `%s': %s\n"
msgstr ""
-#: src/ldap.c:664
+#: src/ldap.c:674
#, c-format
msgid "error allocating memory: %s\n"
msgstr ""
-#: src/ldap.c:696
+#: src/ldap.c:706
#, c-format
msgid "ldap wrapper %d started\n"
msgstr ""
-#: src/ldap.c:1160
+#: src/ldap.c:1170
#, c-format
msgid "start_cert_fetch: invalid pattern `%s'\n"
msgstr ""
-#: src/ldap.c:1298
+#: src/ldap.c:1308
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@ -1420,35 +1420,43 @@
msgid "certificate is not usable for signing\n"
msgstr ""
-#: src/dirmngr-client.c:66
+#: src/dirmngr-client.c:69
msgid "use OCSP instead of CRLs"
msgstr ""
-#: src/dirmngr-client.c:67
+#: src/dirmngr-client.c:70
msgid "check whether a dirmngr is running"
msgstr ""
-#: src/dirmngr-client.c:68
+#: src/dirmngr-client.c:71
msgid "add a certificate to the cache"
msgstr ""
-#: src/dirmngr-client.c:69
+#: src/dirmngr-client.c:72
msgid "validate a certificate"
msgstr ""
-#: src/dirmngr-client.c:70
+#: src/dirmngr-client.c:73
msgid "lookup a certificate"
msgstr ""
-#: src/dirmngr-client.c:71
+#: src/dirmngr-client.c:74
msgid "load a CRL into the dirmngr"
msgstr ""
-#: src/dirmngr-client.c:132
+#: src/dirmngr-client.c:75
+msgid "special mode for use by Squid"
+msgstr ""
+
+#: src/dirmngr-client.c:76
+msgid "certificates are expected in PEM format"
+msgstr ""
+
+#: src/dirmngr-client.c:147
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
-#: src/dirmngr-client.c:136
+#: src/dirmngr-client.c:151
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -1456,98 +1464,98 @@
"not valid and other error codes for general failures\n"
msgstr ""
-#: src/dirmngr-client.c:224
+#: src/dirmngr-client.c:265 src/dirmngr-client.c:953
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr ""
-#: src/dirmngr-client.c:231
+#: src/dirmngr-client.c:272
#, c-format
msgid "error reading certificate from `%s': %s\n"
msgstr ""
-#: src/dirmngr-client.c:245
+#: src/dirmngr-client.c:286
msgid "certificate too large to make any sense\n"
msgstr ""
-#: src/dirmngr-client.c:264
+#: src/dirmngr-client.c:312
#, c-format
msgid "lookup failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:279
+#: src/dirmngr-client.c:327
#, c-format
msgid "loading CRL `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:307
+#: src/dirmngr-client.c:355
msgid "a dirmngr daemon is up and running\n"
msgstr ""
-#: src/dirmngr-client.c:329
+#: src/dirmngr-client.c:377
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:336
+#: src/dirmngr-client.c:384 src/dirmngr-client.c:964
msgid "certificate is valid\n"
msgstr ""
-#: src/dirmngr-client.c:342
+#: src/dirmngr-client.c:390 src/dirmngr-client.c:972
msgid "certificate has been revoked\n"
msgstr ""
-#: src/dirmngr-client.c:347
+#: src/dirmngr-client.c:395 src/dirmngr-client.c:974
#, c-format
msgid "certificate check failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:358
+#: src/dirmngr-client.c:406
#, c-format
msgid "got status: `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:373
+#: src/dirmngr-client.c:421
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr ""
-#: src/dirmngr-client.c:405
+#: src/dirmngr-client.c:453
msgid "apparently no running dirmngr\n"
msgstr ""
-#: src/dirmngr-client.c:410
+#: src/dirmngr-client.c:458
msgid "no running dirmngr - starting one\n"
msgstr ""
-#: src/dirmngr-client.c:443
+#: src/dirmngr-client.c:491
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: src/dirmngr-client.c:458
+#: src/dirmngr-client.c:506
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr ""
-#: src/dirmngr-client.c:474
+#: src/dirmngr-client.c:522
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: src/dirmngr-client.c:482
+#: src/dirmngr-client.c:530
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr ""
-#: src/dirmngr-client.c:565
+#: src/dirmngr-client.c:766
#, c-format
msgid "unsupported inquiry `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:657
+#: src/dirmngr-client.c:858
msgid "absolute file name expected\n"
msgstr ""
-#: src/dirmngr-client.c:700
+#: src/dirmngr-client.c:901
#, c-format
msgid "looking up `%s'\n"
msgstr ""
More information about the Gnupg-commits
mailing list