[git] GPG-ERROR - branch, master, updated. libgpg-error-1.19-13-g17f8cd7

by Werner Koch cvs at cvs.gnupg.org
Wed Aug 26 09:08:29 CEST 2015


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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  17f8cd76419eec7f1b73c4036e82061cf48b67b2 (commit)
       via  44caed05ec146654f1ce40bba4b25def83c369db (commit)
       via  030ee30c4ae85f2f41ca77651e4a7d7c9993e284 (commit)
       via  9cd3f002addf2acae4a7b0f52f8941e517e83d73 (commit)
       via  17e4f727d9bd8e406bf977af445ef57201d23249 (commit)
       via  72101fae17b335b9763444862b957068440307c4 (commit)
      from  d328c4d72fa6d224117d7332082509c240a4f2fc (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 17f8cd76419eec7f1b73c4036e82061cf48b67b2
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 26 09:02:27 2015 +0200

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index 3b8a1ae..ad19b1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.21 (unreleased) [C16/A16/R_]
+-----------------------------------------------
+
+
 Noteworthy changes in version 1.20 (2015-08-26) [C16/A16/R0]
 -----------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index ec8d112..8946ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.14"
 # another commit, and a push so that the git magic is able to work.
 # See below for the LT versions.
 m4_define([mym4_version_major], [1])
-m4_define([mym4_version_minor], [20])
+m4_define([mym4_version_minor], [21])
 
 # Below is m4 magic to extract and compute the revision number, the
 # decimalized short revision number, a beta version string, and a flag

commit 44caed05ec146654f1ce40bba4b25def83c369db
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 26 08:51:15 2015 +0200

    Release 1.20.
    
    * configure.ac: Set LT version to C16/A16/R0.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index f24fd06..3b8a1ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,19 @@
-Noteworthy changes in version 1.20 (unreleased) [C__/A__/R_]
+Noteworthy changes in version 1.20 (2015-08-26) [C16/A16/R0]
 -----------------------------------------------
 
+ * New macros for GCC attributes.
+
+ * Make es_set_binary actually work for Windows.
+
+ * Allow building without thread support.
+
+ * Build without a build timestamp by default.
+
  * Interface changes relative to the 1.19 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GPGRT_VERSION                    NEW macro.
+ GPGRT_VERSION_NUMBER             NEW macro.
+ GPGRT_INLINE                     NEW macro.
  GPGRT_GCC_VERSION                NEW macro.
  GPGRT_ATTR_NORETURN              NEW macro.
  GPGRT_ATTR_PRINTF                NEW macro.
diff --git a/configure.ac b/configure.ac
index 762ecae..ec8d112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,8 @@ AC_INIT([libgpg-error],[mym4_full_version],[http://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed:		AGE=0)
 # Note that added error codes don't constitute an interface change.
-LIBGPG_ERROR_LT_CURRENT=15
-LIBGPG_ERROR_LT_AGE=15
+LIBGPG_ERROR_LT_CURRENT=16
+LIBGPG_ERROR_LT_AGE=16
 LIBGPG_ERROR_LT_REVISION=0
 ################################################
 
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 2ee1aa4..f9dbf59 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -267,6 +267,10 @@ GPG_ERR_CONFLICT		Conflicting use
 
 71	GPG_ERR_INV_CIPHER_MODE		Invalid cipher mode
 72	GPG_ERR_INV_FLAG		Invalid flag
+
+   GPGME: Used to indicate an invalid combination of flags.
+
+
 73	GPG_ERR_INV_HANDLE		Invalid handle
 74	GPG_ERR_TRUNCATED		Result truncated
 75	GPG_ERR_INCOMPLETE_LINE		Incomplete line
@@ -515,6 +519,7 @@ GPG_ERR_TOO_MANY                Too many objects
 
     GPG: - Dirmngr KS_GET called with too many pattern so that the
            maximum Assuan line length would overflow.
+         - gpgsm's command export --secret called with too man keys.
     GPGME: - To many patterns in gpgme-tools's KEYLIST command.
 
 GPG_ERR_LIMIT_REACHED           Limit reached
@@ -552,7 +557,8 @@ GPG_ERR_UNKNOWN_CURVE		Unknown elliptic curve
 GPG_ERR_DUP_KEY                 Duplicated key
 
         A duplicated key was detected.  For example a unique key in a
-        database occurred more than once.
+        database occurred more than once.  Also used if in a protocol
+        an expected key was returned more than once.
 
 GPG_ERR_AMBIGUOUS		Ambiguous search
 
@@ -744,8 +750,8 @@ GPG_ERR_BOGUS_STRING            Bogus string
 
 GPG_ERR_FORBIDDEN		Forbidden
 
-    The use of a features is not allowed to to insuffcient rights.
-    Use by gpg-agent as aerror codes for restricted commands.
+    The use of a features is not allowed due to insuffcient rights.
+    Use by gpg-agent as an error codes for restricted commands.
 
 GPG_ERR_KEY_DISABLED            Key disabled
 
diff --git a/po/uk.po b/po/uk.po
index 1f37874..6f83786 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -731,11 +731,9 @@ msgstr "Помилковий вісімковий символ у S-виразі
 msgid "Legacy key"
 msgstr "Застарілий ключ"
 
-#| msgid "Buffer too short"
 msgid "Request too short"
 msgstr "Занадто короткий запит"
 
-#| msgid "Line too long"
 msgid "Request too long"
 msgstr "Надто довгий запит"
 
@@ -910,65 +908,51 @@ msgstr "Помилка у параметрі IPC"
 msgid "Unknown IPC inquire"
 msgstr "Невідомий запит IPC"
 
-#| msgid "General IPC error"
 msgid "General LDAP error"
 msgstr "Загальна помилка LDAP"
 
-#| msgid "General error"
 msgid "General LDAP attribute error"
 msgstr "Загальна помилка атрибута LDAP"
 
-#| msgid "General error"
 msgid "General LDAP name error"
 msgstr "Загальна помилка назви LDAP"
 
-#| msgid "General Assuan error"
 msgid "General LDAP security error"
 msgstr "Загальна помилка захисту LDAP"
 
-#| msgid "General error"
 msgid "General LDAP service error"
 msgstr "Загальна помилка служби LDAP"
 
-#| msgid "General Assuan error"
 msgid "General LDAP update error"
 msgstr "Загальна помилка оновлення LDAP"
 
 msgid "Experimental LDAP error code"
 msgstr "Експериментальний код помилки LDAP"
 
-#| msgid "IPC write error"
 msgid "Private LDAP error code"
 msgstr "Код конфіденційної помилки LDAP"
 
-#| msgid "General IPC error"
 msgid "Other general LDAP error"
 msgstr "Інша загальна помилка LDAP"
 
-#| msgid "IPC connect call failed"
 msgid "LDAP connecting failed (X)"
 msgstr "Не вдалося з’єднатися із LDAP (X)"
 
-#| msgid "General error"
 msgid "LDAP referral limit exceeded"
 msgstr "Перевищення обмежень щодо спрямовування у LDAP"
 
 msgid "LDAP client loop"
 msgstr "Циклічний клієнт LDAP"
 
-#| msgid "Card reset required"
 msgid "No LDAP results returned"
 msgstr "Не повернуто результатів LDAP"
 
-#| msgid "Element not found"
 msgid "LDAP control not found"
 msgstr "Не знайдено керування LDAP"
 
-#| msgid "Not supported"
 msgid "Not supported by LDAP"
 msgstr "Не підтримується LDAP"
 
-#| msgid "Unexpected error"
 msgid "LDAP connect error"
 msgstr "Помилка з’єднання LDAP"
 
@@ -978,47 +962,36 @@ msgstr "Не вистачає пам’яті у LDAP"
 msgid "Bad parameter to an LDAP routine"
 msgstr "Помилковий параметр підпрограми LDAP"
 
-#| msgid "Unsupported operation"
 msgid "User cancelled LDAP operation"
 msgstr "Дію LDAP скасовано користувачем"
 
-#| msgid "Bad certificate"
 msgid "Bad LDAP search filter"
 msgstr "Помилковий фільтр пошуку LDAP"
 
-#| msgid "Unknown extension"
 msgid "Unknown LDAP authentication method"
 msgstr "Невідомий спосіб розпізнавання LDAP"
 
-#| msgid "Timeout"
 msgid "Timeout in LDAP"
 msgstr "Перевищення часу очікування у LDAP"
 
-#| msgid "dirmngr error"
 msgid "LDAP decoding error"
 msgstr "Помилка декодування LDAP"
 
-#| msgid "dirmngr error"
 msgid "LDAP encoding error"
 msgstr "Помилка кодування LDAP"
 
-#| msgid "IPC read error"
 msgid "LDAP local error"
 msgstr "Локальна помилка LDAP"
 
-#| msgid "Not an IPC server"
 msgid "Cannot contact LDAP server"
 msgstr "Не вдалося встановити зв’язок із сервером LDAP"
 
-#| msgid "Success"
 msgid "LDAP success"
 msgstr "Успіх LDAP"
 
-#| msgid "Configuration error"
 msgid "LDAP operations error"
 msgstr "Помилка дій LDAP"
 
-#| msgid "Protocol violation"
 msgid "LDAP protocol error"
 msgstr "Помилка протоколу LDAP"
 
@@ -1034,18 +1007,15 @@ msgstr "Порівняння LDAP: не збігаються"
 msgid "LDAP compare true"
 msgstr "Порівняння LDAP: збігаються"
 
-#| msgid "Unknown extension"
 msgid "LDAP authentication method not supported"
 msgstr "Підтримки методу розпізнавання LDAP не передбачено"
 
 msgid "Strong(er) LDAP authentication required"
 msgstr "Потрібен потужніший спосіб розпізнавання LDAP"
 
-#| msgid "Fatal alert message received"
 msgid "Partial LDAP results+referral received"
 msgstr "Отримано часткові результати і спрямування LDAP"
 
-#| msgid "General error"
 msgid "LDAP referral"
 msgstr "Спрямування LDAP"
 
@@ -1055,7 +1025,6 @@ msgstr "Перевищено адміністративне обмеження L
 msgid "Critical LDAP extension is unavailable"
 msgstr "Недоступне критичне розширення LDAP"
 
-#| msgid "Card reset required"
 msgid "Confidentiality required by LDAP"
 msgstr "Конфіденційно потрібне LDAP"
 
@@ -1065,52 +1034,42 @@ msgstr "Виконуємо прив’язування SASL LDAP"
 msgid "No such LDAP attribute"
 msgstr "Немає такого атрибута LDAP"
 
-#| msgid "Invalid attribute"
 msgid "Undefined LDAP attribute type"
 msgstr "Невизначний тип атрибута LDAP"
 
-#| msgid "Unsupported protection"
 msgid "Inappropriate matching in LDAP"
 msgstr "Неприйнятна відповідність у LDAP"
 
-#| msgid "Protocol violation"
 msgid "Constraint violation in LDAP"
 msgstr "Порушення обмежень у LDAP"
 
 msgid "LDAP type or value exists"
 msgstr "Тип або значення LDAP існує"
 
-#| msgid "Invalid state"
 msgid "Invalid syntax in LDAP"
 msgstr "Некоректний синтаксис у LDAP"
 
-#| msgid "No CMS object"
 msgid "No such LDAP object"
 msgstr "Немає такого об’єкта LDAP"
 
-#| msgid "Hardware problem"
 msgid "LDAP alias problem"
 msgstr "Проблема псевдоніма LDAP"
 
-#| msgid "Invalid state"
 msgid "Invalid DN syntax in LDAP"
 msgstr "Некоректний синтаксис DN у LDAP"
 
 msgid "LDAP entry is a leaf"
 msgstr "Запис LDAP є листком"
 
-#| msgid "Encoding problem"
 msgid "LDAP alias dereferencing problem"
 msgstr "Проблемі з скасування прив’язки псевдоніма LDAP"
 
 msgid "LDAP proxy authorization failure (X)"
 msgstr "Помилка уповноваження проксі LDAP (X)"
 
-#| msgid "Unsupported protection"
 msgid "Inappropriate LDAP authentication"
 msgstr "Неприйнятне розпізнавання LDAP"
 
-#| msgid "Invalid card"
 msgid "Invalid LDAP credentials"
 msgstr "Некоректні реєстраційні дані LDAP"
 
@@ -1120,7 +1079,6 @@ msgstr "Недостатні права доступу до LDAP"
 msgid "LDAP server is busy"
 msgstr "Сервер LDAP зайнято виконанням завдання"
 
-#| msgid "No keyserver available"
 msgid "LDAP server is unavailable"
 msgstr "Сервер LDAP недоступний"
 
@@ -1130,19 +1088,15 @@ msgstr "Сервер LDAP не бажає працювати"
 msgid "Loop detected by LDAP"
 msgstr "LDAP виявлено цикл"
 
-#| msgid "Missing action"
 msgid "LDAP naming violation"
 msgstr "Порушення іменування LDAP"
 
-#| msgid "Protocol violation"
 msgid "LDAP object class violation"
 msgstr "Порушення класу об’єктів LDAP"
 
-#| msgid "Operation not yet finished"
 msgid "LDAP operation not allowed on non-leaf"
 msgstr "Дію LDAP не дозволено для об’єктів, які не є листками"
 
-#| msgid "Operation cancelled"
 msgid "LDAP operation not allowed on RDN"
 msgstr "Дію LDAP не дозволено над RDN"
 
@@ -1152,58 +1106,45 @@ msgstr "Вже існує (LDAP)"
 msgid "Cannot modify LDAP object class"
 msgstr "Не вдалося змінити клас об’єкта LDAP"
 
-#| msgid "Line too long"
 msgid "LDAP results too large"
 msgstr "Результати LDAP є надто великими"
 
-#| msgid "Operation cancelled"
 msgid "LDAP operation affects multiple DSAs"
 msgstr "Дія LDAP стосується декількох DSA"
 
 msgid "Virtual LDAP list view error"
 msgstr "Помилка перегляду списку віртуальної LDAP"
 
-#| msgid "General IPC error"
 msgid "Other LDAP error"
 msgstr "Інша помилка LDAP"
 
-#| msgid "Resources exhausted"
 msgid "Resources exhausted in LCUP"
 msgstr "Вичерпано ресурси у LCUP"
 
-#| msgid "Protocol violation"
 msgid "Security violation in LCUP"
 msgstr "Порушення захисту у LCUP"
 
-#| msgid "Invalid state"
 msgid "Invalid data in LCUP"
 msgstr "Некоректні дані у LCUP"
 
-#| msgid "Unsupported certificate"
 msgid "Unsupported scheme in LCUP"
 msgstr "Непідтримувана схема у LCUP"
 
-#| msgid "Card reset required"
 msgid "Reload required in LCUP"
 msgstr "Потрібне перезавантаження у LCUP"
 
-#| msgid "Success"
 msgid "LDAP cancelled"
 msgstr "LDAP скасовано"
 
-#| msgid "Not operational"
 msgid "No LDAP operation to cancel"
 msgstr "Немає дії LDAP для скасовування"
 
-#| msgid "Not operational"
 msgid "Too late to cancel LDAP"
 msgstr "Запізно для скасовування LDAP"
 
-#| msgid "Not an IPC server"
 msgid "Cannot cancel LDAP"
 msgstr "Не вдалося скасувати LDAP"
 
-#| msgid "Decryption failed"
 msgid "LDAP assertion failed"
 msgstr "Помилка оцінки LDAP"
 

commit 030ee30c4ae85f2f41ca77651e4a7d7c9993e284
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 26 08:46:17 2015 +0200

    Add new version macros.
    
    * src/gpg-error.h.in (GPGRT_VERSION): New.
    (GPGRT_VERSION_NUMBER): New.
    (GPG_ERROR_VERSION, GPG_ERROR_VERSION_NUMBER): Move to top of file.
    --
    
    Eventually we will have a gpgrt.h file instead of gpg-error.  To make
    things easier we already provide suitable named version macros.
    Miving them to the top makes it easier to find the version.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index 0bdb567..ad5d470 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -26,6 +26,15 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+/* The version string of this header. */
+#define GPG_ERROR_VERSION @version@
+#define GPGRT_VERSION     @version@
+
+/* The version number of this header. */
+#define GPG_ERROR_VERSION_NUMBER @version-number@
+#define GPGRT_VERSION_NUMBER     @version-number@
+
+
 #ifdef __GNUC__
 # define GPG_ERR_INLINE __inline__
 #elif defined(_MSC_VER) && _MSC_VER >= 1300
@@ -359,12 +368,6 @@ void gpg_err_set_errno (int err);
 const char *gpgrt_check_version (const char *req_version);
 const char *gpg_error_check_version (const char *req_version);
 
-/* The version string of this header. */
-#define GPG_ERROR_VERSION @version@
-
-/* The version number of this header. */
-#define GPG_ERROR_VERSION_NUMBER @version-number@
-
 /* System specific type definitions.  */
 @define:gpgrt_ssize_t@
 @define:gpgrt_off_t@

commit 9cd3f002addf2acae4a7b0f52f8941e517e83d73
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 26 08:41:47 2015 +0200

    Add macro GPGRT_INLINE and avoid -Wundef warnings
    
    * src/gpg-error.h.in (GPG_ERR_INLINE): Use #if defined for possible
    undefined macros to avoid warnign with GCC's -Wundef option.
    (GPGRT_INLINE): New.
    --
    
    I still consider using -Wundef for regular building a bad behaviour
    because undefined macros have a well defined value in a cpp
    conditional.  That warning is useful for debugging build problems but
    should not be used as standard warning option.  Anyway, here is a fix.

diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index e85fbe5..0bdb567 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -1,25 +1,24 @@
 /* gpg-error.h - Public interface to libgpg-error.               -*- c -*-
-   Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015 g10 Code GmbH
-
-   This file is part of libgpg-error.
-
-   libgpg-error is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   libgpg-error is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-   @configure_input@
+ * Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015 g10 Code GmbH
+ *
+ * This file is part of libgpg-error.
+ *
+ * libgpg-error is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * libgpg-error is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * @configure_input@
  */
 
-
 #ifndef GPG_ERROR_H
 #define GPG_ERROR_H	1
 
@@ -28,15 +27,15 @@
 #include <stdarg.h>
 
 #ifdef __GNUC__
-#define GPG_ERR_INLINE __inline__
-#elif _MSC_VER >= 1300
-#define GPG_ERR_INLINE __inline
-#elif __STDC_VERSION__ >= 199901L
-#define GPG_ERR_INLINE inline
+# define GPG_ERR_INLINE __inline__
+#elif defined(_MSC_VER) && _MSC_VER >= 1300
+# define GPG_ERR_INLINE __inline
+#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+# define GPG_ERR_INLINE inline
 #else
-#ifndef GPG_ERR_INLINE
-#define GPG_ERR_INLINE
-#endif
+# ifndef GPG_ERR_INLINE
+#  define GPG_ERR_INLINE
+# endif
 #endif
 
 #ifdef __cplusplus
@@ -239,6 +238,8 @@ typedef unsigned int gpg_error_t;
 #endif
 
 
+/* The new name for the inline macro.  */
+#define GPGRT_INLINE GPG_ERR_INLINE
 
 

 /* Initialization function.  */

commit 17e4f727d9bd8e406bf977af445ef57201d23249
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Sun Jul 12 16:26:18 2015 +0300

    Update Ukrainian translation

diff --git a/po/uk.po b/po/uk.po
index 5c3f7e9..1f37874 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgpg-error package.
 #
-# Yuri Chornoivan <yurchor at ukr.net>, 2012, 2014.
+# Yuri Chornoivan <yurchor at ukr.net>, 2012, 2014, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgpg-error 1.7\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2014-11-15 19:40+0200\n"
+"PO-Revision-Date: 2015-07-12 16:21+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk at lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -729,20 +729,18 @@ msgid "Bad octal character in S-expression"
 msgstr "Помилковий вісімковий символ у S-виразі"
 
 msgid "Legacy key"
-msgstr ""
+msgstr "Застарілий ключ"
 
-#, fuzzy
 #| msgid "Buffer too short"
 msgid "Request too short"
-msgstr "Занадто короткий буфер"
+msgstr "Занадто короткий запит"
 
-#, fuzzy
 #| msgid "Line too long"
 msgid "Request too long"
-msgstr "Рядок надто довгий"
+msgstr "Надто довгий запит"
 
 msgid "Object is in termination state"
-msgstr ""
+msgstr "Об’єкт перебуває у стані переривання"
 
 msgid "No certificate chain"
 msgstr "Немає ланцюжка сертифікації"
@@ -829,7 +827,7 @@ msgid "Bogus string"
 msgstr "Фіктивний рядок"
 
 msgid "Forbidden"
-msgstr ""
+msgstr "Заборонено"
 
 msgid "Key disabled"
 msgstr "Ключ вимкнено"
@@ -912,362 +910,305 @@ msgstr "Помилка у параметрі IPC"
 msgid "Unknown IPC inquire"
 msgstr "Невідомий запит IPC"
 
-#, fuzzy
 #| msgid "General IPC error"
 msgid "General LDAP error"
-msgstr "Загальна помилка IPC"
+msgstr "Загальна помилка LDAP"
 
-#, fuzzy
 #| msgid "General error"
 msgid "General LDAP attribute error"
-msgstr "Загальна помилка"
+msgstr "Загальна помилка атрибута LDAP"
 
-#, fuzzy
 #| msgid "General error"
 msgid "General LDAP name error"
-msgstr "Загальна помилка"
+msgstr "Загальна помилка назви LDAP"
 
-#, fuzzy
 #| msgid "General Assuan error"
 msgid "General LDAP security error"
-msgstr "Загальна помилка бібліотеки Assuan"
+msgstr "Загальна помилка захисту LDAP"
 
-#, fuzzy
 #| msgid "General error"
 msgid "General LDAP service error"
-msgstr "Загальна помилка"
+msgstr "Загальна помилка служби LDAP"
 
-#, fuzzy
 #| msgid "General Assuan error"
 msgid "General LDAP update error"
-msgstr "Загальна помилка бібліотеки Assuan"
+msgstr "Загальна помилка оновлення LDAP"
 
 msgid "Experimental LDAP error code"
-msgstr ""
+msgstr "Експериментальний код помилки LDAP"
 
-#, fuzzy
 #| msgid "IPC write error"
 msgid "Private LDAP error code"
-msgstr "Помилка запису IPC"
+msgstr "Код конфіденційної помилки LDAP"
 
-#, fuzzy
 #| msgid "General IPC error"
 msgid "Other general LDAP error"
-msgstr "Загальна помилка IPC"
+msgstr "Інша загальна помилка LDAP"
 
-#, fuzzy
 #| msgid "IPC connect call failed"
 msgid "LDAP connecting failed (X)"
-msgstr "Помилка з’єднувального виклику IPC"
+msgstr "Не вдалося з’єднатися із LDAP (X)"
 
-#, fuzzy
 #| msgid "General error"
 msgid "LDAP referral limit exceeded"
-msgstr "Загальна помилка"
+msgstr "Перевищення обмежень щодо спрямовування у LDAP"
 
 msgid "LDAP client loop"
-msgstr ""
+msgstr "Циклічний клієнт LDAP"
 
-#, fuzzy
 #| msgid "Card reset required"
 msgid "No LDAP results returned"
-msgstr "Надіслано запит на скидання картки"
+msgstr "Не повернуто результатів LDAP"
 
-#, fuzzy
 #| msgid "Element not found"
 msgid "LDAP control not found"
-msgstr "Елемента не знайдено"
+msgstr "Не знайдено керування LDAP"
 
-#, fuzzy
 #| msgid "Not supported"
 msgid "Not supported by LDAP"
-msgstr "Не підтримується"
+msgstr "Не підтримується LDAP"
 
-#, fuzzy
 #| msgid "Unexpected error"
 msgid "LDAP connect error"
-msgstr "Неочікувана помилка"
+msgstr "Помилка з’єднання LDAP"
 
 msgid "Out of memory in LDAP"
-msgstr ""
+msgstr "Не вистачає пам’яті у LDAP"
 
 msgid "Bad parameter to an LDAP routine"
-msgstr ""
+msgstr "Помилковий параметр підпрограми LDAP"
 
-#, fuzzy
 #| msgid "Unsupported operation"
 msgid "User cancelled LDAP operation"
-msgstr "Непідтримувана дія"
+msgstr "Дію LDAP скасовано користувачем"
 
-#, fuzzy
 #| msgid "Bad certificate"
 msgid "Bad LDAP search filter"
-msgstr "Помилковий сертифікат"
+msgstr "Помилковий фільтр пошуку LDAP"
 
-#, fuzzy
 #| msgid "Unknown extension"
 msgid "Unknown LDAP authentication method"
-msgstr "Невідоме розширення"
+msgstr "Невідомий спосіб розпізнавання LDAP"
 
-#, fuzzy
 #| msgid "Timeout"
 msgid "Timeout in LDAP"
-msgstr "Час очікування"
+msgstr "Перевищення часу очікування у LDAP"
 
-#, fuzzy
 #| msgid "dirmngr error"
 msgid "LDAP decoding error"
-msgstr "Помилка dirmngr"
+msgstr "Помилка декодування LDAP"
 
-#, fuzzy
 #| msgid "dirmngr error"
 msgid "LDAP encoding error"
-msgstr "Помилка dirmngr"
+msgstr "Помилка кодування LDAP"
 
-#, fuzzy
 #| msgid "IPC read error"
 msgid "LDAP local error"
-msgstr "Помилка читання IPC"
+msgstr "Локальна помилка LDAP"
 
-#, fuzzy
 #| msgid "Not an IPC server"
 msgid "Cannot contact LDAP server"
-msgstr "Не є сервером IPC"
+msgstr "Не вдалося встановити зв’язок із сервером LDAP"
 
-#, fuzzy
 #| msgid "Success"
 msgid "LDAP success"
-msgstr "Виконано"
+msgstr "Успіх LDAP"
 
-#, fuzzy
 #| msgid "Configuration error"
 msgid "LDAP operations error"
-msgstr "Помилка налаштування"
+msgstr "Помилка дій LDAP"
 
-#, fuzzy
 #| msgid "Protocol violation"
 msgid "LDAP protocol error"
-msgstr "Порушення протоколу"
+msgstr "Помилка протоколу LDAP"
 
 msgid "Time limit exceeded in LDAP"
-msgstr ""
+msgstr "Перевищено час очікування у LDAP"
 
 msgid "Size limit exceeded in LDAP"
-msgstr ""
+msgstr "Перевищено обмеження на розмір у LDAP"
 
 msgid "LDAP compare false"
-msgstr ""
+msgstr "Порівняння LDAP: не збігаються"
 
 msgid "LDAP compare true"
-msgstr ""
+msgstr "Порівняння LDAP: збігаються"
 
-#, fuzzy
 #| msgid "Unknown extension"
 msgid "LDAP authentication method not supported"
-msgstr "Невідоме розширення"
+msgstr "Підтримки методу розпізнавання LDAP не передбачено"
 
 msgid "Strong(er) LDAP authentication required"
-msgstr ""
+msgstr "Потрібен потужніший спосіб розпізнавання LDAP"
 
-#, fuzzy
 #| msgid "Fatal alert message received"
 msgid "Partial LDAP results+referral received"
-msgstr "Отримано критичне попереджувальне повідомлення"
+msgstr "Отримано часткові результати і спрямування LDAP"
 
-#, fuzzy
 #| msgid "General error"
 msgid "LDAP referral"
-msgstr "Загальна помилка"
+msgstr "Спрямування LDAP"
 
 msgid "Administrative LDAP limit exceeded"
-msgstr ""
+msgstr "Перевищено адміністративне обмеження LDAP"
 
 msgid "Critical LDAP extension is unavailable"
-msgstr ""
+msgstr "Недоступне критичне розширення LDAP"
 
-#, fuzzy
 #| msgid "Card reset required"
 msgid "Confidentiality required by LDAP"
-msgstr "Надіслано запит на скидання картки"
+msgstr "Конфіденційно потрібне LDAP"
 
 msgid "LDAP SASL bind in progress"
-msgstr ""
+msgstr "Виконуємо прив’язування SASL LDAP"
 
 msgid "No such LDAP attribute"
-msgstr ""
+msgstr "Немає такого атрибута LDAP"
 
-#, fuzzy
 #| msgid "Invalid attribute"
 msgid "Undefined LDAP attribute type"
-msgstr "Некоректний атрибут"
+msgstr "Невизначний тип атрибута LDAP"
 
-#, fuzzy
 #| msgid "Unsupported protection"
 msgid "Inappropriate matching in LDAP"
-msgstr "Непідтримуваний захист"
+msgstr "Неприйнятна відповідність у LDAP"
 
-#, fuzzy
 #| msgid "Protocol violation"
 msgid "Constraint violation in LDAP"
-msgstr "Порушення протоколу"
+msgstr "Порушення обмежень у LDAP"
 
 msgid "LDAP type or value exists"
-msgstr ""
+msgstr "Тип або значення LDAP існує"
 
-#, fuzzy
 #| msgid "Invalid state"
 msgid "Invalid syntax in LDAP"
-msgstr "Некоректний стан"
+msgstr "Некоректний синтаксис у LDAP"
 
-#, fuzzy
 #| msgid "No CMS object"
 msgid "No such LDAP object"
-msgstr "Немає об’єкта CMS"
+msgstr "Немає такого об’єкта LDAP"
 
-#, fuzzy
 #| msgid "Hardware problem"
 msgid "LDAP alias problem"
-msgstr "Апаратні проблеми"
+msgstr "Проблема псевдоніма LDAP"
 
-#, fuzzy
 #| msgid "Invalid state"
 msgid "Invalid DN syntax in LDAP"
-msgstr "Некоректний стан"
+msgstr "Некоректний синтаксис DN у LDAP"
 
 msgid "LDAP entry is a leaf"
-msgstr ""
+msgstr "Запис LDAP є листком"
 
-#, fuzzy
 #| msgid "Encoding problem"
 msgid "LDAP alias dereferencing problem"
-msgstr "Проблема з кодуванням"
+msgstr "Проблемі з скасування прив’язки псевдоніма LDAP"
 
 msgid "LDAP proxy authorization failure (X)"
-msgstr ""
+msgstr "Помилка уповноваження проксі LDAP (X)"
 
-#, fuzzy
 #| msgid "Unsupported protection"
 msgid "Inappropriate LDAP authentication"
-msgstr "Непідтримуваний захист"
+msgstr "Неприйнятне розпізнавання LDAP"
 
-#, fuzzy
 #| msgid "Invalid card"
 msgid "Invalid LDAP credentials"
-msgstr "Некоректна картка"
+msgstr "Некоректні реєстраційні дані LDAP"
 
 msgid "Insufficient access for LDAP"
-msgstr ""
+msgstr "Недостатні права доступу до LDAP"
 
 msgid "LDAP server is busy"
-msgstr ""
+msgstr "Сервер LDAP зайнято виконанням завдання"
 
-#, fuzzy
 #| msgid "No keyserver available"
 msgid "LDAP server is unavailable"
-msgstr "Немає доступних серверів ключів"
+msgstr "Сервер LDAP недоступний"
 
 msgid "LDAP server is unwilling to perform"
-msgstr ""
+msgstr "Сервер LDAP не бажає працювати"
 
 msgid "Loop detected by LDAP"
-msgstr ""
+msgstr "LDAP виявлено цикл"
 
-#, fuzzy
 #| msgid "Missing action"
 msgid "LDAP naming violation"
-msgstr "Не вистачає дії"
+msgstr "Порушення іменування LDAP"
 
-#, fuzzy
 #| msgid "Protocol violation"
 msgid "LDAP object class violation"
-msgstr "Порушення протоколу"
+msgstr "Порушення класу об’єктів LDAP"
 
-#, fuzzy
 #| msgid "Operation not yet finished"
 msgid "LDAP operation not allowed on non-leaf"
-msgstr "Виконання дії ще не завершено"
+msgstr "Дію LDAP не дозволено для об’єктів, які не є листками"
 
-#, fuzzy
 #| msgid "Operation cancelled"
 msgid "LDAP operation not allowed on RDN"
-msgstr "Дію скасовано"
+msgstr "Дію LDAP не дозволено над RDN"
 
 msgid "Already exists (LDAP)"
-msgstr ""
+msgstr "Вже існує (LDAP)"
 
 msgid "Cannot modify LDAP object class"
-msgstr ""
+msgstr "Не вдалося змінити клас об’єкта LDAP"
 
-#, fuzzy
 #| msgid "Line too long"
 msgid "LDAP results too large"
-msgstr "Рядок надто довгий"
+msgstr "Результати LDAP є надто великими"
 
-#, fuzzy
 #| msgid "Operation cancelled"
 msgid "LDAP operation affects multiple DSAs"
-msgstr "Дію скасовано"
+msgstr "Дія LDAP стосується декількох DSA"
 
 msgid "Virtual LDAP list view error"
-msgstr ""
+msgstr "Помилка перегляду списку віртуальної LDAP"
 
-#, fuzzy
 #| msgid "General IPC error"
 msgid "Other LDAP error"
-msgstr "Загальна помилка IPC"
+msgstr "Інша помилка LDAP"
 
-#, fuzzy
 #| msgid "Resources exhausted"
 msgid "Resources exhausted in LCUP"
-msgstr "Вичерпано ресурси"
+msgstr "Вичерпано ресурси у LCUP"
 
-#, fuzzy
 #| msgid "Protocol violation"
 msgid "Security violation in LCUP"
-msgstr "Порушення протоколу"
+msgstr "Порушення захисту у LCUP"
 
-#, fuzzy
 #| msgid "Invalid state"
 msgid "Invalid data in LCUP"
-msgstr "Некоректний стан"
+msgstr "Некоректні дані у LCUP"
 
-#, fuzzy
 #| msgid "Unsupported certificate"
 msgid "Unsupported scheme in LCUP"
-msgstr "Непідтримуваний сертифікат"
+msgstr "Непідтримувана схема у LCUP"
 
-#, fuzzy
 #| msgid "Card reset required"
 msgid "Reload required in LCUP"
-msgstr "Надіслано запит на скидання картки"
+msgstr "Потрібне перезавантаження у LCUP"
 
-#, fuzzy
 #| msgid "Success"
 msgid "LDAP cancelled"
-msgstr "Виконано"
+msgstr "LDAP скасовано"
 
-#, fuzzy
 #| msgid "Not operational"
 msgid "No LDAP operation to cancel"
-msgstr "Використання неможливе"
+msgstr "Немає дії LDAP для скасовування"
 
-#, fuzzy
 #| msgid "Not operational"
 msgid "Too late to cancel LDAP"
-msgstr "Використання неможливе"
+msgstr "Запізно для скасовування LDAP"
 
-#, fuzzy
 #| msgid "Not an IPC server"
 msgid "Cannot cancel LDAP"
-msgstr "Не є сервером IPC"
+msgstr "Не вдалося скасувати LDAP"
 
-#, fuzzy
 #| msgid "Decryption failed"
 msgid "LDAP assertion failed"
-msgstr "Спроба розшифрування зазнала невдачі"
+msgstr "Помилка оцінки LDAP"
 
 msgid "Proxied authorization denied by LDAP"
-msgstr ""
+msgstr "Уповноваження за допомогою проксі заборонено LDAP"
 
 msgid "User defined error code 1"
 msgstr "Визначений користувачем код помилки 1"

commit 72101fae17b335b9763444862b957068440307c4
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 26 08:14:21 2015 +0200

    Update config.* et al scripts
    
    --

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 9afd676..dbfb978 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2013-11-29'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2013-11-29'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -579,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -826,7 +827,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1371,154 +1372,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 61cb4bc..6d2e94c 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2013-10-01'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2013-10-01'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -283,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -325,6 +328,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -402,8 +408,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -824,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1386,14 @@ case $os in
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1594,9 +1611,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 91d4bf8..4ebd5b3 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-10-18.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -251,6 +251,41 @@ hp)
   exit 1
   ;;
 
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
 xlc)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
@@ -517,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh
index cd916c0..b3719cf 100755
--- a/build-aux/mdate-sh
+++ b/build-aux/mdate-sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2005-06-29.22
+scriptversion=2010-08-21.06; # UTC
 
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2013 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,8 +17,7 @@ scriptversion=2005-06-29.22
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -30,16 +28,26 @@ scriptversion=2005-06-29.22
 # bugs to <bug-automake at gnu.org> or send patches to
 # <automake-patches at gnu.org>.
 
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+fi
+
 case $1 in
   '')
