[git] GPG-ERROR - branch, master, updated. libgpg-error-1.24-6-g0c837a8

by Werner Koch cvs at cvs.gnupg.org
Fri Oct 7 16:28:46 CEST 2016


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  0c837a82207d0b19f9dabc8870ffb23d6a4ade64 (commit)
       via  d6416fbd55256d8e693519cb548ad2cc7847898e (commit)
      from  bf7eb978597ba07906f0a7490e626c071af1987f (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 0c837a82207d0b19f9dabc8870ffb23d6a4ade64
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 16:25:34 2016 +0200

    Add error code USER_ID_EXISTS, NAME_EXISTS, and DUP_NAME.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index f7e1af6..a646c7d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Noteworthy changes in version 1.25 (unreleased) [C19/A19/R_)
  GPG_ERR_WINDOW_TOO_SMALL         NEW.
  GPG_ERR_WINDOW_TOO_LARGE         NEW.
  GPG_ERR_MISSING_ENVVAR	          NEW.
+ GPG_ERR_USER_ID_EXISTS           NEW.
+ GPG_ERR_NAME_EXISTS              NEW.
+ GPG_ERR_DUP_NAME                 NEW.
 
 
 Noteworthy changes in version 1.24 (2016-07-14) [C19/A19/R1)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index b943c67..da5df23 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -798,7 +798,7 @@ GPG_ERR_INV_LOCK_OBJ		Invalid lock object
 
 GPG_ERR_TRUE			True
 
-    Used to retrun the boolena value True.  Note that GPG_ERR_NO_ERROR
+    Used to return the boolean value True.  Note that GPG_ERR_NO_ERROR
     (with the value 0) is also often used to indicate the value true.
 
 GPG_ERR_FALSE			False
@@ -844,6 +844,14 @@ GPG_ERR_MISSING_ENVVAR (303)	Required environment variable not set
 
     Pinentry: - The size of the screen can't be determined.
 
+GPG_ERR_USER_ID_EXISTS (304)	User ID already exists
+
+    GNUPG: - Existing user ID in --quick-gen-key.
+
+GPG_ERR_NAME_EXISTS (305)	Name already exists
+GPG_ERR_DUP_NAME (306)		Duplicated name
+
+
 GPG_ERR_LDAP_GENERAL		LDAP General error
 
    Catch all error for LDAP.  Use if if can't map an erro rocde to an
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index dcbc0a3..1bf717d 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -323,7 +323,9 @@
 301	GPG_ERR_WINDOW_TOO_SMALL	Screen or window too small
 302	GPG_ERR_WINDOW_TOO_LARGE	Screen or window too large
 303	GPG_ERR_MISSING_ENVVAR		Required environment variable not set
-
+304	GPG_ERR_USER_ID_EXISTS		User ID already exists
+305	GPG_ERR_NAME_EXISTS		Name already exists
+306	GPG_ERR_DUP_NAME		Duplicated name
 # This range is free for use.
 
 #

commit d6416fbd55256d8e693519cb548ad2cc7847898e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 16:23:51 2016 +0200

    syscfg: Add support for {i686,x86_64}-apple-darwin.
    
    --
    
    Thanks to Chris Ballinger <chris at chatsecure.org> for the files.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 5623aff..c1e86a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h  \
         syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h \
         syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h        \
+	syscfg/lock-obj-pub.i386-apple-darwin.h             \
         syscfg/lock-obj-pub.i686-pc-gnu.h                   \
         syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h          \
         syscfg/lock-obj-pub.i686-pc-linux-gnu.h             \
@@ -68,6 +69,7 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h         \
         syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h       \
         syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h     \
+	syscfg/lock-obj-pub.x86_64-apple-darwin.h           \
         syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h        \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h           \
         syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h        \
diff --git a/src/syscfg/lock-obj-pub.i386-apple-darwin.h b/src/syscfg/lock-obj-pub.i386-apple-darwin.h
new file mode 100644
index 0000000..a5963c4
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.i386-apple-darwin.h
@@ -0,0 +1,26 @@
+## lock-obj-pub.i386-apple-darwin.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+  long _vers;
+  union {
+    volatile char _priv[44];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##
diff --git a/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h b/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h
new file mode 100644
index 0000000..eaf8689
--- /dev/null
+++ b/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h
@@ -0,0 +1,28 @@
+## lock-obj-pub.x86_64-apple-darwin.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+    long _vers;
+    union {
+        volatile char _priv[64];
+        long _x_align;
+        long *_xp_align;
+    } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0, \
+0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##

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

Summary of changes:
 NEWS                                                           |  3 +++
 doc/errorref.txt                                               | 10 +++++++++-
 src/Makefile.am                                                |  2 ++
 src/err-codes.h.in                                             |  4 +++-
 ...64-unknown-linux-gnu.h => lock-obj-pub.i386-apple-darwin.h} |  8 ++++----
 ...rch64-apple-darwin.h => lock-obj-pub.x86_64-apple-darwin.h} |  2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)
 copy src/syscfg/{lock-obj-pub.aarch64-unknown-linux-gnu.h => lock-obj-pub.i386-apple-darwin.h} (72%)
 copy src/syscfg/{lock-obj-pub.aarch64-apple-darwin.h => lock-obj-pub.x86_64-apple-darwin.h} (92%)


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




More information about the Gnupg-commits mailing list