[svn] assuan - r228 - in trunk: . src

[svn author wk]

Author: wk
Date: 2006-11-22 14:03:20 +0100 (Wed, 22 Nov 2006)
New Revision: 228

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/assuan-handler.c
Log:
Preparing a release


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/ChangeLog	2006-11-22 13:03:20 UTC (rev 228)
@@ -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.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/NEWS	2006-11-22 13:03:20 UTC (rev 228)
@@ -1,11 +1,13 @@
-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)
 ------------------------------------------------
 

Modified: trunk/README
===================================================================
--- trunk/README	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/README	2006-11-22 13:03:20 UTC (rev 228)
@@ -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.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/configure.ac	2006-11-22 13:03:20 UTC (rev 228)
@@ -27,7 +27,7 @@
 # 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;}')]))

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/src/ChangeLog	2006-11-22 13:03:20 UTC (rev 228)
@@ -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.

Modified: trunk/src/assuan-handler.c
===================================================================
--- trunk/src/assuan-handler.c	2006-11-21 18:57:07 UTC (rev 227)
+++ trunk/src/assuan-handler.c	2006-11-22 13:03:20 UTC (rev 228)
@@ -652,6 +652,17 @@
   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 @@
   
 
   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;