diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | common/ChangeLog | 4 | ||||
| -rw-r--r-- | common/util.h | 15 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/gpg.texi | 2 |
5 files changed, 10 insertions, 17 deletions
@@ -1,3 +1,7 @@ +2011-05-20 Werner Koch <wk@g10code.com> + + * configure.ac: Require libgpg-error 1.10. + 2011-03-08 Werner Koch <wk@g10code.com> Release 2.1.0beta2. diff --git a/common/ChangeLog b/common/ChangeLog index a68246e4c..d77fad586 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2011-05-20 Werner Koch <wk@g10code.com> + + * util.h: Remove some error code substitutes. + 2011-04-25 Werner Koch <wk@g10code.com> * userids.c (classify_user_id): Add arg OPENPGP_HACK to fix diff --git a/common/util.h b/common/util.h index fc3dd02df..45bccecd2 100644 --- a/common/util.h +++ b/common/util.h @@ -24,24 +24,9 @@ #include <errno.h> /* We need errno. */ #include <gpg-error.h> /* We need gpg_error_t. */ /* Add error codes available only in newer versions of libgpg-error. */ -#ifndef GPG_ERR_MISSING_KEY -#define GPG_ERR_MISSING_KEY 181 -#endif -#ifndef GPG_ERR_LIMIT_REACHED -#define GPG_ERR_LIMIT_REACHED 183 -#endif -#ifndef GPG_ERR_NOT_INITIALIZED -#define GPG_ERR_NOT_INITIALIZED 184 -#endif -#ifndef GPG_ERR_MISSING_ISSUER_CERT -#define GPG_ERR_MISSING_ISSUER_CERT 185 -#endif #ifndef GPG_ERR_NO_KEYSERVER #define GPG_ERR_NO_KEYSERVER 186 #endif -#ifndef GPG_ERR_FULLY_CANCELED -#define GPG_ERR_FULLY_CANCELED 198 -#endif #ifndef GPG_ERR_INV_CURVE #define GPG_ERR_INV_CURVE 187 #endif diff --git a/configure.ac b/configure.ac index ab40c6fd0..c7be7f72c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ AC_INIT([gnupg], # sufficient. development_version=no -NEED_GPG_ERROR_VERSION=1.8 +NEED_GPG_ERROR_VERSION=1.10 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.5.0 diff --git a/doc/gpg.texi b/doc/gpg.texi index 0ed8c4e88..c505e0792 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2510,7 +2510,7 @@ timestamp issues on subkeys. @item --ignore-valid-from GnuPG normally does not select and use subkeys created in the future. This option allows the use of such keys and thus exhibits the -pre-1.0.7 behaviour. You should not use this option unless you there +pre-1.0.7 behaviour. You should not use this option unless there is some clock problem. See also @option{--ignore-time-conflict} for timestamp issues with signatures. |