[git] GPG-ERROR - branch, master, updated. libgpg-error-1.11-3-gdd05f37
by Werner Koch
cvs at cvs.gnupg.org
Thu May 23 17:02:24 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 "Error codes used by GnuPG et al.".
The branch, master has been updated
via dd05f3790e536dec6ed56087780a1065ca66371e (commit)
via d2e6d96dfd2acc855b244a972269adfcf477cd10 (commit)
from 5763c8135c02b2e99214647e0619e939ef9a95f8 (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 dd05f3790e536dec6ed56087780a1065ca66371e
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 18 14:40:43 2013 +0200
Fix libtool 2.4.2 to correctly detect .def files.
* ltmain.sh (sed_uncomment_deffile): New.
(orig_export_symbols): Uncomment def file before testing for EXPORTS.
* m4/libtool.m4: Do the same for the generated code.
--
The old code was not correct in that it only looked at the first line
and puts an EXPORTS keyword in front if missing. Binutils 2.22
accepted a duplicated EXPORTS keyword but at least 2.23.2 is more
stringent and bails out without this fix.
There is no need to send this upstream. Upstream's git master has a
lot of changes including a similar fix for this problems. There are
no signs that a libtool 2.4.3 will be released to fix this problem and
thus we need to stick to our copy of 2.4.2 along with this patch.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/ltmain.sh b/ltmain.sh
index c7d06c3..24e3fd3 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -411,6 +411,10 @@ sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
# (escaped) backslashes. A very naive implementation.
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+# Sed substitution to remove simple comments and empty
+# lines from a Windows .def file.
+sed_uncomment_deffile='/^;/d; /^[ ]*$/d'
+
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
@@ -8143,7 +8147,7 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ if test "x`$SED "$sed_uncomment_deffile" $export_symbols | $SED 1q`" != xEXPORTS; then
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4bedbd3..ff871a0 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4773,7 +4773,7 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
@@ -5150,7 +5150,7 @@ _LT_EOF
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
else
sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
@@ -6149,7 +6149,7 @@ if test "$_lt_caught_CXX_error" != yes; then
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
$SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
else
$SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
@@ -6190,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
commit d2e6d96dfd2acc855b244a972269adfcf477cd10
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 11 16:27:41 2013 +0200
Add GPG_ERR_*CRYPT_CTX* and GPG_ERR_BROKEN_*KEY.
* src/err-codes.h.in (GPG_ERR_NO_CRYPT_CTX): New.
(GPG_ERR_WRONG_CRYPT_CTX, GPG_ERR_BAD_CRYPT_CTX): New.
(GPG_ERR_CRYPT_CTX_CONFLICT): New.
(GPG_ERR_BROKEN_PUBKEY, GPG_ERR_BROKEN_SECKEY): New.
diff --git a/NEWS b/NEWS
index a53444e..8dd35ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
Noteworthy changes in version 1.12 (unreleased)
-----------------------------------------------
+ * Interface changes relative to the 1.11 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GPG_ERR_NO_CRYPT_CTX NEW.
+ GPG_ERR_WRONG_CRYPT_CTX NEW.
+ GPG_ERR_BAD_CRYPT_CTX NEW.
+ GPG_ERR_CRYPT_CTX_CONFLICT NEW.
+ GPG_ERR_BROKEN_PUBKEY NEW.
+ GPG_ERR_BROKEN_SECKEY NEW.
+
Noteworthy changes in version 1.11 (2013-02-25)
-----------------------------------------------
diff --git a/doc/errorref.txt b/doc/errorref.txt
index eafd9d8..2986937 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -258,7 +258,14 @@ GPG_ERR_INV_NAME Invalid name
[more to come]
89 GPG_ERR_BAD_DATA Bad data
-90 GPG_ERR_INV_PARAMETER Invalid parameter
+
+GPG_ERR_INV_PARAMETER Invalid parameter
+
+ GNUPG: - Returned if gpg-agent sends a new generated key with
+ unknown parameter names.
+ - Invalid parameter in the parameter file for key
+ generation by gpgsm.
+
91 GPG_ERR_WRONG_CARD Wrong card
92 GPG_ERR_NO_DIRMNGR No dirmngr
93 GPG_ERR_DIRMNGR dirmngr error
@@ -401,8 +408,9 @@ GPG_ERR_INV_CERT_OBJ Invalid certificate object
165 GPG_ERR_UNKNOWN_NAME Unknown name
Used by GPG to indicate an unknown ECC curve name (may also
- indicate missing ECC support).
-
+ indicate missing ECC support). It is also used to indicate an
+ unsuported parameter name in functions which take a name and
+ value to update state.
166 GPG_ERR_LOCALE_PROBLEM A locale function failed
167 GPG_ERR_NOT_LOCKED Not locked
@@ -446,6 +454,16 @@ GPG_ERR_LIMIT_REACHED Limit reached
GnuPG: gpgtar: Extract directory can't be created because too
many of directories with a similar name are already existing.
+184 GPG_ERR_NOT_INITIALIZED Not initialized
+185 GPG_ERR_MISSING_ISSUER_CERT Missing issuer certificate
+186 GPG_ERR_NO_KEYSERVER No keyserver available
+
+GPG_ERR_INV_CURVE Invalid elliptic curve
+
+ The curve is missing parameters or the curve is invald, for example
+ it is not possible to get affine coordinates for the public key.
+
+188 GPG_ERR_UNKNOWN_CURVE Unknown elliptic curve
GPG_ERR_DUP_KEY Duplicated key
@@ -457,6 +475,41 @@ GPG_ERR_AMBIGUOUS Ambiguous search
A search etc returned an ambigious result. This usually means
that the search string was not specific enough.
+GPG_ERR_NO_CRYPT_CTX No crypto context
+
+ A crypto context was expected but not given. Commonly used by
+ Libgcrypt.
+
+GPG_ERR_WRONG_CRYPT_CTX Wrong crypto context
+
+ The given crypto context does not match the requirements. For
+ example in Libgcrypt a crypto context has private data
+ pertaining to certain algorithms. This error is for example
+ returned if a crypto context initialized for a different
+ algorithm is used.
+
+GPG_ERR_BAD_CRYPT_CTX Bad crypto context
+
+ The is a problem with the crypto context. For example it has
+ not been properly initialized.
+
+GPG_ERR_CRYPT_CTX_CONFLICT Conflict in the crypto context
+
+ Conflicting use of a crypto context. For example if a context
+ is used with objects that don't match the state of the
+ context.
+
+GPG_ERR_BROKEN_PUBKEY Broken public key
+
+ The public key was mathematically not correctly generated.
+ (It would have been nicer if we would have used BAD_PUBKEY for
+ this, but that error code is in long time use to describe for
+ example policy and encoding problems with a key. Using
+ INV_PUBKEY would have been better for these purposes)
+
+GPG_ERR_BROKEN_SECKEY Broken secret key
+
+ The secret key was mathematically not correctly generated.
199 GPG_ERR_UNFINISHED Operation not yet finished
200 GPG_ERR_BUFFER_TOO_SHORT Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index fd7030d..9c213de 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -220,8 +220,13 @@
188 GPG_ERR_UNKNOWN_CURVE Unknown elliptic curve
189 GPG_ERR_DUP_KEY Duplicated key
190 GPG_ERR_AMBIGUOUS Ambiguous result
-# 191 to 197 are free to be used.
-
+191 GPG_ERR_NO_CRYPT_CTX No crypto context
+192 GPG_ERR_WRONG_CRYPT_CTX Wrong crypto context
+193 GPG_ERR_BAD_CRYPT_CTX Bad crypto context
+194 GPG_ERR_CRYPT_CTX_CONFLICT Conflict in the crypto context
+195 GPG_ERR_BROKEN_PUBKEY Broken public key
+196 GPG_ERR_BROKEN_SECKEY Broken secret key
+# 197 is free to be used.
198 GPG_ERR_FULLY_CANCELED Operation fully cancelled
199 GPG_ERR_UNFINISHED Operation not yet finished
200 GPG_ERR_BUFFER_TOO_SHORT Buffer too short
-----------------------------------------------------------------------
Summary of changes:
NEWS | 9 ++++++++
doc/errorref.txt | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--
ltmain.sh | 6 ++++-
m4/libtool.m4 | 8 +++---
src/err-codes.h.in | 9 ++++++-
5 files changed, 81 insertions(+), 10 deletions(-)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list