[git] GPG-ERROR - branch, master, updated. libgpg-error-1.17-11-g754a987

[by Werner Koch]

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  754a987f6df59e2ba0e69aada65ae4aaf593c148 (commit)
       via  923c4b174520c401a827d8198ebd2dc83666000f (commit)
      from  149fe98e1279b065edb06958d9a73a0c013c2db9 (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 754a987f6df59e2ba0e69aada65ae4aaf593c148
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 15 11:44:20 2014 +0100

    Add configure option --disable-doc
    
    * Makefile.am (doc) [!BUILD_DOC]: Do not recurse into doc/.
    * configure.ac (BUILD_DOC): New am_conditional and new option.
    --
    
    We have this option already for GnuPG and should use it for all
    projects.  Embedded platforms usually do not require documentation and
    being able to disable the building avoids a lot of build dependencies.
    
    Suggested-by: Hans-Christoph Steiner <hans at guardianproject.info>

diff --git a/Makefile.am b/Makefile.am
index c6edd12..42cd0c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,13 @@ else
 lang_subdirs =
 endif
 
-SUBDIRS = m4 src doc tests po $(lang_subdirs)
+if BUILD_DOC
+doc = doc
+else
+doc =
+endif
+
+SUBDIRS = m4 src $(doc) tests po $(lang_subdirs)
 
 
 dist-hook: gen-ChangeLog
diff --git a/configure.ac b/configure.ac
index 9683c81..27fda63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,10 +508,17 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
 
 
 
-AC_ARG_ENABLE(languages,
-[  --disable-languages     do not build support for other languages than C])
+AC_ARG_ENABLE(languages, AC_HELP_STRING([--disable-languages],
+                        [do not build support for other languages than C]))
 AM_CONDITIONAL([LANGUAGES_SOME], [test "x$enable_languages" != xno])
 
+build_doc=yes
+AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
+                                    [do not build the documentation]),
+                     build_doc=$enableval, build_doc=yes)
+AM_CONDITIONAL([BUILD_DOC], [test "x$enable_languages" != xno])
+
+
 #
 # Substitution
 #

commit 923c4b174520c401a827d8198ebd2dc83666000f
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 15 11:40:27 2014 +0100

    Add GPG_ERR_OBJ_TERM_STATE.

diff --git a/NEWS b/NEWS
index d6a3eb4..01eb0fb 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Noteworthy changes in version 1.18 (unreleased) [C13/A13/R_]
  * Interface changes relative to the 1.17 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  GPG_ERR_FORBIDDEN                NEW.
+ GPG_ERR_OBJ_TERM_STATE           NEW.
 
 
 Noteworthy changes in version 1.17 (2014-10-15) [C13/A13/R0]
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 886a304..15a2013 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -509,11 +509,6 @@ GPG_ERR_TOO_MANY                Too many objects
            maximum Assuan line length would overflow.
     GPGME: - To many patterns in gpgme-tools's KEYLIST command.
 
-GPG_ERR_NO_KEYSERVER		No keyserver available
-
-        No keyserver configured or no keyserver available due to
-        missing support for the requested protocol.  Found in Dirmngr.
-
 GPG_ERR_LIMIT_REACHED           Limit reached
 
         A programmed limit has been reached.
@@ -529,7 +524,11 @@ GPG_ERR_NOT_INITIALIZED		Not initialized
     fulfilled.
 
 185	GPG_ERR_MISSING_ISSUER_CERT	Missing issuer certificate
-186	GPG_ERR_NO_KEYSERVER		No keyserver available
+
+GPG_ERR_NO_KEYSERVER		No keyserver available
+
+        No keyserver configured or no keyserver available due to
+        missing support for the requested protocol.  Found in Dirmngr.
 
 GPG_ERR_INV_CURVE		Invalid elliptic curve
 
@@ -612,6 +611,11 @@ GPG_ERR_MAC_ALGO
 213	GPG_ERR_SEXP_BAD_OCT_CHAR	Bad octal character in S-expression
 
 
+GPG_ERR_OBJ_TERM_STATE		Object is in termination state
+
+    For cards this is the ISO status word 0x6285 (file is in
+    termnation state).
+
 
 GPG_ERR_NO_CERT_CHAIN		No certificate chain
 
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 5990bd0..11699cf 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -247,8 +247,9 @@
 212	GPG_ERR_SEXP_ODD_HEX_NUMBERS	Odd hexadecimal numbers in S-expression
 213	GPG_ERR_SEXP_BAD_OCT_CHAR	Bad octal character in S-expression
 
-# 214 to 225 are free to be used.
+# 214 to 224 are free to be used.
 
+225	GPG_ERR_OBJ_TERM_STATE		Object is in termination state
 226	GPG_ERR_NO_CERT_CHAIN		No certificate chain
 227	GPG_ERR_CERT_TOO_LARGE		Certificate is too large
 228	GPG_ERR_INV_RECORD		Invalid record

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

Summary of changes:
 Makefile.am        |    8 +++++++-
 NEWS               |    1 +
 configure.ac       |   11 +++++++++--
 doc/errorref.txt   |   16 ++++++++++------
 src/err-codes.h.in |    3 ++-
 5 files changed, 29 insertions(+), 10 deletions(-)


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