[git] Assuan - branch, master, updated. libassuan-2.1.1-12-g416d045
by Werner Koch
cvs at cvs.gnupg.org
Sun Aug 17 13:57:41 CEST 2014
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 "IPC library used by GnuPG".
The branch, master has been updated
via 416d045b196464c408bed587d1ecf5496924bddf (commit)
via a5d7f4999f4aa844d9446bd4524cb6a47219826c (commit)
via 49a930a613b280fdd55e6d558a2ae414bdbbf66e (commit)
via 5865eeeb809a9bf6ab66fa40cb4bb7259e43e1c8 (commit)
via b6da2da96780ec270439eba5569a618cabe4da02 (commit)
from 134c045c7d1f93ce61f62193d33af8a6e8825543 (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 416d045b196464c408bed587d1ecf5496924bddf
Author: Werner Koch <wk at gnupg.org>
Date: Sun Aug 17 13:57:47 2014 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index 39c9384..0b3bdcf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.3 (unreleased) [C4/A4/R_]
+------------------------------------------------
+
+
Noteworthy changes in version 2.1.2 (2014-08-17) [C4/A4/R2]
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index cb21af1..baa01dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ min_automake_version="1.10"
m4_define([mym4_package],[libassuan])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [2])
+m4_define([mym4_micro], [3])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
commit a5d7f4999f4aa844d9446bd4524cb6a47219826c
Author: Werner Koch <wk at gnupg.org>
Date: Sun Aug 17 13:49:23 2014 +0200
Release 2.1.2.
* configure.ac: Set LT version to C4/A4/R2.
diff --git a/NEWS b/NEWS
index 842383d..39c9384 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
-Noteworthy changes in version 2.1.2 (unreleased)
+Noteworthy changes in version 2.1.2 (2014-08-17) [C4/A4/R2]
------------------------------------------------
+ * Fixed portability bugs for Solaris and AIX.
-Noteworthy changes in version 2.1.1 (2013-06-24)
+ * Added support for ppc64le.
+
+
+Noteworthy changes in version 2.1.1 (2013-06-24) [C4/A4/R1]
------------------------------------------------
* Limited support for 64 bit Windows. This is sufficient for use by
diff --git a/configure.ac b/configure.ac
index a69c2db..cb21af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
#
LIBASSUAN_LT_CURRENT=4
LIBASSUAN_LT_AGE=4
-LIBASSUAN_LT_REVISION=1
+LIBASSUAN_LT_REVISION=2
# If the API is changed in an incompatible way: increment the next counter.
LIBASSUAN_CONFIG_API_VERSION=2
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index ed638be..5c0960c 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -39,7 +39,7 @@ BEGIN
VALUE "FileDescription", "Assuan - GnuPG IPC\0"
VALUE "FileVersion", "@LIBASSUAN_LT_CURRENT at .@LIBASSUAN_LT_AGE at .@LIBASSUAN_LT_REVISION at .@BUILD_REVISION@\0"
VALUE "InternalName", "libassuan\0"
- VALUE "LegalCopyright", "Copyright © 2003-2013 g10 Code GmbH\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2014 g10 Code GmbH\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libassuan.dll\0"
VALUE "PrivateBuild", "\0"
commit 49a930a613b280fdd55e6d558a2ae414bdbbf66e
Author: Werner Koch <wk at gnupg.org>
Date: Sun Aug 17 13:08:26 2014 +0200
Update build system
* autogen.sh: Add --find-version stuff. Taken from GnuPG.
* configure.ac: Change accordingly
diff --git a/autogen.sh b/autogen.sh
index 471193c..90e7d7f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
# configure it for the respective package. It is maintained as part of
# GnuPG and source copied by other packages.
#
-# Version: 2014-01-10
+# Version: 2014-06-06
configure_ac="configure.ac"
@@ -41,7 +41,7 @@ fatal () {
info () {
if [ -z "${SILENT}" ]; then
- echo "autogen.sh:" "$*"
+ echo "autogen.sh:" "$*" >&2
fi
}
@@ -70,8 +70,11 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
DIE=no
FORCE=
SILENT=
+PRINT_HOST=no
+PRINT_BUILD=no
tmp=$(dirname "$0")
tsdir=$(cd "${tmp}"; pwd)
+version_parts=3
if [ -n "${AUTOGEN_SH_SILENT}" ]; then
SILENT=" --silent"
@@ -88,6 +91,14 @@ if test x"$1" = x"--force"; then
FORCE=" --force"
shift
fi
+if test x"$1" = x"--print-host"; then
+ PRINT_HOST=yes
+ shift
+fi
+if test x"$1" = x"--print-build"; then
+ PRINT_BUILD=yes
+ shift
+fi
# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces
@@ -133,6 +144,11 @@ amd64_toolprefixes=
myhost=""
myhostsub=""
case "$1" in
+ --find-version)
+ myhost="find-version"
+ SILENT=" --silent"
+ shift
+ ;;
--build-w32)
myhost="w32"
shift
@@ -172,16 +188,74 @@ if [ -f "$HOME/.gnupg-autogen.rc" ]; then
. "$HOME/.gnupg-autogen.rc"
fi
+
+# **** FIND VERSION ****
+# This is a helper for the configure.ac M4 magic
+# Called
+# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]
+# returns a complete version string with automatic beta numbering.
+if [ "$myhost" = "find-version" ]; then
+ package="$1"
+ major="$2"
+ minor="$3"
+ micro="$4"
+
+ case "$version_parts" in
+ 2)
+ matchstr1="$package-$major.[0-9]*"
+ matchstr2="$package-$major-base"
+ vers="$major.$minor"
+ ;;
+ *)
+ matchstr1="$package-$major.$minor.[0-9]*"
+ matchstr2="$package-$major.$minor-base"
+ vers="$major.$minor.$micro"
+ ;;
+ esac
+
+ beta=no
+ if [ -d .git ]; then
+ ingit=yes
+ tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+ if [ -n "$tmp" ]; then
+ tmp=$(echo "$tmp"|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
+ else
+ tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
+ | awk -F- '$4!=0{print"-beta"$4}')
+ fi
+ [ -n "$tmp" ] && beta=yes
+ rev=$(git rev-parse --short HEAD | tr -d '\n\r')
+ rvd=$((0x$(echo ${rev} | head -c 4)))
+ else
+ ingit=no
+ beta=yes
+ tmp="-unknown"
+ rev="0000000"
+ rvd="0"
+ fi
+
+ echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
+ exit 0
+fi
+# **** end FIND VERSION ****
+
+
+if [ ! -f "$tsdir/build-aux/config.guess" ]; then
+ fatal "$tsdir/build-aux/config.guess not found"
+ exit 1
+fi
+build=`$tsdir/build-aux/config.guess`
+if [ $PRINT_BUILD = yes ]; then
+ echo "$build"
+ exit 0
+fi
+
+
+
# ******************
# W32 build script
# ******************
if [ "$myhost" = "w32" ]; then
- if [ ! -f "$tsdir/build-aux/config.guess" ]; then
- fatal "$tsdir/build-aux/config.guess not found"
- exit 1
- fi
- build=`$tsdir/build-aux/config.guess`
-
case $myhostsub in
ce)
w32root="$w32ce_root"
@@ -222,6 +296,10 @@ if [ "$myhost" = "w32" ]; then
fi
die_p
fi
+ if [ $PRINT_HOST = yes ]; then
+ echo "$host"
+ exit 0
+ fi
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep "$host" >/dev/null; then
@@ -242,13 +320,6 @@ fi
# ***** AMD64 cross build script *******
# Used to cross-compile for AMD64 (for testing)
if [ "$myhost" = "amd64" ]; then
- shift
- if [ ! -f $tsdir/build-aux/config.guess ]; then
- echo "$tsdir/build-aux/config.guess not found" >&2
- exit 1
- fi
- build=`$tsdir/build-aux/config.guess`
-
[ -z "$amd64root" ] && amd64root="$HOME/amd64root"
info "Using $amd64root as standard install directory"
replace_sysroot
@@ -269,6 +340,10 @@ if [ "$myhost" = "amd64" ]; then
echo "Stop." >&2
exit 1
fi
+ if [ $PRINT_HOST = yes ]; then
+ echo "$host"
+ exit 0
+ fi
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep "$host" >/dev/null; then
diff --git a/configure.ac b/configure.ac
index 2e3b197..a69c2db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
# configure.ac - for libassuan
# Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009,
# 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014 g10 Code GmbH
#
# This file is part of Assuan.
#
@@ -27,27 +28,29 @@ min_automake_version="1.10"
# bump the version number immediately after the release and do another
# commit and push so that the git magic is able to work. See below
# for the LT versions.
-m4_define(mym4_version_major, [2])
-m4_define(mym4_version_minor, [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
-# indicating a development version (mym4_isgit). Note that the m4
-# processing is done by autoconf and not during the configure run.
-m4_define(mym4_version,
- [mym4_version_major.mym4_version_minor.mym4_version_micro])
-m4_define([mym4_revision],
- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-m4_define([mym4_revision_dec],
- m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
-m4_define([mym4_betastring],
- m4_esyscmd_s([git describe --match 'libassuan-[0-9].*[0-9]' --long|\
- awk -F- '$3!=0{print"-beta"$3}']))
-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
-m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
-
-AC_INIT([libassuan],[mym4_full_version],[http://bugs.gnupg.org])
+m4_define([mym4_package],[libassuan])
+m4_define([mym4_major], [2])
+m4_define([mym4_minor], [1])
+m4_define([mym4_micro], [2])
+
+# To start a new development series, i.e a new major or minor number
+# you need to mark an arbitrary commit before the first beta release
+# with an annotated tag. For example a 2.1 branch starts off with
+# the tag "foo-2.1-base". This is used as the base for counting
+# beta numbers before the first release of a series.
+
+# Below is m4 magic to extract and compute the git revision number,
+# the decimalized short revision number, a beta version string and a
+# flag indicating a development version (mym4_isbeta). Note that the
+# m4 processing is done by autoconf and not during the configure run.
+m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
+ mym4_package mym4_major mym4_minor mym4_micro),[:]))
+m4_define([mym4_isbeta], m4_argn(2, mym4_verslist))
+m4_define([mym4_version], m4_argn(4, mym4_verslist))
+m4_define([mym4_revision], m4_argn(7, mym4_verslist))
+m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
+
+AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
# LT Version numbers, remember to change them just *before* a release.
# (Code changed: REVISION++)
@@ -88,8 +91,8 @@ AC_SUBST(VERSION)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",[Bug report address])
-VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_version_major \
- mym4_version_minor mym4_version_micro)
+VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \
+ mym4_minor mym4_micro)
AC_SUBST(VERSION_NUMBER)
commit 5865eeeb809a9bf6ab66fa40cb4bb7259e43e1c8
Author: Werner Koch <wk at gnupg.org>
Date: Sun Aug 17 13:05:02 2014 +0200
Update copyright info
--
diff --git a/AUTHORS b/AUTHORS
index 7d2e7c3..2219f35 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,14 @@ Security related bug reports: security at gnupg.org
License (library): LGPLv2.1+
License (manual): GPLv3+
+Libassuan is free software. See below for details. License copyright
+years may be listed using range notation, e.g., 2000-2013, indicating
+that every year in the range, inclusive, is a copyrightable year that
+would otherwise be listed individually.
+
+
+Authors with a FSF copyright assignment
+=======================================
Werner Koch <wk at gnupg.org>
- Initial code.
@@ -22,15 +30,39 @@ Ben Kibbey <bjk at luxsci.net> Assigns Past and Future Changes For GnuPG.
- Fixes and new features
-DCO:
+Authors with a DCO
+==================
+
+Notes:
+======
Libassuan was orginally part of NewPG, a temporary fork of GnuPG, and
later split of into a separate library.
- Copyright 2003, 2007, 2008, 2011, 2013 Free Software Foundation, Inc.
+Copyright
+=========
+
+The Libassuan code distributed under the GNU Lesser General Public
+License, version 2.1 or later. The manual is distributed under the
+GNU General Public License, Version 3 or later.
+
+List of Copyright holders
+=========================
+
+ Copyright (C) 1992-2013 Free Software Foundation, Inc.
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 2000 Werner Koch (dd9jn)
+ Copyright (C) 2001-2014 g10 Code GmbH
+ Copyright (C) 2004 Simon Josefsson
+
+
+==========
+
+ Copyright 2003-2013 Free Software Foundation, Inc.
+ Copyright (C) 2013-2014 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/README b/README
index 089b84b..defb427 100644
--- a/README
+++ b/README
@@ -1,34 +1,52 @@
Libassuan
===========
-This is the IPC library used by GnuPG 2, GPGME and a few other
-packages.
+ Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ Copyright (C) 2001-2014 g10 Code GmbH
-See COPYING.LIB on how to share, modify and distribute the software
-itself (LGPLv2.1+) and COPYING for the documentation (GPLv3+).
-Please send bug report to the gnupg-devel mailing list or enter them
-into the gnupg bug tracker at http://bugs.gnupg.org using the
-category "libassuan".
+ This is a general purpose IPC library which is for example used
+ GnuPG, GPGME and some other software.
-The primary FTP site is ftp://ftp.gnupg.org/gcrypt/libassuan.
+ See COPYING.LIB on how to share, modify and distribute the
+ software itself (LGPLv2.1+) and COPYING for the documentation
+ (GPLv3+).
+ Please send bug report to the gnupg-devel mailing list or enter
+ them into the gnupg bug tracker at http://bugs.gnupg.org using the
+ category "libassuan".
+ The primary FTP site is ftp://ftp.gnupg.org/gcrypt/libassuan.
-Notes for Windows CE:
-----------------------
-Libassuan supports WindowsCE (tested with WindowsMobile 6.5). To
-install it, copy libassuan-0.dll into a location where DLL are found
-and install the included gpgcedev driver: First copy "gpgcedev.dll"
-into the root directory, second run the included program gpgcemgr on
-the device: "gpgcemgr --register". This creates the necessary
-registry keys. In case the copy step fails, the driver may still be
-in use: Close all applications using that driver, run "gpgcemgr
---deactivate" to deactivate the running driver and try again.
+ Notes for Windows CE:
+ ----------------------
-Registry keys created by "gpgcemgr --register" are:
+ Libassuan supports WindowsCE (tested with WindowsMobile 6.5). To
+ install it, copy libassuan-0.dll into a location where DLL are found
+ and install the included gpgcedev driver: First copy "gpgcedev.dll"
+ into the root directory, second run the included program gpgcemgr on
+ the device: "gpgcemgr --register". This creates the necessary
+ registry keys. In case the copy step fails, the driver may still be
+ in use: Close all applications using that driver, run "gpgcemgr
+ --deactivate" to deactivate the running driver and try again.
- Drivers\\GnuPG_Device\dll -> "gpgcedev.dll"
- Drivers\\GnuPG_Device\prefix -> "GPG"
- Drivers\\GnuPG_Device\Index -> 1 (dword)
+ Registry keys created by "gpgcemgr --register" are:
+
+ Drivers\\GnuPG_Device\dll -> "gpgcedev.dll"
+ Drivers\\GnuPG_Device\prefix -> "GPG"
+ Drivers\\GnuPG_Device\Index -> 1 (dword)
+
+
+ Contact
+ -------
+
+ See the file AUTHORS.
+
+ Commercial grade support for Libassuan and GnuPG is available; for
+ a listing of offers see https://www.gnupg.org/service.html .
+ Maintaining and improving this software is costly. Since 2001,
+ g10 Code GmbH, a German company owned and headed by GnuPG's
+ principal author Werner Koch, is bearing the majority of these
+ costs. To help them carry on this work, they need your support.
+ See https://gnupg.org/donate/ .
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 089415c..d074a9f 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,6 +1,6 @@
/* assuan.h - Definitions for the Assuan IPC library -*- c -*-
- Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010,
- 2011, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ Copyright (C) 2001-2014 g10 Code GmbH
This file is part of Assuan.
diff --git a/src/sysutils.c b/src/sysutils.c
index 6951ceb..0eb5d1c 100644
--- a/src/sysutils.c
+++ b/src/sysutils.c
@@ -45,8 +45,8 @@ _assuan_sysutils_blurb (void)
static const char blurb[] =
"\n\n"
"This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n"
- "Copyright 2000, 2002, 2003, 2004, 2007, 2008, 2009,\n"
- " 2010, 2011, 2013 Free Software Foundation, Inc.\n"
+ "Copyright 2001-2013 Free Software Foundation, Inc.\n"
+ "Copyright 2001-2014 g10 Code GmbH\n"
"\n"
"(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
"\n\n";
commit b6da2da96780ec270439eba5569a618cabe4da02
Author: Werner Koch <wk at gnupg.org>
Date: Thu Aug 14 17:15:04 2014 +0200
Fix possible segv in a call to _assuan_debug.
* src/context.c (assuan_set_error): Do not pass NULL for %s in the
trace function.
--
This likely fixes
GnuPG-bug-id: 1659
diff --git a/src/context.c b/src/context.c
index b4d4d49..62b7f57 100644
--- a/src/context.c
+++ b/src/context.c
@@ -190,7 +190,7 @@ assuan_set_error (assuan_context_t ctx, gpg_error_t err, const char *text)
{
TRACE4 (ctx, ASSUAN_LOG_CTX, "assuan_set_error", ctx,
"err=%i (%s,%s),text=%s", err, gpg_strsource (err),
- gpg_strerror (err), text);
+ gpg_strerror (err), text?text:"(none)");
ctx->err_no = err;
ctx->err_str = text;
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 36 ++++++++++++++++-
NEWS | 12 +++++-
README | 62 ++++++++++++++++++-----------
autogen.sh | 105 ++++++++++++++++++++++++++++++++++++++++++-------
configure.ac | 51 +++++++++++++-----------
src/assuan.h.in | 4 +-
src/context.c | 2 +-
src/sysutils.c | 4 +-
src/versioninfo.rc.in | 2 +-
9 files changed, 207 insertions(+), 71 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list