mirror of git://git.gnupg.org/gnupg.git
Remove keyserver helper code.
* configure.ac: Remove keyserver helper related stuff. * Makefile.am (SUBDIRS): Remove keyserver. * keyserver/Makefile.am: Remove. -- The dirmngr is used instead of the keyserver helpers. Thus there is more need to distribute the old code. We keep it in the repo for references, though.
This commit is contained in:
Werner Koch
parent
9c9e26d41e
commit
23712e69d3
|
|
@ -40,12 +40,8 @@ endif
|
|||
|
||||
if BUILD_GPG
|
||||
gpg = g10
|
||||
if !HAVE_W32CE_SYSTEM
|
||||
keyserver =
|
||||
endif
|
||||
else
|
||||
gpg =
|
||||
keyserver =
|
||||
endif
|
||||
if BUILD_GPGSM
|
||||
sm = sm
|
||||
|
|
@ -90,7 +86,7 @@ tests =
|
|||
endif
|
||||
|
||||
SUBDIRS = m4 gl common ${kbx} \
|
||||
${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
|
||||
${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
|
||||
${tools} po ${doc} ${tests}
|
||||
|
||||
dist_doc_DATA = README
|
||||
|
|
|
|||
64
configure.ac
64
configure.ac
|
|
@ -90,7 +90,6 @@ use_zip=yes
|
|||
use_bzip2=yes
|
||||
use_exec=yes
|
||||
use_trust_models=yes
|
||||
disable_keyserver_path=no
|
||||
card_support=yes
|
||||
use_ccid_driver=yes
|
||||
use_standard_socket=yes
|
||||
|
|
@ -313,61 +312,6 @@ if test "$use_exec" = yes ; then
|
|||
fi],withval=no)
|
||||
AC_MSG_RESULT($withval)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether to enable external keyserver helpers])
|
||||
AC_ARG_ENABLE(keyserver-helpers,
|
||||
[ --disable-keyserver-helpers disable all external keyserver support],
|
||||
[if test "$enableval" = no ; then
|
||||
AC_DEFINE(DISABLE_KEYSERVER_HELPERS,1,
|
||||
[define to disable keyserver helpers])
|
||||
fi],enableval=yes)
|
||||
gnupg_cv_enable_keyserver_helpers=$enableval
|
||||
AC_MSG_RESULT($enableval)
|
||||
|
||||
if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
|
||||
# LDAP is defined only after we confirm the library is available later
|
||||
AC_MSG_CHECKING([whether LDAP keyserver support is requested])
|
||||
AC_ARG_ENABLE(ldap,
|
||||
AC_HELP_STRING([--disable-ldap],[disable LDAP keyserver interface only]),
|
||||
try_ks_ldap=$enableval, try_ks_ldap=yes)
|
||||
AC_MSG_RESULT($try_ks_ldap)
|
||||
|
||||
AC_MSG_CHECKING([whether HKP keyserver support is requested])
|
||||
AC_ARG_ENABLE(hkp,
|
||||
AC_HELP_STRING([--disable-hkp],[disable HKP keyserver interface only]),
|
||||
try_hkp=$enableval, try_hkp=yes)
|
||||
AC_MSG_RESULT($try_hkp)
|
||||
|
||||
AC_MSG_CHECKING([whether finger key fetching support is requested])
|
||||
AC_ARG_ENABLE(finger,
|
||||
AC_HELP_STRING([--disable-finger],
|
||||
[disable finger key fetching interface only]),
|
||||
try_finger=$enableval, try_finger=yes)
|
||||
AC_MSG_RESULT($try_finger)
|
||||
|
||||
AC_MSG_CHECKING([whether generic object key fetching support is requested])
|
||||
AC_ARG_ENABLE(generic,
|
||||
AC_HELP_STRING([--disable-generic],
|
||||
[disable generic object key fetching interface only]),
|
||||
try_generic=$enableval, try_generic=yes)
|
||||
AC_MSG_RESULT($try_generic)
|
||||
|
||||
AC_MSG_CHECKING([whether email keyserver support is requested])
|
||||
AC_ARG_ENABLE(mailto,
|
||||
AC_HELP_STRING([--enable-mailto],
|
||||
[enable email keyserver interface only]),
|
||||
try_mailto=$enableval, try_mailto=no)
|
||||
AC_MSG_RESULT($try_mailto)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether keyserver exec-path is enabled])
|
||||
AC_ARG_ENABLE(keyserver-path,
|
||||
AC_HELP_STRING([--disable-keyserver-path],
|
||||
[disable the exec-path option for keyserver helpers]),
|
||||
[if test "$enableval" = no ; then
|
||||
disable_keyserver_path=yes
|
||||
fi],enableval=yes)
|
||||
AC_MSG_RESULT($enableval)
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -655,7 +599,6 @@ case "${host}" in
|
|||
[Because the Unix gettext has too much overhead on
|
||||
MingW32 systems and these systems lack Posix functions,
|
||||
we use a simplified version of gettext])
|
||||
disable_keyserver_path=yes
|
||||
have_dosish_system=yes
|
||||
have_w32_system=yes
|
||||
run_tests=no
|
||||
|
|
@ -758,10 +701,6 @@ if test "$use_ldapwrapper" = yes; then
|
|||
fi
|
||||
AM_CONDITIONAL(USE_LDAPWRAPPER, test "$use_ldapwrapper" = yes)
|
||||
|
||||
if test "$disable_keyserver_path" = yes; then
|
||||
AC_DEFINE(DISABLE_KEYSERVER_PATH,1,
|
||||
[Defined to disable exec-path for keyserver helpers])
|
||||
fi
|
||||
|
||||
#
|
||||
# Allows enabling the use of a standard socket by default This is
|
||||
|
|
@ -1878,9 +1817,6 @@ tests/Makefile
|
|||
tests/openpgp/Makefile
|
||||
tests/pkits/Makefile
|
||||
])
|
||||
#keyserver/Makefile
|
||||
#keyserver/gpg2keys_mailto
|
||||
#keyserver/gpg2keys_test
|
||||
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
# Makefile.am - Makefile for keyservers
|
||||
# Copyright (C) 2001, 2002, 2004, 2005, 2006,
|
||||
# 2009 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GnuPG.
|
||||
#
|
||||
# GnuPG is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# GnuPG 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 General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
# Note that we have renamed the resulting binaries to from gpgkeys_foo
|
||||
# to gpg2keys_foo to allow for a non-conflicting installation of
|
||||
# gnupg1 and gnupg2. Having the same names for the helpers would
|
||||
# otherwise lead to trouble when to uninstall one of them.
|
||||
EXTRA_PROGRAMS = gpg2keys_ldap gpg2keys_hkp gpg2keys_finger gpg2keys_curl \
|
||||
gpg2keys_kdns
|
||||
EXTRA_SCRIPTS = gpg2keys_mailto
|
||||
|
||||
EXTRA_DIST = ChangeLog-2011
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
|
||||
|
||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
|
||||
|
||||
include $(top_srcdir)/am/cmacros.am
|
||||
|
||||
libexec_PROGRAMS = $(GPGKEYS_LDAP) $(GPGKEYS_HKP) $(GPGKEYS_FINGER) \
|
||||
$(GPGKEYS_CURL) $(GPGKEYS_KDNS)
|
||||
libexec_SCRIPTS = $(GPGKEYS_MAILTO)
|
||||
noinst_SCRIPTS = gpg2keys_test
|
||||
|
||||
common_libs = ../gl/libgnu.a ../common/libcommon.a
|
||||
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
|
||||
|
||||
gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
|
||||
gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
|
||||
gpg2keys_ldap_LDADD = $(common_libs) $(LDAPLIBS) $(GPG_ERROR_LIBS) \
|
||||
$(NETLIBS) $(other_libs)
|
||||
|
||||
gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c
|
||||
gpg2keys_finger_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpg2keys_finger_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
|
||||
$(NETLIBS) $(other_libs)
|
||||
|
||||
gpg2keys_kdns_SOURCES = gpgkeys_kdns.c ksutil.c ksutil.h no-libgcrypt.c
|
||||
gpg2keys_kdns_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpg2keys_kdns_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
|
||||
$(ADNSLIBS) $(NETLIBS) $(other_libs)
|
||||
|
||||
|
||||
gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c
|
||||
gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h no-libgcrypt.c
|
||||
if FAKE_CURL
|
||||
gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
|
||||
gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
|
||||
$(other_libs)
|
||||
gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
|
||||
gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
|
||||
$(other_libs)
|
||||
else
|
||||
# Note that we need to include all other libs here as well because
|
||||
# some compilers don't care about inline functions and insert
|
||||
# references to symbols used in unused inline functions.
|
||||
gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
|
||||
gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
|
||||
$(other_libs) $(LIBCURL) $(GETOPT)
|
||||
gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
|
||||
gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
|
||||
$(other_libs) $(LIBCURL) $(GETOPT)
|
||||
endif
|
||||
|
||||
# Make sure that all libs are build before we use them. This is
|
||||
# important for things like make -j2.
|
||||
$(PROGRAMS): $(common_libs)
|
||||
Loading…
Reference in New Issue