[git] GPGME - branch, master, updated. gpgme-1.5.5-26-gc8e7870
by Werner Koch
cvs at cvs.gnupg.org
Wed Aug 26 10:19:48 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 "GnuPG Made Easy".
The branch, master has been updated
via c8e7870281950ae3b943c819147d4329198c0520 (commit)
via 107bff70edb611309f627058dd4777a5da084b1a (commit)
via c4f4b5c0a6fc172f7ceedc1a0021169e7f31b941 (commit)
from 3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6 (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 c8e7870281950ae3b943c819147d4329198c0520
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 26 10:16:39 2015 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index 8518dae..7bf140b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.6.1 (unreleased) [C25/A14/R_]
+------------------------------------------------
+
+
Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 015ed46..55c388e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ min_automake_version="1.14"
# for the LT versions.
m4_define(mym4_version_major, [1])
m4_define(mym4_version_minor, [6])
-m4_define(mym4_version_micro, [0])
+m4_define(mym4_version_micro, [1])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
commit 107bff70edb611309f627058dd4777a5da084b1a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 26 09:28:32 2015 +0200
Release 1.6.0
* configure.ac: Set LT version to C25/A14/R0.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index 0e1e500..8518dae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,35 @@
-Noteworthy changes in version 1.6.0 (unreleased) [C24/A13/R_]
+Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
------------------------------------------------
+ * Added gpgme_set_offline to do a key listinging w/o requiring CRL.
+
+ * Added gpgme_set_status_cb to allow a user to see some status
+ messages.
+
+ * Added an export mode for secret keys.
+
+ * More precise error codes are returned if GnuPG >= 2.1.8 is used.
+
+ * The passphrase handler for the loopback mode has been improved and may
+ also be used with genkey.
+
+ * [w32] The standard GnuPG 2.1 install directory is now seached for
+ gpgconf.exe before a registry specified directory and the Gpg4win
+ install directory.
+
+ * [w32] gpgme-w32spawn.exe will now only be searched in the gpgme DLL
+ directory.
+
+ * Interface changes relative to the 1.5.1 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_set_offline NEW.
+ gpgme_get_offline NEW.
+ gpgme_set_status_cb NEW.
+ gpgme_get_status_cb NEW.
+ GPGME_EXPORT_MODE_SECRET NEW
+ GPGME_EXPORT_MODE_RAW NEW.
+ GPGME_EXPORT_MODE_PKCS12 NEW.
+
Noteworthy changes in version 1.5.5 (2015-06-08) [C24/A13/R4]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a1973e7..015ed46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# configure.ac for GPGME
# Copyright (C) 2000 Werner Koch (dd9jn)
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010, 2011, 2012, 2013 g10 Code GmbH
+# 2009, 2010, 2011, 2012, 2013, 2014, 2015 g10 Code GmbH
#
# This file is part of GPGME.
#
@@ -55,11 +55,11 @@ AC_INIT([gpgme],[mym4_full_version],[http://bugs.gnupg.org])
# (Interfaces added: AGE++)
# (Interfaces removed/changed: AGE=0)
#
-LIBGPGME_LT_CURRENT=24
+LIBGPGME_LT_CURRENT=25
# Subtract 2 from this value if you want to make the LFS transition an
# ABI break. [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=13
-LIBGPGME_LT_REVISION=4
+LIBGPGME_LT_AGE=14
+LIBGPGME_LT_REVISION=0
# If the API is changed in an incompatible way: increment the next counter.
GPGME_CONFIG_API_VERSION=1
diff --git a/doc/HACKING b/doc/HACKING
index aedcf09..83c0f51 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -23,11 +23,34 @@
the big picture. Omit the leading TABs that you're used to seeing
in a "real" ChangeLog file, but keep the maximum line length at 72
or smaller, so that the generated ChangeLog lines, each with its
- leading TAB, will not exceed 80 columns.
+ leading TAB, will not exceed 80 columns. If you want to add text
+ which shall not be copied to the ChangeLog, separate it by a line
+ consisting of two dashes at the begin of a line.
Note that ./autogen.sh installs a git hook to do some basic syntax
checking on the commit log message.
+ Typo fixes and documentation updates don't need a ChangeLog entry;
+ thus you would use a commit message like
+
+ #+begin_example
+ Fix typo in a comment
+
+ --
+ #+end_example
+
+ The marker line here is important; without it the first line would
+ appear in the ChangeLog.
+
+ If you exceptionally need to have longer lines in a commit log you may
+ do this after this scissor line:
+ #+begin_example
+ # ------------------------ >8 ------------------------
+ #+end_example
+ (hash, blank, 24 dashes, blank, scissor, blank, 24 dashes).
+ Note that such a comment will be removed if the git commit option
+ =--cleanup-scissor= is used.
+
** License policy
GPGME is currently licensed under the LGPLv2.1+ with tools and the
@@ -73,6 +96,29 @@
need. If you really need to do it, use a separate commit for such a
change.
+ - C99 syntax should not be used; stick to C90.
+ - Please do not use C++ =//= style comments.
+ - Try to fit lines into 80 columns.
+ - Ignore signed/unsigned pointer mismatches
+ - No arithmetic on void pointers; cast to char* first.
+
+** Commit log keywords
+
+ - GnuPG-bug-id :: Values are comma or space delimited bug numbers
+ from bug.gnupg.org pertaining to this commit.
+ - Debian-bug-id :: Same as above but from the Debian bug tracker.
+ - CVE-id :: CVE id number pertaining to this commit.
+ - Regression-due-to :: Commit id of the regression fixed by this commit.
+ - Fixes-commit :: Commit id this commit fixes.
+ - Reported-by :: Value is a name or mail address of a bug reporte.
+ - Suggested-by :: Value is a name or mail address of someone how
+ suggested this change.
+ - Co-authored-by :: Name or mail address of a co-author
+ - Some-comments-by :: Name or mail address of the author of
+ additional comments (commit log or code).
+ - Proofread-by :: Sometimes used by translation commits.
+ - Signed-off-by :: Name or mail address of the developer
+
* Debug hints
- Use gpgme-tool for manual tests.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 20e1912..c02a30f 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -6203,15 +6203,15 @@ you run your tests only with play data.
@include gpl.texi
- at node Function and Data Index
- at unnumbered Function and Data Index
-
- at printindex fn
-
@node Concept Index
@unnumbered Concept Index
@printindex cp
+ at node Function and Data Index
+ at unnumbered Function and Data Index
+
+ at printindex fn
+
@bye
diff --git a/doc/lesser.texi b/doc/lesser.texi
index f23f0fd..bbd18a0 100644
--- a/doc/lesser.texi
+++ b/doc/lesser.texi
@@ -1,7 +1,7 @@
@node Library Copying
@unnumbered GNU Lesser General Public License
- at cindex LGPL, Lesser General Public License
+ at cindex LGPL, GNU Lesser General Public License
@center Version 2.1, February 1999
@display
@@ -16,7 +16,7 @@ as the successor of the GNU Library Public License, version 2, hence the
version number 2.1.]
@end display
- at section Preamble
+ at heading Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -119,7 +119,7 @@ former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
@iftex
- at section TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ at heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@end iftex
@ifinfo
@center GNU LESSER GENERAL PUBLIC LICENSE
@@ -476,12 +476,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- at iftex
- at heading NO WARRANTY
- at end iftex
- at ifinfo
@center NO WARRANTY
- at end ifinfo
@item
BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
@@ -515,7 +510,7 @@ DAMAGES.
@end ifinfo
@page
- at section How to Apply These Terms to Your New Libraries
+ at heading How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
commit c4f4b5c0a6fc172f7ceedc1a0021169e7f31b941
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 26 09:16:36 2015 +0200
Make use of GPGRT macros is available.
* src/gpgme.h.in (_GPGME_INLINE): Define using GPGRT_INLINE if
possible. Fix problem with -Wundef by adding an extra "defined()".
(_GPGME_GCC_VERSION): Define using GPGRT_ macro if possible.
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index a0d9d31..6cea2c7 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -56,28 +56,33 @@ extern "C" {
/*
* Check for compiler features.
*/
-#ifdef __GNUC__
+#ifdef GPGRT_INLINE
+# define _GPGME_INLINE GPGRT_INLINE
+#elif defined(__GNUC__)
# define _GPGME_INLINE __inline__
-#elif __STDC_VERSION__ >= 199901L
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
# define _GPGME_INLINE inline
#else
# define _GPGME_INLINE
#endif
-#if __GNUC__
-#define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
+#ifdef GPGRT_ATTR_DEPRECATED
+# define _GPGME_DEPRECATED GPGRT_ATTR_DEPRECATED
+#elif defined(__GNUC__)
+# define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
-#if _GPGME_GCC_VERSION > 30100
-#define _GPGME_DEPRECATED __attribute__ ((__deprecated__))
-#endif
+# if _GPGME_GCC_VERSION > 30100
+# define _GPGME_DEPRECATED __attribute__ ((__deprecated__))
+# else
+# define _GPGME_DEPRECATED
+# endif
+#else
+# define _GPGME_DEPRECATED
#endif
-#ifndef _GPGME_DEPRECATED
-#define _GPGME_DEPRECATED
-#endif
/* The macro _GPGME_DEPRECATED_OUTSIDE_GPGME suppresses warnings for
fields we must access in GPGME for ABI compatibility. */
-----------------------------------------------------------------------
Summary of changes:
NEWS | 35 ++++++++++++++++++++++++++++++++++-
configure.ac | 10 +++++-----
doc/HACKING | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
doc/gpgme.texi | 10 +++++-----
doc/lesser.texi | 13 ++++---------
src/gpgme.h.in | 29 +++++++++++++++++------------
6 files changed, 112 insertions(+), 33 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list