[svn] GnuPG - r4124 - trunk/keyserver
svn author dshaw
cvs at cvs.gnupg.org
Wed Apr 26 23:48:32 CEST 2006
Author: dshaw
Date: 2006-04-26 23:48:29 +0200 (Wed, 26 Apr 2006)
New Revision: 4124
Modified:
trunk/keyserver/ChangeLog
trunk/keyserver/Makefile.am
trunk/keyserver/gpgkeys_curl.c
trunk/keyserver/gpgkeys_hkp.c
trunk/keyserver/ksutil.c
trunk/keyserver/ksutil.h
Log:
* Makefile.am: Don't build gpgkeys_http or gpgkeys_(old)hkp any longer as
this is done via curl or fake-curl.
* ksutil.h, ksutil.c, gpgkeys_hkp.c, gpgkeys_curl.c: Minor #include tweaks
as FAKE_CURL is no longer meaningful.
Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/ChangeLog 2006-04-26 21:48:29 UTC (rev 4124)
@@ -1,3 +1,11 @@
+2006-04-26 David Shaw <dshaw at jabberwocky.com>
+
+ * Makefile.am: Don't build gpgkeys_http or gpgkeys_(old)hkp any
+ longer as this is done via curl or fake-curl.
+
+ * ksutil.h, ksutil.c, gpgkeys_hkp.c, gpgkeys_curl.c: Minor
+ #include tweaks as FAKE_CURL is no longer meaningful.
+
2006-04-10 David Shaw <dshaw at jabberwocky.com>
* gpgkeys_ldap.c (ldap_quote, get_name, search_key): LDAP-quote
Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/Makefile.am 2006-04-26 21:48:29 UTC (rev 4124)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -19,18 +19,17 @@
## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
-EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_curl
+EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_finger gpgkeys_curl
EXTRA_SCRIPTS = gpgkeys_mailto
gpglibexecdir = $(libexecdir)/@PACKAGE@
-gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@
+gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_CURL@
gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@
noinst_SCRIPTS = gpgkeys_test
gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
-gpgkeys_hkp_SOURCES = ksutil.c ksutil.h
-gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h
+gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h
gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h
gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h
@@ -39,11 +38,8 @@
gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@
gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
-gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
-if WITH_CURL
-gpgkeys_hkp_SOURCES += gpgkeys_hkp.c
if FAKE_CURL
gpgkeys_curl_SOURCES += curl-shim.c curl-shim.h
gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
@@ -55,7 +51,3 @@
gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@
gpgkeys_hkp_LDADD = @LIBCURL@ @GETOPT@
endif
-else
-gpgkeys_hkp_SOURCES += gpgkeys_oldhkp.c
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
-endif
Modified: trunk/keyserver/gpgkeys_curl.c
===================================================================
--- trunk/keyserver/gpgkeys_curl.c 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/gpgkeys_curl.c 2006-04-26 21:48:29 UTC (rev 4124)
@@ -1,5 +1,5 @@
/* gpgkeys_curl.c - fetch a key via libcurl
- * Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -28,10 +28,10 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
-#ifdef FAKE_CURL
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#else
#include "curl-shim.h"
-#else
-#include <curl/curl.h>
#endif
#include "keyserver.h"
#include "ksutil.h"
Modified: trunk/keyserver/gpgkeys_hkp.c
===================================================================
--- trunk/keyserver/gpgkeys_hkp.c 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/gpgkeys_hkp.c 2006-04-26 21:48:29 UTC (rev 4124)
@@ -28,10 +28,10 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
-#ifdef FAKE_CURL
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#else
#include "curl-shim.h"
-#else
-#include <curl/curl.h>
#endif
#include "keyserver.h"
#include "ksutil.h"
Modified: trunk/keyserver/ksutil.c
===================================================================
--- trunk/keyserver/ksutil.c 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/ksutil.c 2006-04-26 21:48:29 UTC (rev 4124)
@@ -1,5 +1,5 @@
/* ksutil.c - general keyserver utility functions
- * Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -29,10 +29,8 @@
#ifdef HAVE_LIBCURL
#include <curl/curl.h>
#else
-#ifdef FAKE_CURL
#include "curl-shim.h"
#endif
-#endif
#include "keyserver.h"
#include "ksutil.h"
@@ -380,7 +378,6 @@
}
}
-#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
int
curl_err_to_gpg_err(CURLcode error)
{
@@ -541,4 +538,3 @@
ctx->flags.done=1;
}
}
-#endif
Modified: trunk/keyserver/ksutil.h
===================================================================
--- trunk/keyserver/ksutil.h 2006-04-22 14:15:50 UTC (rev 4123)
+++ trunk/keyserver/ksutil.h 2006-04-26 21:48:29 UTC (rev 4124)
@@ -1,5 +1,5 @@
/* ksutil.h
- * Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
@@ -25,10 +25,8 @@
#ifdef HAVE_LIBCURL
#include <curl/curl.h>
#else
-#ifdef FAKE_CURL
#include "curl-shim.h"
#endif
-#endif
/* MAX_LINE must be at least 1 larger than the largest item we expect
to receive, including the name tag ("COMMAND", "PORT", etc) and
@@ -107,7 +105,6 @@
void print_nocr(FILE *stream,const char *str);
enum ks_search_type classify_ks_search(const char **search);
-#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
int curl_err_to_gpg_err(CURLcode error);
struct curl_writer_ctx
@@ -130,6 +127,4 @@
size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
void curl_writer_finalize(struct curl_writer_ctx *ctx);
-#endif
-
#endif /* !_KSUTIL_H_ */
More information about the Gnupg-commits
mailing list