-     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No file.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: mdate-sh [--help] [--version] FILE
 
-Pretty-print the modification time of FILE.
+Pretty-print the modification day of FILE, in the format:
+1 January 1970
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
@@ -51,6 +59,13 @@ EOF
     ;;
 esac
 
+error ()
+{
+  echo "$0: $1" >&2
+  exit 1
+}
+
+
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -60,7 +75,7 @@ LC_TIME=C
 export LC_TIME
 
 # GNU ls changes its time format in response to the TIME_STYLE
-# variable.  Since we cannot assume `unset' works, revert this
+# variable.  Since we cannot assume 'unset' works, revert this
 # variable to its documented default.
 if test "${TIME_STYLE+set}" = set; then
   TIME_STYLE=posix-long-iso
@@ -75,27 +90,32 @@ if ls -L /dev/null 1>/dev/null 2>&1; then
 else
   ls_command='ls -l -d'
 fi
+# Avoid user/group names that might have spaces, when possible.
+if ls -n /dev/null 1>/dev/null 2>&1; then
+  ls_command="$ls_command -n"
+fi
 
-# A `ls -l' line looks as follows on OS/2.
+# A 'ls -l' line looks as follows on OS/2.
 #  drwxrwx---        0 Aug 11  2001 foo
 # This differs from Unix, which adds ownership information.
 #  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
 #
 # To find the date, we split the line on spaces and iterate on words
 # until we find a month.  This cannot work with files whose owner is a
-# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
+# user named "Jan", or "Feb", etc.  However, it's unlikely that '/'
 # will be owned by a user whose name is a month.  So we first look at
 # the extended ls output of the root directory to decide how many
 # words should be skipped to get the date.
 
 # On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-set x`ls -l -d /`
+set x`$ls_command /`
 
 # Find which argument is the month.
 month=
 command=
 until test $month
 do
+  test $# -gt 0 || error "failed parsing '$ls_command /' output"
   shift
   # Add another shift to the command.
   command="$command shift;"
@@ -115,8 +135,10 @@ do
   esac
 done
 
+test -n "$month" || error "failed parsing '$ls_command /' output"
+
 # Get the extended ls output of the file or directory.
-set dummy x`eval "$ls_command \"\$save_arg1\""`
+set dummy x`eval "$ls_command \"\\\$save_arg1\""`
 
 # Remove all preceding arguments
 eval $command
@@ -197,5 +219,6 @@ echo $day $month $year
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/build-aux/missing b/build-aux/missing
index 894e786..db98974 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2005-06-08.21
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +17,7 @@ scriptversion=2005-06-08.21
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -28,63 +25,40 @@ scriptversion=2005-06-08.21
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
+case $1 in
 
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake at gnu.org>."
     exit $?
@@ -96,265 +70,146 @@ Send bug reports to <bug-automake at gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

-----------------------------------------------------------------------

Summary of changes:
 NEWS                   |  17 +-
 build-aux/config.guess | 173 ++-----------------
 build-aux/config.sub   |  38 +++--
 build-aux/depcomp      |  38 ++++-
 build-aux/mdate-sh     |  49 ++++--
 build-aux/missing      | 453 +++++++++++++++++--------------------------------
 configure.ac           |   6 +-
 doc/errorref.txt       |  12 +-
 po/uk.po               | 294 ++++++++++----------------------
 src/gpg-error.h.in     |  70 ++++----
 10 files changed, 419 insertions(+), 731 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list