security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-31 11:41:32 +01:00
Code Activity

build: Remove the code to build symcryptrun

Browse Source 
--

syncryptrun is too ancient to be of any use and has not been tested in
many years.  Thus we should not allow to build it.
This commit is contained in:
Werner Koch 2020-12-21 15:09:01 +01:00
parent 261fb98c6f
commit 725f4a487f
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -30,7 +30,7 @@ RELEASE_ARCHIVE_SUFFIX = gnupg/v2.2
# Autoconf flags. # Autoconf flags.
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
--enable-all-tests --enable-symcryptrun --enable-g13 \ --enable-all-tests --enable-g13 \
--enable-gpgtar --enable-wks-tools --disable-ntbtls --enable-gpgtar --enable-wks-tools --disable-ntbtls
GITLOG_TO_CHANGELOG=gitlog-to-changelog GITLOG_TO_CHANGELOG=gitlog-to-changelog

4
configure.ac
View File

@ -125,7 +125,6 @@ GNUPG_BUILD_PROGRAM(scdaemon, yes)
GNUPG_BUILD_PROGRAM(g13, no) GNUPG_BUILD_PROGRAM(g13, no)
GNUPG_BUILD_PROGRAM(dirmngr, yes) GNUPG_BUILD_PROGRAM(dirmngr, yes)
GNUPG_BUILD_PROGRAM(doc, yes) GNUPG_BUILD_PROGRAM(doc, yes)
GNUPG_BUILD_PROGRAM(symcryptrun, no)
# We use gpgtar to unpack test data, hence we always build it. If the # We use gpgtar to unpack test data, hence we always build it. If the
# user opts out, we simply don't install it. # user opts out, we simply don't install it.
GNUPG_BUILD_PROGRAM(gpgtar, yes) GNUPG_BUILD_PROGRAM(gpgtar, yes)
@ -975,7 +974,7 @@ AC_DEFINE_UNQUOTED(FUSERMOUNT,
# #
# Checks for symcryptrun: # Checks formerly used for symcryptrun.
# #
# libutil has openpty() and login_tty(). # libutil has openpty() and login_tty().
@ -1779,7 +1778,6 @@ AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes") AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes")
AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "yes") AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "yes")
AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes") AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes")
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes") AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
AM_CONDITIONAL(BUILD_WKS_TOOLS, test "$build_wks_tools" = "yes") AM_CONDITIONAL(BUILD_WKS_TOOLS, test "$build_wks_tools" = "yes")

13
tools/Makefile.am
View File

@ -60,12 +60,6 @@ if HAVE_USTAR
noinst_SCRIPTS = gpg-zip noinst_SCRIPTS = gpg-zip
endif endif
if BUILD_SYMCRYPTRUN
symcryptrun = symcryptrun
else
symcryptrun =
endif
if BUILD_WKS_TOOLS if BUILD_WKS_TOOLS
gpg_wks_server = gpg-wks-server gpg_wks_server = gpg-wks-server
else else
@ -74,7 +68,7 @@ endif
libexec_PROGRAMS = gpg-wks-client libexec_PROGRAMS = gpg-wks-client
bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} bin_PROGRAMS = gpgconf gpg-connect-agent
if !HAVE_W32_SYSTEM if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
else else
@ -139,11 +133,6 @@ gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
gpgparsemail_LDADD = gpgparsemail_LDADD =
symcryptrun_SOURCES = symcryptrun.c
symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
$(LIBICONV) $(NETLIBS) $(W32SOCKLIBS) $(LIBASSUAN_LIBS)
watchgnupg_SOURCES = watchgnupg.c watchgnupg_SOURCES = watchgnupg.c
watchgnupg_LDADD = $(NETLIBS) watchgnupg_LDADD = $(NETLIBS)