[git] GPGME - branch, master, updated. gpgme-1.5.3-8-g7dcb654
by Werner Koch
cvs at cvs.gnupg.org
Mon Apr 13 17:12:35 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 7dcb65428116e76cba9c5b171a653e791a5efaf1 (commit)
via d2712d9f6f086911184453219a096c61f6829d3b (commit)
via 524dacfbb6bb131f05a4ecab3d7bcd91c1b43d33 (commit)
from 8cfcdfe5564f87362e5ec1bfdca5c14aed9c45f0 (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 7dcb65428116e76cba9c5b171a653e791a5efaf1
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 13 15:50:59 2015 +0200
Post release updates.
--
diff --git a/NEWS b/NEWS
index dc3bbfc..09cc930 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.6.0 (unreleased) [C__/A__/R_]
+------------------------------------------------
+
+
Noteworthy changes in version 1.5.4 (2015-04-13) [C24/A13/R3]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 298a22b..2f47719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@ min_automake_version="1.14"
# commit and push so that the git magic is able to work. See below
# for the LT versions.
m4_define(mym4_version_major, [1])
-m4_define(mym4_version_minor, [5])
-m4_define(mym4_version_micro, [4])
+m4_define(mym4_version_minor, [6])
+m4_define(mym4_version_micro, [0])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
commit d2712d9f6f086911184453219a096c61f6829d3b
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 13 15:43:13 2015 +0200
Release 1.5.4.
diff --git a/NEWS b/NEWS
index 399c1e0..dc3bbfc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
-Noteworthy changes in version 1.6.0 (unreleased) [C__/A__/R0]
--------------------------------------------------------------
+Noteworthy changes in version 1.5.4 (2015-04-13) [C24/A13/R3]
+------------------------------------------------
- * Interface changes relative to the 1.5.3 release:
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Fixed a possible crash in the debug code.
+
+ * Fixed building for Windows with newer versions of Mingw.
Noteworthy changes in version 1.5.3 (2014-12-11) [C24/A13/R2]
diff --git a/README b/README
index a16a066..6da94e5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
GPGME - GnuPG Made Easy
---------------------------
- Copyright 2004, 2006, 2010, 2012, 2013, 2014 g10 Code GmbH
+ Copyright 2004, 2006, 2010, 2012, 2013, 2014, 2015 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/configure.ac b/configure.ac
index 3b444a0..298a22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@ min_automake_version="1.14"
# commit and push so that the git magic is able to work. See below
# 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_minor, [5])
+m4_define(mym4_version_micro, [4])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag
@@ -59,7 +59,7 @@ LIBGPGME_LT_CURRENT=24
# 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=2
+LIBGPGME_LT_REVISION=3
# If the API is changed in an incompatible way: increment the next counter.
GPGME_CONFIG_API_VERSION=1
@@ -546,7 +546,7 @@ AH_BOTTOM([
#define GPG_ERR_ENABLE_ERRNO_MACROS 1
#define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \
- "Copyright (C) 2001--2013 g10 Code GmbH\n"
+ "Copyright (C) 2001--2015 g10 Code GmbH\n"
])
commit 524dacfbb6bb131f05a4ecab3d7bcd91c1b43d33
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 13 15:35:06 2015 +0200
w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.
* src/Makefile.am (extra_ltoptions): New.
(libgpgme_la_LDFLAGS): Use it.
(libgpgme_pthread_la_LDFLAGS): Ditto.
(libgpgme_glib_la_LDFLAGS): Ditto.
--
Since gcc 4.8 there is a regression in Mingw64 in that plain C
programs may link to libgcc_s.a which has a dependency on
libgcc_s_sjlj.dll. This is for example triggered by using long long
arithmetic on a 32 bit Windows (e.g symbol __udivdi3).
Note that we don't use this patch for the Qt version which, as C++
programs, actually requires that DLL,
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/Makefile.am b/src/Makefile.am
index b7ddbc1..58922f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,6 +153,7 @@ SUFFIXES = .rc .lo
gpgme_res = versioninfo.lo
no_undefined = -no-undefined
export_symbols = -export-symbols $(srcdir)/gpgme.def
+extra_ltoptions = -XCClinker -static-libgcc
install-def-file:
-$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -167,20 +168,22 @@ else
gpgme_res =
no_undefined =
export_symbols =
+extra_ltoptions =
install-def-file:
uninstall-def-file:
gpgme_deps =
endif
-libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
$(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@GPG_ERROR_LIBS@
-libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_pthread_la_LDFLAGS = \
+ $(no_undefined) $(export_symbols) $(extra_ltoptions) \
$(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
@@ -188,8 +191,9 @@ libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
-lpthread @GPG_ERROR_LIBS@
if BUILD_W32_GLIB
-libgpgme_glib_la_LDFLAGS = $(no_undefined) \
- $(export_symbols) $(libgpgme_version_script_cmd) -version-info \
+libgpgme_glib_la_LDFLAGS = \
+ $(no_undefined) $(export_symbols) $(extra_ltoptions) \
+ $(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_glib_la_DEPENDENCIES = @LTLIBOBJS@ \
$(srcdir)/libgpgme.vers $(gpgme_deps)
-----------------------------------------------------------------------
Summary of changes:
NEWS | 13 +++++++++----
README | 2 +-
configure.ac | 4 ++--
src/Makefile.am | 12 ++++++++----
4 files changed, 20 insertions(+), 11 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list