[Pkg-gnupg-commit] [libassuan] 178/437: Preparing a release

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit e064b81c0ad9f5d6933aff6753b03a6b53f6d752
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 22 13:03:20 2006 +0000

    Preparing a release
---
 ChangeLog            |  4 ++++
 NEWS                 |  4 +++-
 README               |  2 +-
 configure.ac         |  2 +-
 src/ChangeLog        |  5 +++++
 src/assuan-handler.c | 15 +++++++++++++++
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eedaf84..3199ade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-22  Werner Koch  <wk at g10code.com>
+
+	Released 1.0.1.
+
 2006-11-21  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (AH_BOTTOM): Define PTH_SYSCALL_SOFT to 0.
diff --git a/NEWS b/NEWS
index 014b18a..cece2a7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-Noteworthy changes in version 1.0.1
+Noteworthy changes in version 1.0.1 (2006-11-22)
 ------------------------------------------------
 
  * New function: assuan_set_io_monitor.
 
  * New function: assuan_register_post_cmd_notify.
 
+ * Fixed a memory leak.
+
 
 Noteworthy changes in version 1.0.0 (2006-10-31)
 ------------------------------------------------
diff --git a/README b/README
index 7632a08..10eb2c9 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                               Libassuan
                              ===========
 
-This is the IPC library used by GnuPG 1.9, GPGME and a few other
+This is the IPC library used by GnuPG 2, GPGME and a few other
 packages.  It used to be included with the latter packages but we
 decided to make your life not too easy and separated it out to a stand
 alone library.
diff --git a/configure.ac b/configure.ac
index 6c15e57..939d91d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
 # 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([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
diff --git a/src/ChangeLog b/src/ChangeLog
index c0a704b..98b0f81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-22  Werner Koch  <wk at g10code.com>
+
+	* assuan-handler.c (fun_cookie_write): New.
+	(assuan_get_data_fp) [HAVE_FUNOPEN]: Use it.
+
 2006-11-21  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (libassuan_pth_a_CFLAGS): New.
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index fd3a52b..205ad10 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -652,6 +652,17 @@ assuan_get_active_fds (assuan_context_t ctx, int what,
   return n;
 }
 
+
+/* funopen uses a different prototype for the write fucntions.  We use
+   this wrapper here to fix it. */
+#ifdef HAVE_FUNOPEN
+static int
+fun_cookie_write (void *cookie, const char *buffer, int orig_size)
+{
+  return _assuan_cookie_write_data (cookie, buffer, orig_size);
+}
+#endif /*HAVE_FUNOPEN*/
+
 /* Return a FP to be used for data output.  The FILE pointer is valid
    until the end of a handler.  So a close is not needed.  Assuan does
    all the buffering needed to insert the status line as well as the
@@ -669,7 +680,11 @@ assuan_get_data_fp (assuan_context_t ctx)
   
 
   ctx->outbound.data.fp = funopen (ctx, 0,
+#ifdef HAVE_FUNOPEN
+				   fun_cookie_write,
+#else
 				   _assuan_cookie_write_data,
+#endif                                   
 				   0, _assuan_cookie_write_flush);
   ctx->outbound.data.error = 0;
   return ctx->outbound.data.fp;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git