From 3986c1e3fdba3cfe04d4c1831a3d21d14e4287aa Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 27 Jun 2014 15:26:53 +0200 Subject: [PATCH] autoconf: Replace --disable-tools option with --disable-scepclient Since using a separate option for pki this was the only tool that was still enabled by that option. --- conf/Makefile.am | 8 ++++---- conf/options/{tools.opt => scepclient.opt} | 0 configure.ac | 14 +++++++------- packages/maemo-strongswan/debian/rules | 14 +++++++------- scripts/test.sh | 4 ++-- src/Makefile.am | 2 +- src/checksum/Makefile.am | 2 +- src/conftest/README | 2 +- src/starter/Makefile.am | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) rename conf/options/{tools.opt => scepclient.opt} (100%) diff --git a/conf/Makefile.am b/conf/Makefile.am index 46aa135bb..3b571f643 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -15,11 +15,11 @@ options = \ options/manager.opt \ options/medsrv.opt \ options/pacman.opt \ - options/pool.opt \ - options/starter.opt \ - options/tnc.opt \ options/pki.opt \ - options/tools.opt + options/pool.opt \ + options/scepclient.opt \ + options/starter.opt \ + options/tnc.opt plugins = \ plugins/android_log.opt \ diff --git a/conf/options/tools.opt b/conf/options/scepclient.opt similarity index 100% rename from conf/options/tools.opt rename to conf/options/scepclient.opt diff --git a/configure.ac b/configure.ac index cdf1b035d..9bea699cf 100644 --- a/configure.ac +++ b/configure.ac @@ -203,8 +203,8 @@ ARG_ENABL_SET([xauth-noauth], [enable XAuth pseudo-backend that does not actua ARG_DISBL_SET([kernel-netlink], [disable the netlink kernel interface.]) ARG_ENABL_SET([kernel-pfkey], [enable the PF_KEY kernel interface.]) ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.]) -ARG_ENABL_SET([kernel-libipsec],[enable the libipsec kernel interface.]) ARG_ENABL_SET([kernel-iph], [enable the Windows IP Helper based networking backend.]) +ARG_ENABL_SET([kernel-libipsec],[enable the libipsec kernel interface.]) ARG_ENABL_SET([kernel-wfp], [enable the Windows Filtering Platform IPsec backend.]) ARG_DISBL_SET([socket-default], [disable default socket implementation for charon.]) ARG_ENABL_SET([socket-dynamic], [enable dynamic socket implementation for charon]) @@ -258,6 +258,7 @@ ARG_ENABL_SET([test-vectors], [enable plugin providing crypto test vectors.]) ARG_ENABL_SET([unit-tester], [enable unit tests on IKEv2 daemon startup.]) ARG_DISBL_SET([updown], [disable updown firewall script plugin.]) # programs/components +ARG_ENABL_SET([aikgen], [enable AIK generator.]) ARG_DISBL_SET([charon], [disable the IKEv1/IKEv2 keying daemon charon.]) ARG_ENABL_SET([cmd], [enable the command line IKE client charon-cmd.]) ARG_ENABL_SET([conftest], [enforce Suite B conformance test framework.]) @@ -269,12 +270,11 @@ ARG_ENABL_SET([medcli], [enable mediation client configuration database ARG_ENABL_SET([medsrv], [enable mediation server web frontend and daemon plugin.]) ARG_ENABL_SET([nm], [enable NetworkManager backend.]) ARG_DISBL_SET([pki], [disable pki certificate utility.]) +ARG_DISBL_SET([scepclient], [disable SCEP client tool.]) ARG_DISBL_SET([scripts], [disable additional utilities (found in directory scripts).]) ARG_ENABL_SET([svc], [enable charon Windows service.]) ARG_ENABL_SET([swanctl], [enable swanctl configuration and control tool.]) ARG_ENABL_SET([tkm], [enable Trusted Key Manager support.]) -ARG_DISBL_SET([tools], [disable additional utilities (scepclient).]) -ARG_ENABL_SET([aikgen], [enable AIK generator.]) # optional features ARG_ENABL_SET([bfd-backtraces], [use binutils libbfd to resolve backtraces for memory leaks and segfaults.]) ARG_ENABL_SET([dbghelp-backtraces],[use dbghlp.dll on Windows to create and print backtraces for memory leaks and segfaults.]) @@ -1462,10 +1462,10 @@ AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue) AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue) AM_CONDITIONAL(USE_NM, test x$nm = xtrue) AM_CONDITIONAL(USE_PKI, test x$pki = xtrue) -AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue) +AM_CONDITIONAL(USE_SCEPCLIENT, test x$scepclient = xtrue) AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue) AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue) -AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pki = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue) +AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pki = xtrue -o x$scepclient = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue) AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue) @@ -1473,7 +1473,7 @@ AM_CONDITIONAL(USE_LIBTNCIF, test x$tnc_tnccs = xtrue -o x$imcv = xtrue) AM_CONDITIONAL(USE_LIBTNCCS, test x$tnc_tnccs = xtrue) AM_CONDITIONAL(USE_LIBPTTLS, test x$tnc_tnccs = xtrue) AM_CONDITIONAL(USE_FILE_CONFIG, test x$stroke = xtrue) -AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue) +AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$stroke = xtrue -o x$scepclient = xtrue -o x$conftest = xtrue) AM_CONDITIONAL(USE_LIBCAP, test x$capabilities = xlibcap) AM_CONDITIONAL(USE_VSTR, test x$printf_hooks = xvstr) AM_CONDITIONAL(USE_BUILTIN_PRINTF, test x$printf_hooks = xbuiltin) @@ -1528,7 +1528,7 @@ AM_COND_IF([USE_IMV_OS], [strongswan_options=${strongswan_options}" pacman"]) AM_COND_IF([USE_LIBTNCCS], [strongswan_options=${strongswan_options}" tnc"]) AM_COND_IF([USE_MANAGER], [strongswan_options=${strongswan_options}" manager"]) AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"]) -AM_COND_IF([USE_TOOLS], [strongswan_options=${strongswan_options}" tools"]) +AM_COND_IF([USE_SCEPCLIENT], [strongswan_options=${strongswan_options}" scepclient"]) AM_COND_IF([USE_PKI], [strongswan_options=${strongswan_options}" pki"]) AC_SUBST(strongswan_options) diff --git a/packages/maemo-strongswan/debian/rules b/packages/maemo-strongswan/debian/rules index 3eb1409bd..04fe338eb 100755 --- a/packages/maemo-strongswan/debian/rules +++ b/packages/maemo-strongswan/debian/rules @@ -23,7 +23,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CONFIG_OPTIONS = \ --prefix=/usr --sysconfdir=/etc \ - --disable-tools --disable-scripts \ + --disable-scepclient --disable-pki --disable-scripts \ --disable-fips-prf --disable-pubkey --disable-attr \ --disable-constraints --disable-revocation \ --disable-sha1 --disable-sha2 --disable-aes --disable-des \ @@ -55,11 +55,11 @@ endif config.status: configure dh_testdir - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFIG_OPTIONS) CFLAGS="$(CFLAGS)" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFIG_OPTIONS) CFLAGS="$(CFLAGS)" #LDFLAGS="-Wl,-z,defs" -#Architecture +#Architecture build: build-arch build-indep build-arch: build-arch-stamp @@ -86,7 +86,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - dh_clean + dh_clean install: build dh_testdir @@ -108,8 +108,8 @@ binary-common: dh_installdocs dh_installexamples # dh_installmenu -# dh_installdebconf -# dh_installlogrotate +# dh_installdebconf +# dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime @@ -120,7 +120,7 @@ binary-common: dh_installman dh_link dh_strip - dh_compress + dh_compress dh_fixperms # dh_perl dh_makeshlibs diff --git a/scripts/test.sh b/scripts/test.sh index 5aa576e80..48d4e9f63 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -19,11 +19,11 @@ default) CONFIG="--with-printf-hooks=glibc" ;; openssl) - CONFIG="--disable-defaults --enable-tools --enable-openssl" + CONFIG="--disable-defaults --enable-pki --enable-openssl" DEPS="libssl-dev" ;; gcrypt) - CONFIG="--disable-defaults --enable-tools --enable-gcrypt --enable-pkcs1" + CONFIG="--disable-defaults --enable-pki --enable-gcrypt --enable-pkcs1" DEPS="libgcrypt11-dev" ;; printf-builtin) diff --git a/src/Makefile.am b/src/Makefile.am index c412d9181..95c68d0c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,7 +72,7 @@ if USE_UPDOWN SUBDIRS += _updown _updown_espmark endif -if USE_TOOLS +if USE_SCEPCLIENT SUBDIRS += scepclient endif diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index 27bc09491..821c51747 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -99,7 +99,7 @@ if USE_CMD exes += $(DESTDIR)$(sbindir)/charon-cmd endif -if USE_TOOLS +if USE_SCEPCLIENT exes += $(DESTDIR)$(ipsecdir)/scepclient endif diff --git a/src/conftest/README b/src/conftest/README index 617195df9..d37539a16 100644 --- a/src/conftest/README +++ b/src/conftest/README @@ -304,7 +304,7 @@ Compile time options required depend on the test suite. A minimalistic strongSwan build with the OpenSSL crypto backend can be configured with: ./configure --sysconfdir=/etc --disable-pluto --disable-scripts \ - --disable-tools --disable-aes --disable-des --disable-md5 \ + --disable-scepclient --disable-aes --disable-des --disable-md5 \ --disable-sha1 --disable-sha2 --disable-fips-prf --disable-gmp \ --disable-pubkey --disable-pgp --disable-dnskey --disable-updown \ --disable-attr --disable-resolve --enable-openssl --enable-conftest \ diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index 04e126d94..f0a2be856 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -48,7 +48,7 @@ if USE_LOAD_WARNING AM_CPPFLAGS += -DLOAD_WARNING endif -if USE_TOOLS +if USE_SCEPCLIENT AM_CPPFLAGS += -DGENERATE_SELFCERT endif