[git] GPG-ERROR - branch, master, updated. gpgrt-1.29-9-gbe7653e
by Werner Koch
cvs at cvs.gnupg.org
Mon Apr 30 08:46:32 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 "Error codes used by GnuPG et al.".
The branch, master has been updated
via be7653e1fee62496a58b7fe5e3e259ed74cbf657 (commit)
via cac048bf8454ade95a905f9d3840b1ec284fce20 (commit)
via d1d4c4f8eb9830bfb671054e1558342106ba9d8d (commit)
from 4f45f3e0bb404b4a9787cb55ca154c6f60c1437b (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 be7653e1fee62496a58b7fe5e3e259ed74cbf657
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 30 08:39:11 2018 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index a84f9cb..9fb494a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.31 (unreleased) [C24/A24/R_]
+-----------------------------------------------
+
+
Noteworthy changes in version 1.30 (2018-04-30) [C24/A24/R1]
-----------------------------------------------
diff --git a/configure.ac b/configure.ac
index fb2891a..050272e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ min_automake_version="1.14"
# See below for the LT versions.
m4_define([mym4_package],[libgpg-error])
m4_define([mym4_major], [1])
-m4_define([mym4_minor], [30])
+m4_define([mym4_minor], [31])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
commit cac048bf8454ade95a905f9d3840b1ec284fce20
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 30 08:33:14 2018 +0200
Release 1.30.
* configure.ac: Bump LT version to C24/A/24/R1.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index 9c1459f..a84f9cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes in version 1.30 (unreleased) [C24/A24/R_]
+Noteworthy changes in version 1.30 (2018-04-30) [C24/A24/R1]
-----------------------------------------------
+ * Fix for a hang on Windows when using gpgrt_poll under nPth.
+
+ * Build fix for Solaris. [#3869]
+
Noteworthy changes in version 1.29 (2018-04-11) [C24/A24/R0]
-----------------------------------------------
diff --git a/configure.ac b/configure.ac
index 2026128..fb2891a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
# Note that added error codes don't constitute an interface change.
LIBGPG_ERROR_LT_CURRENT=24
LIBGPG_ERROR_LT_AGE=24
-LIBGPG_ERROR_LT_REVISION=0
+LIBGPG_ERROR_LT_REVISION=1
################################################
AC_SUBST(LIBGPG_ERROR_LT_CURRENT)
commit d1d4c4f8eb9830bfb671054e1558342106ba9d8d
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 30 08:24:12 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 56145f7..b602c7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,16 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, see <https://www.gnu.org/licenses/>.
+# 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/libgpg-error/
+
+# The key used to sign the released sources. Adjust as needed.
+RELEASE_SIGNING_KEY = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+
+# Autoconf flags
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-doc
@@ -75,7 +85,7 @@ distcheck-hook:
gen_start_date = 2011-12-01T00:00:00
-.PHONY: gen-ChangeLog
+.PHONY: gen-ChangeLog release sign-release
gen-ChangeLog:
set -e; \
if test -d $(top_srcdir)/.git; then \
@@ -103,3 +113,51 @@ endif
stowinstall:
$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libgpg-error
+
+
+# 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; \
+ 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 \
+ $(RELEASE_NAME).tar.gz" ; \
+ files2="$(RELEASE_NAME).tar.bz2.sig \
+ $(RELEASE_NAME).tar.gz.sig \
+ $(RELEASE_NAME).swdb \
+ $(RELEASE_NAME).buildlog" ;\
+ echo "/* Signing the source tarball ..." ;\
+ gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
+ gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.gz ;\
+ 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 '/*' ;\
+ echo ' * All done; for checksums see dist/swdb.snippet' ;\
+ echo ' */' ;\
+ )
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
NEWS | 10 +++++++++-
configure.ac | 4 ++--
3 files changed, 70 insertions(+), 4 deletions(-)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list