[git] GPGME - branch, master, updated. gpgme-1.11.0-11-g302ec1f
by Werner Koch
cvs at cvs.gnupg.org
Fri Apr 20 10:48:56 CEST 2018
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 302ec1f9aa396f2207e9a0e0b87ebee4d28d5df2 (commit)
via 2e9a14912fb906c17017553ccd0941d172e095ff (commit)
via f779362ffbc7b9334d98f9ee50bfe3c2dc177215 (commit)
via d11bec5ef5e576dab52c1dc7d87758e4f9bf3583 (commit)
from 969700bc56ce3830bdd0ac498c14cd9f9e7db7fe (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 302ec1f9aa396f2207e9a0e0b87ebee4d28d5df2
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 20 10:41:38 2018 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index 7603130..80c0119 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.11.2 (unreleased)
+-------------------------------------------------
+
+
Noteworthy changes in version 1.11.1 (2018-04-20)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 2a35404..a1da1e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
# for the LT versions.
m4_define(mym4_version_major, [1])
m4_define(mym4_version_minor, [11])
-m4_define(mym4_version_micro, [1])
+m4_define(mym4_version_micro, [2])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
commit 2e9a14912fb906c17017553ccd0941d172e095ff
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 20 10:22:12 2018 +0200
Release 1.11.1
* configure.ac: Bump LT version to C31/A20/R1. For cpp to C13/A7/R0.
For qt to: C10/A3/R2.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index 6deb325..7603130 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes in version 1.11.1 (unreleased)
+Noteworthy changes in version 1.11.1 (2018-04-20)
-------------------------------------------------
+ * Fixed build problems in the 1.11.0 release.
+
+ * Added C++ interfaces which were planned for 1.11.0.
+
* Interface changes relative to the 1.10.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cpp: Key::origin NEW.
@@ -8,6 +12,9 @@ Noteworthy changes in version 1.11.1 (unreleased)
cpp: UserID::origin NEW.
cpp: UserID::lastUpdate NEW.
+ [c=C31/A20/R1 cpp=C13/A7/R0 qt=C10/A3/R2]
+
+
Noteworthy changes in version 1.11.0 (2018-04-18)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5268a69..2a35404 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,18 +56,18 @@ AC_INIT([gpgme],[mym4_full_version],[http://bugs.gnupg.org])
#
LIBGPGME_LT_CURRENT=31
LIBGPGME_LT_AGE=20
-LIBGPGME_LT_REVISION=0
+LIBGPGME_LT_REVISION=1
# If there is an ABI break in gpgmepp or qgpgme also bump the
# version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in
-LIBGPGMEPP_LT_CURRENT=12
-LIBGPGMEPP_LT_AGE=6
+LIBGPGMEPP_LT_CURRENT=13
+LIBGPGMEPP_LT_AGE=7
LIBGPGMEPP_LT_REVISION=0
LIBQGPGME_LT_CURRENT=10
LIBQGPGME_LT_AGE=3
-LIBQGPGME_LT_REVISION=1
+LIBQGPGME_LT_REVISION=2
# If the API is changed in an incompatible way: increment the next counter.
GPGME_CONFIG_API_VERSION=1
commit f779362ffbc7b9334d98f9ee50bfe3c2dc177215
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 20 10:32:37 2018 +0200
core: Remove another debug output leftover.
* src/decrypt.c (_gpgme_decrypt_status_handler): Remove log debug.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/decrypt.c b/src/decrypt.c
index 155e18e..0fc7019 100644
--- a/src/decrypt.c
+++ b/src/decrypt.c
@@ -414,7 +414,6 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
err = _gpgme_parse_plaintext (args, &opd->result.file_name, &mime);
if (err)
return err;
- gpgrt_log_debug ("decrypt.c setting mime to %d\n", mime);
opd->result.is_mime = !!mime;
}
break;
commit d11bec5ef5e576dab52c1dc7d87758e4f9bf3583
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 20 10:13:25 2018 +0200
build: More release creation automation.
* Makefile.am: Add release and sign-release targets.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/Makefile.am b/Makefile.am
index e47ace5..2dc02e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,16 @@
## Process this file with automake to produce Makefile.in
+# Location of the released tarball archives. Note that this is an
+# internal archive and before uploading this to the public server,
+# manual tests should be run and the git release tat set and pushed.
+# Adjust as needed.
+RELEASE_ARCHIVE_DIR = wk at vigenere:tarballs/gpgme/
+
+# The key used to sign the released sources. Adjust as needed.
+RELEASE_SIGNING_KEY = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+
+# Autoconf flags
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS =
@@ -57,9 +67,9 @@ distcheck-hook:
esac;\
done ) | tee $(distdir).swdb
+.PHONY: gen-ChangeLog release sign-release
gen_start_date = 2011-12-01T00:00:00
-.PHONY: gen-ChangeLog
gen-ChangeLog:
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
@@ -70,3 +80,50 @@ gen-ChangeLog:
rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi
+
+
+# Macro to help the release target.
+RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+
+release:
+ +(set -e;\
+ if [ "$(abs_top_builddir)" = "$(abs_top_srcdir)" ]; then \
+ echo "error: build directory must not be the source directory" >&2;\
+ exit 2;\
+ fi ;\
+ echo "/* Build started at $$(date -uIseconds) */" ;\
+ cd $(top_srcdir); \
+ ./autogen.sh --force; \
+ cd $(abs_top_builddir); \
+ rm -rf dist; mkdir dist ; cd dist ; \
+ $(abs_top_srcdir)/configure --enable-maintainer-mode; \
+ $(MAKE) distcheck TESTFLAGS=--parallel; \
+ echo "/* Build finished at $$(date -uIseconds) */" ;\
+ echo "/*" ;\
+ echo " * Please run the final step interactivly:" ;\
+ echo " * make sign-release" ;\
+ echo " */" ;\
+ ) 2>&1 | tee "$(RELEASE_NAME).buildlog"
+
+sign-release:
+ +(set -e; \
+ cd dist; \
+ files1="$(RELEASE_NAME).tar.bz2" ;\
+ files2="$(RELEASE_NAME).tar.bz2.sig \
+ $(RELEASE_NAME).swdb \
+ $(RELEASE_NAME).buildlog" ;\
+ echo "/* Signing the source tarball ..." ;\
+ gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
+ cat $(RELEASE_NAME).swdb >swdb.snippet;\
+ echo >>swdb.snippet ;\
+ sha1sum $${files1} >>swdb.snippet ;\
+ cat "../$(RELEASE_NAME).buildlog" swdb.snippet \
+ | gzip >$(RELEASE_NAME).buildlog ;\
+ echo "Copying to local archive ..." ;\
+ scp -p $${files1} $${files2} $(RELEASE_ARCHIVE_DIR)/ || true;\
+ echo "Uploading documentation ..." ;\
+ $(MAKE) -C doc online; \
+ echo '/*' ;\
+ echo ' * All done; for checksums see dist/swdb.snippet' ;\
+ echo ' */' ;\
+ )
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
NEWS | 13 ++++++++++++-
configure.ac | 10 +++++-----
src/decrypt.c | 1 -
4 files changed, 75 insertions(+), 8 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list