[svn] assuan - r226 - in trunk: . doc m4 src
svn author wk
cvs at cvs.gnupg.org
Tue Nov 21 19:42:07 CET 2006
Author: wk
Date: 2006-11-21 19:42:07 +0100 (Tue, 21 Nov 2006)
New Revision: 226
Modified:
trunk/ChangeLog
trunk/autogen.sh
trunk/configure.ac
trunk/doc/assuan.texi
trunk/m4/gnupg-pth.m4
trunk/src/ChangeLog
trunk/src/assuan-pipe-server.c
Log:
Fix for newer Pth versions.
Fix memory leak.
Add convenience option for cross build to amd64
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/ChangeLog 2006-11-21 18:42:07 UTC (rev 226)
@@ -1,3 +1,15 @@
+2006-11-21 Werner Koch <wk at g10code.com>
+
+ * configure.ac (AH_BOTTOM): Define PTH_SYSCALL_SOFT to 0.
+ (AC_INIT): Use the SVN magic.
+
+ * m4/gnupg-pth.m4 (GNUPG_PTH_VERSION_CHECK): Use --all with
+ pth-config.
+
+2006-11-15 Werner Koch <wk at g10code.com>
+
+ * autogen.sh: Add convenience option --build-amd64.
+
2006-10-31 Werner Koch <wk at g10code.com>
Released 1.0.0.
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/autogen.sh 2006-11-21 18:42:07 UTC (rev 226)
@@ -84,8 +84,52 @@
# ***** end W32 build script *******
+# ***** AMD64 cross build script *******
+# Used to cross-compile for AMD64 (for testing)
+if test "$1" = "--build-amd64"; then
+ tmp=`dirname $0`
+ tsdir=`cd "$tmp"; pwd`
+ shift
+ if [ ! -f $tsdir/config.guess ]; then
+ echo "$tsdir/config.guess not found" >&2
+ exit 1
+ fi
+ build=`$tsdir/config.guess`
+ [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
+ echo "Using $amd64root as standard install directory" >&2
+
+ # Locate the cross compiler
+ crossbindir=
+ for host in x86_64-linux-gnu amd64-linux-gnu; do
+ if ${host}-gcc --version >/dev/null 2>&1 ; then
+ crossbindir=/usr/${host}/bin
+ conf_CC="CC=${host}-gcc"
+ break;
+ fi
+ done
+ if [ -z "$crossbindir" ]; then
+ echo "Cross compiler kit not installed" >&2
+ echo "Stop." >&2
+ exit 1
+ fi
+
+ if [ -f "$tsdir/config.log" ]; then
+ if ! head $tsdir/config.log | grep "$host" >/dev/null; then
+ echo "Please run a 'make distclean' first" >&2
+ exit 1
+ fi
+ fi
+ $tsdir/configure --enable-maintainer-mode --prefix=${amd64root} \
+ --host=${host} --build=${build}
+ rc=$?
+ exit $rc
+fi
+# ***** end AMD64 cross build script *******
+
+
+
# Grep the required versions from configure.ac
autoconf_vers=`sed -n '/^AC_PREREQ(/ {
s/^.*(\(.*\))/\1/p
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/configure.ac 2006-11-21 18:42:07 UTC (rev 226)
@@ -23,9 +23,16 @@
AC_PREREQ(2.59)
min_automake_version="1.9.3"
-# Version number: Remember to change it immediately *after* a release.
-# Add a "-cvs" prefix for non-released code.
-AC_INIT(libassuan, 1.0.1-cvs, bug-libassuan at gnupg.org)
+# Remember to change the version number immediately *after* a release.
+# Set my_issvn to "yes" for non-released code. Remember to run an
+# "svn up" and "autogen.sh" right before creating a distribution.
+m4_define([my_version], [1.0.1])
+m4_define([my_issvn], [yes])
+
+m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
+ || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
+AC_INIT([libassuan], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+ [bug-libassuan at gnupg.org])
# Note, that this is not yet available as a shared library.
PACKAGE=$PACKAGE_NAME
@@ -73,6 +80,11 @@
AH_BOTTOM([
#define _ASSUAN_IN_LIBASSUAN 1
+
+/* We explicitly need to disable PTH's soft mapping as Debian
+ currently enables it by default for no reason. */
+#define PTH_SYSCALL_SOFT 0
+
])
Modified: trunk/doc/assuan.texi
===================================================================
--- trunk/doc/assuan.texi 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/doc/assuan.texi 2006-11-21 18:42:07 UTC (rev 226)
@@ -886,7 +886,7 @@
@end deftypefun
@noindent
-If a file descriptor has been passed a the assuan context gets initialized
+If a file descriptor has been passed, the assuan context gets initialized
by
@deftypefun assuan_error_t assuan_init_socket_server_ext (@w{assuan_context_t *@var{r_ctx}}, @w{int @var{fd}}, @w{unsigned int @var{flags}})
Modified: trunk/m4/gnupg-pth.m4
===================================================================
--- trunk/m4/gnupg-pth.m4 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/m4/gnupg-pth.m4 2006-11-21 18:42:07 UTC (rev 226)
@@ -53,7 +53,7 @@
_gnupg_pth_save_libs=$LIBS
CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
- LIBS="$LIBS `$PTH_CONFIG --libs`"
+ LIBS="$LIBS `$PTH_CONFIG --libs --all`"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
],
[[ pth_init ();]])],
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/src/ChangeLog 2006-11-21 18:42:07 UTC (rev 226)
@@ -1,3 +1,7 @@
+2006-11-21 Werner Koch <wk at g10code.com>
+
+ * assuan-pipe-server.c (_assuan_release_context): Free CMDTBL.
+
2006-11-14 Werner Koch <wk at g10code.com>
* libassuan.m4 (AM_CHECK_LIBASSUAN): New.
Modified: trunk/src/assuan-pipe-server.c
===================================================================
--- trunk/src/assuan-pipe-server.c 2006-11-14 16:56:07 UTC (rev 225)
+++ trunk/src/assuan-pipe-server.c 2006-11-21 18:42:07 UTC (rev 226)
@@ -168,6 +168,7 @@
{
xfree (ctx->hello_line);
xfree (ctx->okay_line);
+ xfree (ctx->cmdtbl);
xfree (ctx);
}
}
More information about the Gnupg-commits
mailing list