2009-10-20 Marcus Brinkmann <[email protected]>

	* configure.ac: Replace internal libassuan by external libassuan.
	* m4/libassuan.m4: New file.
	* Makefile.am (assuan): Remove variable.
	(SUBDIRS): Remove ${assuan}.
	* assuan/: Removed.

src/
2009-10-20  Marcus Brinkmann  <[email protected]>

	* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
	(gpgsm_components): Move engine-assuan.c to ...
	(assuan_components): ... this new variable.
	(main_sources): Add this new variable.
	(AM_CPPFLAGS): Remove $(assuan_cppflags).
	(AM_CFLAGS): Add @LIBASSUAN_CFLAGS@.
	(libgpgme_la_DEPENDENCIES, libgpgme_pth_la_DEPENDENCIES)
	(libgpgme_glib_la_DEPENDENCIES, libgpgme_qt_la_DEPENDENCIES)
	(libgpgme_pthread_la_DEPENDENCIES): Remove $(assuan_libobjs).
	(libgpgme_la_LIBADD, libgpgme_pth_la_LIBADD)
	(libgpgme_glib_la_LIBADD, libgpgme_qt_la_LIBADD))
	(libgpgme_pthread_la_LIBADD): Replace $(assuan_libobjs) by
	@LIBASSUAN_LIBS@.
	* priv-io.h [!HAVE_W32_SYSTEM]: Declare _gpgme_io_recvmsg,
	_gpgme_io_sendmsg, _gpgme_io_waitpid.
	* engine-backend.h: Define with [ENABLE_ASSUAN] instead
	of [ENABLE_GPGSM].
	* posix-io.c (_gpgme_io_waitpid): Make non-static.
	* util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks,
	_gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb.
	* engine-gpgsm.c: Don't map assuan error codes.  Use
	assuan_release instead of assuan_disconnect.
	(map_assuan_error): Remove function.
	(gpgsm_new): Use new assuan context interface.
	* engine-assuan.c: Use assuan_release instead of
	assuan_disconnect.
	(llass_new): Use new assuan context interface.

1 files changed, 0 insertions, 180 deletions

