[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-128-g9b87602
by Werner Koch
cvs at cvs.gnupg.org
Fri May 10 18:52:01 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via 9b8760233fa3416b0bda7db8ee8f4eaaaa8190a8 (commit)
via 11ce4c79bb953ae3a20f6de609655f6949017c54 (commit)
via 45451565b9d1ec08dbd44165998dd1272c7a6590 (commit)
via 3f79a0b4b4bffa6b04ec7fb0eb82c3bb3ae70d16 (commit)
via 0a9a4a38df0a5d6a84302154470904b9ec8014f5 (commit)
from e877f9ee129dcbc245736e9334cfbc6725f19f9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9b8760233fa3416b0bda7db8ee8f4eaaaa8190a8
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 25 12:00:16 2013 +0100
Post release version bump.
--
diff --git a/NEWS b/NEWS
index 9e64e46..bf6e11c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Noteworthy changes in version 2.0.21 (unreleased)
+-------------------------------------------------
+
Noteworthy changes in version 2.0.20 (2013-05-10)
-------------------------------------------------
diff --git a/announce.txt b/announce.txt
index 4171d94..d4e11b1 100644
--- a/announce.txt
+++ b/announce.txt
@@ -5,7 +5,7 @@ Mail-Followup-To: gnupg-users at gnupg.org
Hello!
We are pleased to announce the availability of a new stable GnuPG-2
-release: Version 2.0.19.
+release: Version 2.0.20.
The GNU Privacy Guard (GnuPG) is GNU's tool for secure communication
and data storage. It can be used to encrypt data, create digital
@@ -14,7 +14,7 @@ framework for public key cryptography. It includes an advanced key
management facility and is compliant with the OpenPGP and S/MIME
standards.
-GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.12) in
+GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.13) in
that it splits up functionality into several modules. However, both
versions may be installed alongside without any conflict. In fact,
the gpg version from GnuPG-1 is able to make use of the gpg-agent as
@@ -29,24 +29,43 @@ GnuPG is distributed under the terms of the GNU General Public License
also available for other Unices, Microsoft Windows and Mac OS X.
-What's New in 2.0.19
+What's New in 2.0.20
====================
- * GPG now accepts a space separated fingerprint as a user ID. This
- allows to copy and paste the fingerprint from the key listing.
+ * Decryption using smartcards keys > 3072 bit does now work.
- * GPG now uses the longest key ID available. Removed support for the
- original HKP keyserver which is not anymore used by any site.
+ * New meta option ignore-invalid-option to allow using the same
+ option file by other GnuPG versions.
- * Rebuild the trustdb after changing the option --min-cert-level.
+ * gpg: The hash algorithm is now printed for sig records in key listings.
- * Ukrainian translation.
+ * gpg: Skip invalid keyblock packets during import to avoid a DoS.
- * Honor option --cert-digest-algo when creating a cert.
+ * gpg: Correctly handle ports from DNS SRV records.
- * Emit a DECRYPTION_INFO status line.
+ * keyserver: Improve use of SRV records
- * Improved detection of JPEG files.
+ * gpg-agent: Avoid tty corruption when killing pinentry.
+
+ * scdaemon: Improve detection of card insertion and removal.
+
+ * scdaemon: Rename option --disable-keypad to --disable-pinpad.
+
+ * scdaemon: Better support for CCID readers. Now, the internal CCID
+ driver supports readers without the auto configuration feature.
+
+ * scdaemon: Add pinpad input for PC/SC, if your reader has pinpad and
+ it supports variable length PIN input, and you specify
+ --enable-pinpad-varlen option.
+
+ * scdaemon: New option --enable-pinpad-varlen.
+
+ * scdaemon: Install into libexecdir to avoid accidental execution
+ from the command line.
+
+ * Support building using w64-mingw32.
+
+ * Assorted bug fixes.
Getting the Software
@@ -55,7 +74,7 @@ Getting the Software
Please follow the instructions found at http://www.gnupg.org/download/
or read on:
-GnuPG 2.0.19 may be downloaded from one of the GnuPG mirror sites or
+GnuPG 2.0.20 may be downloaded from one of the GnuPG mirror sites or
direct from ftp://ftp.gnupg.org/gcrypt/gnupg/ . The list of mirrors
can be found at http://www.gnupg.org/mirrors.html . Note, that GnuPG
is not available at ftp.gnu.org.
@@ -63,14 +82,14 @@ is not available at ftp.gnu.org.
On the FTP server and its mirrors you should find the following files
in the gnupg/ directory:
- gnupg-2.0.19.tar.bz2 (4089k)
- gnupg-2.0.19.tar.bz2.sig
+ gnupg-2.0.20.tar.bz2 (4186k)
+ gnupg-2.0.20.tar.bz2.sig
GnuPG source compressed using BZIP2 and OpenPGP signature.
- gnupg-2.0.18-2.0.19.diff.bz2 (305k)
+ gnupg-2.0.19-2.0.20.diff.bz2 (249k)
- A patch file to upgrade a 2.0.18 GnuPG source tree. This patch
+ A patch file to upgrade a 2.0.19 GnuPG source tree. This patch
does not include updates of the language files.
Note, that we don't distribute gzip compressed tarballs for GnuPG-2.
@@ -85,9 +104,9 @@ the following ways:
* If you already have a trusted version of GnuPG installed, you
can simply check the supplied signature. For example to check the
- signature of the file gnupg-2.0.19.tar.bz2 you would use this command:
+ signature of the file gnupg-2.0.20.tar.bz2 you would use this command:
- gpg --verify gnupg-2.0.19.tar.bz2.sig
+ gpg --verify gnupg-2.0.20.tar.bz2.sig
This checks whether the signature file matches the source file.
You should see a message indicating that the signature is good and
@@ -110,15 +129,15 @@ the following ways:
* If you are not able to use an old version of GnuPG, you have to verify
the SHA-1 checksum. Assuming you downloaded the file
- gnupg-2.0.19.tar.bz2, you would run the sha1sum command like this:
+ gnupg-2.0.20.tar.bz2, you would run the sha1sum command like this:
- sha1sum gnupg-2.0.19.tar.bz2
+ sha1sum gnupg-2.0.20.tar.bz2
and check that the output matches the first line from the
following list:
-190c09e6688f688fb0a5cf884d01e240d957ac1f gnupg-2.0.19.tar.bz2
-d5e5643dc5ecb4e5296f1a9500f850cfbfd0f8ff gnupg-2.0.18-2.0.19.diff.bz2
+7ddfefa37ee9da89a8aaa8f9059d251b4cd02562 gnupg-2.0.20.tar.bz2
+4afefda1f42c7b8065e97c6df051fab2db552642 gnupg-2.0.19-2.0.20.diff.bz2
Documentation
@@ -158,11 +177,11 @@ service directory at:
http://www.gnupg.org/service.html
-Maintaining and improving GnuPG is costly. For more than 10 years
-now, g10 Code, a German company owned and headed by GnuPG's principal
-author Werner Koch, is bearing the majority of these costs. To help
-them carry on this work, they need your support. Please consider to
-visit the GnuPG donation page at:
+The driving force behind the development of GnuPG is the company of
+its principal author, Werner Koch. Maintenance and improvement of
+GnuPG and related software takes up most of their resources. To
+allow him them continue his work he asks to either purchase a support
+contract, engage them for custom enhancements, or to donate money:
http://g10code.com/gnupg-donation.html
diff --git a/configure.ac b/configure.ac
index 4752772..b85124c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.20])
+m4_define([mym4_version], [2.0.21])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 11ce4c79bb953ae3a20f6de609655f6949017c54
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 25 12:00:16 2013 +0100
Release 2.0.20
diff --git a/AUTHORS b/AUTHORS
index 92f44cb..c787c7c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -180,7 +180,7 @@ name gpg2keys_*.
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011,
- 2012 Free Software Foundation, Inc.
+ 2012, 2013 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/NEWS b/NEWS
index 9ead9bf..9e64e46 100644
--- a/NEWS
+++ b/NEWS
@@ -1,33 +1,40 @@
-Noteworthy changes in version 2.0.20 (unreleased)
+Noteworthy changes in version 2.0.20 (2013-05-10)
-------------------------------------------------
- * The hash algorithm is now printed for sig records in key listings.
-
* Decryption using smartcards keys > 3072 bit does now work.
* New meta option ignore-invalid-option to allow using the same
option file by other GnuPG versions.
- * [gpg] Skip invalid keyblock packets during import to avoid a DoS.
+ * gpg: The hash algorithm is now printed for sig records in key listings.
+
+ * gpg: Skip invalid keyblock packets during import to avoid a DoS.
+
+ * gpg: Correctly handle ports from DNS SRV records.
- * [gpg] Correctly handle ports from DNS SRV records.
+ * keyserver: Improve use of SRV records
- * [gpg-agent] Avoid tty corruption when killing pinentry.
+ * gpg-agent: Avoid tty corruption when killing pinentry.
- * [scdaemon] Rename option --disable-keypad to --disable-pinpad.
+ * scdaemon: Improve detection of card insertion and removal.
- * [scdaemon] Better support for CCID readers. Now, the internal CCID
+ * scdaemon: Rename option --disable-keypad to --disable-pinpad.
+
+ * scdaemon: Better support for CCID readers. Now, the internal CCID
driver supports readers without the auto configuration feature.
- * [scdaemon] Add pinpad input for PC/SC, if your reader has pinpad
- and it supports variable length PIN input, and you specify
+ * scdaemon: Add pinpad input for PC/SC, if your reader has pinpad and
+ it supports variable length PIN input, and you specify
--enable-pinpad-varlen option.
- * [scdaemon] New option --enable-pinpad-varlen.
+ * scdaemon: New option --enable-pinpad-varlen.
- * [scdaemon] Install into libexecdir to avoid accidental execution
+ * scdaemon: Install into libexecdir to avoid accidental execution
from the command line.
+ * Support building using w64-mingw32.
+
+ * Assorted bug fixes.
Noteworthy changes in version 2.0.19 (2012-03-27)
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index ea624e8..c457953 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -1266,7 +1266,7 @@ strusage( int level )
break;
case 11: p = "foo"; break;
case 13: p = "0.0"; break;
- case 14: p = "Copyright (C) 2012 Free Software Foundation, Inc."; break;
+ case 14: p = "Copyright (C) 2013 Free Software Foundation, Inc."; break;
case 15: p =
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n";
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index aae1120..4bbf212 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -188,7 +188,7 @@ static void
print_version (int with_help)
{
fputs (MYVERSION_LINE "\n"
- "Copyright (C) 2012 Free Software Foundation, Inc.\n"
+ "Copyright (C) 2013 Free Software Foundation, Inc.\n"
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions. See the file COPYING for details.\n",
commit 45451565b9d1ec08dbd44165998dd1272c7a6590
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 25 12:00:16 2013 +0100
po: Auto updates
--
diff --git a/po/uk.po b/po/uk.po
index 4eced4b..e14cc6e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -186,7 +186,6 @@ msgid "Reset Code"
msgstr "Код скидання"
#, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
@@ -285,7 +284,6 @@ msgid "Yes, protection is not needed"
msgstr "Так, у захисті немає потреби"
#, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Вкажіть пароль до%0Aз метою захисту вашого нового ключа"
@@ -1694,10 +1692,6 @@ msgstr ""
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Використання: gpg [параметри] [файли] (-h — довідка)"
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@ -5383,9 +5377,6 @@ msgstr "увімкнути повну діагностику"
msgid "Usage: kbxutil [options] [files] (-h for help)"
msgstr "Використання: kbxutil [параметри] [файли] (-h — довідка)"
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
msgid ""
"Syntax: kbxutil [options] [files]\n"
"List, export, import Keybox data\n"
@@ -5546,11 +5537,9 @@ msgstr "|AN|Новий адміністративний пінкод"
msgid "|N|New PIN"
msgstr "|N|Новий пінкод"
-#| msgid "|A|Please enter the Admin PIN"
msgid "||Please enter the Admin PIN and New Admin PIN"
msgstr "|A|Вкажіть новий адміністративний пінкод"
-#| msgid "||Please enter the PIN"
msgid "||Please enter the PIN and New PIN"
msgstr "||Вкажіть новий пінкод"
@@ -5616,7 +5605,6 @@ msgstr "перевірку адміністративного пінкоду з
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
-#| msgid "||Please enter your PIN at the reader's keypad"
msgid "||Please enter your PIN at the reader's pinpad"
msgstr "||Вкажіть ваш пінкод за допомогою клавіатурної панелі зчитувача"
@@ -5650,7 +5638,6 @@ msgstr "не використовувати вбудованого драйве
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|від’єднати бездіяльну вказану кількість секунд картку"
-#| msgid "do not use a reader's keypad"
msgid "do not use a reader's pinpad"
msgstr "не використовувати додаткову клавіатуру зчитувача"
@@ -5931,19 +5918,15 @@ msgstr "не вказано використання ключа — припус
msgid "error getting key usage information: %s\n"
msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
-#| msgid "certificate should have not been used for certification\n"
msgid "certificate should not have been used for certification\n"
msgstr "сертифікат не мав використовуватися для сертифікації\n"
-#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
-#| msgid "certificate should have not been used for encryption\n"
msgid "certificate should not have been used for encryption\n"
msgstr "сертифікат не мав використовуватися для шифрування\n"
-#| msgid "certificate should have not been used for signing\n"
msgid "certificate should not have been used for signing\n"
msgstr "сертифікат не мав використовуватися для підписування\n"
@@ -6220,10 +6203,6 @@ msgstr ""
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Використання: gpgsm [параметри] [файли] (-h — довідка)"
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
msgid ""
"Syntax: gpgsm [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
commit 3f79a0b4b4bffa6b04ec7fb0eb82c3bb3ae70d16
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 25 12:00:16 2013 +0100
Update gpg-error, libgcrypt, and ksba m4 scripts.
* m4/gpg-error.m4: Update from libgpg-error repo.
* m4/ksba.m4: Likewise.
* m4/libgcrypt.m4: Likewise.
--
GnuPG-bug-id: 1496.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 9d96d16..feb963c 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -1,5 +1,5 @@
# gpg-error.m4 - autoconf macro to detect libgpg-error.
-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -14,21 +14,34 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
-[ AC_ARG_WITH(gpg-error-prefix,
- AC_HELP_STRING([--with-gpg-error-prefix=PFX],
- [prefix where GPG Error is installed (optional)]),
- gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+ gpg_error_config_prefix=""
+ dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
+ dnl since that is consistent with how our three siblings use the directory/
+ dnl package name in --with-$dir_name-prefix=PFX.
+ AC_ARG_WITH(libgpg-error-prefix,
+ AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
+ [prefix where GPG Error is installed (optional)]),
+ [gpg_error_config_prefix="$withval"])
+
+ dnl Accept --with-gpg-error-prefix and make it work the same as
+ dnl --with-libgpg-error-prefix above, for backwards compatibility,
+ dnl but do not document this old, inconsistently-named option.
+ AC_ARG_WITH(gpg-error-prefix,,
+ [gpg_error_config_prefix="$withval"])
+
if test x$gpg_error_config_prefix != x ; then
if test x${GPG_ERROR_CONFIG+set} != xset ; then
GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
fi
fi
- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
+ AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,0.0,$1)
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
ok=no
- if test "$GPG_ERROR_CONFIG" != "no" ; then
+ if test "$GPG_ERROR_CONFIG" != "no" \
+ && test -f "$GPG_ERROR_CONFIG" ; then
req_major=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \
@@ -40,7 +53,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
if test "$major" -gt "$req_major"; then
ok=yes
- else
+ else
if test "$major" -eq "$req_major"; then
if test "$minor" -ge "$req_minor"; then
ok=yes
@@ -53,6 +66,19 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
+ gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+ if test x"$gpg_error_config_host" != xnone ; then
+ if test x"$gpg_error_config_host" != x"$host" ; then
+ AC_MSG_WARN([[
+***
+*** The config script $GPG_ERROR_CONFIG was
+*** built for $gpg_error_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-gpg-error-prefix
+*** to specify a matching config script.
+***]])
+ fi
+ fi
else
GPG_ERROR_CFLAGS=""
GPG_ERROR_LIBS=""
@@ -62,4 +88,3 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_SUBST(GPG_ERROR_CFLAGS)
AC_SUBST(GPG_ERROR_LIBS)
])
-
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 1100387..73b2e26 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -15,13 +15,14 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
+dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libksba
dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_KSBA],
-[ AC_ARG_WITH(ksba-prefix,
+[AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_ARG_WITH(ksba-prefix,
AC_HELP_STRING([--with-ksba-prefix=PFX],
[prefix where KSBA is installed (optional)]),
ksba_config_prefix="$withval", ksba_config_prefix="")
@@ -60,7 +61,7 @@ AC_DEFUN([AM_PATH_KSBA],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
ok=yes
- else
+ else
if test "$major" -eq "$req_major"; then
if test "$minor" -gt "$req_minor"; then
ok=yes
@@ -99,6 +100,19 @@ AC_DEFUN([AM_PATH_KSBA],
KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
ifelse([$2], , :, [$2])
+ libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
+ if test x"$libksba_config_host" != xnone ; then
+ if test x"$libksba_config_host" != x"$host" ; then
+ AC_MSG_WARN([[
+***
+*** The config script $LIBKSBA_CONFIG was
+*** built for $libksba_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libksba-prefix
+*** to specify a matching config script.
+***]])
+ fi
+ fi
else
KSBA_CFLAGS=""
KSBA_LIBS=""
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 854eaaa..6cf482f 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,5 +1,5 @@
dnl Autoconf macros for libgcrypt
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
dnl
dnl This file is free software; as a special exception the author gives
dnl unlimited permission to copy and/or distribute it, with or without
@@ -15,13 +15,14 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_ARG_WITH(libgcrypt-prefix,
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_ARG_WITH(libgcrypt-prefix,
AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
@@ -31,7 +32,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
fi
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -59,7 +60,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
ok=yes
- else
+ else
if test "$major" -eq "$req_major"; then
if test "$minor" -gt "$req_minor"; then
ok=yes
@@ -98,6 +99,19 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ if test x"$libgcrypt_config_host" != xnone ; then
+ if test x"$libgcrypt_config_host" != x"$host" ; then
+ AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script.
+***]])
+ fi
+ fi
else
LIBGCRYPT_CFLAGS=""
LIBGCRYPT_LIBS=""
commit 0a9a4a38df0a5d6a84302154470904b9ec8014f5
Author: Yuri Chornoivan <yurchor at ukr.net>
Date: Thu Apr 25 12:00:16 2013 +0100
Update Ukrainian translation.
diff --git a/po/uk.po b/po/uk.po
index d87dba7..4eced4b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,12 +2,12 @@
# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the GnuPG package.
#
-# Yuri Chornoivan <yurchor at ukr.net>, 2011.
+# Yuri Chornoivan <yurchor at ukr.net>, 2011, 2013.
msgid ""
msgstr ""
"Project-Id-Version: gnupg2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-08-28 10:55+0300\n"
+"PO-Revision-Date: 2013-04-27 14:41+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
"Language: uk\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
@@ -185,7 +185,7 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Код скидання"
-#, fuzzy, c-format
+#, c-format
#| msgid "%s%%0A%%0AUse the reader's keypad for input."
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
@@ -284,7 +284,7 @@ msgstr ""
msgid "Yes, protection is not needed"
msgstr "Так, у захисті немає потреби"
-#, fuzzy, c-format
+#, c-format
#| msgid "Please enter the passphrase to%0Ato protect your new key"
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Вкажіть пароль до%0Aз метою захисту вашого нового ключа"
@@ -1694,7 +1694,6 @@ msgstr ""
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Використання: gpg [параметри] [файли] (-h — довідка)"
-#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
#| "sign, check, encrypt or decrypt\n"
@@ -5384,7 +5383,6 @@ msgstr "увімкнути повну діагностику"
msgid "Usage: kbxutil [options] [files] (-h for help)"
msgstr "Використання: kbxutil [параметри] [файли] (-h — довідка)"
-#, fuzzy
#| msgid ""
#| "Syntax: kbxutil [options] [files]\n"
#| "list, export, import Keybox data\n"
@@ -5393,7 +5391,7 @@ msgid ""
"List, export, import Keybox data\n"
msgstr ""
"Синтаксис: kbxutil [параметри] [файли]\n"
-"перегляд, експортування, імпортування даних Keybox\n"
+"Перегляд, експортування, імпортування даних Keybox\n"
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
@@ -5548,15 +5546,13 @@ msgstr "|AN|Новий адміністративний пінкод"
msgid "|N|New PIN"
msgstr "|N|Новий пінкод"
-#, fuzzy
#| msgid "|A|Please enter the Admin PIN"
msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "|A|Вкажіть адміністративний пінкод"
+msgstr "|A|Вкажіть новий адміністративний пінкод"
-#, fuzzy
#| msgid "||Please enter the PIN"
msgid "||Please enter the PIN and New PIN"
-msgstr "||Вкажіть пінкод"
+msgstr "||Вкажіть новий пінкод"
msgid "error reading application data\n"
msgstr "помилка читання даних програми\n"
@@ -5620,7 +5616,6 @@ msgstr "перевірку адміністративного пінкоду з
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
-#, fuzzy
#| msgid "||Please enter your PIN at the reader's keypad"
msgid "||Please enter your PIN at the reader's pinpad"
msgstr "||Вкажіть ваш пінкод за допомогою клавіатурної панелі зчитувача"
@@ -5655,7 +5650,6 @@ msgstr "не використовувати вбудованого драйве
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|від’єднати бездіяльну вказану кількість секунд картку"
-#, fuzzy
#| msgid "do not use a reader's keypad"
msgid "do not use a reader's pinpad"
msgstr "не використовувати додаткову клавіатуру зчитувача"
@@ -5664,7 +5658,7 @@ msgid "deny the use of admin card commands"
msgstr "заборонити використання команд з адміністрування картки"
msgid "use variable length input for pinpad"
-msgstr ""
+msgstr "використовувати для клавіатурної панелі змінну довжину введених даних"
msgid "Usage: scdaemon [options] (-h for help)"
msgstr "Використання: scdaemon [параметри] (-h — довідка)"
@@ -5937,22 +5931,18 @@ msgstr "не вказано використання ключа — припус
msgid "error getting key usage information: %s\n"
msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
-#, fuzzy
#| msgid "certificate should have not been used for certification\n"
msgid "certificate should not have been used for certification\n"
msgstr "сертифікат не мав використовуватися для сертифікації\n"
-#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
-#, fuzzy
#| msgid "certificate should have not been used for encryption\n"
msgid "certificate should not have been used for encryption\n"
msgstr "сертифікат не мав використовуватися для шифрування\n"
-#, fuzzy
#| msgid "certificate should have not been used for signing\n"
msgid "certificate should not have been used for signing\n"
msgstr "сертифікат не мав використовуватися для підписування\n"
@@ -6230,7 +6220,6 @@ msgstr ""
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Використання: gpgsm [параметри] [файли] (-h — довідка)"
-#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 2 +-
NEWS | 32 ++++++++++++++-------
announce.txt | 75 ++++++++++++++++++++++++++++++++-------------------
configure.ac | 2 +-
jnlib/argparse.c | 2 +-
m4/gpg-error.m4 | 43 +++++++++++++++++++++++------
m4/ksba.m4 | 20 ++++++++++++--
m4/libgcrypt.m4 | 24 +++++++++++++---
po/uk.po | 50 ++++++----------------------------
tools/watchgnupg.c | 2 +-
10 files changed, 151 insertions(+), 101 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list