aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--agent/ChangeLog8
-rw-r--r--agent/Makefile.am4
-rw-r--r--agent/gpg-agent.c7
-rw-r--r--common/ChangeLog5
-rw-r--r--common/Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--g13/ChangeLog6
-rw-r--r--g13/Makefile.am4
-rw-r--r--g13/g13.c3
-rw-r--r--scd/ChangeLog6
-rw-r--r--scd/Makefile.am6
-rw-r--r--scd/scdaemon.c5
13 files changed, 52 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fd3eda3d..1fe8eba6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-16 Marcus Brinkmann <[email protected]>
+
+ * configure.ac: Check for libassuan instead of libassuan-pth.
+
2009-10-12 Werner Koch <[email protected]>
* configure.ac: Use -O3 because newer gcc versions require that
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 59674b49b..242d2f0a1 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-16 Marcus Brinkmann <[email protected]>
+
+ * gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
+ libassuan-pth.
+ * gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
+ (main): Call assuan_set_system_hooks and assuan_sock_init.
+ Fix invocation of assuan_socket_connect.
+
2009-09-23 Werner Koch <[email protected]>
* command.c (register_commands) [HAVE_ASSUAN_SET_IO_MONITOR]:
diff --git a/agent/Makefile.am b/agent/Makefile.am
index c2830a94b..38200c1d8 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -62,9 +62,9 @@ gpg_agent_res_deps =
#endif
-gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
gpg_agent_LDADD = $(commonpth_libs) \
- $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags)
gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 4493c7abd..be7da2009 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -50,7 +50,6 @@
#include "gc-opt-flags.h"
#include "exechelp.h"
-
enum cmd_and_opt_values
{ aNull = 0,
oCsh = 'c',
@@ -276,6 +275,8 @@ static void check_own_socket (void);
static int check_for_running_agent (int silent, int mode);
/* Pth wrapper function definitions. */
+ASSUAN_SYSTEM_PTH_IMPL;
+
GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void)
{
@@ -593,6 +594,8 @@ main (int argc, char **argv )
assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+ assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
+ assuan_sock_init ();
setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
@@ -2217,7 +2220,7 @@ check_for_running_agent (int silent, int mode)
rc = assuan_new (&ctx);
if (! rc)
- rc = assuan_socket_connect (&ctx, infostr, pid);
+ rc = assuan_socket_connect (ctx, infostr, pid);
xfree (infostr);
if (rc)
{
diff --git a/common/ChangeLog b/common/ChangeLog
index 2c70240da..c6c43ec3f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16 Marcus Brinkmann <[email protected]>
+
+ * Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
+ of LIBASSUAN_PTH_CFLAGS.
+
2009-10-13 Werner Koch <[email protected]>
* exechelp.c (gnupg_kill_process): New.
diff --git a/common/Makefile.am b/common/Makefile.am
index dd3661dac..10be46eba 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -87,7 +87,7 @@ libcommonpth_a_SOURCES = $(common_sources)
if USE_DNS_SRV
libcommonpth_a_SOURCES += srv.c
endif
-libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
libsimple_pwquery_a_SOURCES = \
simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
diff --git a/configure.ac b/configure.ac
index 6c7c2e767..85da4c4f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,8 +612,8 @@ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
have_libassuan=yes,have_libassuan=no)
if test "$have_libassuan" = "yes"; then
have_libassuan=no
- AM_PATH_LIBASSUAN_PTH("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
- have_libassuan=yes,have_libassuan=no)
+ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
+ have_libassuan=yes,have_libassuan=no)
AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
[version of the libassuan library])
fi
@@ -1384,7 +1384,7 @@ if test "$have_libassuan" = "no"; then
die=yes
AC_MSG_NOTICE([[
***
-*** You need libassuan with Pth support to build this program.
+*** You need libassuan to build this program.
*** This library is for example available at
*** ftp://ftp.gnupg.org/gcrypt/libassuan/
*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
diff --git a/g13/ChangeLog b/g13/ChangeLog
index 119ef9b7d..1430297b2 100644
--- a/g13/ChangeLog
+++ b/g13/ChangeLog
@@ -1,5 +1,11 @@
2009-10-16 Marcus Brinkmann <[email protected]>
+ * AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
+ * g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
+ (main): Call assuan_set_system_hooks.
+
+2009-10-16 Marcus Brinkmann <[email protected]>
+
* Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).
(g13_LDADD): Add $(KSBA_LIBS).
diff --git a/g13/Makefile.am b/g13/Makefile.am
index f10f7fd38..cf25f6945 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
- $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+ $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
g13_SOURCES = \
g13.c g13.h \
@@ -42,6 +42,6 @@ g13_SOURCES = \
be-truecrypt.c be-truecrypt.h
g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL)
diff --git a/g13/g13.c b/g13/g13.c
index 453fa9e65..0e479b016 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -204,6 +204,8 @@ static void join_idle_task (void);
/* Begin Pth wrapper functions. */
+ASSUAN_SYSTEM_PTH_IMPL;
+
GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void)
{
@@ -441,6 +443,7 @@ main ( int argc, char **argv)
/* Prepare libassuan. */
assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+ assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
/* Setup a default control structure for command line mode. */
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 60f5462ac..d1ab1c643 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-16 Marcus Brinkmann <[email protected]>
+
+ * AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
+ * scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
+ (main): Call assuan_set_system_hooks and assuan_sock_init.
+
2009-09-23 Marcus Brinkmann <[email protected]>
* command.c: Include "scdaemon.h" before <assuan.h> because of
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 86dbff897..ae623ace8 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
- $(KSBA_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+ $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c
@@ -42,7 +42,7 @@ scdaemon_SOURCES = \
scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)
@@ -60,7 +60,7 @@ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
#sc_copykeys_LDADD = \
# ../jnlib/libjnlib.a ../common/libcommon.a \
# ../common/libsimple-pwquery.a \
-# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
# $(LIBUSB_LIBS) \
# -lgpg-error @LIBINTL@ @DL_LIBS@
#
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 8e353189f..f483d2098 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -53,7 +53,6 @@
#include "mkdtemp.h"
#include "gc-opt-flags.h"
-
enum cmd_and_opt_values
{ aNull = 0,
oCsh = 'c',
@@ -204,6 +203,8 @@ static void *start_connection_thread (void *arg);
static void handle_connections (int listen_fd);
/* Pth wrapper function definitions. */
+ASSUAN_SYSTEM_PTH_IMPL;
+
GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void)
{
@@ -410,6 +411,8 @@ main (int argc, char **argv )
assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+ assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
+ assuan_sock_init ();
setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:08:39 +0000