diff --git a/assuan/assuan-socket-connect.c b/assuan/assuan-socket-connect.c
deleted file mode 100644
index 8eb6d828..00000000
--- a/assuan/assuan-socket-connect.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* assuan-socket-connect.c - Assuan socket based client
- *	Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- *
- * This file is part of Assuan.
- *
- * Assuan is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * Assuan is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#ifndef HAVE_W32_SYSTEM
-#include <sys/socket.h>
-#include <sys/un.h>
-#else
-#include <windows.h>
-#endif
-
-#include "assuan-defs.h"
-
-/* Hacks for Slowaris.  */
-#ifndef PF_LOCAL
-# ifdef PF_UNIX
-#  define PF_LOCAL PF_UNIX
-# else
-#  define PF_LOCAL AF_UNIX
-# endif
-#endif
-#ifndef AF_LOCAL
-# define AF_LOCAL AF_UNIX
-#endif
-
-#ifndef SUN_LEN
-# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
-	               + strlen ((ptr)->sun_path))
-#endif
-
- 
-static int
-do_finish (assuan_context_t ctx)
-{
-  if (ctx->inbound.fd != ASSUAN_INVALID_FD)
-    {
-      _assuan_close (ctx->inbound.fd);
-    }
-  ctx->inbound.fd = ASSUAN_INVALID_FD;
-  ctx->outbound.fd = ASSUAN_INVALID_FD;
-  return 0;
-}
-
-static void
-do_deinit (assuan_context_t ctx)
-{
-  do_finish (ctx);
-}
-
-
-/* Make a connection to the Unix domain socket NAME and return a new
-   Assuan context in CTX.  SERVER_PID is currently not used but may
-   become handy in the future.  */
-assuan_error_t
-assuan_socket_connect (assuan_context_t *r_ctx,
-                       const char *name, pid_t server_pid)
-{
-  return assuan_socket_connect_ext (r_ctx, name, server_pid, 0);
-}
-
-
-/* Make a connection to the Unix domain socket NAME and return a new
-   Assuan context in CTX.  SERVER_PID is currently not used but may
-   become handy in the future.  With flags set to 1 sendmsg and
-   recvmsg are used. */
-assuan_error_t
-assuan_socket_connect_ext (assuan_context_t *r_ctx,
-                           const char *name, pid_t server_pid,
-                           unsigned int flags)
-{
-  static struct assuan_io io = { _assuan_simple_read, _assuan_simple_write,
-				 NULL, NULL };
-  assuan_error_t err;
-  assuan_context_t ctx;
-  assuan_fd_t fd;
-  struct sockaddr_un srvr_addr;
-  size_t len;
-  const char *s;
-
-  if (!r_ctx || !name)
-    return _assuan_error (ASSUAN_Invalid_Value);
-  *r_ctx = NULL;
-
-  /* We require that the name starts with a slash, so that we
-     eventually can reuse this function for other socket types.  To
-     make things easier we allow an optional driver prefix.  */
-  s = name;
-  if (*s && s[1] == ':')
-    s += 2;
-  if (*s != DIRSEP_C && *s != '/')
-    return _assuan_error (ASSUAN_Invalid_Value);
-
-  if (strlen (name)+1 >= sizeof srvr_addr.sun_path)
-    return _assuan_error (ASSUAN_Invalid_Value);
-
-  err = _assuan_new_context (&ctx); 
-  if (err)
-      return err;
-  ctx->deinit_handler = ((flags&1))? _assuan_uds_deinit :  do_deinit;
-  ctx->finish_handler = do_finish;
-
-  fd = _assuan_sock_new (PF_LOCAL, SOCK_STREAM, 0);
-  if (fd == ASSUAN_INVALID_FD)
-    {
-      _assuan_log_printf ("can't create socket: %s\n", strerror (errno));
-      _assuan_release_context (ctx);
-      return _assuan_error (ASSUAN_General_Error);
-    }
-
-  memset (&srvr_addr, 0, sizeof srvr_addr);
-  srvr_addr.sun_family = AF_LOCAL;
-  strncpy (srvr_addr.sun_path, name, sizeof (srvr_addr.sun_path) - 1);
-  srvr_addr.sun_path[sizeof (srvr_addr.sun_path) - 1] = 0;
-  len = SUN_LEN (&srvr_addr);
-
-  if ( _assuan_sock_connect (fd, (struct sockaddr *) &srvr_addr, len) == -1 )
-    {
-      _assuan_log_printf ("can't connect to `%s': %s\n",
-                          name, strerror (errno));
-      _assuan_release_context (ctx);
-      _assuan_close (fd);
-      return _assuan_error (ASSUAN_Connect_Failed);
-    }
-
-  ctx->inbound.fd = fd;
-  ctx->outbound.fd = fd;
-  ctx->io = &io;
-  if ((flags&1))
-    _assuan_init_uds_io (ctx);
- 
-  /* initial handshake */
-  {
-    int okay, off;
-
-    err = _assuan_read_from_server (ctx, &okay, &off);
-    if (err)
-      _assuan_log_printf ("can't connect to server: %s\n",
-                          assuan_strerror (err));
-    else if (okay != 1)
-      {
-        /*LOG ("can't connect to server: `");*/
-	_assuan_log_sanitized_string (ctx->inbound.line);
-	fprintf (assuan_get_assuan_log_stream (), "'\n");
-	err = _assuan_error (ASSUAN_Connect_Failed);
-      }
-  }
-
-  if (err)
-    {
-      assuan_disconnect (ctx); 
-    }
-  else
-    *r_ctx = ctx;
-  return 0;
-}
-
-