From 7585facf05d927eb6df3929ce09ed5e60d905437 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Thu, 7 Feb 2013 13:27:27 +0100 Subject: Imported Upstream version 5.0.2 --- testing/start-testing | 129 ++++++++++++++++++-------------------------------- 1 file changed, 46 insertions(+), 83 deletions(-) (limited to 'testing/start-testing') diff --git a/testing/start-testing b/testing/start-testing index 278500e6f..183729423 100755 --- a/testing/start-testing +++ b/testing/start-testing @@ -1,85 +1,48 @@ #!/bin/bash -# Start up the specified UML instances and wait for them to finish booting -# -# Copyright (C) 2004 Eric Marchionni, Patrik Rayo -# Zuercher Hochschule Winterthur -# -# This program 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 2 of the License, or (at your -# option) any later version. See . -# -# This program 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. - -DIR=`dirname $0` - -source $DIR/scripts/function.sh - -[ -f $DIR/testing.conf ] || die "!! Configuration file 'testing.conf' not found" -[ -d $DIR/hosts ] || die "Directory hosts cannot be found." - -source $DIR/testing.conf - -if [ "$#" -eq 0 ] -then - HOSTS=$STRONGSWANHOSTS -else - HOSTS=$* -fi - -##################################################### -# start the uml bridges -# -cecho "Start the uml bridges (scripts/start-bridges)" -$DIR/scripts/start-bridges - - -##################################################### -# start the uml instances -# -case $UMLSTARTMODE in - konsole) - cecho "Start the uml instances (scripts/kstart-umls)" - $DIR/scripts/kstart-umls $HOSTS - ;; - gnome-terminal) - cecho "Start the uml instances (scripts/gstart-umls)" - $DIR/scripts/gstart-umls $HOSTS - ;; - xterm) - cecho "Start the uml instances (scripts/xstart-umls)" - $DIR/scripts/xstart-umls $HOSTS - ;; - screen) - cecho "Start the uml instances (scripts/start-umls)" - $DIR/scripts/start-umls $HOSTS - ;; - *) - die "The start mode is unknown! Please set $UMLSTARTMODE properly." - ;; -esac - - -##################################################### -# do the automated testing -# -if [ $ENABLE_DO_TESTS = "yes" ] -then - cecho "Run the automated tests (do-tests)" - $DIR/do-tests -fi - - -############################################################################## -# stop all UML instances and switches -# - -if [ $ENABLE_STOP_TESTING = "yes" ] -then - cecho "Stopping all UML instances and switches (stop-testing)" - $DIR/stop-testing $HOSTS -fi +DIR=$(dirname `readlink -f $0`) +. $DIR/testing.conf +. $DIR/scripts/function.sh + +NETWORKS="vnet1 vnet2 vnet3" +CONFDIR=$DIR/config/kvm +KNLSRC=$BUILDDIR/$KERNEL/arch/x86/boot/bzImage +KNLTARGET=/var/run/kvm-swan-kernel +HOSTFSTARGET=/var/run/kvm-swan-hostfs +MCASTBRS="virbr1 virbr2" + +echo "Starting test environment" + +[ `id -u` -eq 0 ] || die "You must be root to run $0" + +check_commands virsh + +log_action "Deploying kernel $KERNEL" +execute "ln -fs $KNLSRC $KNLTARGET" + +log_action "Deploying $SHAREDDIR as hostfs" +execute "chown -R $KVMUSER:$KVMGROUP $SHAREDDIR" 0 +execute "ln -Tfs $SHAREDDIR $HOSTFSTARGET" + +for net in $NETWORKS +do + log_action "Network $net" + execute "virsh net-create $CONFDIR/$net.xml" +done + +for host in $STRONGSWANHOSTS +do + ln -fs $IMGDIR/$host.$IMGEXT $VIRTIMGSTORE/$host.$IMGEXT + log_action "Guest $host" + execute "virsh create $CONFDIR/$host.xml" +done + +# Enforce reception of multicast traffic on bridges +for br in $MCASTBRS +do + cd /sys/devices/virtual/net/$br/brif + for vnet in `find . -name "vnet*"` + do + echo 2 > $vnet/multicast_router + done +done -- cgit v1.2.3 From 10e5fb2b9b2f27c83b3e5a1d048b158d5cf42a43 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Fri, 26 Apr 2013 14:57:47 +0200 Subject: Imported Upstream version 5.0.3 --- Android.common.mk | 2 +- Android.mk | 3 +- Doxyfile.in | 660 +++++-- Makefile.in | 52 +- NEWS | 57 +- aclocal.m4 | 45 +- compile | 343 ++++ config.h.in | 6 + config.sub | 11 +- configure | 1497 +++++++++++----- configure.in | 576 +++--- depcomp | 124 +- init/Makefile.in | 41 +- init/systemd/Makefile.in | 35 +- ltmain.sh | 4 +- m4/macros/enable-disable.m4 | 4 +- man/Makefile.in | 47 +- man/ipsec.conf.5 | 19 +- man/ipsec.conf.5.in | 17 + man/ipsec.secrets.5 | 2 +- man/strongswan.conf.5 | 70 +- man/strongswan.conf.5.in | 70 +- scripts/Makefile.am | 5 +- scripts/Makefile.in | 54 +- scripts/crypt_burn.c | 4 +- scripts/dnssec.c | 125 ++ scripts/tls_test.c | 59 +- src/Makefile.am | 8 + src/Makefile.in | 86 +- src/_copyright/Makefile.in | 35 +- src/_updown/Makefile.in | 50 +- src/_updown_espmark/Makefile.in | 50 +- src/charon-nm/Makefile.in | 35 +- src/charon-nm/nm/nm_backend.c | 4 + src/charon-nm/nm/nm_service.c | 64 +- src/charon-nm/nm/nm_service.h | 6 +- src/charon-tkm/Makefile.am | 54 + src/charon-tkm/Makefile.in | 506 ++++++ src/charon-tkm/build_charon.gpr | 20 + src/charon-tkm/build_common.gpr | 25 + src/charon-tkm/build_tests.gpr | 14 + src/charon-tkm/src/charon-tkm.c | 387 ++++ src/charon-tkm/src/ees/ees_callbacks.c | 40 + src/charon-tkm/src/ees/ees_callbacks.h | 42 + src/charon-tkm/src/ees/esa_event_service.adb | 57 + src/charon-tkm/src/ees/esa_event_service.ads | 30 + src/charon-tkm/src/ees/tkmrpc-servers-ees.adb | 65 + src/charon-tkm/src/ehandler/eh_callbacks.c | 28 + src/charon-tkm/src/ehandler/eh_callbacks.h | 34 + src/charon-tkm/src/ehandler/exception_handler.adb | 57 + src/charon-tkm/src/ehandler/exception_handler.ads | 24 + src/charon-tkm/src/tkm/.gitignore | 1 + src/charon-tkm/src/tkm/tkm.c | 123 ++ src/charon-tkm/src/tkm/tkm.h | 113 ++ src/charon-tkm/src/tkm/tkm_chunk_map.c | 171 ++ src/charon-tkm/src/tkm/tkm_chunk_map.h | 72 + src/charon-tkm/src/tkm/tkm_cred.c | 148 ++ src/charon-tkm/src/tkm/tkm_cred.h | 51 + src/charon-tkm/src/tkm/tkm_diffie_hellman.c | 140 ++ src/charon-tkm/src/tkm/tkm_diffie_hellman.h | 57 + src/charon-tkm/src/tkm/tkm_encoder.c | 106 ++ src/charon-tkm/src/tkm/tkm_encoder.h | 33 + src/charon-tkm/src/tkm/tkm_id_manager.c | 168 ++ src/charon-tkm/src/tkm/tkm_id_manager.h | 99 ++ src/charon-tkm/src/tkm/tkm_kernel_ipsec.c | 392 ++++ src/charon-tkm/src/tkm/tkm_kernel_ipsec.h | 47 + src/charon-tkm/src/tkm/tkm_kernel_sad.c | 253 +++ src/charon-tkm/src/tkm/tkm_kernel_sad.h | 83 + src/charon-tkm/src/tkm/tkm_keymat.c | 511 ++++++ src/charon-tkm/src/tkm/tkm_keymat.h | 77 + src/charon-tkm/src/tkm/tkm_listener.c | 355 ++++ src/charon-tkm/src/tkm/tkm_listener.h | 52 + src/charon-tkm/src/tkm/tkm_nonceg.c | 106 ++ src/charon-tkm/src/tkm/tkm_nonceg.h | 56 + src/charon-tkm/src/tkm/tkm_private_key.c | 190 ++ src/charon-tkm/src/tkm/tkm_private_key.h | 45 + src/charon-tkm/src/tkm/tkm_public_key.c | 169 ++ src/charon-tkm/src/tkm/tkm_public_key.h | 49 + src/charon-tkm/src/tkm/tkm_types.h | 128 ++ src/charon-tkm/src/tkm/tkm_utils.c | 53 + src/charon-tkm/src/tkm/tkm_utils.h | 48 + src/charon-tkm/tests/.gitignore | 1 + src/charon-tkm/tests/chunk_map_tests.c | 58 + src/charon-tkm/tests/diffie_hellman_tests.c | 59 + src/charon-tkm/tests/id_manager_tests.c | 150 ++ src/charon-tkm/tests/kernel_sad_tests.c | 122 ++ src/charon-tkm/tests/keymat_tests.c | 149 ++ src/charon-tkm/tests/nonceg_tests.c | 93 + src/charon-tkm/tests/test_runner.c | 84 + src/charon-tkm/tests/test_runner.h | 30 + src/charon-tkm/tests/utils_tests.c | 63 + src/charon/Makefile.in | 35 +- src/charon/charon.c | 1 + src/checksum/Makefile.in | 33 +- src/conftest/Makefile.in | 35 +- src/conftest/config.c | 6 +- src/conftest/config.h | 2 +- src/conftest/hooks/hook.h | 4 +- src/dumm/Makefile.in | 38 +- src/include/Makefile.in | 30 +- src/ipsec/Android.mk | 3 +- src/ipsec/Makefile.in | 50 +- src/ipsec/_ipsec.8 | 2 +- src/ipsec/_ipsec.in | 16 +- src/libcharon/Android.mk | 15 +- src/libcharon/Makefile.am | 29 +- src/libcharon/Makefile.in | 329 ++-- src/libcharon/bus/bus.h | 4 +- src/libcharon/config/ike_cfg.c | 15 +- src/libcharon/config/ike_cfg.h | 10 +- src/libcharon/control/controller.c | 16 +- src/libcharon/encoding/message.c | 6 +- src/libcharon/encoding/payloads/notify_payload.c | 14 +- src/libcharon/encoding/payloads/notify_payload.h | 4 +- .../payloads/traffic_selector_substructure.c | 6 +- src/libcharon/network/receiver.c | 2 +- src/libcharon/plugins/addrblock/Makefile.in | 33 +- src/libcharon/plugins/android/Makefile.am | 20 - src/libcharon/plugins/android/Makefile.in | 640 ------- src/libcharon/plugins/android/android_creds.c | 294 --- src/libcharon/plugins/android/android_creds.h | 73 - src/libcharon/plugins/android/android_handler.c | 240 --- src/libcharon/plugins/android/android_handler.h | 52 - src/libcharon/plugins/android/android_plugin.c | 97 - src/libcharon/plugins/android/android_plugin.h | 42 - src/libcharon/plugins/android/android_service.c | 389 ---- src/libcharon/plugins/android/android_service.h | 54 - src/libcharon/plugins/android_dns/Makefile.am | 18 + src/libcharon/plugins/android_dns/Makefile.in | 660 +++++++ .../plugins/android_dns/android_dns_handler.c | 235 +++ .../plugins/android_dns/android_dns_handler.h | 50 + .../plugins/android_dns/android_dns_plugin.c | 76 + .../plugins/android_dns/android_dns_plugin.h | 42 + src/libcharon/plugins/android_log/Makefile.in | 33 +- src/libcharon/plugins/certexpire/Makefile.in | 33 +- src/libcharon/plugins/coupling/Makefile.in | 33 +- src/libcharon/plugins/dhcp/Makefile.in | 33 +- src/libcharon/plugins/duplicheck/Makefile.in | 38 +- .../plugins/duplicheck/duplicheck_listener.c | 186 +- src/libcharon/plugins/eap_aka/Makefile.in | 33 +- src/libcharon/plugins/eap_aka_3gpp2/Makefile.in | 33 +- src/libcharon/plugins/eap_dynamic/Makefile.in | 33 +- src/libcharon/plugins/eap_gtc/Makefile.in | 33 +- src/libcharon/plugins/eap_identity/Makefile.in | 33 +- src/libcharon/plugins/eap_md5/Makefile.in | 33 +- src/libcharon/plugins/eap_mschapv2/Makefile.in | 33 +- src/libcharon/plugins/eap_peap/Makefile.in | 33 +- src/libcharon/plugins/eap_radius/Makefile.am | 1 + src/libcharon/plugins/eap_radius/Makefile.in | 39 +- src/libcharon/plugins/eap_radius/eap_radius.c | 142 +- .../plugins/eap_radius/eap_radius_accounting.c | 425 ++++- .../plugins/eap_radius/eap_radius_accounting.h | 8 + .../plugins/eap_radius/eap_radius_plugin.c | 66 +- .../plugins/eap_radius/eap_radius_plugin.h | 11 + .../plugins/eap_radius/eap_radius_provider.c | 486 +++++ .../plugins/eap_radius/eap_radius_provider.h | 74 + src/libcharon/plugins/eap_sim/Makefile.in | 33 +- src/libcharon/plugins/eap_sim_file/Makefile.in | 33 +- src/libcharon/plugins/eap_sim_pcsc/Makefile.in | 33 +- .../plugins/eap_simaka_pseudonym/Makefile.in | 33 +- .../plugins/eap_simaka_reauth/Makefile.in | 33 +- src/libcharon/plugins/eap_simaka_sql/Makefile.in | 33 +- src/libcharon/plugins/eap_tls/Makefile.in | 33 +- src/libcharon/plugins/eap_tnc/Makefile.in | 33 +- src/libcharon/plugins/eap_tnc/eap_tnc.c | 83 +- src/libcharon/plugins/eap_tnc/eap_tnc.h | 6 +- src/libcharon/plugins/eap_ttls/Makefile.in | 33 +- src/libcharon/plugins/eap_ttls/eap_ttls_server.c | 13 +- src/libcharon/plugins/error_notify/Makefile.in | 38 +- .../plugins/error_notify/error_notify_socket.c | 6 + src/libcharon/plugins/farp/Makefile.in | 33 +- src/libcharon/plugins/ha/Makefile.in | 33 +- src/libcharon/plugins/ha/ha_attribute.c | 2 +- src/libcharon/plugins/ha/ha_segments.c | 90 +- src/libcharon/plugins/ha/ha_tunnel.c | 3 +- src/libcharon/plugins/ipseckey/Makefile.am | 18 + src/libcharon/plugins/ipseckey/Makefile.in | 662 +++++++ src/libcharon/plugins/ipseckey/ipseckey.c | 209 +++ src/libcharon/plugins/ipseckey/ipseckey.h | 149 ++ src/libcharon/plugins/ipseckey/ipseckey_cred.c | 263 +++ src/libcharon/plugins/ipseckey/ipseckey_cred.h | 57 + src/libcharon/plugins/ipseckey/ipseckey_plugin.c | 103 ++ src/libcharon/plugins/ipseckey/ipseckey_plugin.h | 48 + src/libcharon/plugins/led/Makefile.in | 33 +- src/libcharon/plugins/load_tester/Makefile.in | 38 +- .../plugins/load_tester/load_tester_config.c | 149 +- .../plugins/load_tester/load_tester_ipsec.c | 4 +- .../plugins/load_tester/load_tester_listener.c | 1 - src/libcharon/plugins/lookip/Makefile.in | 38 +- src/libcharon/plugins/maemo/Makefile.in | 38 +- src/libcharon/plugins/maemo/maemo_service.c | 4 +- src/libcharon/plugins/medcli/Makefile.in | 33 +- src/libcharon/plugins/medcli/medcli_config.c | 7 +- src/libcharon/plugins/medsrv/Makefile.in | 33 +- src/libcharon/plugins/medsrv/medsrv_config.c | 3 +- src/libcharon/plugins/medsrv/medsrv_config.h | 2 +- src/libcharon/plugins/medsrv/medsrv_creds.h | 2 +- src/libcharon/plugins/medsrv/medsrv_plugin.h | 4 +- src/libcharon/plugins/radattr/Makefile.in | 33 +- src/libcharon/plugins/smp/Makefile.in | 33 +- src/libcharon/plugins/socket_default/Makefile.in | 33 +- .../plugins/socket_default/socket_default_socket.c | 136 +- src/libcharon/plugins/socket_dynamic/Makefile.in | 33 +- src/libcharon/plugins/sql/Makefile.in | 33 +- src/libcharon/plugins/sql/sql_config.c | 3 +- src/libcharon/plugins/stroke/Makefile.in | 33 +- src/libcharon/plugins/stroke/stroke_config.c | 79 +- src/libcharon/plugins/stroke/stroke_control.c | 100 +- src/libcharon/plugins/stroke/stroke_counter.c | 222 ++- src/libcharon/plugins/stroke/stroke_counter.h | 10 +- src/libcharon/plugins/stroke/stroke_cred.c | 49 +- src/libcharon/plugins/stroke/stroke_list.c | 19 +- src/libcharon/plugins/stroke/stroke_socket.c | 44 +- src/libcharon/plugins/systime_fix/Makefile.am | 15 + src/libcharon/plugins/systime_fix/Makefile.in | 658 +++++++ .../plugins/systime_fix/systime_fix_plugin.c | 256 +++ .../plugins/systime_fix/systime_fix_plugin.h | 42 + .../plugins/systime_fix/systime_fix_validator.c | 83 + .../plugins/systime_fix/systime_fix_validator.h | 49 + src/libcharon/plugins/tnc_ifmap/Makefile.am | 18 +- src/libcharon/plugins/tnc_ifmap/Makefile.in | 59 +- src/libcharon/plugins/tnc_ifmap/tnc_ifmap_http.c | 244 +++ src/libcharon/plugins/tnc_ifmap/tnc_ifmap_http.h | 68 + .../plugins/tnc_ifmap/tnc_ifmap_listener.c | 25 +- .../plugins/tnc_ifmap/tnc_ifmap_listener.h | 2 +- src/libcharon/plugins/tnc_ifmap/tnc_ifmap_plugin.c | 55 +- src/libcharon/plugins/tnc_ifmap/tnc_ifmap_plugin.h | 2 +- .../tnc_ifmap/tnc_ifmap_renew_session_job.c | 103 ++ .../tnc_ifmap/tnc_ifmap_renew_session_job.h | 51 + src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c | 920 +++++----- src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h | 30 +- .../plugins/tnc_ifmap/tnc_ifmap_soap_msg.c | 256 +++ .../plugins/tnc_ifmap/tnc_ifmap_soap_msg.h | 62 + src/libcharon/plugins/tnc_imc/Makefile.am | 3 +- src/libcharon/plugins/tnc_imc/Makefile.in | 36 +- src/libcharon/plugins/tnc_imv/Makefile.am | 3 +- src/libcharon/plugins/tnc_imv/Makefile.in | 36 +- src/libcharon/plugins/tnc_pdp/Makefile.in | 33 +- src/libcharon/plugins/tnc_pdp/tnc_pdp.c | 12 +- .../plugins/tnc_pdp/tnc_pdp_connections.c | 98 +- .../plugins/tnc_pdp/tnc_pdp_connections.h | 10 +- src/libcharon/plugins/tnc_tnccs/Makefile.am | 1 + src/libcharon/plugins/tnc_tnccs/Makefile.in | 34 +- .../plugins/tnc_tnccs/tnc_tnccs_manager.c | 160 +- src/libcharon/plugins/tnccs_11/Makefile.in | 33 +- src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c | 39 +- .../plugins/tnccs_11/messages/imc_imv_msg.c | 18 +- .../plugins/tnccs_11/messages/tnccs_error_msg.c | 21 +- .../plugins/tnccs_11/messages/tnccs_msg.c | 6 +- .../messages/tnccs_preferred_language_msg.c | 14 +- .../tnccs_11/messages/tnccs_reason_strings_msg.c | 32 +- .../tnccs_11/messages/tnccs_recommendation_msg.c | 20 +- .../messages/tnccs_tncs_contact_info_msg.c | 12 +- src/libcharon/plugins/tnccs_11/tnccs_11.c | 94 +- src/libcharon/plugins/tnccs_11/tnccs_11.h | 16 +- src/libcharon/plugins/tnccs_11/tnccs_11_plugin.c | 3 - src/libcharon/plugins/tnccs_20/Makefile.in | 33 +- .../plugins/tnccs_20/batch/pb_tnc_batch.c | 9 +- .../plugins/tnccs_20/messages/pb_pa_msg.c | 1 + .../messages/pb_remediation_parameters_msg.c | 200 ++- .../messages/pb_remediation_parameters_msg.h | 64 +- src/libcharon/plugins/tnccs_20/tnccs_20.c | 134 +- src/libcharon/plugins/tnccs_20/tnccs_20.h | 16 +- src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c | 3 - src/libcharon/plugins/tnccs_dynamic/Makefile.in | 33 +- .../plugins/tnccs_dynamic/tnccs_dynamic.c | 103 +- .../plugins/tnccs_dynamic/tnccs_dynamic.h | 16 +- .../plugins/tnccs_dynamic/tnccs_dynamic_plugin.c | 3 - src/libcharon/plugins/uci/Makefile.in | 33 +- src/libcharon/plugins/uci/uci_config.c | 7 +- src/libcharon/plugins/unit_tester/Makefile.in | 33 +- src/libcharon/plugins/unity/Makefile.in | 33 +- src/libcharon/plugins/unity/unity_handler.c | 19 +- src/libcharon/plugins/updown/Makefile.in | 33 +- src/libcharon/plugins/whitelist/Makefile.in | 38 +- src/libcharon/plugins/xauth_eap/Makefile.in | 33 +- src/libcharon/plugins/xauth_generic/Makefile.in | 33 +- src/libcharon/plugins/xauth_noauth/Makefile.am | 17 + src/libcharon/plugins/xauth_noauth/Makefile.in | 659 +++++++ src/libcharon/plugins/xauth_noauth/xauth_noauth.c | 89 + src/libcharon/plugins/xauth_noauth/xauth_noauth.h | 50 + .../plugins/xauth_noauth/xauth_noauth_plugin.c | 60 + .../plugins/xauth_noauth/xauth_noauth_plugin.h | 45 + src/libcharon/plugins/xauth_pam/Makefile.in | 33 +- src/libcharon/processing/jobs/delete_ike_sa_job.c | 12 +- src/libcharon/processing/jobs/dpd_timeout_job.c | 3 +- src/libcharon/processing/jobs/inactivity_job.c | 5 +- src/libcharon/sa/child_sa.c | 25 +- src/libcharon/sa/child_sa.h | 3 +- src/libcharon/sa/eap/eap_inner_method.h | 57 + src/libcharon/sa/ike_sa.c | 56 +- src/libcharon/sa/ike_sa_manager.c | 76 +- src/libcharon/sa/ikev1/keymat_v1.c | 1 + src/libcharon/sa/ikev1/task_manager_v1.c | 44 +- src/libcharon/sa/ikev1/tasks/aggressive_mode.c | 9 +- src/libcharon/sa/ikev1/tasks/main_mode.c | 9 +- src/libcharon/sa/ikev1/tasks/quick_delete.c | 4 +- src/libcharon/sa/ikev1/tasks/quick_mode.c | 60 +- src/libcharon/sa/ikev1/tasks/xauth.c | 66 +- .../sa/ikev2/authenticators/eap_authenticator.c | 10 + src/libcharon/sa/ikev2/task_manager_v2.c | 17 + src/libcharon/sa/ikev2/tasks/child_create.c | 9 + src/libcharon/sa/ikev2/tasks/child_delete.c | 4 +- src/libcharon/sa/ikev2/tasks/child_rekey.c | 37 +- src/libcharon/sa/ikev2/tasks/ike_auth.c | 68 +- src/libcharon/sa/ikev2/tasks/ike_dpd.c | 10 +- src/libcharon/sa/xauth/xauth_manager.c | 7 +- src/libfast/Makefile.in | 40 +- src/libfast/controller.h | 2 +- src/libhydra/Android.mk | 4 +- src/libhydra/Makefile.in | 44 +- src/libhydra/attributes/mem_pool.c | 55 +- src/libhydra/attributes/mem_pool.h | 16 +- src/libhydra/kernel/kernel_interface.c | 24 +- src/libhydra/kernel/kernel_interface.h | 22 +- src/libhydra/kernel/kernel_ipsec.h | 11 +- src/libhydra/kernel/kernel_net.h | 8 + src/libhydra/plugins/attr/Makefile.in | 33 +- src/libhydra/plugins/attr/attr_provider.c | 53 +- src/libhydra/plugins/attr_sql/Makefile.in | 38 +- src/libhydra/plugins/attr_sql/pool.c | 15 + src/libhydra/plugins/attr_sql/sql_attribute.c | 31 +- src/libhydra/plugins/kernel_klips/Makefile.in | 33 +- .../plugins/kernel_klips/kernel_klips_ipsec.c | 4 +- src/libhydra/plugins/kernel_netlink/Makefile.in | 33 +- .../plugins/kernel_netlink/kernel_netlink_ipsec.c | 410 ++--- .../plugins/kernel_netlink/kernel_netlink_net.c | 4 + .../plugins/kernel_netlink/kernel_netlink_shared.c | 23 +- .../plugins/kernel_netlink/kernel_netlink_shared.h | 25 +- src/libhydra/plugins/kernel_pfkey/Makefile.in | 33 +- .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 19 +- src/libhydra/plugins/kernel_pfroute/Makefile.in | 33 +- src/libhydra/plugins/resolve/Makefile.in | 33 +- src/libimcv/Makefile.in | 44 +- src/libimcv/ietf/ietf_attr.h | 4 +- src/libimcv/ietf/ietf_attr_assess_result.c | 2 +- src/libimcv/ietf/ietf_attr_assess_result.h | 2 +- src/libimcv/ietf/ietf_attr_attr_request.c | 2 +- src/libimcv/ietf/ietf_attr_attr_request.h | 2 +- src/libimcv/ietf/ietf_attr_default_pwd_enabled.c | 2 +- src/libimcv/ietf/ietf_attr_default_pwd_enabled.h | 2 +- src/libimcv/ietf/ietf_attr_fwd_enabled.c | 2 +- src/libimcv/ietf/ietf_attr_fwd_enabled.h | 2 +- src/libimcv/ietf/ietf_attr_installed_packages.c | 2 +- src/libimcv/ietf/ietf_attr_installed_packages.h | 2 +- src/libimcv/ietf/ietf_attr_numeric_version.c | 2 +- src/libimcv/ietf/ietf_attr_numeric_version.h | 2 +- src/libimcv/ietf/ietf_attr_op_status.c | 2 +- src/libimcv/ietf/ietf_attr_op_status.h | 6 +- src/libimcv/ietf/ietf_attr_pa_tnc_error.c | 96 +- src/libimcv/ietf/ietf_attr_pa_tnc_error.h | 6 +- src/libimcv/ietf/ietf_attr_port_filter.c | 2 +- src/libimcv/ietf/ietf_attr_port_filter.h | 2 +- src/libimcv/ietf/ietf_attr_product_info.c | 2 +- src/libimcv/ietf/ietf_attr_product_info.h | 2 +- src/libimcv/ietf/ietf_attr_remediation_instr.c | 18 +- src/libimcv/ietf/ietf_attr_remediation_instr.h | 2 +- src/libimcv/ietf/ietf_attr_string_version.c | 2 +- src/libimcv/ietf/ietf_attr_string_version.h | 2 +- src/libimcv/imc/imc_agent.c | 2 - src/libimcv/imc/imc_agent.h | 2 +- src/libimcv/imc/imc_msg.c | 8 +- src/libimcv/imc/imc_msg.h | 10 +- src/libimcv/imc/imc_state.h | 4 +- src/libimcv/imcv.c | 14 +- src/libimcv/imcv.h | 11 +- src/libimcv/imv/imv_agent.c | 85 +- src/libimcv/imv/imv_agent.h | 4 +- src/libimcv/imv/imv_lang_string.h | 2 +- src/libimcv/imv/imv_msg.c | 7 + src/libimcv/imv/imv_msg.h | 12 +- src/libimcv/imv/imv_reason_string.c | 2 +- src/libimcv/imv/imv_reason_string.h | 2 +- src/libimcv/imv/imv_remediation_string.h | 2 +- src/libimcv/imv/imv_state.h | 23 +- src/libimcv/ita/ita_attr.c | 5 +- src/libimcv/ita/ita_attr.h | 7 +- src/libimcv/ita/ita_attr_angel.h | 4 +- src/libimcv/ita/ita_attr_command.h | 6 +- src/libimcv/ita/ita_attr_dummy.h | 8 +- src/libimcv/ita/ita_attr_get_settings.c | 2 +- src/libimcv/ita/ita_attr_get_settings.h | 4 +- src/libimcv/ita/ita_attr_settings.c | 2 +- src/libimcv/ita/ita_attr_settings.h | 4 +- src/libimcv/os_info/os_info.c | 2 +- src/libimcv/pa_tnc/pa_tnc_attr.h | 2 +- src/libimcv/pa_tnc/pa_tnc_attr_manager.h | 6 +- src/libimcv/pa_tnc/pa_tnc_msg.c | 14 +- src/libimcv/pa_tnc/pa_tnc_msg.h | 2 +- src/libimcv/plugins/imc_os/Makefile.in | 33 +- src/libimcv/plugins/imc_os/imc_os_state.h | 4 +- src/libimcv/plugins/imc_scanner/Makefile.in | 33 +- .../plugins/imc_scanner/imc_scanner_state.h | 4 +- src/libimcv/plugins/imc_test/Makefile.in | 33 +- src/libimcv/plugins/imc_test/imc_test_state.h | 4 +- src/libimcv/plugins/imv_os/Makefile.in | 38 +- src/libimcv/plugins/imv_os/imv_os.c | 29 +- src/libimcv/plugins/imv_os/imv_os_database.c | 46 +- src/libimcv/plugins/imv_os/imv_os_database.h | 12 +- src/libimcv/plugins/imv_os/imv_os_state.c | 51 +- src/libimcv/plugins/imv_os/imv_os_state.h | 21 +- src/libimcv/plugins/imv_os/pacman.c | 3 +- src/libimcv/plugins/imv_scanner/Makefile.in | 33 +- .../plugins/imv_scanner/imv_scanner_state.c | 32 +- .../plugins/imv_scanner/imv_scanner_state.h | 4 +- src/libimcv/plugins/imv_test/Makefile.in | 33 +- src/libimcv/plugins/imv_test/imv_test_state.c | 32 +- src/libimcv/plugins/imv_test/imv_test_state.h | 4 +- src/libipsec/Android.mk | 4 +- src/libipsec/Makefile.in | 44 +- src/libipsec/esp_packet.c | 14 + src/libipsec/ip_packet.c | 1 + src/libipsec/ipsec_processor.c | 2 +- src/libpts/Makefile.in | 44 +- src/libpts/libpts.h | 2 +- src/libpts/plugins/imc_attestation/Makefile.in | 33 +- .../imc_attestation/imc_attestation_process.h | 3 +- .../imc_attestation/imc_attestation_state.h | 4 +- src/libpts/plugins/imv_attestation/Makefile.in | 38 +- src/libpts/plugins/imv_attestation/attest_db.c | 38 +- src/libpts/plugins/imv_attestation/attest_db.h | 3 +- .../imv_attestation/imv_attestation_build.h | 3 +- .../imv_attestation/imv_attestation_process.h | 3 +- .../imv_attestation/imv_attestation_state.c | 33 +- .../imv_attestation/imv_attestation_state.h | 8 +- src/libpts/plugins/imv_attestation/tables.sql | 12 +- src/libpts/pts/components/pts_comp_func_name.h | 2 +- src/libpts/pts/pts.c | 2 +- src/libpts/pts/pts.h | 2 +- src/libpts/pts/pts_dh_group.h | 10 +- src/libpts/pts/pts_file_meas.h | 4 +- src/libpts/tcg/tcg_attr.c | 17 +- src/libpts/tcg/tcg_attr.h | 17 +- src/libpts/tcg/tcg_pts_attr_aik.c | 4 +- src/libpts/tcg/tcg_pts_attr_aik.h | 6 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c | 2 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.h | 6 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c | 2 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.h | 2 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c | 2 +- src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.h | 8 +- src/libpts/tcg/tcg_pts_attr_file_meas.c | 2 +- src/libpts/tcg/tcg_pts_attr_file_meas.h | 8 +- src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c | 2 +- src/libpts/tcg/tcg_pts_attr_gen_attest_evid.h | 2 +- src/libpts/tcg/tcg_pts_attr_get_aik.c | 2 +- src/libpts/tcg/tcg_pts_attr_get_aik.h | 2 +- src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c | 2 +- src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.h | 2 +- src/libpts/tcg/tcg_pts_attr_meas_algo.c | 2 +- src/libpts/tcg/tcg_pts_attr_meas_algo.h | 2 +- src/libpts/tcg/tcg_pts_attr_proto_caps.c | 2 +- src/libpts/tcg/tcg_pts_attr_proto_caps.h | 2 +- src/libpts/tcg/tcg_pts_attr_req_file_meas.c | 2 +- src/libpts/tcg/tcg_pts_attr_req_file_meas.h | 11 +- src/libpts/tcg/tcg_pts_attr_req_file_meta.c | 2 +- src/libpts/tcg/tcg_pts_attr_req_file_meta.h | 10 +- src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c | 2 +- src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.h | 6 +- src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c | 2 +- src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h | 8 +- src/libpts/tcg/tcg_pts_attr_simple_evid_final.c | 2 +- src/libpts/tcg/tcg_pts_attr_simple_evid_final.h | 18 +- src/libpts/tcg/tcg_pts_attr_tpm_version_info.c | 2 +- src/libpts/tcg/tcg_pts_attr_tpm_version_info.h | 6 +- src/libpts/tcg/tcg_pts_attr_unix_file_meta.c | 2 +- src/libpts/tcg/tcg_pts_attr_unix_file_meta.h | 8 +- src/libpttls/Makefile.am | 12 + src/libpttls/Makefile.in | 660 +++++++ src/libpttls/pt_tls.c | 120 ++ src/libpttls/pt_tls.h | 109 ++ src/libpttls/pt_tls_client.c | 497 ++++++ src/libpttls/pt_tls_client.h | 65 + src/libpttls/pt_tls_dispatcher.c | 204 +++ src/libpttls/pt_tls_dispatcher.h | 75 + src/libpttls/pt_tls_server.c | 544 ++++++ src/libpttls/pt_tls_server.h | 72 + src/libpttls/sasl/sasl_mechanism.c | 92 + src/libpttls/sasl/sasl_mechanism.h | 103 ++ src/libpttls/sasl/sasl_plain/sasl_plain.c | 171 ++ src/libpttls/sasl/sasl_plain/sasl_plain.h | 48 + src/libradius/Makefile.in | 33 +- src/libradius/radius_client.c | 3 - src/libradius/radius_message.c | 81 + src/libradius/radius_message.h | 25 +- src/libsimaka/Makefile.in | 33 +- src/libsimaka/simaka_manager.h | 14 +- src/libstrongswan/Android.mk | 1 + src/libstrongswan/Makefile.am | 10 + src/libstrongswan/Makefile.in | 162 +- src/libstrongswan/asn1/oid.c | 342 ++-- src/libstrongswan/asn1/oid.h | 170 +- src/libstrongswan/asn1/oid.txt | 6 + src/libstrongswan/bio/bio_reader.c | 20 + src/libstrongswan/bio/bio_reader.h | 13 +- src/libstrongswan/credentials/auth_cfg.c | 56 +- src/libstrongswan/credentials/cert_validator.h | 17 + src/libstrongswan/credentials/cred_encoding.h | 2 + src/libstrongswan/credentials/credential_manager.c | 116 +- src/libstrongswan/credentials/sets/mem_cred.c | 61 +- src/libstrongswan/credentials/sets/mem_cred.h | 12 +- src/libstrongswan/crypto/crypto_tester.c | 5 +- src/libstrongswan/library.c | 2 + src/libstrongswan/library.h | 9 + src/libstrongswan/networking/packet.c | 19 + src/libstrongswan/networking/packet.h | 14 + src/libstrongswan/networking/tun_device.c | 4 +- src/libstrongswan/pen/pen.c | 12 +- src/libstrongswan/pen/pen.h | 69 +- src/libstrongswan/plugins/aes/Makefile.in | 33 +- src/libstrongswan/plugins/af_alg/Makefile.in | 33 +- src/libstrongswan/plugins/agent/Makefile.in | 33 +- src/libstrongswan/plugins/blowfish/Makefile.in | 33 +- src/libstrongswan/plugins/ccm/Makefile.in | 33 +- src/libstrongswan/plugins/ccm/ccm_aead.h | 2 +- src/libstrongswan/plugins/cmac/Makefile.in | 33 +- src/libstrongswan/plugins/constraints/Makefile.in | 33 +- src/libstrongswan/plugins/ctr/Makefile.in | 33 +- src/libstrongswan/plugins/curl/Makefile.in | 33 +- src/libstrongswan/plugins/curl/curl_fetcher.c | 17 +- src/libstrongswan/plugins/des/Makefile.in | 33 +- src/libstrongswan/plugins/dnskey/Makefile.am | 3 +- src/libstrongswan/plugins/dnskey/Makefile.in | 39 +- src/libstrongswan/plugins/dnskey/dnskey_builder.c | 12 +- src/libstrongswan/plugins/dnskey/dnskey_encoder.c | 91 + src/libstrongswan/plugins/dnskey/dnskey_encoder.h | 32 + src/libstrongswan/plugins/dnskey/dnskey_plugin.c | 5 + src/libstrongswan/plugins/fips_prf/Makefile.in | 33 +- src/libstrongswan/plugins/gcm/Makefile.in | 33 +- src/libstrongswan/plugins/gcm/gcm_aead.h | 2 +- src/libstrongswan/plugins/gcrypt/Makefile.in | 33 +- src/libstrongswan/plugins/gmp/Makefile.in | 33 +- src/libstrongswan/plugins/hmac/Makefile.in | 33 +- src/libstrongswan/plugins/ldap/Makefile.in | 33 +- src/libstrongswan/plugins/md4/Makefile.in | 33 +- src/libstrongswan/plugins/md5/Makefile.in | 33 +- src/libstrongswan/plugins/mysql/Makefile.in | 33 +- src/libstrongswan/plugins/mysql/mysql_database.c | 2 +- src/libstrongswan/plugins/nonce/Makefile.in | 33 +- src/libstrongswan/plugins/openssl/Makefile.am | 3 +- src/libstrongswan/plugins/openssl/Makefile.in | 39 +- .../plugins/openssl/openssl_diffie_hellman.c | 6 + .../plugins/openssl/openssl_ec_private_key.c | 5 +- .../plugins/openssl/openssl_ec_public_key.c | 4 +- src/libstrongswan/plugins/openssl/openssl_gcm.c | 265 +++ src/libstrongswan/plugins/openssl/openssl_gcm.h | 37 + src/libstrongswan/plugins/openssl/openssl_hmac.c | 5 + src/libstrongswan/plugins/openssl/openssl_pkcs7.c | 3 + src/libstrongswan/plugins/openssl/openssl_plugin.c | 19 +- .../plugins/openssl/openssl_rsa_private_key.c | 5 + .../plugins/openssl/openssl_rsa_public_key.c | 6 + .../plugins/openssl/openssl_sha1_prf.c | 5 + src/libstrongswan/plugins/padlock/Makefile.in | 33 +- src/libstrongswan/plugins/pem/Makefile.in | 33 +- src/libstrongswan/plugins/pgp/Makefile.in | 33 +- src/libstrongswan/plugins/pkcs1/Makefile.in | 33 +- src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c | 6 +- src/libstrongswan/plugins/pkcs11/Makefile.in | 33 +- src/libstrongswan/plugins/pkcs7/Makefile.in | 33 +- src/libstrongswan/plugins/pkcs8/Makefile.in | 33 +- src/libstrongswan/plugins/pubkey/Makefile.in | 33 +- src/libstrongswan/plugins/random/Makefile.in | 33 +- src/libstrongswan/plugins/rdrand/Makefile.in | 33 +- src/libstrongswan/plugins/rdrand/rdrand_rng.h | 2 +- src/libstrongswan/plugins/revocation/Makefile.in | 33 +- src/libstrongswan/plugins/sha1/Makefile.in | 33 +- src/libstrongswan/plugins/sha2/Makefile.in | 33 +- src/libstrongswan/plugins/soup/Makefile.in | 33 +- src/libstrongswan/plugins/sqlite/Makefile.in | 33 +- src/libstrongswan/plugins/test_vectors/Makefile.in | 33 +- src/libstrongswan/plugins/unbound/Makefile.am | 20 + src/libstrongswan/plugins/unbound/Makefile.in | 661 +++++++ src/libstrongswan/plugins/unbound/unbound_plugin.c | 66 + src/libstrongswan/plugins/unbound/unbound_plugin.h | 42 + .../plugins/unbound/unbound_resolver.c | 143 ++ .../plugins/unbound/unbound_resolver.h | 29 + .../plugins/unbound/unbound_response.c | 259 +++ .../plugins/unbound/unbound_response.h | 51 + src/libstrongswan/plugins/unbound/unbound_rr.c | 164 ++ src/libstrongswan/plugins/unbound/unbound_rr.h | 48 + src/libstrongswan/plugins/x509/Makefile.in | 33 +- src/libstrongswan/plugins/xcbc/Makefile.in | 33 +- src/libstrongswan/resolver/resolver.h | 58 + src/libstrongswan/resolver/resolver_manager.c | 90 + src/libstrongswan/resolver/resolver_manager.h | 72 + src/libstrongswan/resolver/resolver_response.h | 143 ++ src/libstrongswan/resolver/rr.h | 268 +++ src/libstrongswan/resolver/rr_set.c | 100 ++ src/libstrongswan/resolver/rr_set.h | 79 + src/libstrongswan/selectors/traffic_selector.c | 202 ++- src/libstrongswan/selectors/traffic_selector.h | 15 +- src/libstrongswan/threading/thread.c | 4 + src/libstrongswan/utils/backtrace.c | 91 +- src/libstrongswan/utils/backtrace.h | 7 +- src/libstrongswan/utils/capabilities.c | 38 +- src/libstrongswan/utils/chunk.h | 5 + src/libstrongswan/utils/identification.c | 24 +- src/libstrongswan/utils/identification.h | 6 +- src/libstrongswan/utils/leak_detective.c | 2 + src/libstrongswan/utils/utils.c | 73 +- src/libstrongswan/utils/utils.h | 45 + src/libtls/Makefile.in | 40 +- src/libtls/tls.c | 32 +- src/libtls/tls.h | 14 + src/libtls/tls_fragmentation.c | 8 +- src/libtls/tls_handshake.h | 14 + src/libtls/tls_peer.c | 23 +- src/libtls/tls_peer.h | 8 +- src/libtls/tls_server.c | 54 +- src/libtls/tls_server.h | 7 +- src/libtls/tls_socket.c | 272 ++- src/libtls/tls_socket.h | 37 +- src/libtnccs/Android.mk | 5 +- src/libtnccs/Makefile.am | 5 +- src/libtnccs/Makefile.in | 39 +- src/libtnccs/tnc/tnccs/tnccs.h | 65 +- src/libtnccs/tnc/tnccs/tnccs_manager.h | 9 +- src/libtncif/Android.mk | 5 +- src/libtncif/Makefile.am | 1 + src/libtncif/Makefile.in | 35 +- src/libtncif/tncif_identity.c | 205 +++ src/libtncif/tncif_identity.h | 112 ++ src/libtncif/tncif_names.c | 17 + src/libtncif/tncif_names.h | 2 + src/libtncif/tncif_pa_subtypes.c | 15 +- src/libtncif/tncif_pa_subtypes.h | 3 + src/libtncif/tncifimv.h | 24 + src/manager/Makefile.in | 70 +- src/manager/controller/auth_controller.h | 2 +- src/manager/controller/config_controller.h | 2 +- src/manager/controller/control_controller.h | 2 +- src/manager/controller/gateway_controller.h | 2 +- src/manager/controller/ikesa_controller.h | 2 +- src/manager/manager.h | 2 +- src/medsrv/Makefile.in | 55 +- src/medsrv/controller/peer_controller.h | 4 +- src/medsrv/controller/user_controller.h | 4 +- src/medsrv/filter/auth_filter.h | 4 +- src/medsrv/user.h | 9 +- src/openac/Makefile.in | 52 +- src/pki/Makefile.in | 35 +- src/pki/command.h | 2 +- src/pki/commands/pub.c | 2 +- src/pki/pki.c | 11 + src/pki/pki.h | 4 +- src/scepclient/Makefile.in | 52 +- src/scepclient/scep.c | 37 +- src/scepclient/scep.h | 2 +- src/scepclient/scepclient.c | 24 +- src/starter/Android.mk | 4 +- src/starter/Makefile.in | 35 +- src/starter/args.c | 17 + src/starter/cmp.c | 4 +- src/starter/confread.c | 39 +- src/starter/confread.h | 5 +- src/starter/files.h | 8 +- src/starter/invokecharon.c | 37 +- src/starter/keywords.c | 91 +- src/starter/keywords.h | 2 +- src/starter/keywords.txt | 1 + src/starter/starter.c | 108 +- src/starter/starterstroke.c | 5 +- src/stroke/Android.mk | 4 +- src/stroke/Makefile.in | 35 +- src/stroke/stroke.c | 25 +- src/stroke/stroke_keywords.c | 81 +- src/stroke/stroke_keywords.h | 4 +- src/stroke/stroke_keywords.txt | 3 +- src/stroke/stroke_msg.h | 17 +- testing/Makefile.in | 30 +- testing/config/kernel/config-3.8 | 1863 ++++++++++++++++++++ testing/config/kvm/alice.xml | 4 +- testing/config/kvm/bob.xml | 3 +- testing/config/kvm/carol.xml | 3 +- testing/config/kvm/dave.xml | 3 +- testing/config/kvm/moon.xml | 4 +- testing/config/kvm/sun.xml | 4 +- testing/config/kvm/venus.xml | 3 +- testing/config/kvm/vnet1.xml | 2 +- testing/config/kvm/vnet2.xml | 2 +- testing/config/kvm/vnet3.xml | 2 +- testing/config/kvm/winnetou.xml | 3 +- testing/do-tests | 5 +- .../hosts/default/etc/ld.so.conf.d/strongswan.conf | 1 + testing/hosts/default/usr/local/bin/expect-file | 29 + testing/hosts/winnetou/etc/bind/K.+008+32329.key | 5 + .../hosts/winnetou/etc/bind/K.+008+32329.private | 13 + testing/hosts/winnetou/etc/bind/K.+008+43749.key | 5 + .../hosts/winnetou/etc/bind/K.+008+43749.private | 13 + .../hosts/winnetou/etc/bind/Korg.+008+24285.key | 5 + .../winnetou/etc/bind/Korg.+008+24285.private | 13 + .../hosts/winnetou/etc/bind/Korg.+008+51859.key | 5 + .../winnetou/etc/bind/Korg.+008+51859.private | 13 + .../etc/bind/Kstrongswan.org.+008+00481.key | 5 + .../etc/bind/Kstrongswan.org.+008+00481.private | 13 + .../etc/bind/Kstrongswan.org.+008+09396.key | 5 + .../etc/bind/Kstrongswan.org.+008+09396.private | 13 + testing/hosts/winnetou/etc/bind/bind.keys | 46 + testing/hosts/winnetou/etc/bind/db.org | 40 + testing/hosts/winnetou/etc/bind/db.root | 40 + testing/hosts/winnetou/etc/bind/db.strongswan.org | 88 + .../winnetou/etc/bind/named.conf.default-zones | 23 + testing/hosts/winnetou/etc/bind/named.conf.local | 18 + testing/scripts/build-baseimage | 12 +- testing/scripts/build-guestimages | 8 +- testing/scripts/load-testconfig | 6 +- testing/scripts/recipes/004_iptables.mk | 37 - testing/scripts/recipes/004_wpa_supplicant.mk | 39 + testing/scripts/recipes/005_anet.mk | 21 + testing/scripts/recipes/005_strongswan.mk | 87 - testing/scripts/recipes/006_tkm-rpc.mk | 23 + testing/scripts/recipes/007_x509-ada.mk | 21 + testing/scripts/recipes/008_xfrm-ada.mk | 23 + testing/scripts/recipes/009_tkm.mk | 21 + testing/scripts/recipes/010_strongswan.mk | 94 + testing/scripts/recipes/011_xfrm-proxy.mk | 21 + .../scripts/recipes/patches/iptables-xfrm-hooks | 61 - .../scripts/recipes/patches/wpa_supplicant-eap-tnc | 47 + testing/scripts/restore-defaults | 1 + testing/start-testing | 9 +- testing/testing.conf | 11 +- .../ikev1/net2net-fragmentation/description.txt | 9 + .../tests/ikev1/net2net-fragmentation/evaltest.dat | 15 + .../hosts/moon/etc/ipsec.conf | 22 + .../hosts/moon/etc/strongswan.conf | 11 + .../net2net-fragmentation/hosts/sun/etc/ipsec.conf | 22 + .../hosts/sun/etc/strongswan.conf | 11 + .../tests/ikev1/net2net-fragmentation/posttest.dat | 5 + .../tests/ikev1/net2net-fragmentation/pretest.dat | 6 + .../tests/ikev1/net2net-fragmentation/test.conf | 21 + .../ikev2/ip-two-pools-v4v6-db/description.txt | 5 + .../tests/ikev2/ip-two-pools-v4v6-db/evaltest.dat | 9 + .../hosts/carol/etc/ipsec.conf | 20 + .../hosts/carol/etc/strongswan.conf | 5 + .../ip-two-pools-v4v6-db/hosts/moon/etc/ipsec.conf | 19 + .../hosts/moon/etc/strongswan.conf | 17 + .../tests/ikev2/ip-two-pools-v4v6-db/posttest.dat | 5 + .../tests/ikev2/ip-two-pools-v4v6-db/pretest.dat | 9 + testing/tests/ikev2/ip-two-pools-v4v6-db/test.conf | 21 + testing/tests/ikev2/net2net-dnssec/description.txt | 8 + testing/tests/ikev2/net2net-dnssec/evaltest.dat | 9 + .../ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf | 24 + .../hosts/moon/etc/ipsec.d/certs/moonPub.der | Bin 0 -> 294 bytes .../hosts/moon/etc/ipsec.d/dnssec.keys | 10 + .../net2net-dnssec/hosts/moon/etc/iptables.rules | 28 + .../net2net-dnssec/hosts/moon/etc/resolv.conf | 1 + .../net2net-dnssec/hosts/moon/etc/strongswan.conf | 20 + .../ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf | 24 + .../hosts/sun/etc/ipsec.d/certs/sunPub.der | Bin 0 -> 294 bytes .../hosts/sun/etc/ipsec.d/dnssec.keys | 10 + .../net2net-dnssec/hosts/sun/etc/iptables.rules | 28 + .../ikev2/net2net-dnssec/hosts/sun/etc/resolv.conf | 1 + .../net2net-dnssec/hosts/sun/etc/strongswan.conf | 20 + testing/tests/ikev2/net2net-dnssec/posttest.dat | 8 + testing/tests/ikev2/net2net-dnssec/pretest.dat | 8 + testing/tests/ikev2/net2net-dnssec/test.conf | 21 + testing/tests/ikev2/rw-dnssec/description.txt | 10 + testing/tests/ikev2/rw-dnssec/evaltest.dat | 24 + .../ikev2/rw-dnssec/hosts/carol/etc/ipsec.conf | 23 + .../rw-dnssec/hosts/carol/etc/ipsec.d/dnssec.keys | 10 + .../ikev2/rw-dnssec/hosts/carol/etc/iptables.rules | 28 + .../ikev2/rw-dnssec/hosts/carol/etc/resolv.conf | 1 + .../rw-dnssec/hosts/carol/etc/strongswan.conf | 11 + .../ikev2/rw-dnssec/hosts/dave/etc/ipsec.conf | 23 + .../rw-dnssec/hosts/dave/etc/ipsec.d/dnssec.keys | 10 + .../ikev2/rw-dnssec/hosts/dave/etc/iptables.rules | 28 + .../ikev2/rw-dnssec/hosts/dave/etc/resolv.conf | 1 + .../ikev2/rw-dnssec/hosts/dave/etc/strongswan.conf | 11 + .../ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf | 22 + .../hosts/moon/etc/ipsec.d/certs/moonPub.der | Bin 0 -> 294 bytes .../rw-dnssec/hosts/moon/etc/ipsec.d/dnssec.keys | 10 + .../ikev2/rw-dnssec/hosts/moon/etc/iptables.rules | 28 + .../ikev2/rw-dnssec/hosts/moon/etc/resolv.conf | 1 + .../ikev2/rw-dnssec/hosts/moon/etc/strongswan.conf | 14 + testing/tests/ikev2/rw-dnssec/posttest.dat | 12 + testing/tests/ikev2/rw-dnssec/pretest.dat | 13 + testing/tests/ikev2/rw-dnssec/test.conf | 21 + .../ikev2/rw-eap-framed-ip-radius/description.txt | 9 + .../ikev2/rw-eap-framed-ip-radius/evaltest.dat | 26 + .../hosts/alice/etc/freeradius/eap.conf | 5 + .../hosts/alice/etc/freeradius/proxy.conf | 5 + .../alice/etc/freeradius/sites-available/default | 42 + .../hosts/alice/etc/freeradius/users | 4 + .../hosts/carol/etc/ipsec.conf | 22 + .../hosts/carol/etc/ipsec.secrets | 3 + .../hosts/carol/etc/strongswan.conf | 5 + .../hosts/dave/etc/ipsec.conf | 22 + .../hosts/dave/etc/ipsec.secrets | 3 + .../hosts/dave/etc/strongswan.conf | 5 + .../hosts/moon/etc/ipsec.conf | 24 + .../hosts/moon/etc/ipsec.secrets | 3 + .../hosts/moon/etc/iptables.rules | 32 + .../hosts/moon/etc/strongswan.conf | 12 + .../ikev2/rw-eap-framed-ip-radius/posttest.dat | 7 + .../ikev2/rw-eap-framed-ip-radius/pretest.dat | 11 + .../tests/ikev2/rw-eap-framed-ip-radius/test.conf | 26 + .../hosts/carol/etc/ipsec.conf | 1 + .../rw-radius-accounting/hosts/moon/etc/ipsec.conf | 1 + .../openssl-ikev2/alg-aes-gcm/description.txt | 16 + .../tests/openssl-ikev2/alg-aes-gcm/evaltest.dat | 26 + .../alg-aes-gcm/hosts/carol/etc/ipsec.conf | 22 + .../alg-aes-gcm/hosts/carol/etc/strongswan.conf | 5 + .../alg-aes-gcm/hosts/dave/etc/ipsec.conf | 22 + .../alg-aes-gcm/hosts/dave/etc/strongswan.conf | 5 + .../alg-aes-gcm/hosts/moon/etc/ipsec.conf | 21 + .../alg-aes-gcm/hosts/moon/etc/strongswan.conf | 5 + .../tests/openssl-ikev2/alg-aes-gcm/posttest.dat | 6 + .../tests/openssl-ikev2/alg-aes-gcm/pretest.dat | 9 + testing/tests/openssl-ikev2/alg-aes-gcm/test.conf | 21 + .../tests/tkm/host2host-initiator/description.txt | 3 + testing/tests/tkm/host2host-initiator/evaltest.dat | 12 + .../hosts/moon/etc/tkm/moonKey.der | Bin 0 -> 1191 bytes .../hosts/moon/etc/tkm/strongswanCert.der | Bin 0 -> 956 bytes .../hosts/moon/etc/tkm/tkm.conf | 21 + .../host2host-initiator/hosts/sun/etc/ipsec.conf | 20 + .../hosts/sun/etc/strongswan.conf | 5 + testing/tests/tkm/host2host-initiator/posttest.dat | 4 + testing/tests/tkm/host2host-initiator/pretest.dat | 10 + testing/tests/tkm/host2host-initiator/test.conf | 21 + .../tests/tkm/host2host-responder/description.txt | 3 + testing/tests/tkm/host2host-responder/evaltest.dat | 12 + .../hosts/moon/etc/tkm/moonKey.der | Bin 0 -> 1191 bytes .../hosts/moon/etc/tkm/strongswanCert.der | Bin 0 -> 956 bytes .../hosts/moon/etc/tkm/tkm.conf | 21 + .../host2host-responder/hosts/sun/etc/ipsec.conf | 21 + .../hosts/sun/etc/strongswan.conf | 5 + testing/tests/tkm/host2host-responder/posttest.dat | 4 + testing/tests/tkm/host2host-responder/pretest.dat | 10 + testing/tests/tkm/host2host-responder/test.conf | 21 + .../tests/tkm/host2host-xfrmproxy/description.txt | 5 + testing/tests/tkm/host2host-xfrmproxy/evaltest.dat | 13 + .../hosts/moon/etc/tkm/moonKey.der | Bin 0 -> 1191 bytes .../hosts/moon/etc/tkm/strongswanCert.der | Bin 0 -> 956 bytes .../hosts/moon/etc/tkm/tkm.conf | 21 + .../host2host-xfrmproxy/hosts/sun/etc/ipsec.conf | 20 + .../hosts/sun/etc/strongswan.conf | 5 + testing/tests/tkm/host2host-xfrmproxy/posttest.dat | 5 + testing/tests/tkm/host2host-xfrmproxy/pretest.dat | 12 + testing/tests/tkm/host2host-xfrmproxy/test.conf | 21 + testing/tests/tkm/multiple-clients/description.txt | 5 + testing/tests/tkm/multiple-clients/evaltest.dat | 23 + .../multiple-clients/hosts/carol/etc/ipsec.conf | 22 + .../hosts/carol/etc/strongswan.conf | 5 + .../tkm/multiple-clients/hosts/dave/etc/ipsec.conf | 22 + .../hosts/dave/etc/strongswan.conf | 5 + .../hosts/sun/etc/tkm/strongswanCert.der | Bin 0 -> 956 bytes .../multiple-clients/hosts/sun/etc/tkm/sunKey.der | Bin 0 -> 1192 bytes .../multiple-clients/hosts/sun/etc/tkm/tkm.conf | 36 + testing/tests/tkm/multiple-clients/posttest.dat | 5 + testing/tests/tkm/multiple-clients/pretest.dat | 14 + testing/tests/tkm/multiple-clients/test.conf | 21 + .../tests/tkm/net2net-initiator/description.txt | 5 + testing/tests/tkm/net2net-initiator/evaltest.dat | 12 + .../hosts/moon/etc/tkm/moonKey.der | Bin 0 -> 1191 bytes .../net2net-initiator/hosts/moon/etc/tkm/tkm.conf | 23 + .../tkm/net2net-initiator/hosts/sun/etc/ipsec.conf | 23 + .../hosts/sun/etc/strongswan.conf | 6 + testing/tests/tkm/net2net-initiator/posttest.dat | 4 + testing/tests/tkm/net2net-initiator/pretest.dat | 10 + testing/tests/tkm/net2net-initiator/test.conf | 21 + .../tests/tkm/net2net-xfrmproxy/description.txt | 6 + testing/tests/tkm/net2net-xfrmproxy/evaltest.dat | 13 + .../hosts/moon/etc/tkm/moonKey.der | Bin 0 -> 1191 bytes .../hosts/moon/etc/tkm/strongswanCert.der | Bin 0 -> 956 bytes .../net2net-xfrmproxy/hosts/moon/etc/tkm/tkm.conf | 23 + .../tkm/net2net-xfrmproxy/hosts/sun/etc/ipsec.conf | 23 + .../hosts/sun/etc/strongswan.conf | 6 + testing/tests/tkm/net2net-xfrmproxy/posttest.dat | 4 + testing/tests/tkm/net2net-xfrmproxy/pretest.dat | 12 + testing/tests/tkm/net2net-xfrmproxy/test.conf | 21 + testing/tests/tnc/tnccs-11-fhh/pretest.dat | 6 +- .../tests/tnc/tnccs-11-radius-block/pretest.dat | 4 +- testing/tests/tnc/tnccs-11-radius/pretest.dat | 4 +- testing/tests/tnc/tnccs-11/pretest.dat | 6 +- testing/tests/tnc/tnccs-20-pdp/evaltest.dat | 6 +- .../tnc/tnccs-20-pdp/hosts/alice/etc/ipsec.secrets | 4 +- .../tnc/tnccs-20-pdp/hosts/carol/etc/ipsec.conf | 2 +- .../tnc/tnccs-20-pdp/hosts/carol/etc/ipsec.secrets | 2 +- .../tnc/tnccs-20-pdp/hosts/dave/etc/ipsec.conf | 2 +- .../tnc/tnccs-20-pdp/hosts/dave/etc/ipsec.secrets | 2 +- .../tnc/tnccs-20-pdp/hosts/moon/etc/ipsec.conf | 2 +- .../tnccs-20-pdp/hosts/moon/etc/strongswan.conf | 2 +- testing/tests/tnc/tnccs-20-tls/evaltest.dat | 4 +- .../tnc/tnccs-20-tls/hosts/carol/etc/ipsec.conf | 1 - .../tnc/tnccs-20-tls/hosts/dave/etc/ipsec.conf | 1 - .../tnc/tnccs-20-tls/hosts/moon/etc/ipsec.conf | 2 +- 886 files changed, 36535 insertions(+), 6856 deletions(-) create mode 100755 compile create mode 100644 scripts/dnssec.c create mode 100644 src/charon-tkm/Makefile.am create mode 100644 src/charon-tkm/Makefile.in create mode 100644 src/charon-tkm/build_charon.gpr create mode 100644 src/charon-tkm/build_common.gpr create mode 100644 src/charon-tkm/build_tests.gpr create mode 100644 src/charon-tkm/src/charon-tkm.c create mode 100644 src/charon-tkm/src/ees/ees_callbacks.c create mode 100644 src/charon-tkm/src/ees/ees_callbacks.h create mode 100644 src/charon-tkm/src/ees/esa_event_service.adb create mode 100644 src/charon-tkm/src/ees/esa_event_service.ads create mode 100644 src/charon-tkm/src/ees/tkmrpc-servers-ees.adb create mode 100644 src/charon-tkm/src/ehandler/eh_callbacks.c create mode 100644 src/charon-tkm/src/ehandler/eh_callbacks.h create mode 100644 src/charon-tkm/src/ehandler/exception_handler.adb create mode 100644 src/charon-tkm/src/ehandler/exception_handler.ads create mode 100644 src/charon-tkm/src/tkm/.gitignore create mode 100644 src/charon-tkm/src/tkm/tkm.c create mode 100644 src/charon-tkm/src/tkm/tkm.h create mode 100644 src/charon-tkm/src/tkm/tkm_chunk_map.c create mode 100644 src/charon-tkm/src/tkm/tkm_chunk_map.h create mode 100644 src/charon-tkm/src/tkm/tkm_cred.c create mode 100644 src/charon-tkm/src/tkm/tkm_cred.h create mode 100644 src/charon-tkm/src/tkm/tkm_diffie_hellman.c create mode 100644 src/charon-tkm/src/tkm/tkm_diffie_hellman.h create mode 100644 src/charon-tkm/src/tkm/tkm_encoder.c create mode 100644 src/charon-tkm/src/tkm/tkm_encoder.h create mode 100644 src/charon-tkm/src/tkm/tkm_id_manager.c create mode 100644 src/charon-tkm/src/tkm/tkm_id_manager.h create mode 100644 src/charon-tkm/src/tkm/tkm_kernel_ipsec.c create mode 100644 src/charon-tkm/src/tkm/tkm_kernel_ipsec.h create mode 100644 src/charon-tkm/src/tkm/tkm_kernel_sad.c create mode 100644 src/charon-tkm/src/tkm/tkm_kernel_sad.h create mode 100644 src/charon-tkm/src/tkm/tkm_keymat.c create mode 100644 src/charon-tkm/src/tkm/tkm_keymat.h create mode 100644 src/charon-tkm/src/tkm/tkm_listener.c create mode 100644 src/charon-tkm/src/tkm/tkm_listener.h create mode 100644 src/charon-tkm/src/tkm/tkm_nonceg.c create mode 100644 src/charon-tkm/src/tkm/tkm_nonceg.h create mode 100644 src/charon-tkm/src/tkm/tkm_private_key.c create mode 100644 src/charon-tkm/src/tkm/tkm_private_key.h create mode 100644 src/charon-tkm/src/tkm/tkm_public_key.c create mode 100644 src/charon-tkm/src/tkm/tkm_public_key.h create mode 100644 src/charon-tkm/src/tkm/tkm_types.h create mode 100644 src/charon-tkm/src/tkm/tkm_utils.c create mode 100644 src/charon-tkm/src/tkm/tkm_utils.h create mode 100644 src/charon-tkm/tests/.gitignore create mode 100644 src/charon-tkm/tests/chunk_map_tests.c create mode 100644 src/charon-tkm/tests/diffie_hellman_tests.c create mode 100644 src/charon-tkm/tests/id_manager_tests.c create mode 100644 src/charon-tkm/tests/kernel_sad_tests.c create mode 100644 src/charon-tkm/tests/keymat_tests.c create mode 100644 src/charon-tkm/tests/nonceg_tests.c create mode 100644 src/charon-tkm/tests/test_runner.c create mode 100644 src/charon-tkm/tests/test_runner.h create mode 100644 src/charon-tkm/tests/utils_tests.c delete mode 100644 src/libcharon/plugins/android/Makefile.am delete mode 100644 src/libcharon/plugins/android/Makefile.in delete mode 100644 src/libcharon/plugins/android/android_creds.c delete mode 100644 src/libcharon/plugins/android/android_creds.h delete mode 100644 src/libcharon/plugins/android/android_handler.c delete mode 100644 src/libcharon/plugins/android/android_handler.h delete mode 100644 src/libcharon/plugins/android/android_plugin.c delete mode 100644 src/libcharon/plugins/android/android_plugin.h delete mode 100644 src/libcharon/plugins/android/android_service.c delete mode 100644 src/libcharon/plugins/android/android_service.h create mode 100644 src/libcharon/plugins/android_dns/Makefile.am create mode 100644 src/libcharon/plugins/android_dns/Makefile.in create mode 100644 src/libcharon/plugins/android_dns/android_dns_handler.c create mode 100644 src/libcharon/plugins/android_dns/android_dns_handler.h create mode 100644 src/libcharon/plugins/android_dns/android_dns_plugin.c create mode 100644 src/libcharon/plugins/android_dns/android_dns_plugin.h create mode 100644 src/libcharon/plugins/eap_radius/eap_radius_provider.c create mode 100644 src/libcharon/plugins/eap_radius/eap_radius_provider.h create mode 100644 src/libcharon/plugins/ipseckey/Makefile.am create mode 100644 src/libcharon/plugins/ipseckey/Makefile.in create mode 100644 src/libcharon/plugins/ipseckey/ipseckey.c create mode 100644 src/libcharon/plugins/ipseckey/ipseckey.h create mode 100644 src/libcharon/plugins/ipseckey/ipseckey_cred.c create mode 100644 src/libcharon/plugins/ipseckey/ipseckey_cred.h create mode 100644 src/libcharon/plugins/ipseckey/ipseckey_plugin.c create mode 100644 src/libcharon/plugins/ipseckey/ipseckey_plugin.h create mode 100644 src/libcharon/plugins/systime_fix/Makefile.am create mode 100644 src/libcharon/plugins/systime_fix/Makefile.in create mode 100644 src/libcharon/plugins/systime_fix/systime_fix_plugin.c create mode 100644 src/libcharon/plugins/systime_fix/systime_fix_plugin.h create mode 100644 src/libcharon/plugins/systime_fix/systime_fix_validator.c create mode 100644 src/libcharon/plugins/systime_fix/systime_fix_validator.h create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_http.c create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_http.h create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_renew_session_job.c create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_renew_session_job.h create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap_msg.c create mode 100644 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap_msg.h create mode 100644 src/libcharon/plugins/xauth_noauth/Makefile.am create mode 100644 src/libcharon/plugins/xauth_noauth/Makefile.in create mode 100644 src/libcharon/plugins/xauth_noauth/xauth_noauth.c create mode 100644 src/libcharon/plugins/xauth_noauth/xauth_noauth.h create mode 100644 src/libcharon/plugins/xauth_noauth/xauth_noauth_plugin.c create mode 100644 src/libcharon/plugins/xauth_noauth/xauth_noauth_plugin.h create mode 100644 src/libcharon/sa/eap/eap_inner_method.h create mode 100644 src/libpttls/Makefile.am create mode 100644 src/libpttls/Makefile.in create mode 100644 src/libpttls/pt_tls.c create mode 100644 src/libpttls/pt_tls.h create mode 100644 src/libpttls/pt_tls_client.c create mode 100644 src/libpttls/pt_tls_client.h create mode 100644 src/libpttls/pt_tls_dispatcher.c create mode 100644 src/libpttls/pt_tls_dispatcher.h create mode 100644 src/libpttls/pt_tls_server.c create mode 100644 src/libpttls/pt_tls_server.h create mode 100644 src/libpttls/sasl/sasl_mechanism.c create mode 100644 src/libpttls/sasl/sasl_mechanism.h create mode 100644 src/libpttls/sasl/sasl_plain/sasl_plain.c create mode 100644 src/libpttls/sasl/sasl_plain/sasl_plain.h create mode 100644 src/libstrongswan/plugins/dnskey/dnskey_encoder.c create mode 100644 src/libstrongswan/plugins/dnskey/dnskey_encoder.h create mode 100644 src/libstrongswan/plugins/openssl/openssl_gcm.c create mode 100644 src/libstrongswan/plugins/openssl/openssl_gcm.h create mode 100644 src/libstrongswan/plugins/unbound/Makefile.am create mode 100644 src/libstrongswan/plugins/unbound/Makefile.in create mode 100644 src/libstrongswan/plugins/unbound/unbound_plugin.c create mode 100644 src/libstrongswan/plugins/unbound/unbound_plugin.h create mode 100644 src/libstrongswan/plugins/unbound/unbound_resolver.c create mode 100644 src/libstrongswan/plugins/unbound/unbound_resolver.h create mode 100644 src/libstrongswan/plugins/unbound/unbound_response.c create mode 100644 src/libstrongswan/plugins/unbound/unbound_response.h create mode 100644 src/libstrongswan/plugins/unbound/unbound_rr.c create mode 100644 src/libstrongswan/plugins/unbound/unbound_rr.h create mode 100644 src/libstrongswan/resolver/resolver.h create mode 100644 src/libstrongswan/resolver/resolver_manager.c create mode 100644 src/libstrongswan/resolver/resolver_manager.h create mode 100644 src/libstrongswan/resolver/resolver_response.h create mode 100644 src/libstrongswan/resolver/rr.h create mode 100644 src/libstrongswan/resolver/rr_set.c create mode 100644 src/libstrongswan/resolver/rr_set.h create mode 100644 src/libtncif/tncif_identity.c create mode 100644 src/libtncif/tncif_identity.h create mode 100644 testing/config/kernel/config-3.8 create mode 100644 testing/hosts/default/etc/ld.so.conf.d/strongswan.conf create mode 100755 testing/hosts/default/usr/local/bin/expect-file create mode 100644 testing/hosts/winnetou/etc/bind/K.+008+32329.key create mode 100644 testing/hosts/winnetou/etc/bind/K.+008+32329.private create mode 100644 testing/hosts/winnetou/etc/bind/K.+008+43749.key create mode 100644 testing/hosts/winnetou/etc/bind/K.+008+43749.private create mode 100644 testing/hosts/winnetou/etc/bind/Korg.+008+24285.key create mode 100644 testing/hosts/winnetou/etc/bind/Korg.+008+24285.private create mode 100644 testing/hosts/winnetou/etc/bind/Korg.+008+51859.key create mode 100644 testing/hosts/winnetou/etc/bind/Korg.+008+51859.private create mode 100644 testing/hosts/winnetou/etc/bind/Kstrongswan.org.+008+00481.key create mode 100644 testing/hosts/winnetou/etc/bind/Kstrongswan.org.+008+00481.private create mode 100644 testing/hosts/winnetou/etc/bind/Kstrongswan.org.+008+09396.key create mode 100644 testing/hosts/winnetou/etc/bind/Kstrongswan.org.+008+09396.private create mode 100644 testing/hosts/winnetou/etc/bind/bind.keys create mode 100644 testing/hosts/winnetou/etc/bind/db.org create mode 100644 testing/hosts/winnetou/etc/bind/db.root create mode 100644 testing/hosts/winnetou/etc/bind/db.strongswan.org create mode 100644 testing/hosts/winnetou/etc/bind/named.conf.default-zones create mode 100644 testing/hosts/winnetou/etc/bind/named.conf.local delete mode 100644 testing/scripts/recipes/004_iptables.mk create mode 100644 testing/scripts/recipes/004_wpa_supplicant.mk create mode 100644 testing/scripts/recipes/005_anet.mk delete mode 100644 testing/scripts/recipes/005_strongswan.mk create mode 100644 testing/scripts/recipes/006_tkm-rpc.mk create mode 100644 testing/scripts/recipes/007_x509-ada.mk create mode 100644 testing/scripts/recipes/008_xfrm-ada.mk create mode 100644 testing/scripts/recipes/009_tkm.mk create mode 100644 testing/scripts/recipes/010_strongswan.mk create mode 100644 testing/scripts/recipes/011_xfrm-proxy.mk delete mode 100644 testing/scripts/recipes/patches/iptables-xfrm-hooks create mode 100644 testing/scripts/recipes/patches/wpa_supplicant-eap-tnc create mode 100644 testing/tests/ikev1/net2net-fragmentation/description.txt create mode 100644 testing/tests/ikev1/net2net-fragmentation/evaltest.dat create mode 100644 testing/tests/ikev1/net2net-fragmentation/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/ikev1/net2net-fragmentation/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/ikev1/net2net-fragmentation/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/ikev1/net2net-fragmentation/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/ikev1/net2net-fragmentation/posttest.dat create mode 100644 testing/tests/ikev1/net2net-fragmentation/pretest.dat create mode 100644 testing/tests/ikev1/net2net-fragmentation/test.conf create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/description.txt create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/evaltest.dat create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/carol/etc/ipsec.conf create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/carol/etc/strongswan.conf create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/posttest.dat create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/pretest.dat create mode 100644 testing/tests/ikev2/ip-two-pools-v4v6-db/test.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/description.txt create mode 100644 testing/tests/ikev2/net2net-dnssec/evaltest.dat create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/dnssec.keys create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/iptables.rules create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/resolv.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/certs/sunPub.der create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/dnssec.keys create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/iptables.rules create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/resolv.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/ikev2/net2net-dnssec/posttest.dat create mode 100644 testing/tests/ikev2/net2net-dnssec/pretest.dat create mode 100644 testing/tests/ikev2/net2net-dnssec/test.conf create mode 100644 testing/tests/ikev2/rw-dnssec/description.txt create mode 100644 testing/tests/ikev2/rw-dnssec/evaltest.dat create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/carol/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/carol/etc/ipsec.d/dnssec.keys create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/carol/etc/iptables.rules create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/carol/etc/resolv.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/carol/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/dave/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/dave/etc/ipsec.d/dnssec.keys create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/dave/etc/iptables.rules create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/dave/etc/resolv.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/dave/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/dnssec.keys create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/iptables.rules create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/resolv.conf create mode 100644 testing/tests/ikev2/rw-dnssec/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-dnssec/posttest.dat create mode 100644 testing/tests/ikev2/rw-dnssec/pretest.dat create mode 100644 testing/tests/ikev2/rw-dnssec/test.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/description.txt create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/evaltest.dat create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/eap.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/proxy.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/sites-available/default create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/users create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/carol/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/carol/etc/ipsec.secrets create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/carol/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/dave/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/dave/etc/ipsec.secrets create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/dave/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/moon/etc/ipsec.secrets create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/moon/etc/iptables.rules create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/posttest.dat create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/pretest.dat create mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/test.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/description.txt create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/evaltest.dat create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/carol/etc/ipsec.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/carol/etc/strongswan.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/dave/etc/ipsec.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/dave/etc/strongswan.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/moon/etc/ipsec.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/hosts/moon/etc/strongswan.conf create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/posttest.dat create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/pretest.dat create mode 100644 testing/tests/openssl-ikev2/alg-aes-gcm/test.conf create mode 100644 testing/tests/tkm/host2host-initiator/description.txt create mode 100644 testing/tests/tkm/host2host-initiator/evaltest.dat create mode 100644 testing/tests/tkm/host2host-initiator/hosts/moon/etc/tkm/moonKey.der create mode 100644 testing/tests/tkm/host2host-initiator/hosts/moon/etc/tkm/strongswanCert.der create mode 100644 testing/tests/tkm/host2host-initiator/hosts/moon/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/host2host-initiator/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/tkm/host2host-initiator/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/tkm/host2host-initiator/posttest.dat create mode 100644 testing/tests/tkm/host2host-initiator/pretest.dat create mode 100644 testing/tests/tkm/host2host-initiator/test.conf create mode 100644 testing/tests/tkm/host2host-responder/description.txt create mode 100644 testing/tests/tkm/host2host-responder/evaltest.dat create mode 100644 testing/tests/tkm/host2host-responder/hosts/moon/etc/tkm/moonKey.der create mode 100644 testing/tests/tkm/host2host-responder/hosts/moon/etc/tkm/strongswanCert.der create mode 100644 testing/tests/tkm/host2host-responder/hosts/moon/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/host2host-responder/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/tkm/host2host-responder/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/tkm/host2host-responder/posttest.dat create mode 100644 testing/tests/tkm/host2host-responder/pretest.dat create mode 100644 testing/tests/tkm/host2host-responder/test.conf create mode 100644 testing/tests/tkm/host2host-xfrmproxy/description.txt create mode 100644 testing/tests/tkm/host2host-xfrmproxy/evaltest.dat create mode 100644 testing/tests/tkm/host2host-xfrmproxy/hosts/moon/etc/tkm/moonKey.der create mode 100644 testing/tests/tkm/host2host-xfrmproxy/hosts/moon/etc/tkm/strongswanCert.der create mode 100644 testing/tests/tkm/host2host-xfrmproxy/hosts/moon/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/host2host-xfrmproxy/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/tkm/host2host-xfrmproxy/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/tkm/host2host-xfrmproxy/posttest.dat create mode 100644 testing/tests/tkm/host2host-xfrmproxy/pretest.dat create mode 100644 testing/tests/tkm/host2host-xfrmproxy/test.conf create mode 100644 testing/tests/tkm/multiple-clients/description.txt create mode 100644 testing/tests/tkm/multiple-clients/evaltest.dat create mode 100644 testing/tests/tkm/multiple-clients/hosts/carol/etc/ipsec.conf create mode 100644 testing/tests/tkm/multiple-clients/hosts/carol/etc/strongswan.conf create mode 100644 testing/tests/tkm/multiple-clients/hosts/dave/etc/ipsec.conf create mode 100644 testing/tests/tkm/multiple-clients/hosts/dave/etc/strongswan.conf create mode 100644 testing/tests/tkm/multiple-clients/hosts/sun/etc/tkm/strongswanCert.der create mode 100644 testing/tests/tkm/multiple-clients/hosts/sun/etc/tkm/sunKey.der create mode 100644 testing/tests/tkm/multiple-clients/hosts/sun/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/multiple-clients/posttest.dat create mode 100644 testing/tests/tkm/multiple-clients/pretest.dat create mode 100644 testing/tests/tkm/multiple-clients/test.conf create mode 100644 testing/tests/tkm/net2net-initiator/description.txt create mode 100644 testing/tests/tkm/net2net-initiator/evaltest.dat create mode 100644 testing/tests/tkm/net2net-initiator/hosts/moon/etc/tkm/moonKey.der create mode 100644 testing/tests/tkm/net2net-initiator/hosts/moon/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/net2net-initiator/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/tkm/net2net-initiator/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/tkm/net2net-initiator/posttest.dat create mode 100644 testing/tests/tkm/net2net-initiator/pretest.dat create mode 100644 testing/tests/tkm/net2net-initiator/test.conf create mode 100644 testing/tests/tkm/net2net-xfrmproxy/description.txt create mode 100644 testing/tests/tkm/net2net-xfrmproxy/evaltest.dat create mode 100644 testing/tests/tkm/net2net-xfrmproxy/hosts/moon/etc/tkm/moonKey.der create mode 100644 testing/tests/tkm/net2net-xfrmproxy/hosts/moon/etc/tkm/strongswanCert.der create mode 100644 testing/tests/tkm/net2net-xfrmproxy/hosts/moon/etc/tkm/tkm.conf create mode 100644 testing/tests/tkm/net2net-xfrmproxy/hosts/sun/etc/ipsec.conf create mode 100644 testing/tests/tkm/net2net-xfrmproxy/hosts/sun/etc/strongswan.conf create mode 100644 testing/tests/tkm/net2net-xfrmproxy/posttest.dat create mode 100644 testing/tests/tkm/net2net-xfrmproxy/pretest.dat create mode 100644 testing/tests/tkm/net2net-xfrmproxy/test.conf (limited to 'testing/start-testing') diff --git a/Android.common.mk b/Android.common.mk index 9824242d7..21dbbb9ce 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -15,5 +15,5 @@ add_plugin = $(if $(call plugin_enabled,$(1)), \ ) # strongSwan version, replaced by top Makefile -strongswan_VERSION := "5.0.2" +strongswan_VERSION := "5.0.3" diff --git a/Android.mk b/Android.mk index 0b8da5b8d..e762fe955 100644 --- a/Android.mk +++ b/Android.mk @@ -17,7 +17,7 @@ include $(CLEAR_VARS) # this is the list of plugins that are built into libstrongswan and charon # also these plugins are loaded by default (if not changed in strongswan.conf) strongswan_CHARON_PLUGINS := android-log openssl fips-prf random nonce pubkey \ - pkcs1 pkcs8 pem xcbc hmac kernel-netlink socket-default android \ + pkcs1 pkcs8 pem xcbc hmac kernel-netlink socket-default android-dns \ stroke eap-identity eap-mschapv2 eap-md5 eap-gtc ifneq ($(strongswan_BUILD_SCEPCLIENT),) @@ -67,7 +67,6 @@ strongswan_CFLAGS := \ -DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \ -DHAVE_IPSEC_MODE_BEET \ -DHAVE_IPSEC_DIR_FWD \ - -DOPENSSL_NO_CMS \ -DOPENSSL_NO_EC \ -DOPENSSL_NO_ECDSA \ -DOPENSSL_NO_ECDH \ diff --git a/Doxyfile.in b/Doxyfile.in index 343f130b3..ac0a96c88 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -1,14 +1,14 @@ -# Doxyfile 1.5.6 +# Doxyfile 1.8.1.2 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] # For lists items can also be appended using: # TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# Values that contain spaces should be placed between quotes (" "). #--------------------------------------------------------------------------- # Project related configuration options @@ -22,8 +22,9 @@ DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +# The PROJECT_NAME tag is a single word (or sequence of words) that should +# identify the project. Note that if you do not use Doxywizard you need +# to put quotes around the project name if it contains spaces. PROJECT_NAME = "@PACKAGE_NAME@" @@ -33,6 +34,19 @@ PROJECT_NAME = "@PACKAGE_NAME@" PROJECT_NUMBER = "@PACKAGE_VERSION@" +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # If a relative path is entered, it will be relative to the location @@ -54,11 +68,11 @@ CREATE_SUBDIRS = NO # information to generate all constant output in the proper language. # The default language is English, other supported languages are: # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, -# and Ukrainian. +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English @@ -126,7 +140,7 @@ STRIP_FROM_PATH = STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# (but less readable) file names. This can be useful if your file system # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO @@ -181,6 +195,13 @@ TAB_SIZE = 4 ALIASES = +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding +# "class=itcl::class" will allow you to use the command class in the +# itcl::class meaning. + +TCL_SUBST = + # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C # sources only. Doxygen will then generate output that is more tailored for C. # For instance, some of the names that are used will be different. The list @@ -207,11 +228,32 @@ OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all +# comments according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you +# can mix doxygen, HTML, and XML commands with Markdown formatting. +# Disable only in case of backward compatibilities issues. + +MARKDOWN_SUPPORT = YES + # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# func(std::string) {}). This also makes the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO @@ -229,7 +271,7 @@ SIP_SUPPORT = NO # For Microsoft's IDL there are propget and propput attributes to indicate getter # and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the +# will make doxygen replace the get and set methods by a property in the # documentation. This will only work if the methods are indeed getting or # setting a simple type. If this is not the case, or you want to show the # methods anyway, you should set this option to NO. @@ -251,6 +293,22 @@ DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and +# unions with only public data fields will be shown inline in the documentation +# of the scope in which they are defined (i.e. file, namespace, or group +# documentation), provided this scope is documented. If set to NO (the default), +# structs, classes, and unions are shown on a separate page (for HTML and Man +# pages) or section (for LaTeX and RTF). + +INLINE_SIMPLE_STRUCTS = NO + # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum # is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct @@ -261,6 +319,33 @@ SUBGROUPING = YES TYPEDEF_HIDES_STRUCT = YES +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +SYMBOL_CACHE_SIZE = 0 + +# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be +# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given +# their name and scope. Since this can be an expensive process and often the +# same symbol appear multiple times in the code, doxygen keeps a cache of +# pre-resolved symbols. If the cache is too small doxygen will become slower. +# If the cache is too large, memory is wasted. The cache size is given by this +# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +LOOKUP_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -277,6 +362,10 @@ EXTRACT_ALL = NO EXTRACT_PRIVATE = NO +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation. + +EXTRACT_PACKAGE = NO + # If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. @@ -299,7 +388,7 @@ EXTRACT_LOCAL_METHODS = NO # extracted and appear in the documentation as a namespace called # 'anonymous_namespace{file}', where file will be replaced with the base # name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. +# anonymous namespaces are hidden. EXTRACT_ANON_NSPACES = NO @@ -359,6 +448,12 @@ HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = NO +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. @@ -378,6 +473,16 @@ SORT_MEMBER_DOCS = NO SORT_BRIEF_DOCS = NO +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the # hierarchy of group names into alphabetical order. If set to NO (the default) # the group names will appear in their defined order. @@ -394,6 +499,15 @@ SORT_GROUP_NAMES = NO SORT_BY_SCOPE_NAME = NO +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + # The GENERATE_TODOLIST tag can be used to enable (YES) or # disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. @@ -424,10 +538,10 @@ GENERATE_DEPRECATEDLIST= NO ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in +# the initial value of a variable or macro consists of for it to appear in # the documentation. If the initializer consists of more lines than specified # here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the +# The appearance of the initializer of individual variables and macros in the # documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. @@ -439,20 +553,15 @@ MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = NO -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = YES - # Set the SHOW_FILES tag to NO to disable the generation of the Files page. # This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. -SHOW_FILES = NO +SHOW_FILES = YES # Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. SHOW_NAMESPACES = YES @@ -467,6 +576,25 @@ SHOW_NAMESPACES = YES FILE_VERSION_FILTER = +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files +# containing the references data. This must be a list of .bib files. The +# .bib extension is automatically appended if omitted. Using this command +# requires the bibtex tool to be installed. See also +# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style +# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this +# feature you need bibtex and perl available in the search path. + +CITE_BIB_FILES = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -495,13 +623,13 @@ WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for +# The WARN_NO_PARAMDOC option can be enabled to get warnings for # functions that are documented, but have no documentation for their parameters # or return value. If set to NO (the default) doxygen will only warn about # wrong or incomplete parameter documentation, but not about the absence of # documentation. -WARN_NO_PARAMDOC = NO +WARN_NO_PARAMDOC = YES # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text @@ -527,17 +655,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @SRC_DIR@/src/libstrongswan \ - @SRC_DIR@/src/libhydra \ - @SRC_DIR@/src/libcharon \ - @SRC_DIR@/src/libipsec \ - @SRC_DIR@/src/libsimaka \ - @SRC_DIR@/src/libtls \ - @SRC_DIR@/src/libradius \ - @SRC_DIR@/src/libtnccs \ - @SRC_DIR@/src/libtncif \ - @SRC_DIR@/src/libfast \ - @SRC_DIR@/src/manager +INPUT = @SRC_DIR@/src/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -551,8 +669,9 @@ INPUT_ENCODING = UTF-8 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.h @@ -562,17 +681,19 @@ FILE_PATTERNS = *.h RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should +# The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# Note that relative paths are relative to the directory from which doxygen is +# run. -EXCLUDE = +EXCLUDE = @SRC_DIR@/src/include -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. -EXCLUDE_SYMLINKS = NO +EXCLUDE_SYMLINKS = YES # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude @@ -621,17 +742,20 @@ IMAGE_PATH = # by executing (via popen()) the command , where # is the value of the INPUT_FILTER tag, and is the name of an # input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = @@ -641,6 +765,14 @@ FILTER_PATTERNS = FILTER_SOURCE_FILES = NO +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -650,7 +782,7 @@ FILTER_SOURCE_FILES = NO # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. @@ -659,7 +791,7 @@ INLINE_SOURCES = NO # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct # doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. +# fragments. Normal C, C++ and Fortran comments will always remain visible. STRIP_CODE_COMMENTS = NO @@ -678,7 +810,8 @@ REFERENCES_RELATION = NO # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# link to the source code. +# Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES @@ -742,7 +875,14 @@ HTML_FILE_EXTENSION = .html # The HTML_HEADER tag can be used to specify a personal HTML header for # each generated HTML page. If it is left blank doxygen will generate a -# standard header. +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is advised to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when +# changing the value of configuration settings such as GENERATE_TREEVIEW! HTML_HEADER = @@ -757,22 +897,66 @@ HTML_FOOTER = # fine-tune the look of the HTML output. If the tag is left blank doxygen # will generate a default style sheet. Note that doxygen will try to copy # the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! +# style sheet in the HTML output directory as well, or it will be erased! HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. -HTML_ALIGN_MEMBERS = YES +HTML_EXTRA_FILES = -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the style sheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. -GENERATE_HTMLHELP = NO +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. + +HTML_DYNAMIC_SECTIONS = YES + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of +# entries shown in the various tree structured indices initially; the user +# can expand and collapse entries dynamically later on. Doxygen will expand +# the tree to such a level that at most the specified number of entries are +# visible (unless a fully collapsed tree already exceeds this amount). +# So setting the number of entries 1 will produce a full collapsed tree by +# default. 0 is a special value representing an infinite number of entries +# and will result in a full expanded tree by default. + +HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files # will be generated that can be used as input for Apple's Xcode 3 @@ -782,6 +966,8 @@ GENERATE_HTMLHELP = NO # directory and running "make install" will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find # it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. GENERATE_DOCSET = NO @@ -799,13 +985,22 @@ DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. -HTML_DYNAMIC_SECTIONS = NO +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You @@ -844,40 +1039,114 @@ BINARY_TOC = NO TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. -DISABLE_INDEX = NO +GENERATE_QHP = NO -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. -ENUM_VALUES_PER_LINE = 1 +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) +# at top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. Since the tabs have the same information as the +# navigation tree you can set this option to NO if you already set +# GENERATE_TREEVIEW to YES. + +DISABLE_INDEX = NO # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated +# If the tag value is set to YES, a side panel will be generated # containing a tree-like index structure (just like the one that # is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hiererachy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. +# Since the tree basically has the same information as the tab index you +# could consider to set DISABLE_INDEX to NO when enabling this option. GENERATE_TREEVIEW = YES +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 1 + # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + # Use this tag to change the font size of Latex formulas included # as images in the HTML documentation. The default is 10. Note that # when you change the font size after a successful doxygen run you need @@ -886,6 +1155,60 @@ TREEVIEW_WIDTH = 250 FORMULA_FONTSIZE = 10 +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you may also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to +# the MathJax Content Delivery Network so you can quickly see the result without +# installing MathJax. +# However, it is strongly recommended to install a local +# copy of MathJax from http://www.mathjax.org before deployment. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension +# names that should be enabled during MathJax rendering. + +MATHJAX_EXTENSIONS = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -903,6 +1226,9 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex @@ -919,7 +1245,7 @@ MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO # The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# by the printer. Possible values are: a4, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide @@ -936,6 +1262,13 @@ EXTRA_PACKAGES = LATEX_HEADER = +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will # contain links (just like the HTML output) instead of page references @@ -962,6 +1295,19 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See +# http://en.wikipedia.org/wiki/BibTeX for more info. + +LATEX_BIB_STYLE = plain + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -993,7 +1339,7 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's +# Load style sheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. @@ -1098,8 +1444,10 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this # tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. @@ -1136,7 +1484,7 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. +# pointed to by INCLUDE_PATH will be searched when a #include is found. SEARCH_INCLUDES = YES @@ -1161,20 +1509,20 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = LEAK_DETECTIVE +PREDEFINED = LEAK_DETECTIVE __attribute__(x)= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. # The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. +# Use the PREDEFINED tag if you want to use a different macro definition that +# overrules the definition found in the source code. EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. SKIP_FUNCTION_MACROS = YES @@ -1182,20 +1530,18 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... +# The TAGFILES option can be used to specify one or more tagfiles. For each +# tag file the location of the external documentation should be added. The +# format of a tag file without this location is as follows: +# +# TAGFILES = file1 file2 ... # Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths +# or URLs. Note that each tag file must have a unique name (where the name does +# NOT include the path). If a tag file is not located in the directory in which +# doxygen is run, you must also specify the path to the tagfile here. TAGFILES = @@ -1228,9 +1574,8 @@ PERL_PATH = /usr/bin/perl # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base # or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. CLASS_DIAGRAMS = YES @@ -1256,28 +1601,38 @@ HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will use the Helvetica font for all dot files that +# doxygen generates. When you want a differently looking font you can specify +# the font name using DOT_FONTNAME. You need to make sure dot is able to find +# the font, which can be done by putting it in a standard location or by setting +# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. DOT_FONTNAME = FreeSans -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the Helvetica font. +# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to +# set the path where dot can find it. DOT_FONTPATH = # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and # indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. +# CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES @@ -1299,6 +1654,15 @@ GROUP_GRAPHS = YES UML_LOOK = NO +# If the UML_LOOK tag is enabled, the fields and methods are shown inside +# the class node. If there are many fields or methods and many nodes the +# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS +# threshold limits the number of items for each type to make the size more +# managable. Set this to 0 for no limit. Note that the threshold may be +# exceeded by 50% before the limit is enforced. + +UML_LIMIT_NUM_FIELDS = 10 + # If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. @@ -1335,11 +1699,11 @@ CALL_GRAPH = NO CALLER_GRAPH = NO # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. +# will generate a graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES # then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. @@ -1347,11 +1711,22 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. If you choose svg you need to set +# HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible in IE 9+ (other browsers do not have this requirement). DOT_IMAGE_FORMAT = png +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# Note that this requires a modern browser other than Internet Explorer. +# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you +# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible. Older versions of IE do not have SVG support. + +INTERACTIVE_SVG = NO + # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. @@ -1363,6 +1738,12 @@ DOT_PATH = DOTFILE_DIRS = +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of # nodes that will be shown in the graph. If the number of nodes in a graph # becomes larger than this value, doxygen will truncate the graph, which is @@ -1384,10 +1765,10 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is enabled by default, which results in a transparent -# background. Warning: Depending on the platform used, enabling this option -# may lead to badly anti-aliased labels on the edges of a graph (i.e. they -# become hard to read). +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO @@ -1409,12 +1790,3 @@ GENERATE_LEGEND = YES # the various graphs. DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/Makefile.in b/Makefile.in index 2b952cc52..a457a4519 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,8 +57,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure \ $(top_srcdir)/src/dumm/ext/extconf.rb.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing ylwrap + ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \ $(top_srcdir)/m4/config/ltoptions.m4 \ @@ -69,6 +86,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -159,6 +181,8 @@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -175,6 +199,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GPERF = @GPERF@ +GPRBUILD = @GPRBUILD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -243,8 +268,6 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ attest_plugins = @attest_plugins@ -axis2c_CFLAGS = @axis2c_CFLAGS@ -axis2c_LIBS = @axis2c_LIBS@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -300,7 +323,6 @@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ -p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ @@ -408,8 +430,11 @@ distclean-libtool: -rm -f libtool config.lt install-nodist_config_includeHEADERS: $(nodist_config_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(config_includedir)" || $(MKDIR_P) "$(DESTDIR)$(config_includedir)" @list='$(nodist_config_include_HEADERS)'; test -n "$(config_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(config_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(config_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -594,13 +619,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -686,7 +708,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/NEWS b/NEWS index 95f7e1c60..b95698d91 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,56 @@ +strongswan-5.0.3 +---------------- + +- The new ipseckey plugin enables authentication based on trustworthy public + keys stored as IPSECKEY resource records in the DNS and protected by DNSSEC. + To do so it uses a DNSSEC enabled resolver, like the one provided by the new + unbound plugin, which is based on libldns and libunbound. Both plugins were + created by Reto Guadagnini. + +- Implemented the TCG TNC IF-IMV 1.4 draft making access requestor identities + available to an IMV. The OS IMV stores the AR identity together with the + device ID in the attest database. + +- The openssl plugin now uses the AES-NI accelerated version of AES-GCM + if the hardware supports it. + +- The eap-radius plugin can now assign virtual IPs to IKE clients using the + Framed-IP-Address attribute by using the "%radius" named pool in the + rightsourceip ipsec.conf option. Cisco Banner attributes are forwarded to + Unity-capable IKEv1 clients during mode config. charon now sends Interim + Accounting updates if requested by the RADIUS server, reports + sent/received packets in Accounting messages, and adds a Terminate-Cause + to Accounting-Stops. + +- The recently introduced "ipsec listcounters" command can report connection + specific counters by passing a connection name, and global or connection + counters can be reset by the "ipsec resetcounters" command. + +- The strongSwan libpttls library provides an experimental implementation of + PT-TLS (RFC 6876), a Posture Transport Protocol over TLS. + +- The charon systime-fix plugin can disable certificate lifetime checks on + embedded systems if the system time is obviously out of sync after bootup. + Certificates lifetimes get checked once the system time gets sane, closing + or reauthenticating connections using expired certificates. + +- The "ikedscp" ipsec.conf option can set DiffServ code points on outgoing + IKE packets. + +- The new xauth-noauth plugin allows to use basic RSA or PSK authentication with + clients that cannot be configured without XAuth authentication. The plugin + simply concludes the XAuth exchange successfully without actually performing + any authentication. Therefore, to use this backend it has to be selected + explicitly with rightauth2=xauth-noauth. + +- The new charon-tkm IKEv2 daemon delegates security critical operations to a + separate process. This has the benefit that the network facing daemon has no + knowledge of keying material used to protect child SAs. Thus subverting + charon-tkm does not result in the compromise of cryptographic keys. + The extracted functionality has been implemented from scratch in a minimal TCB + (trusted computing base) in the Ada programming language. Further information + can be found at http://www.codelabs.ch/tkm/. + strongswan-5.0.2 ---------------- @@ -49,6 +102,7 @@ strongswan-5.0.2 - The integration test environment was updated and now uses KVM and reproducible guest images based on Debian. + strongswan-5.0.1 ---------------- @@ -122,6 +176,7 @@ strongswan-5.0.1 - All crypto primitives gained return values for most operations, allowing crypto backends to fail, for example when using hardware accelerators. + strongswan-5.0.0 ---------------- @@ -425,7 +480,7 @@ strongswan-4.5.1 ./configure switch. - The new libstrongswan constraints plugin provides advanced X.509 constraint - checking. In additon to X.509 pathLen constraints, the plugin checks for + checking. In addition to X.509 pathLen constraints, the plugin checks for nameConstraints and certificatePolicies, including policyMappings and policyConstraints. The x509 certificate plugin and the pki tool have been enhanced to support these extensions. The new left/rightcertpolicy ipsec.conf diff --git a/aclocal.m4 b/aclocal.m4 index b27ee7bab..b2938b090 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -423,7 +423,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -439,7 +439,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1037,6 +1037,41 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 6 + +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 diff --git a/compile b/compile new file mode 100755 index 000000000..862a14e8c --- /dev/null +++ b/compile @@ -0,0 +1,343 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-03-05.13; # UTC + +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program 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 2, or (at your option) +# any later version. +# +# This program 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 . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.h.in b/config.h.in index 3965ed25c..a761227f3 100644 --- a/config.h.in +++ b/config.h.in @@ -76,6 +76,9 @@ /* Define to 1 if you have the `getpwnam_r' function. */ #undef HAVE_GETPWNAM_R +/* Define to 1 if you have the `getpwuid_r' function. */ +#undef HAVE_GETPWUID_R + /* have gettid() */ #undef HAVE_GETTID @@ -225,6 +228,9 @@ /* monolithic build embedding plugins */ #undef MONOLITHIC +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff --git a/config.sub b/config.sub index c894da455..6205f8423 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -1537,6 +1543,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff --git a/configure b/configure index 7424477b3..178f9c9ca 100755 --- a/configure +++ b/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for strongSwan 5.0.2. +# Generated by GNU Autoconf 2.69 for strongSwan 5.0.3. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -220,21 +244,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -336,6 +364,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -512,28 +552,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -567,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='strongSwan' PACKAGE_TARNAME='strongswan' -PACKAGE_VERSION='5.0.2' -PACKAGE_STRING='strongSwan 5.0.2' +PACKAGE_VERSION='5.0.3' +PACKAGE_STRING='strongSwan 5.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -612,6 +632,10 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +USE_TKM_FALSE +USE_TKM_TRUE +UNITTESTS_FALSE +UNITTESTS_TRUE MONOLITHIC_FALSE MONOLITHIC_TRUE USE_TROUSERS_FALSE @@ -634,6 +658,8 @@ USE_IPSEC_SCRIPT_FALSE USE_IPSEC_SCRIPT_TRUE USE_FILE_CONFIG_FALSE USE_FILE_CONFIG_TRUE +USE_LIBPTTLS_FALSE +USE_LIBPTTLS_TRUE USE_LIBTNCCS_FALSE USE_LIBTNCCS_TRUE USE_LIBTNCIF_FALSE @@ -736,6 +762,8 @@ USE_TNC_PDP_FALSE USE_TNC_PDP_TRUE USE_TNC_IFMAP_FALSE USE_TNC_IFMAP_TRUE +USE_XAUTH_NOAUTH_FALSE +USE_XAUTH_NOAUTH_TRUE USE_XAUTH_PAM_FALSE USE_XAUTH_PAM_TRUE USE_XAUTH_EAP_FALSE @@ -786,6 +814,8 @@ USE_DUPLICHECK_FALSE USE_DUPLICHECK_TRUE USE_LED_FALSE USE_LED_TRUE +USE_SYSTIME_FIX_FALSE +USE_SYSTIME_FIX_TRUE USE_CERTEXPIRE_FALSE USE_CERTEXPIRE_TRUE USE_ERROR_NOTIFY_FALSE @@ -804,6 +834,8 @@ USE_DHCP_FALSE USE_DHCP_TRUE USE_UPDOWN_FALSE USE_UPDOWN_TRUE +USE_IPSECKEY_FALSE +USE_IPSECKEY_TRUE USE_SQL_FALSE USE_SQL_TRUE USE_SMP_FALSE @@ -812,8 +844,8 @@ USE_MAEMO_FALSE USE_MAEMO_TRUE USE_ANDROID_LOG_FALSE USE_ANDROID_LOG_TRUE -USE_ANDROID_FALSE -USE_ANDROID_TRUE +USE_ANDROID_DNS_FALSE +USE_ANDROID_DNS_TRUE USE_UCI_FALSE USE_UCI_TRUE USE_MEDCLI_FALSE @@ -898,13 +930,14 @@ USE_LDAP_FALSE USE_LDAP_TRUE USE_SOUP_FALSE USE_SOUP_TRUE +USE_UNBOUND_FALSE +USE_UNBOUND_TRUE USE_CURL_FALSE USE_CURL_TRUE USE_TEST_VECTORS_FALSE USE_TEST_VECTORS_TRUE s_plugins h_plugins -p_plugins c_plugins nm_plugins medsrv_plugins @@ -917,6 +950,9 @@ attest_plugins pool_plugins starter_plugins charon_plugins +CHECK_LIBS +CHECK_CFLAGS +GPRBUILD dev_headers USE_DEV_HEADERS_FALSE USE_DEV_HEADERS_TRUE @@ -937,8 +973,6 @@ RUBYINCLUDE RUBY gtk_LIBS gtk_CFLAGS -axis2c_LIBS -axis2c_CFLAGS xml_LIBS xml_CFLAGS soup_LIBS @@ -1116,6 +1150,7 @@ with_group with_charon_udp_port with_charon_natt_port enable_curl +enable_unbound enable_soup enable_ldap enable_aes @@ -1139,6 +1174,7 @@ enable_pkcs7 enable_pkcs8 enable_pgp enable_dnskey +enable_ipseckey enable_pem enable_hmac enable_cmac @@ -1177,6 +1213,7 @@ enable_eap_radius enable_xauth_generic enable_xauth_eap enable_xauth_pam +enable_xauth_noauth enable_tnc_ifmap enable_tnc_pdp enable_tnc_imc @@ -1228,7 +1265,7 @@ enable_gcm enable_addrblock enable_unity enable_uci -enable_android +enable_android_dns enable_android_log enable_maemo enable_nm @@ -1237,6 +1274,7 @@ enable_whitelist enable_lookip enable_error_notify enable_certexpire +enable_systime_fix enable_led enable_duplicheck enable_coupling @@ -1244,6 +1282,9 @@ enable_radattr enable_vstr enable_monolithic enable_bfd_backtraces +enable_unit_tests +enable_tkm +enable_defaults enable_dependency_tracking with_lib_prefix enable_shared @@ -1272,8 +1313,6 @@ soup_CFLAGS soup_LIBS xml_CFLAGS xml_LIBS -axis2c_CFLAGS -axis2c_LIBS gtk_CFLAGS gtk_LIBS maemo_CFLAGS @@ -1281,7 +1320,9 @@ maemo_LIBS pcsclite_CFLAGS pcsclite_LIBS nm_CFLAGS -nm_LIBS' +nm_LIBS +CHECK_CFLAGS +CHECK_LIBS' # Initialize some variables set by options. @@ -1737,8 +1778,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1824,7 +1863,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures strongSwan 5.0.2 to adapt to many kinds of systems. +\`configure' configures strongSwan 5.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1894,7 +1933,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of strongSwan 5.0.2:";; + short | recursive ) echo "Configuration of strongSwan 5.0.3:";; esac cat <<\_ACEOF @@ -1904,6 +1943,9 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-curl enable CURL fetcher plugin to fetch files via libcurl. Requires libcurl. + --enable-unbound enable UNBOUND resolver plugin to perform DNS + queries via libunbound. Requires libldns and + libunbound. --enable-soup enable soup fetcher plugin to fetch from HTTP via libsoup. Requires libsoup. --enable-ldap enable LDAP fetching plugin to fetch files via @@ -1931,6 +1973,7 @@ Optional Features: --disable-pkcs8 disable PKCS8 private key decoding plugin. --disable-pgp disable PGP key decoding plugin. --disable-dnskey disable DNS RR key decoding plugin. + --enable-ipseckey enable IPSECKEY authentication plugin. --disable-pem disable PEM decoding plugin. --disable-hmac disable HMAC crypto implementation plugin. --disable-cmac disable CMAC crypto implementation plugin. @@ -1980,11 +2023,13 @@ Optional Features: --enable-xauth-eap enable XAuth backend using EAP methods to verify passwords. --enable-xauth-pam enable XAuth backend using PAM to verify passwords. - --enable-tnc-ifmap enable TNC IF-MAP module. + --enable-xauth-noauth enable XAuth pseudo-backend that does not actually + verify or even request any credentials. + --enable-tnc-ifmap enable TNC IF-MAP module. Requires libxml --enable-tnc-pdp enable TNC policy decision point module. --enable-tnc-imc enable TNC IMC module. --enable-tnc-imv enable TNC IMV module. - --enable-tnccs-11 enable TNCCS 1.1 protocol module. + --enable-tnccs-11 enable TNCCS 1.1 protocol module. Requires libxml --enable-tnccs-20 enable TNCCS 2.0 protocol module. --enable-tnccs-dynamic enable dynamic TNCCS protocol discovery module. --enable-imc-test enable IMC test module. @@ -2042,7 +2087,7 @@ Optional Features: --enable-addrblock enables RFC 3779 address block constraint support. --enable-unity enables Cisco Unity extension plugin. --enable-uci enable OpenWRT UCI configuration plugin. - --enable-android enable Android specific plugin. + --enable-android-dns enable Android specific DNS handler. --enable-android-log enable Android specific logger plugin. --enable-maemo enable Maemo specific plugin. --enable-nm enable NetworkManager backend. @@ -2053,6 +2098,8 @@ Optional Features: --enable-error-notify enable error notification plugin. --enable-certexpire enable CSV export of expiration dates of used certificates. + --enable-systime-fix enable plugin to handle cert lifetimes with invalid + system time gracefully. --enable-led enable plugin to control LEDs on IKEv2 activity using the Linux kernel LED subsystem. --enable-duplicheck advanced duplicate checking plugin using liveness @@ -2068,6 +2115,10 @@ Optional Features: of charon are assembled in libcharon. --enable-bfd-backtraces use binutils libbfd to resolve backtraces for memory leaks and segfaults. + --enable-unit-tests enable unit tests using the check test framework. + --enable-tkm enable Trusted Key Manager support. + --disable-defaults disable all default plugins (they can be enabled + with their respective --enable options) --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] @@ -2168,9 +2219,6 @@ Some influential environment variables: soup_LIBS linker flags for soup, overriding pkg-config xml_CFLAGS C compiler flags for xml, overriding pkg-config xml_LIBS linker flags for xml, overriding pkg-config - axis2c_CFLAGS - C compiler flags for axis2c, overriding pkg-config - axis2c_LIBS linker flags for axis2c, overriding pkg-config gtk_CFLAGS C compiler flags for gtk, overriding pkg-config gtk_LIBS linker flags for gtk, overriding pkg-config maemo_CFLAGS @@ -2182,6 +2230,9 @@ Some influential environment variables: linker flags for pcsclite, overriding pkg-config nm_CFLAGS C compiler flags for nm, overriding pkg-config nm_LIBS linker flags for nm, overriding pkg-config + CHECK_CFLAGS + C compiler flags for CHECK, overriding pkg-config + CHECK_LIBS linker flags for CHECK, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2249,10 +2300,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -strongSwan configure 5.0.2 -generated by GNU Autoconf 2.68 +strongSwan configure 5.0.3 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2438,7 +2489,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2771,8 +2822,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by strongSwan $as_me 5.0.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by strongSwan $as_me 5.0.3, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3187,7 +3238,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3356,7 +3407,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3396,7 +3447,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3447,7 +3498,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3500,7 +3551,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3586,7 +3637,7 @@ fi # Define the identity of the package. PACKAGE='strongswan' - VERSION='5.0.2' + VERSION='5.0.3' cat >>confdefs.h <<_ACEOF @@ -3740,7 +3791,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3783,7 +3834,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3834,6 +3885,9 @@ $as_echo "no" >&6; } fi fi +# ================================= +# check --enable-xxx & --with-xxx +# ================================= # ARG_WITH_SUBST(option, default, help) @@ -4170,6 +4224,7 @@ ipsec_script_upper=`echo -n "$ipsec_script" | tr a-z A-Z` # ARG_DISBL_SET(option, help) # --------------------------- # Create a --disable-$1 option with helptext, set a variable $1 to true/false +# All $1 are collected in the variable $enabled_by_default @@ -4188,6 +4243,21 @@ else fi +# Check whether --enable-unbound was given. +if test "${enable_unbound+set}" = set; then : + enableval=$enable_unbound; unbound_given=true + if test x$enableval = xyes; then + unbound=true + else + unbound=false + fi +else + unbound=false + unbound_given=false + +fi + + # Check whether --enable-soup was given. if test "${enable_soup+set}" = set; then : enableval=$enable_soup; soup_given=true @@ -4232,6 +4302,7 @@ else fi + enabled_by_default=${enabled_by_default}" aes" # Check whether --enable-des was given. if test "${enable_des+set}" = set; then : @@ -4247,6 +4318,7 @@ else fi + enabled_by_default=${enabled_by_default}" des" # Check whether --enable-blowfish was given. if test "${enable_blowfish+set}" = set; then : @@ -4292,6 +4364,7 @@ else fi + enabled_by_default=${enabled_by_default}" md5" # Check whether --enable-sha1 was given. if test "${enable_sha1+set}" = set; then : @@ -4307,6 +4380,7 @@ else fi + enabled_by_default=${enabled_by_default}" sha1" # Check whether --enable-sha2 was given. if test "${enable_sha2+set}" = set; then : @@ -4322,6 +4396,7 @@ else fi + enabled_by_default=${enabled_by_default}" sha2" # Check whether --enable-fips-prf was given. if test "${enable_fips_prf+set}" = set; then : @@ -4337,6 +4412,7 @@ else fi + enabled_by_default=${enabled_by_default}" fips_prf" # Check whether --enable-gmp was given. if test "${enable_gmp+set}" = set; then : @@ -4352,6 +4428,7 @@ else fi + enabled_by_default=${enabled_by_default}" gmp" # Check whether --enable-rdrand was given. if test "${enable_rdrand+set}" = set; then : @@ -4382,6 +4459,7 @@ else fi + enabled_by_default=${enabled_by_default}" random" # Check whether --enable-nonce was given. if test "${enable_nonce+set}" = set; then : @@ -4397,6 +4475,7 @@ else fi + enabled_by_default=${enabled_by_default}" nonce" # Check whether --enable-x509 was given. if test "${enable_x509+set}" = set; then : @@ -4412,6 +4491,7 @@ else fi + enabled_by_default=${enabled_by_default}" x509" # Check whether --enable-revocation was given. if test "${enable_revocation+set}" = set; then : @@ -4427,6 +4507,7 @@ else fi + enabled_by_default=${enabled_by_default}" revocation" # Check whether --enable-constraints was given. if test "${enable_constraints+set}" = set; then : @@ -4442,6 +4523,7 @@ else fi + enabled_by_default=${enabled_by_default}" constraints" # Check whether --enable-pubkey was given. if test "${enable_pubkey+set}" = set; then : @@ -4457,6 +4539,7 @@ else fi + enabled_by_default=${enabled_by_default}" pubkey" # Check whether --enable-pkcs1 was given. if test "${enable_pkcs1+set}" = set; then : @@ -4472,6 +4555,7 @@ else fi + enabled_by_default=${enabled_by_default}" pkcs1" # Check whether --enable-pkcs7 was given. if test "${enable_pkcs7+set}" = set; then : @@ -4487,6 +4571,7 @@ else fi + enabled_by_default=${enabled_by_default}" pkcs7" # Check whether --enable-pkcs8 was given. if test "${enable_pkcs8+set}" = set; then : @@ -4502,6 +4587,7 @@ else fi + enabled_by_default=${enabled_by_default}" pkcs8" # Check whether --enable-pgp was given. if test "${enable_pgp+set}" = set; then : @@ -4517,6 +4603,7 @@ else fi + enabled_by_default=${enabled_by_default}" pgp" # Check whether --enable-dnskey was given. if test "${enable_dnskey+set}" = set; then : @@ -4530,6 +4617,22 @@ else dnskey=true dnskey_given=false +fi + + enabled_by_default=${enabled_by_default}" dnskey" + +# Check whether --enable-ipseckey was given. +if test "${enable_ipseckey+set}" = set; then : + enableval=$enable_ipseckey; ipseckey_given=true + if test x$enableval = xyes; then + ipseckey=true + else + ipseckey=false + fi +else + ipseckey=false + ipseckey_given=false + fi @@ -4547,6 +4650,7 @@ else fi + enabled_by_default=${enabled_by_default}" pem" # Check whether --enable-hmac was given. if test "${enable_hmac+set}" = set; then : @@ -4562,6 +4666,7 @@ else fi + enabled_by_default=${enabled_by_default}" hmac" # Check whether --enable-cmac was given. if test "${enable_cmac+set}" = set; then : @@ -4577,6 +4682,7 @@ else fi + enabled_by_default=${enabled_by_default}" cmac" # Check whether --enable-xcbc was given. if test "${enable_xcbc+set}" = set; then : @@ -4592,6 +4698,7 @@ else fi + enabled_by_default=${enabled_by_default}" xcbc" # Check whether --enable-af-alg was given. if test "${enable_af_alg+set}" = set; then : @@ -4667,6 +4774,7 @@ else fi + enabled_by_default=${enabled_by_default}" stroke" # Check whether --enable-medsrv was given. if test "${enable_medsrv+set}" = set; then : @@ -5072,6 +5180,7 @@ else fi + enabled_by_default=${enabled_by_default}" xauth_generic" # Check whether --enable-xauth-eap was given. if test "${enable_xauth_eap+set}" = set; then : @@ -5103,6 +5212,21 @@ else fi +# Check whether --enable-xauth-noauth was given. +if test "${enable_xauth_noauth+set}" = set; then : + enableval=$enable_xauth_noauth; xauth_noauth_given=true + if test x$enableval = xyes; then + xauth_noauth=true + else + xauth_noauth=false + fi +else + xauth_noauth=false + xauth_noauth_given=false + +fi + + # Check whether --enable-tnc-ifmap was given. if test "${enable_tnc_ifmap+set}" = set; then : enableval=$enable_tnc_ifmap; tnc_ifmap_given=true @@ -5342,6 +5466,7 @@ else fi + enabled_by_default=${enabled_by_default}" kernel_netlink" # Check whether --enable-kernel-pfkey was given. if test "${enable_kernel_pfkey+set}" = set; then : @@ -5417,6 +5542,7 @@ else fi + enabled_by_default=${enabled_by_default}" socket_default" # Check whether --enable-socket-dynamic was given. if test "${enable_socket_dynamic+set}" = set; then : @@ -5537,6 +5663,7 @@ else fi + enabled_by_default=${enabled_by_default}" load_warning" # Check whether --enable-ikev1 was given. if test "${enable_ikev1+set}" = set; then : @@ -5552,6 +5679,7 @@ else fi + enabled_by_default=${enabled_by_default}" ikev1" # Check whether --enable-ikev2 was given. if test "${enable_ikev2+set}" = set; then : @@ -5567,6 +5695,7 @@ else fi + enabled_by_default=${enabled_by_default}" ikev2" # Check whether --enable-charon was given. if test "${enable_charon+set}" = set; then : @@ -5582,6 +5711,7 @@ else fi + enabled_by_default=${enabled_by_default}" charon" # Check whether --enable-tools was given. if test "${enable_tools+set}" = set; then : @@ -5597,6 +5727,7 @@ else fi + enabled_by_default=${enabled_by_default}" tools" # Check whether --enable-scripts was given. if test "${enable_scripts+set}" = set; then : @@ -5612,6 +5743,7 @@ else fi + enabled_by_default=${enabled_by_default}" scripts" # Check whether --enable-conftest was given. if test "${enable_conftest+set}" = set; then : @@ -5642,6 +5774,7 @@ else fi + enabled_by_default=${enabled_by_default}" updown" # Check whether --enable-attr was given. if test "${enable_attr+set}" = set; then : @@ -5657,6 +5790,7 @@ else fi + enabled_by_default=${enabled_by_default}" attr" # Check whether --enable-attr-sql was given. if test "${enable_attr_sql+set}" = set; then : @@ -5702,6 +5836,7 @@ else fi + enabled_by_default=${enabled_by_default}" resolve" # Check whether --enable-padlock was given. if test "${enable_padlock+set}" = set; then : @@ -5868,17 +6003,17 @@ else fi -# Check whether --enable-android was given. -if test "${enable_android+set}" = set; then : - enableval=$enable_android; android_given=true +# Check whether --enable-android-dns was given. +if test "${enable_android_dns+set}" = set; then : + enableval=$enable_android_dns; android_dns_given=true if test x$enableval = xyes; then - android=true + android_dns=true else - android=false + android_dns=false fi else - android=false - android_given=false + android_dns=false + android_dns_given=false fi @@ -6003,6 +6138,21 @@ else fi +# Check whether --enable-systime-fix was given. +if test "${enable_systime_fix+set}" = set; then : + enableval=$enable_systime_fix; systime_fix_given=true + if test x$enableval = xyes; then + systime_fix=true + else + systime_fix=false + fi +else + systime_fix=false + systime_fix_given=false + +fi + + # Check whether --enable-led was given. if test "${enable_led+set}" = set; then : enableval=$enable_led; led_given=true @@ -6108,7 +6258,68 @@ else fi +# Check whether --enable-unit-tests was given. +if test "${enable_unit_tests+set}" = set; then : + enableval=$enable_unit_tests; unit_tests_given=true + if test x$enableval = xyes; then + unit_tests=true + else + unit_tests=false + fi +else + unit_tests=false + unit_tests_given=false + +fi + + +# Check whether --enable-tkm was given. +if test "${enable_tkm+set}" = set; then : + enableval=$enable_tkm; tkm_given=true + if test x$enableval = xyes; then + tkm=true + else + tkm=false + fi +else + tkm=false + tkm_given=false + +fi + + +# =================================== +# option to disable default options +# =================================== + +# Check whether --enable-defaults was given. +if test "${enable_defaults+set}" = set; then : + enableval=$enable_defaults; defaults_given=true + if test x$enableval = xyes; then + defaults=true + else + defaults=false + fi +else + defaults=true + defaults_given=false + +fi + + enabled_by_default=${enabled_by_default}" defaults" + + +if test x$defaults = xfalse; then + for option in $enabled_by_default; do + eval test x\${${option}_given} = xtrue && continue + let $option=false + done +fi + +# =========================== +# set up compiler and flags +# =========================== if test -z "$CFLAGS"; then CFLAGS="-g -O2 -Wall -Wno-format -Wno-pointer-sign" @@ -6135,7 +6346,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6175,7 +6386,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6228,7 +6439,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6269,7 +6480,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -6327,7 +6538,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6371,7 +6582,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6817,8 +7028,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -7094,6 +7304,133 @@ else fi +if test "x$CC" != xcc; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } +fi +set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +rm -f conftest2.* +if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi +else + eval ac_cv_prog_cc_${ac_cc}_c_o=no +fi +rm -f core conftest* + +fi +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h + +fi + +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi + + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -7320,7 +7657,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -7386,7 +7723,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -7981,7 +8318,9 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac - +# ========================= +# check required programs +# ========================= case `pwd` in *\ * | *\ *) @@ -8099,7 +8438,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -8178,7 +8517,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -8434,7 +8773,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8478,7 +8817,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8902,7 +9241,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8942,7 +9281,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9248,7 +9587,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9288,7 +9627,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9391,7 +9730,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9435,7 +9774,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9560,7 +9899,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9600,7 +9939,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9659,7 +9998,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9699,7 +10038,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10348,7 +10687,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10388,7 +10727,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10468,7 +10807,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10508,7 +10847,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10560,7 +10899,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10600,7 +10939,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10652,7 +10991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10692,7 +11031,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10744,7 +11083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10784,7 +11123,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10836,7 +11175,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10876,7 +11215,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15112,6 +15451,7 @@ CC="$lt_save_CC" # Only expand once: + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } if ${ac_cv_path_EGREP+:} false; then : @@ -15131,7 +15471,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -15197,7 +15537,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15239,7 +15579,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15271,7 +15611,8 @@ a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } -e { yyless (input () != 0); } +e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ + yyless ((input () != 0)); } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -15397,7 +15738,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15441,7 +15782,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15482,7 +15823,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15505,6 +15846,7 @@ fi +# because gperf is not needed by end-users we just report it but do not abort on failure { $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version >= 3.0.0" >&5 $as_echo_n "checking gperf version >= 3.0.0... " >&6; } if test -x "$GPERF"; then @@ -15520,6 +15862,9 @@ else $as_echo "not found" >&6; } fi +# ======================== +# dependency calculation +# ======================== if test x$xauth_generic_given = xfalse -a x$ikev1 = xfalse; then xauth_generic=false; @@ -15565,14 +15910,10 @@ if test x$fips_prf = xtrue; then fi fi -if test x$smp = xtrue -o x$tnccs_11 = xtrue; then +if test x$smp = xtrue -o x$tnccs_11 = xtrue -o x$tnc_ifmap = xtrue; then xml=true fi -if test x$tnc_ifmap = xtrue; then - axis2c=true -fi - if test x$manager = xtrue; then fast=true fi @@ -15586,6 +15927,9 @@ if test x$medcli = xtrue; then mediation=true fi +# =========================================== +# check required libraries and header files +# =========================================== { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } @@ -15595,60 +15939,60 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -15663,7 +16007,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF @@ -15673,6 +16017,7 @@ _ACEOF fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -15841,23 +16186,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -15972,8 +16314,11 @@ $as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h fi +# libraries needed on some platforms but not on others +# ------------------------------------------------------ saved_LIBS=$LIBS +# FreeBSD and Mac OS X have dlopen integrated in libc, Linux needs libdl LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 $as_echo_n "checking for library containing dlopen... " >&6; } @@ -16033,6 +16378,7 @@ fi +# glibc's backtrace() can be replicated on FreeBSD with libexecinfo LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 $as_echo_n "checking for library containing backtrace... " >&6; } @@ -16103,6 +16449,7 @@ done +# OpenSolaris needs libsocket and libnsl for socket() LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 $as_echo_n "checking for library containing socket... " >&6; } @@ -16204,6 +16551,7 @@ fi +# FreeBSD has clock_gettime in libc, Linux needs librt LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 $as_echo_n "checking for library containing clock_gettime... " >&6; } @@ -16274,6 +16622,7 @@ done +# Android has pthread_* functions in bionic (libc), others need libpthread LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 $as_echo_n "checking for library containing pthread_create... " >&6; } @@ -16334,18 +16683,19 @@ fi LIBS=$saved_LIBS +# ------------------------------------------------------ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr" >&5 $as_echo_n "checking for dladdr... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GNU_SOURCE - #include + #include int main () { Dl_info* info = 0; - dladdr(0, info); + dladdr(0, info); ; return 0; } @@ -16362,12 +16712,14 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported saved_LIBS=$LIBS LIBS=$PTHREADLIB { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_condattr_setclock(CLOCK_MONOTONE)" >&5 $as_echo_n "checking for pthread_condattr_setclock(CLOCK_MONOTONE)... " >&6; } if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 + # Check existence of pthread_condattr_setclock if cross-compiling + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 $as_echo "unknown" >&6; }; for ac_func in pthread_condattr_setclock do : @@ -16388,9 +16740,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - int main() { pthread_condattr_t attr; - pthread_condattr_init(&attr); - return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);} + int main() { pthread_condattr_t attr; + pthread_condattr_init(&attr); + return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);} _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -16406,6 +16758,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi +# check if we actually are able to configure attributes on cond vars for ac_func in pthread_condattr_init do : ac_fn_c_check_func "$LINENO" "pthread_condattr_init" "ac_cv_func_pthread_condattr_init" @@ -16417,6 +16770,7 @@ _ACEOF fi done +# instead of pthread_condattr_setclock Android has this function for ac_func in pthread_cond_timedwait_monotonic do : ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait_monotonic" "ac_cv_func_pthread_cond_timedwait_monotonic" @@ -16428,6 +16782,7 @@ _ACEOF fi done +# check if we can cancel threads for ac_func in pthread_cancel do : ac_fn_c_check_func "$LINENO" "pthread_cancel" "ac_cv_func_pthread_cancel" @@ -16439,6 +16794,7 @@ _ACEOF fi done +# check if native rwlocks are available for ac_func in pthread_rwlock_init do : ac_fn_c_check_func "$LINENO" "pthread_rwlock_init" "ac_cv_func_pthread_rwlock_init" @@ -16450,6 +16806,7 @@ _ACEOF fi done +# check if pthread spinlocks are available for ac_func in pthread_spin_init do : ac_fn_c_check_func "$LINENO" "pthread_spin_init" "ac_cv_func_pthread_spin_init" @@ -16461,6 +16818,7 @@ _ACEOF fi done +# check if we have POSIX semaphore functions, including timed-wait for ac_func in sem_timedwait do : ac_fn_c_check_func "$LINENO" "sem_timedwait" "ac_cv_func_sem_timedwait" @@ -16485,13 +16843,13 @@ $as_echo_n "checking for SYS_gettid... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GNU_SOURCE - #include - #include + #include + #include int main () { int main() { - return syscall(SYS_gettid);} + return syscall(SYS_gettid);} ; return 0; } @@ -16515,7 +16873,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -for ac_func in prctl mallinfo getpass closefrom getpwnam_r getgrnam_r +for ac_func in prctl mallinfo getpass closefrom getpwnam_r getgrnam_r getpwuid_r do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -16556,7 +16914,11 @@ done for ac_header in netinet/ip6.h do : - ac_fn_c_check_header_mongrel "$LINENO" "netinet/ip6.h" "ac_cv_header_netinet_ip6_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "netinet/ip6.h" "ac_cv_header_netinet_ip6_h" " + #include + #include + +" if test "x$ac_cv_header_netinet_ip6_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_NETINET_IP6_H 1 @@ -16607,13 +16969,13 @@ $as_echo_n "checking for in6addr_any... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #include - #include + #include + #include int main () { struct in6_addr in6; - in6 = in6addr_any; + in6 = in6addr_any; ; return 0; } @@ -16636,17 +16998,17 @@ $as_echo_n "checking for in6_pktinfo... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GNU_SOURCE - #include - #include - #include + #include + #include + #include int main () { struct in6_pktinfo pi; - if (pi.ipi6_ifindex) - { - return 0; - } + if (pi.ipi6_ifindex) + { + return 0; + } ; return 0; } @@ -16669,19 +17031,19 @@ $as_echo_n "checking for IPSEC_MODE_BEET... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifdef HAVE_NETIPSEC_IPSEC_H - #include - #elif defined(HAVE_NETINET6_IPSEC_H) - #include - #else - #include - #include - #endif + #ifdef HAVE_NETIPSEC_IPSEC_H + #include + #elif defined(HAVE_NETINET6_IPSEC_H) + #include + #else + #include + #include + #endif int main () { int mode = IPSEC_MODE_BEET; - return mode; + return mode; ; return 0; } @@ -16704,19 +17066,19 @@ $as_echo_n "checking for IPSEC_DIR_FWD... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifdef HAVE_NETIPSEC_IPSEC_H - #include - #elif defined(HAVE_NETINET6_IPSEC_H) - #include - #else - #include - #include - #endif + #ifdef HAVE_NETIPSEC_IPSEC_H + #include + #elif defined(HAVE_NETINET6_IPSEC_H) + #include + #else + #include + #include + #endif int main () { int dir = IPSEC_DIR_FWD; - return dir; + return dir; ; return 0; } @@ -16739,13 +17101,13 @@ $as_echo_n "checking for RTA_TABLE... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #include - #include + #include + #include int main () { int rta_type = RTA_TABLE; - return rta_type; + return rta_type; ; return 0; } @@ -16768,18 +17130,19 @@ $as_echo_n "checking for gcc atomic operations... " >&6; } if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - int main() { - volatile int ref = 1; - __sync_fetch_and_add (&ref, 1); - __sync_sub_and_fetch (&ref, 1); - /* Make sure test fails if operations are not supported */ - __sync_val_compare_and_swap(&ref, 1, 0); - return ref; - } + int main() { + volatile int ref = 1; + __sync_fetch_and_add (&ref, 1); + __sync_sub_and_fetch (&ref, 1); + /* Make sure test fails if operations are not supported */ + __sync_val_compare_and_swap(&ref, 1, 0); + return ref; + } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -16797,6 +17160,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi +# check for the new register_printf_specifier function with len argument, +# or the deprecated register_printf_function without ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier" if test "x$ac_cv_func_register_printf_specifier" = xyes; then : @@ -16857,7 +17222,6 @@ if test "x$ac_cv_lib_vstr_main" = xyes; then : else as_fn_error $? "Vstr string library not found" "$LINENO" 5 fi -ac_cv_lib_vstr=ac_cv_lib_vstr_main $as_echo "#define USE_VSTR /**/" >>confdefs.h @@ -16906,7 +17270,6 @@ _ACEOF else as_fn_error $? "GNU Multi Precision library gmp not found" "$LINENO" 5 fi -ac_cv_lib_gmp=ac_cv_lib_gmp_main { $as_echo "$as_me:${as_lineno-$LINENO}: checking mpz_powm_sec" >&5 $as_echo_n "checking mpz_powm_sec... " >&6; } @@ -16917,9 +17280,7 @@ $as_echo_n "checking mpz_powm_sec... " >&6; } int main () { - - void *x = mpz_powm_sec; - +void *x = mpz_powm_sec; ; return 0; } @@ -16950,10 +17311,9 @@ int main () { - #if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414 - #error bad gmp - #endif - + #if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414 + #error bad gmp + #endif ; return 0; } @@ -17005,7 +17365,6 @@ if test "x$ac_cv_lib_ldap_main" = xyes; then : else as_fn_error $? "LDAP library ldap not found" "$LINENO" 5 fi -ac_cv_lib_ldap=ac_cv_lib_ldap_main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -llber" >&5 $as_echo_n "checking for main in -llber... " >&6; } @@ -17042,7 +17401,6 @@ if test "x$ac_cv_lib_lber_main" = xyes; then : else as_fn_error $? "LDAP library lber not found" "$LINENO" 5 fi -ac_cv_lib_lber=ac_cv_lib_lber_main ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" if test "x$ac_cv_header_ldap_h" = xyes; then : @@ -17090,7 +17448,6 @@ if test "x$ac_cv_lib_curl_main" = xyes; then : else as_fn_error $? "CURL library curl not found" "$LINENO" 5 fi -ac_cv_lib_curl=ac_cv_lib_curl_main ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default" if test "x$ac_cv_header_curl_curl_h" = xyes; then : @@ -17100,6 +17457,99 @@ else fi +fi + +if test x$unbound = xtrue; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lldns" >&5 +$as_echo_n "checking for main in -lldns... " >&6; } +if ${ac_cv_lib_ldns_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lldns $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ldns_main=yes +else + ac_cv_lib_ldns_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldns_main" >&5 +$as_echo "$ac_cv_lib_ldns_main" >&6; } +if test "x$ac_cv_lib_ldns_main" = xyes; then : + LIBS="$LIBS" +else + as_fn_error $? "UNBOUND library ldns not found" "$LINENO" 5 +fi +ac_cv_lib_ldns=ac_cv_lib_ldns_main + + ac_fn_c_check_header_mongrel "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default" +if test "x$ac_cv_header_ldns_ldns_h" = xyes; then : + +else + as_fn_error $? "UNBOUND header ldns/ldns.h not found!" "$LINENO" 5 +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunbound" >&5 +$as_echo_n "checking for main in -lunbound... " >&6; } +if ${ac_cv_lib_unbound_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lunbound $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_unbound_main=yes +else + ac_cv_lib_unbound_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_main" >&5 +$as_echo "$ac_cv_lib_unbound_main" >&6; } +if test "x$ac_cv_lib_unbound_main" = xyes; then : + LIBS="$LIBS" +else + as_fn_error $? "UNBOUND library libunbound not found" "$LINENO" 5 +fi +ac_cv_lib_unbound=ac_cv_lib_unbound_main + + ac_fn_c_check_header_mongrel "$LINENO" "unbound.h" "ac_cv_header_unbound_h" "$ac_includes_default" +if test "x$ac_cv_header_unbound_h" = xyes; then : + +else + as_fn_error $? "UNBOUND header unbound.h not found!" "$LINENO" 5 +fi + + fi if test x$soup = xtrue; then @@ -17292,102 +17742,6 @@ $as_echo "yes" >&6; } fi -fi - -if test x$axis2c = xtrue; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for axis2c" >&5 -$as_echo_n "checking for axis2c... " >&6; } - -if test -n "$axis2c_CFLAGS"; then - pkg_cv_axis2c_CFLAGS="$axis2c_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"axis2c\""; } >&5 - ($PKG_CONFIG --exists --print-errors "axis2c") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_axis2c_CFLAGS=`$PKG_CONFIG --cflags "axis2c" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$axis2c_LIBS"; then - pkg_cv_axis2c_LIBS="$axis2c_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"axis2c\""; } >&5 - ($PKG_CONFIG --exists --print-errors "axis2c") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_axis2c_LIBS=`$PKG_CONFIG --libs "axis2c" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - axis2c_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "axis2c" 2>&1` - else - axis2c_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "axis2c" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$axis2c_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (axis2c) were not met: - -$axis2c_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables axis2c_CFLAGS -and axis2c_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables axis2c_CFLAGS -and axis2c_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - axis2c_CFLAGS=$pkg_cv_axis2c_CFLAGS - axis2c_LIBS=$pkg_cv_axis2c_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - fi if test x$tss = xtrousers; then @@ -17426,7 +17780,6 @@ if test "x$ac_cv_lib_tspi_main" = xyes; then : else as_fn_error $? "TrouSerS library libtspi not found" "$LINENO" 5 fi -ac_cv_lib_tspi=ac_cv_lib_tspi_main ac_fn_c_check_header_mongrel "$LINENO" "trousers/tss.h" "ac_cv_header_trousers_tss_h" "$ac_includes_default" if test "x$ac_cv_header_trousers_tss_h" = xyes; then : @@ -17553,7 +17906,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RUBY="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17685,7 +18038,6 @@ if test "x$ac_cv_lib_neo_cgi_main" = xyes; then : else as_fn_error $? "ClearSilver library neo_cgi not found!" "$LINENO" 5 fi -ac_cv_lib_neo_cgi=ac_cv_lib_neo_cgi_main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lneo_utl" >&5 $as_echo_n "checking for main in -lneo_utl... " >&6; } @@ -17722,7 +18074,6 @@ if test "x$ac_cv_lib_neo_utl_main" = xyes; then : else as_fn_error $? "ClearSilver library neo_utl not found!" "$LINENO" 5 fi -ac_cv_lib_neo_utl=ac_cv_lib_neo_utl_main { $as_echo "$as_me:${as_lineno-$LINENO}: checking ClearSilver requires zlib" >&5 $as_echo_n "checking ClearSilver requires zlib... " >&6; } @@ -17736,9 +18087,7 @@ $as_echo_n "checking ClearSilver requires zlib... " >&6; } int main () { - - NEOERR *err = cgi_display(NULL, NULL); - +NEOERR *err = cgi_display(NULL, NULL); ; return 0; } @@ -17756,6 +18105,8 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS=$saved_LIBS CFLAGS=$saved_CFLAGS +# autoconf does not like CamelCase!? How to fix this? +# AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])]) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfcgi" >&5 $as_echo_n "checking for main in -lfcgi... " >&6; } @@ -17792,7 +18143,6 @@ if test "x$ac_cv_lib_fcgi_main" = xyes; then : else as_fn_error $? "FastCGI library fcgi not found!" "$LINENO" 5 fi -ac_cv_lib_fcgi=ac_cv_lib_fcgi_main ac_fn_c_check_header_mongrel "$LINENO" "fcgiapp.h" "ac_cv_header_fcgiapp_h" "$ac_includes_default" if test "x$ac_cv_header_fcgiapp_h" = xyes; then : @@ -17824,7 +18174,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17891,7 +18241,6 @@ if test "x$ac_cv_lib_sqlite3_main" = xyes; then : else as_fn_error $? "SQLite library sqlite3 not found" "$LINENO" 5 fi -ac_cv_lib_sqlite3=ac_cv_lib_sqlite3_main ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default" if test "x$ac_cv_header_sqlite3_h" = xyes; then : @@ -17909,9 +18258,7 @@ $as_echo_n "checking sqlite3_prepare_v2... " >&6; } int main () { - - void *test = sqlite3_prepare_v2; - +void *test = sqlite3_prepare_v2; ; return 0; } @@ -17925,6 +18272,7 @@ $as_echo "#define HAVE_SQLITE3_PREPARE_V2 /**/" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking sqlite3.h version >= 3.3.1" >&5 @@ -17936,10 +18284,9 @@ int main () { - #if SQLITE_VERSION_NUMBER < 3003001 - #error bad sqlite - #endif - + #if SQLITE_VERSION_NUMBER < 3003001 + #error bad sqlite + #endif ; return 0; } @@ -17950,6 +18297,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; }; as_fn_error $? "SQLite version >= 3.3.1 required!" "$LINENO" 5 + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -17990,7 +18338,6 @@ if test "x$ac_cv_lib_crypto_main" = xyes; then : else as_fn_error $? "OpenSSL crypto library not found" "$LINENO" 5 fi -ac_cv_lib_crypto=ac_cv_lib_crypto_main ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default" if test "x$ac_cv_header_openssl_evp_h" = xyes; then : @@ -18038,7 +18385,6 @@ if test "x$ac_cv_lib_gcrypt_main" = xyes; then : else as_fn_error $? "gcrypt library not found" "$LINENO" 5 fi -ac_cv_lib_gcrypt=ac_cv_lib_gcrypt_main ac_fn_c_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default" if test "x$ac_cv_header_gcrypt_h" = xyes; then : @@ -18111,7 +18457,6 @@ if test "x$ac_cv_lib_uci_main" = xyes; then : else as_fn_error $? "UCI library libuci not found" "$LINENO" 5 fi -ac_cv_lib_uci=ac_cv_lib_uci_main ac_fn_c_check_header_mongrel "$LINENO" "uci.h" "ac_cv_header_uci_h" "$ac_includes_default" if test "x$ac_cv_header_uci_h" = xyes; then : @@ -18123,7 +18468,7 @@ fi fi -if test x$android = xtrue; then +if test x$android_dns = xtrue; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcutils" >&5 $as_echo_n "checking for main in -lcutils... " >&6; } if ${ac_cv_lib_cutils_main+:} false; then : @@ -18159,7 +18504,6 @@ if test "x$ac_cv_lib_cutils_main" = xyes; then : else as_fn_error $? "Android library libcutils not found" "$LINENO" 5 fi -ac_cv_lib_cutils=ac_cv_lib_cutils_main ac_fn_c_check_header_mongrel "$LINENO" "cutils/properties.h" "ac_cv_header_cutils_properties_h" "$ac_includes_default" if test "x$ac_cv_header_cutils_properties_h" = xyes; then : @@ -18169,7 +18513,9 @@ else fi - DLLIB="-ldl" + # we have to force the use of libdl here because the autodetection + # above does not work correctly when cross-compiling for android. + DLLIB="-ldl" fi @@ -18599,7 +18945,6 @@ if test "x$ac_cv_lib_pam_main" = xyes; then : else as_fn_error $? "PAM library not found" "$LINENO" 5 fi -ac_cv_lib_pam=ac_cv_lib_pam_main ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" if test "x$ac_cv_header_security_pam_appl_h" = xyes; then : @@ -18614,7 +18959,9 @@ fi if test x$capabilities = xnative; then { $as_echo "$as_me:${as_lineno-$LINENO}: Usage of the native Linux capabilities interface is deprecated, use libcap instead" >&5 $as_echo "$as_me: Usage of the native Linux capabilities interface is deprecated, use libcap instead" >&6;} - for ac_header in sys/capability.h + # Linux requires the following for capset(), Android does not have it, + # but defines capset() in unistd.h instead. + for ac_header in sys/capability.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" if test "x$ac_cv_header_sys_capability_h" = xyes; then : @@ -18674,7 +19021,6 @@ if test "x$ac_cv_lib_cap_main" = xyes; then : else as_fn_error $? "libcap library not found" "$LINENO" 5 fi -ac_cv_lib_cap=ac_cv_lib_cap_main ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" if test "x$ac_cv_header_sys_capability_h" = xyes; then : @@ -18697,7 +19043,7 @@ $as_echo_n "checking for dladdr()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GNU_SOURCE - #include + #include int main () { @@ -18721,7 +19067,7 @@ $as_echo_n "checking for dl_iterate_phdr()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GNU_SOURCE - #include + #include int main () { @@ -18778,7 +19124,6 @@ if test "x$ac_cv_lib_bfd_main" = xyes; then : else as_fn_error $? "binutils libbfd not found!" "$LINENO" 5 fi -ac_cv_lib_bfd=ac_cv_lib_bfd_main ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default" if test "x$ac_cv_header_bfd_h" = xyes; then : @@ -18809,6 +19154,149 @@ fi CFLAGS="$CFLAGS -include `pwd`/config.h" +if test x$tkm = xtrue; then + # Extract the first word of "gprbuild", so it can be a program name with args. +set dummy gprbuild; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GPRBUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GPRBUILD in + [\\/]* | ?:[\\/]*) + ac_cv_path_GPRBUILD="$GPRBUILD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/bin:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GPRBUILD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GPRBUILD=$ac_cv_path_GPRBUILD +if test -n "$GPRBUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPRBUILD" >&5 +$as_echo "$GPRBUILD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi + +if test x$unit_tests = xtrue; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 +$as_echo_n "checking for CHECK... " >&6; } + +if test -n "$CHECK_CFLAGS"; then + pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$CHECK_LIBS"; then + pkg_cv_CHECK_LIBS="$CHECK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.4" 2>&1` + else + CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.4" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CHECK_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (check >= 0.9.4) were not met: + +$CHECK_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables CHECK_CFLAGS +and CHECK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables CHECK_CFLAGS +and CHECK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS + CHECK_LIBS=$pkg_cv_CHECK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + +fi + +# =============================================== +# collect plugin list for strongSwan components +# =============================================== # ADD_PLUGIN(plugin, category list) # ----------------------------------- @@ -18861,6 +19349,13 @@ if test x$soup = xtrue; then fi +if test x$unbound = xtrue; then + s_plugins=${s_plugins}" unbound" + charon_plugins=${charon_plugins}" unbound" + scripts_plugins=${scripts_plugins}" unbound" + + fi + if test x$ldap = xtrue; then s_plugins=${s_plugins}" ldap" charon_plugins=${charon_plugins}" ldap" @@ -19092,6 +19587,12 @@ if test x$dnskey = xtrue; then fi +if test x$ipseckey = xtrue; then + c_plugins=${c_plugins}" ipseckey" + charon_plugins=${charon_plugins}" ipseckey" + + fi + if test x$pem = xtrue; then s_plugins=${s_plugins}" pem" charon_plugins=${charon_plugins}" pem" @@ -19458,6 +19959,12 @@ if test x$xauth_pam = xtrue; then fi +if test x$xauth_noauth = xtrue; then + c_plugins=${c_plugins}" xauth-noauth" + charon_plugins=${charon_plugins}" xauth-noauth" + + fi + if test x$tnc_ifmap = xtrue; then c_plugins=${c_plugins}" tnc-ifmap" charon_plugins=${charon_plugins}" tnc-ifmap" @@ -19524,9 +20031,9 @@ if test x$dhcp = xtrue; then fi -if test x$android = xtrue; then - c_plugins=${c_plugins}" android" - charon_plugins=${charon_plugins}" android" +if test x$android_dns = xtrue; then + c_plugins=${c_plugins}" android-dns" + charon_plugins=${charon_plugins}" android-dns" fi @@ -19566,6 +20073,12 @@ if test x$certexpire = xtrue; then fi +if test x$systime_fix = xtrue; then + c_plugins=${c_plugins}" systime-fix" + charon_plugins=${charon_plugins}" systime-fix" + + fi + if test x$led = xtrue; then c_plugins=${c_plugins}" led" charon_plugins=${charon_plugins}" led" @@ -19637,8 +20150,12 @@ if test x$unit_tester = xtrue; then +# ====================== +# set Makefile.am vars +# ====================== - +# libstrongswan plugins +# ----------------------- if test x$test_vectors = xtrue; then USE_TEST_VECTORS_TRUE= USE_TEST_VECTORS_FALSE='#' @@ -19655,6 +20172,14 @@ else USE_CURL_FALSE= fi + if test x$unbound = xtrue; then + USE_UNBOUND_TRUE= + USE_UNBOUND_FALSE='#' +else + USE_UNBOUND_TRUE='#' + USE_UNBOUND_FALSE= +fi + if test x$soup = xtrue; then USE_SOUP_TRUE= USE_SOUP_FALSE='#' @@ -19960,6 +20485,8 @@ else fi +# charon plugins +# ---------------- if test x$stroke = xtrue; then USE_STROKE_TRUE= USE_STROKE_FALSE='#' @@ -19992,12 +20519,12 @@ else USE_UCI_FALSE= fi - if test x$android = xtrue; then - USE_ANDROID_TRUE= - USE_ANDROID_FALSE='#' + if test x$android_dns = xtrue; then + USE_ANDROID_DNS_TRUE= + USE_ANDROID_DNS_FALSE='#' else - USE_ANDROID_TRUE='#' - USE_ANDROID_FALSE= + USE_ANDROID_DNS_TRUE='#' + USE_ANDROID_DNS_FALSE= fi if test x$android_log = xtrue; then @@ -20032,6 +20559,14 @@ else USE_SQL_FALSE= fi + if test x$ipseckey = xtrue; then + USE_IPSECKEY_TRUE= + USE_IPSECKEY_FALSE='#' +else + USE_IPSECKEY_TRUE='#' + USE_IPSECKEY_FALSE= +fi + if test x$updown = xtrue; then USE_UPDOWN_TRUE= USE_UPDOWN_FALSE='#' @@ -20104,6 +20639,14 @@ else USE_CERTEXPIRE_FALSE= fi + if test x$systime_fix = xtrue; then + USE_SYSTIME_FIX_TRUE= + USE_SYSTIME_FIX_FALSE='#' +else + USE_SYSTIME_FIX_TRUE='#' + USE_SYSTIME_FIX_FALSE= +fi + if test x$led = xtrue; then USE_LED_TRUE= USE_LED_FALSE='#' @@ -20304,6 +20847,14 @@ else USE_XAUTH_PAM_FALSE= fi + if test x$xauth_noauth = xtrue; then + USE_XAUTH_NOAUTH_TRUE= + USE_XAUTH_NOAUTH_FALSE='#' +else + USE_XAUTH_NOAUTH_TRUE='#' + USE_XAUTH_NOAUTH_FALSE= +fi + if test x$tnc_ifmap = xtrue; then USE_TNC_IFMAP_TRUE= USE_TNC_IFMAP_FALSE='#' @@ -20473,6 +21024,8 @@ else fi +# hydra plugins +# --------------- if test x$attr = xtrue; then USE_ATTR_TRUE= USE_ATTR_FALSE='#' @@ -20481,7 +21034,7 @@ else USE_ATTR_FALSE= fi - if test x$attr_sql = xtrue -o x$sql = xtrue; then + if test x$attr_sql = xtrue; then USE_ATTR_SQL_TRUE= USE_ATTR_SQL_FALSE='#' else @@ -20530,6 +21083,8 @@ else fi +# other options +# --------------- if test x$leak_detective = xtrue; then USE_LEAK_DETECTIVE_TRUE= USE_LEAK_DETECTIVE_FALSE='#' @@ -20666,7 +21221,7 @@ else USE_CONFTEST_FALSE= fi - if test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue; then + if test x$charon = 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; then USE_LIBSTRONGSWAN_TRUE= USE_LIBSTRONGSWAN_FALSE='#' else @@ -20674,7 +21229,7 @@ else USE_LIBSTRONGSWAN_FALSE= fi - if test x$charon = xtrue -o x$nm = xtrue; then + if test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue; then USE_LIBHYDRA_TRUE= USE_LIBHYDRA_FALSE='#' else @@ -20682,7 +21237,7 @@ else USE_LIBHYDRA_FALSE= fi - if test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue; then + if test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue; then USE_LIBCHARON_TRUE= USE_LIBCHARON_FALSE='#' else @@ -20714,6 +21269,14 @@ else USE_LIBTNCCS_FALSE= fi + if test x$tnc_tnccs = xtrue; then + USE_LIBPTTLS_TRUE= + USE_LIBPTTLS_FALSE='#' +else + USE_LIBPTTLS_TRUE='#' + USE_LIBPTTLS_FALSE= +fi + if test x$stroke = xtrue; then USE_FILE_CONFIG_TRUE= USE_FILE_CONFIG_FALSE='#' @@ -20802,7 +21365,26 @@ else MONOLITHIC_FALSE= fi + if test x$unit_tests = xtrue; then + UNITTESTS_TRUE= + UNITTESTS_FALSE='#' +else + UNITTESTS_TRUE='#' + UNITTESTS_FALSE= +fi + + if test x$tkm = xtrue; then + USE_TKM_TRUE= + USE_TKM_FALSE='#' +else + USE_TKM_TRUE='#' + USE_TKM_FALSE= +fi + +# ======================== +# set global definitions +# ======================== if test x$mediation = xtrue; then @@ -20830,8 +21412,11 @@ $as_echo "#define USE_IKEV2 /**/" >>confdefs.h fi +# ================= +# build Makefiles +# ================= -ac_config_files="$ac_config_files Makefile man/Makefile init/Makefile init/systemd/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/cmac/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/soup/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_sim_pcsc/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_peap/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/android_log/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile" +ac_config_files="$ac_config_files Makefile man/Makefile init/Makefile init/systemd/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/cmac/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/unbound/Makefile src/libstrongswan/plugins/soup/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/charon-tkm/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_sim_pcsc/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_peap/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20975,6 +21560,10 @@ if test -z "${USE_CURL_TRUE}" && test -z "${USE_CURL_FALSE}"; then as_fn_error $? "conditional \"USE_CURL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_UNBOUND_TRUE}" && test -z "${USE_UNBOUND_FALSE}"; then + as_fn_error $? "conditional \"USE_UNBOUND\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_SOUP_TRUE}" && test -z "${USE_SOUP_FALSE}"; then as_fn_error $? "conditional \"USE_SOUP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21143,8 +21732,8 @@ if test -z "${USE_UCI_TRUE}" && test -z "${USE_UCI_FALSE}"; then as_fn_error $? "conditional \"USE_UCI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_ANDROID_TRUE}" && test -z "${USE_ANDROID_FALSE}"; then - as_fn_error $? "conditional \"USE_ANDROID\" was never defined. +if test -z "${USE_ANDROID_DNS_TRUE}" && test -z "${USE_ANDROID_DNS_FALSE}"; then + as_fn_error $? "conditional \"USE_ANDROID_DNS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_ANDROID_LOG_TRUE}" && test -z "${USE_ANDROID_LOG_FALSE}"; then @@ -21163,6 +21752,10 @@ if test -z "${USE_SQL_TRUE}" && test -z "${USE_SQL_FALSE}"; then as_fn_error $? "conditional \"USE_SQL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_IPSECKEY_TRUE}" && test -z "${USE_IPSECKEY_FALSE}"; then + as_fn_error $? "conditional \"USE_IPSECKEY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_UPDOWN_TRUE}" && test -z "${USE_UPDOWN_FALSE}"; then as_fn_error $? "conditional \"USE_UPDOWN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21199,6 +21792,10 @@ if test -z "${USE_CERTEXPIRE_TRUE}" && test -z "${USE_CERTEXPIRE_FALSE}"; then as_fn_error $? "conditional \"USE_CERTEXPIRE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_SYSTIME_FIX_TRUE}" && test -z "${USE_SYSTIME_FIX_FALSE}"; then + as_fn_error $? "conditional \"USE_SYSTIME_FIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_LED_TRUE}" && test -z "${USE_LED_FALSE}"; then as_fn_error $? "conditional \"USE_LED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21299,6 +21896,10 @@ if test -z "${USE_XAUTH_PAM_TRUE}" && test -z "${USE_XAUTH_PAM_FALSE}"; then as_fn_error $? "conditional \"USE_XAUTH_PAM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_XAUTH_NOAUTH_TRUE}" && test -z "${USE_XAUTH_NOAUTH_FALSE}"; then + as_fn_error $? "conditional \"USE_XAUTH_NOAUTH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_TNC_IFMAP_TRUE}" && test -z "${USE_TNC_IFMAP_FALSE}"; then as_fn_error $? "conditional \"USE_TNC_IFMAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21503,6 +22104,10 @@ if test -z "${USE_LIBTNCCS_TRUE}" && test -z "${USE_LIBTNCCS_FALSE}"; then as_fn_error $? "conditional \"USE_LIBTNCCS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_LIBPTTLS_TRUE}" && test -z "${USE_LIBPTTLS_FALSE}"; then + as_fn_error $? "conditional \"USE_LIBPTTLS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_FILE_CONFIG_TRUE}" && test -z "${USE_FILE_CONFIG_FALSE}"; then as_fn_error $? "conditional \"USE_FILE_CONFIG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21547,6 +22152,14 @@ if test -z "${MONOLITHIC_TRUE}" && test -z "${MONOLITHIC_FALSE}"; then as_fn_error $? "conditional \"MONOLITHIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${UNITTESTS_TRUE}" && test -z "${UNITTESTS_FALSE}"; then + as_fn_error $? "conditional \"UNITTESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_TKM_TRUE}" && test -z "${USE_TKM_FALSE}"; then + as_fn_error $? "conditional \"USE_TKM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -21845,16 +22458,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -21914,28 +22527,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -21956,8 +22557,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by strongSwan $as_me 5.0.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by strongSwan $as_me 5.0.3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -22022,11 +22623,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -strongSwan config.status 5.0.2 -configured by $0, generated by GNU Autoconf 2.68, +strongSwan config.status 5.0.3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -22117,7 +22718,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -22464,6 +23065,7 @@ do "src/libstrongswan/plugins/dnskey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/dnskey/Makefile" ;; "src/libstrongswan/plugins/pem/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pem/Makefile" ;; "src/libstrongswan/plugins/curl/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/curl/Makefile" ;; + "src/libstrongswan/plugins/unbound/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/unbound/Makefile" ;; "src/libstrongswan/plugins/soup/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/soup/Makefile" ;; "src/libstrongswan/plugins/ldap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ldap/Makefile" ;; "src/libstrongswan/plugins/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/mysql/Makefile" ;; @@ -22492,6 +23094,7 @@ do "src/libradius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libradius/Makefile" ;; "src/libtncif/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtncif/Makefile" ;; "src/libtnccs/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtnccs/Makefile" ;; + "src/libpttls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpttls/Makefile" ;; "src/libpts/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpts/Makefile" ;; "src/libpts/plugins/imc_attestation/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpts/plugins/imc_attestation/Makefile" ;; "src/libpts/plugins/imv_attestation/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpts/plugins/imv_attestation/Makefile" ;; @@ -22504,6 +23107,7 @@ do "src/libimcv/plugins/imv_os/Makefile") CONFIG_FILES="$CONFIG_FILES src/libimcv/plugins/imv_os/Makefile" ;; "src/charon/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/Makefile" ;; "src/charon-nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-nm/Makefile" ;; + "src/charon-tkm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-tkm/Makefile" ;; "src/libcharon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/Makefile" ;; "src/libcharon/plugins/eap_aka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka/Makefile" ;; "src/libcharon/plugins/eap_aka_3gpp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka_3gpp2/Makefile" ;; @@ -22526,6 +23130,7 @@ do "src/libcharon/plugins/xauth_generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_generic/Makefile" ;; "src/libcharon/plugins/xauth_eap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_eap/Makefile" ;; "src/libcharon/plugins/xauth_pam/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_pam/Makefile" ;; + "src/libcharon/plugins/xauth_noauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/xauth_noauth/Makefile" ;; "src/libcharon/plugins/tnc_ifmap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_ifmap/Makefile" ;; "src/libcharon/plugins/tnc_pdp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_pdp/Makefile" ;; "src/libcharon/plugins/tnc_imc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imc/Makefile" ;; @@ -22539,6 +23144,7 @@ do "src/libcharon/plugins/farp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/farp/Makefile" ;; "src/libcharon/plugins/smp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/smp/Makefile" ;; "src/libcharon/plugins/sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/sql/Makefile" ;; + "src/libcharon/plugins/ipseckey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/ipseckey/Makefile" ;; "src/libcharon/plugins/medsrv/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medsrv/Makefile" ;; "src/libcharon/plugins/medcli/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/medcli/Makefile" ;; "src/libcharon/plugins/addrblock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/addrblock/Makefile" ;; @@ -22549,11 +23155,12 @@ do "src/libcharon/plugins/lookip/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/lookip/Makefile" ;; "src/libcharon/plugins/error_notify/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/error_notify/Makefile" ;; "src/libcharon/plugins/certexpire/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/certexpire/Makefile" ;; + "src/libcharon/plugins/systime_fix/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/systime_fix/Makefile" ;; "src/libcharon/plugins/led/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/led/Makefile" ;; "src/libcharon/plugins/duplicheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/duplicheck/Makefile" ;; "src/libcharon/plugins/coupling/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/coupling/Makefile" ;; "src/libcharon/plugins/radattr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/radattr/Makefile" ;; - "src/libcharon/plugins/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/Makefile" ;; + "src/libcharon/plugins/android_dns/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android_dns/Makefile" ;; "src/libcharon/plugins/android_log/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android_log/Makefile" ;; "src/libcharon/plugins/maemo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/maemo/Makefile" ;; "src/libcharon/plugins/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/stroke/Makefile" ;; @@ -23937,3 +24544,23 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +# ======================== +# report enabled plugins +# ======================== + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: strongSwan will be built with the following plugins" >&5 +$as_echo " strongSwan will be built with the following plugins" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -----------------------------------------------------" >&5 +$as_echo "-----------------------------------------------------" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libstrongswan:$s_plugins" >&5 +$as_echo "libstrongswan:$s_plugins" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libcharon: $c_plugins" >&5 +$as_echo "libcharon: $c_plugins" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libhydra: $h_plugins" >&5 +$as_echo "libhydra: $h_plugins" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } diff --git a/configure.in b/configure.in index 2c3e739d6..1e367d094 100644 --- a/configure.in +++ b/configure.in @@ -1,31 +1,34 @@ -dnl configure.in for linux strongSwan -dnl Copyright (C) 2006 Martin Willi -dnl Hochschule fuer Technik Rapperswil -dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the -dnl Free Software Foundation; either version 2 of the License, or (at your -dnl option) any later version. See . -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -dnl for more details. - -dnl =========================== -dnl initialize & set some vars -dnl =========================== - -AC_INIT(strongSwan,5.0.2) +# +# Copyright (C) 2007-2013 Tobias Brunner +# Copyright (C) 2006-2013 Andreas Steffen +# Copyright (C) 2006-2013 Martin Willi +# Hochschule fuer Technik Rapperswil +# +# This program 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 2 of the License, or (at your +# option) any later version. See . +# +# This program 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. +# + +# ============================ +# initialize & set some vars +# ============================ + +AC_INIT([strongSwan],[5.0.3]) AM_INIT_AUTOMAKE(tar-ustar) AC_CONFIG_MACRO_DIR([m4/config]) AC_CONFIG_HEADERS([config.h]) AC_DEFINE([CONFIG_H_INCLUDED], [], [defined if config.h included]) PKG_PROG_PKG_CONFIG -dnl ================================= -dnl check --enable-xxx & --with-xxx -dnl ================================= +# ================================= +# check --enable-xxx & --with-xxx +# ================================= m4_include(m4/macros/with.m4) @@ -101,6 +104,7 @@ AC_SUBST(ipsec_script_upper, [`echo -n "$ipsec_script" | tr a-z A-Z`]) m4_include(m4/macros/enable-disable.m4) ARG_ENABL_SET([curl], [enable CURL fetcher plugin to fetch files via libcurl. Requires libcurl.]) +ARG_ENABL_SET([unbound], [enable UNBOUND resolver plugin to perform DNS queries via libunbound. Requires libldns and libunbound.]) ARG_ENABL_SET([soup], [enable soup fetcher plugin to fetch from HTTP via libsoup. Requires libsoup.]) ARG_ENABL_SET([ldap], [enable LDAP fetching plugin to fetch files via libldap. Requires openLDAP.]) ARG_DISBL_SET([aes], [disable AES software implementation plugin.]) @@ -124,6 +128,7 @@ ARG_DISBL_SET([pkcs7], [disable PKCS7 container support plugin.]) ARG_DISBL_SET([pkcs8], [disable PKCS8 private key decoding plugin.]) ARG_DISBL_SET([pgp], [disable PGP key decoding plugin.]) ARG_DISBL_SET([dnskey], [disable DNS RR key decoding plugin.]) +ARG_ENABL_SET([ipseckey], [enable IPSECKEY authentication plugin.]) ARG_DISBL_SET([pem], [disable PEM decoding plugin.]) ARG_DISBL_SET([hmac], [disable HMAC crypto implementation plugin.]) ARG_DISBL_SET([cmac], [disable CMAC crypto implementation plugin.]) @@ -162,11 +167,12 @@ ARG_ENABL_SET([eap-radius], [enable RADIUS proxy authentication module.]) ARG_DISBL_SET([xauth-generic], [disable generic XAuth backend.]) ARG_ENABL_SET([xauth-eap], [enable XAuth backend using EAP methods to verify passwords.]) ARG_ENABL_SET([xauth-pam], [enable XAuth backend using PAM to verify passwords.]) -ARG_ENABL_SET([tnc-ifmap], [enable TNC IF-MAP module.]) +ARG_ENABL_SET([xauth-noauth], [enable XAuth pseudo-backend that does not actually verify or even request any credentials.]) +ARG_ENABL_SET([tnc-ifmap], [enable TNC IF-MAP module. Requires libxml]) ARG_ENABL_SET([tnc-pdp], [enable TNC policy decision point module.]) ARG_ENABL_SET([tnc-imc], [enable TNC IMC module.]) ARG_ENABL_SET([tnc-imv], [enable TNC IMV module.]) -ARG_ENABL_SET([tnccs-11], [enable TNCCS 1.1 protocol module.]) +ARG_ENABL_SET([tnccs-11], [enable TNCCS 1.1 protocol module. Requires libxml]) ARG_ENABL_SET([tnccs-20], [enable TNCCS 2.0 protocol module.]) ARG_ENABL_SET([tnccs-dynamic], [enable dynamic TNCCS protocol discovery module.]) ARG_ENABL_SET([imc-test], [enable IMC test module.]) @@ -213,7 +219,7 @@ ARG_ENABL_SET([gcm], [enables the GCM AEAD wrapper crypto plugin.]) ARG_ENABL_SET([addrblock], [enables RFC 3779 address block constraint support.]) ARG_ENABL_SET([unity], [enables Cisco Unity extension plugin.]) ARG_ENABL_SET([uci], [enable OpenWRT UCI configuration plugin.]) -ARG_ENABL_SET([android], [enable Android specific plugin.]) +ARG_ENABL_SET([android-dns], [enable Android specific DNS handler.]) ARG_ENABL_SET([android-log], [enable Android specific logger plugin.]) ARG_ENABL_SET([maemo], [enable Maemo specific plugin.]) ARG_ENABL_SET([nm], [enable NetworkManager backend.]) @@ -222,6 +228,7 @@ ARG_ENABL_SET([whitelist], [enable peer identity whitelisting plugin.]) ARG_ENABL_SET([lookip], [enable fast virtual IP lookup and notification plugin.]) ARG_ENABL_SET([error-notify], [enable error notification plugin.]) ARG_ENABL_SET([certexpire], [enable CSV export of expiration dates of used certificates.]) +ARG_ENABL_SET([systime-fix], [enable plugin to handle cert lifetimes with invalid system time gracefully.]) ARG_ENABL_SET([led], [enable plugin to control LEDs on IKEv2 activity using the Linux kernel LED subsystem.]) ARG_ENABL_SET([duplicheck], [advanced duplicate checking plugin using liveness checks.]) ARG_ENABL_SET([coupling], [enable IKEv2 plugin to couple peer certificates permanently to authentication.]) @@ -229,24 +236,41 @@ ARG_ENABL_SET([radattr], [enable plugin to inject and process custom RADI ARG_ENABL_SET([vstr], [enforce using the Vstr string library to replace glibc-like printf hooks.]) ARG_ENABL_SET([monolithic], [build monolithic version of libstrongswan that includes all enabled plugins. Similarly, the plugins of charon are assembled in libcharon.]) ARG_ENABL_SET([bfd-backtraces], [use binutils libbfd to resolve backtraces for memory leaks and segfaults.]) +ARG_ENABL_SET([unit-tests], [enable unit tests using the check test framework.]) +ARG_ENABL_SET([tkm], [enable Trusted Key Manager support.]) -dnl ========================= -dnl set up compiler and flags -dnl ========================= +# =================================== +# option to disable default options +# =================================== + +ARG_DISBL_SET([defaults], [disable all default plugins (they can be enabled with their respective --enable options)]) + +if test x$defaults = xfalse; then + for option in $enabled_by_default; do + eval test x\${${option}_given} = xtrue && continue + let $option=false + done +fi + +# =========================== +# set up compiler and flags +# =========================== if test -z "$CFLAGS"; then CFLAGS="-g -O2 -Wall -Wno-format -Wno-pointer-sign" fi AC_PROG_CC +AM_PROG_CC_C_O + AC_LIB_PREFIX AC_C_BIGENDIAN -dnl ========================= -dnl check required programs -dnl ========================= +# ========================= +# check required programs +# ========================= +LT_INIT AC_PROG_INSTALL -AC_PROG_LIBTOOL AC_PROG_EGREP AC_PROG_AWK AC_PROG_LEX @@ -254,7 +278,7 @@ AC_PROG_YACC AC_PATH_PROG([PERL], [perl], [], [$PATH:/bin:/usr/bin:/usr/local/bin]) AC_PATH_PROG([GPERF], [gperf], [], [$PATH:/bin:/usr/bin:/usr/local/bin]) -dnl because gperf is not needed by end-users we just report it but do not abort on failure +# because gperf is not needed by end-users we just report it but do not abort on failure AC_MSG_CHECKING([gperf version >= 3.0.0]) if test -x "$GPERF"; then if test "`$GPERF --version | $AWK -F' ' '/^GNU gperf/ { print $3 }' | $AWK -F. '{ print $1 }'`" -ge "3"; then @@ -266,9 +290,9 @@ else AC_MSG_RESULT([not found]) fi -dnl ========================= -dnl dependency calculation -dnl ========================= +# ======================== +# dependency calculation +# ======================== if test x$xauth_generic_given = xfalse -a x$ikev1 = xfalse; then xauth_generic=false; @@ -314,14 +338,10 @@ if test x$fips_prf = xtrue; then fi fi -if test x$smp = xtrue -o x$tnccs_11 = xtrue; then +if test x$smp = xtrue -o x$tnccs_11 = xtrue -o x$tnc_ifmap = xtrue; then xml=true fi -if test x$tnc_ifmap = xtrue; then - axis2c=true -fi - if test x$manager = xtrue; then fast=true fi @@ -335,91 +355,93 @@ if test x$medcli = xtrue; then mediation=true fi -dnl =========================================== -dnl check required libraries and header files -dnl =========================================== +# =========================================== +# check required libraries and header files +# =========================================== AC_HEADER_STDBOOL AC_FUNC_ALLOCA AC_FUNC_STRERROR_R -dnl libraries needed on some platforms but not on others -dnl ==================================================== +# libraries needed on some platforms but not on others +# ------------------------------------------------------ saved_LIBS=$LIBS -dnl FreeBSD and Mac OS X have dlopen integrated in libc, Linux needs libdl +# FreeBSD and Mac OS X have dlopen integrated in libc, Linux needs libdl LIBS="" AC_SEARCH_LIBS(dlopen, dl, [DLLIB=$LIBS]) AC_SUBST(DLLIB) -dnl glibc's backtrace() can be replicated on FreeBSD with libexecinfo +# glibc's backtrace() can be replicated on FreeBSD with libexecinfo LIBS="" AC_SEARCH_LIBS(backtrace, execinfo, [BTLIB=$LIBS]) AC_CHECK_FUNCS(backtrace) AC_SUBST(BTLIB) -dnl OpenSolaris needs libsocket and libnsl for socket() +# OpenSolaris needs libsocket and libnsl for socket() LIBS="" AC_SEARCH_LIBS(socket, socket, [SOCKLIB=$LIBS], [AC_CHECK_LIB(nsl, socket, [SOCKLIB="-lsocket -lnsl"], [], [-lsocket])] ) AC_SUBST(SOCKLIB) -dnl FreeBSD has clock_gettime in libc, Linux needs librt +# FreeBSD has clock_gettime in libc, Linux needs librt LIBS="" AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS]) AC_CHECK_FUNCS(clock_gettime) AC_SUBST(RTLIB) -dnl Android has pthread_* functions in bionic (libc), others need libpthread +# Android has pthread_* functions in bionic (libc), others need libpthread LIBS="" AC_SEARCH_LIBS(pthread_create, pthread, [PTHREADLIB=$LIBS]) AC_SUBST(PTHREADLIB) LIBS=$saved_LIBS -dnl ====================== +# ------------------------------------------------------ AC_MSG_CHECKING(for dladdr) -AC_TRY_COMPILE( - [#define _GNU_SOURCE - #include ], - [Dl_info* info = 0; - dladdr(0, info);], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include ]], + [[Dl_info* info = 0; + dladdr(0, info);]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_DLADDR], [], [have dladdr()])], [AC_MSG_RESULT([no])] ) -dnl check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported +# check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported saved_LIBS=$LIBS LIBS=$PTHREADLIB AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONE)]) -AC_TRY_RUN( - [#include - int main() { pthread_condattr_t attr; - pthread_condattr_init(&attr); - return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}], +AC_RUN_IFELSE( + [AC_LANG_SOURCE( + [[#include + int main() { pthread_condattr_t attr; + pthread_condattr_init(&attr); + return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], [pthread_condattr_setclock supports CLOCK_MONOTONIC])], [AC_MSG_RESULT([no])], - dnl Check existence of pthread_condattr_setclock if cross-compiling + # Check existence of pthread_condattr_setclock if cross-compiling [AC_MSG_RESULT([unknown]); AC_CHECK_FUNCS(pthread_condattr_setclock, [AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], [have pthread_condattr_setclock()])] )] ) -dnl check if we actually are able to configure attributes on cond vars +# check if we actually are able to configure attributes on cond vars AC_CHECK_FUNCS(pthread_condattr_init) -dnl instead of pthread_condattr_setclock Android has this function +# instead of pthread_condattr_setclock Android has this function AC_CHECK_FUNCS(pthread_cond_timedwait_monotonic) -dnl check if we can cancel threads +# check if we can cancel threads AC_CHECK_FUNCS(pthread_cancel) -dnl check if native rwlocks are available +# check if native rwlocks are available AC_CHECK_FUNCS(pthread_rwlock_init) -dnl check if pthread spinlocks are available +# check if pthread spinlocks are available AC_CHECK_FUNCS(pthread_spin_init) -dnl check if we have POSIX semaphore functions, including timed-wait +# check if we have POSIX semaphore functions, including timed-wait AC_CHECK_FUNCS(sem_timedwait) LIBS=$saved_LIBS @@ -427,12 +449,13 @@ AC_CHECK_FUNC( [gettid], [AC_DEFINE([HAVE_GETTID], [], [have gettid()])], [AC_MSG_CHECKING([for SYS_gettid]) - AC_TRY_COMPILE( - [#define _GNU_SOURCE - #include - #include ], - [int main() { - return syscall(SYS_gettid);}], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include + #include ]], + [[int main() { + return syscall(SYS_gettid);}]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_GETTID], [], [have gettid()]) AC_DEFINE([HAVE_SYS_GETTID], [], [have syscall(SYS_gettid)])], @@ -440,11 +463,15 @@ AC_CHECK_FUNC( )] ) -AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r) +AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r getpwuid_r) AC_CHECK_HEADERS(sys/sockio.h glob.h) AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h) -AC_CHECK_HEADERS(netinet/ip6.h) +AC_CHECK_HEADERS(netinet/ip6.h, [], [], +[ + #include + #include +]) AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [ @@ -464,101 +491,107 @@ AC_CHECK_MEMBERS([struct sadb_x_policy.sadb_x_policy_priority], [], [], ]) AC_MSG_CHECKING([for in6addr_any]) -AC_TRY_COMPILE( - [#include - #include - #include ], - [struct in6_addr in6; - in6 = in6addr_any;], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include ]], + [[struct in6_addr in6; + in6 = in6addr_any;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6ADDR_ANY], [], [have struct in6_addr in6addr_any])], [AC_MSG_RESULT([no])] ) AC_MSG_CHECKING([for in6_pktinfo]) -AC_TRY_COMPILE( - [#define _GNU_SOURCE - #include - #include - #include ], - [struct in6_pktinfo pi; - if (pi.ipi6_ifindex) - { - return 0; - }], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include + #include + #include ]], + [[struct in6_pktinfo pi; + if (pi.ipi6_ifindex) + { + return 0; + }]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IN6_PKTINFO], [], [have struct in6_pktinfo.ipi6_ifindex])], [AC_MSG_RESULT([no])] ) AC_MSG_CHECKING([for IPSEC_MODE_BEET]) -AC_TRY_COMPILE( - [#include - #ifdef HAVE_NETIPSEC_IPSEC_H - #include - #elif defined(HAVE_NETINET6_IPSEC_H) - #include - #else - #include - #include - #endif], - [int mode = IPSEC_MODE_BEET; - return mode;], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #ifdef HAVE_NETIPSEC_IPSEC_H + #include + #elif defined(HAVE_NETINET6_IPSEC_H) + #include + #else + #include + #include + #endif]], + [[int mode = IPSEC_MODE_BEET; + return mode;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IPSEC_MODE_BEET], [], [have IPSEC_MODE_BEET defined])], [AC_MSG_RESULT([no])] ) AC_MSG_CHECKING([for IPSEC_DIR_FWD]) -AC_TRY_COMPILE( - [#include - #ifdef HAVE_NETIPSEC_IPSEC_H - #include - #elif defined(HAVE_NETINET6_IPSEC_H) - #include - #else - #include - #include - #endif], - [int dir = IPSEC_DIR_FWD; - return dir;], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #ifdef HAVE_NETIPSEC_IPSEC_H + #include + #elif defined(HAVE_NETINET6_IPSEC_H) + #include + #else + #include + #include + #endif]], + [[int dir = IPSEC_DIR_FWD; + return dir;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_IPSEC_DIR_FWD], [], [have IPSEC_DIR_FWD defined])], [AC_MSG_RESULT([no])] ) AC_MSG_CHECKING([for RTA_TABLE]) -AC_TRY_COMPILE( - [#include - #include - #include ], - [int rta_type = RTA_TABLE; - return rta_type;], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include ]], + [[int rta_type = RTA_TABLE; + return rta_type;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_RTA_TABLE], [], [have netlink RTA_TABLE defined])], [AC_MSG_RESULT([no])] ) AC_MSG_CHECKING([for gcc atomic operations]) -AC_TRY_RUN( -[ - int main() { - volatile int ref = 1; - __sync_fetch_and_add (&ref, 1); - __sync_sub_and_fetch (&ref, 1); - /* Make sure test fails if operations are not supported */ - __sync_val_compare_and_swap(&ref, 1, 0); - return ref; - } -], -[AC_MSG_RESULT([yes]); - AC_DEFINE([HAVE_GCC_ATOMIC_OPERATIONS], [], +AC_RUN_IFELSE([AC_LANG_SOURCE( + [[ + int main() { + volatile int ref = 1; + __sync_fetch_and_add (&ref, 1); + __sync_sub_and_fetch (&ref, 1); + /* Make sure test fails if operations are not supported */ + __sync_val_compare_and_swap(&ref, 1, 0); + return ref; + } + ]])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_GCC_ATOMIC_OPERATIONS], [], [have GCC __sync_* atomic operations])], -[AC_MSG_RESULT([no])], -[AC_MSG_RESULT([no])]) + [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([no])] +) -dnl check for the new register_printf_specifier function with len argument, -dnl or the deprecated register_printf_function without +# check for the new register_printf_specifier function with len argument, +# or the deprecated register_printf_function without AC_CHECK_FUNC( [register_printf_specifier], [AC_DEFINE([HAVE_PRINTF_SPECIFIER], [], [have register_printf_specifier()])], @@ -573,20 +606,19 @@ AC_CHECK_FUNC( ) if test x$vstr = xtrue; then - AC_HAVE_LIBRARY([vstr],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])]) + AC_CHECK_LIB([vstr],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])],[]) AC_DEFINE([USE_VSTR], [], [use vstring library for printf hooks]) fi if test x$gmp = xtrue; then saved_LIBS=$LIBS - AC_HAVE_LIBRARY([gmp],,[AC_MSG_ERROR([GNU Multi Precision library gmp not found])]) + AC_CHECK_LIB([gmp],[main],[],[AC_MSG_ERROR([GNU Multi Precision library gmp not found])],[]) AC_MSG_CHECKING([mpz_powm_sec]) if test x$mpz_powm_sec = xyes; then - AC_TRY_COMPILE( - [#include "gmp.h"], - [ - void *x = mpz_powm_sec; - ], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include "gmp.h"]], + [[void *x = mpz_powm_sec;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_MPZ_POWM_SEC], [], [have mpz_mown_sec()])], [AC_MSG_RESULT([no])] @@ -596,28 +628,36 @@ if test x$gmp = xtrue; then fi LIBS=$saved_LIBS AC_MSG_CHECKING([gmp.h version >= 4.1.4]) - AC_TRY_COMPILE( - [#include "gmp.h"], - [ - #if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414 - #error bad gmp - #endif - ], - [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])] + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include "gmp.h"]], + [[ + #if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414 + #error bad gmp + #endif]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])] ) fi if test x$ldap = xtrue; then - AC_HAVE_LIBRARY([ldap],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library ldap not found])]) - AC_HAVE_LIBRARY([lber],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library lber not found])]) + AC_CHECK_LIB([ldap],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library ldap not found])],[]) + AC_CHECK_LIB([lber],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library lber not found])],[]) AC_CHECK_HEADER([ldap.h],,[AC_MSG_ERROR([LDAP header ldap.h not found!])]) fi if test x$curl = xtrue; then - AC_HAVE_LIBRARY([curl],[LIBS="$LIBS"],[AC_MSG_ERROR([CURL library curl not found])]) + AC_CHECK_LIB([curl],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([CURL library curl not found])],[]) AC_CHECK_HEADER([curl/curl.h],,[AC_MSG_ERROR([CURL header curl/curl.h not found!])]) fi +if test x$unbound = xtrue; then + AC_HAVE_LIBRARY([ldns],[LIBS="$LIBS"],[AC_MSG_ERROR([UNBOUND library ldns not found])]) + AC_CHECK_HEADER([ldns/ldns.h],,[AC_MSG_ERROR([UNBOUND header ldns/ldns.h not found!])]) + AC_HAVE_LIBRARY([unbound],[LIBS="$LIBS"],[AC_MSG_ERROR([UNBOUND library libunbound not found])]) + AC_CHECK_HEADER([unbound.h],,[AC_MSG_ERROR([UNBOUND header unbound.h not found!])]) +fi + if test x$soup = xtrue; then PKG_CHECK_MODULES(soup, [libsoup-2.4]) AC_SUBST(soup_CFLAGS) @@ -630,14 +670,8 @@ if test x$xml = xtrue; then AC_SUBST(xml_LIBS) fi -if test x$axis2c = xtrue; then - PKG_CHECK_MODULES(axis2c, [axis2c]) - AC_SUBST(axis2c_CFLAGS) - AC_SUBST(axis2c_LIBS) -fi - if test x$tss = xtrousers; then - AC_HAVE_LIBRARY([tspi],[LIBS="$LIBS"],[AC_MSG_ERROR([TrouSerS library libtspi not found])]) + AC_CHECK_LIB([tspi],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([TrouSerS library libtspi not found])],[]) AC_CHECK_HEADER([trousers/tss.h],,[AC_MSG_ERROR([TrouSerS header trousers/tss.h not found!])]) AC_DEFINE([TSS_TROUSERS], [], [use TrouSerS library libtspi as TSS implementation]) fi @@ -683,28 +717,27 @@ if test x$dumm = xtrue; then fi if test x$fast = xtrue; then - AC_HAVE_LIBRARY([neo_cgi],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_cgi not found!])]) - AC_HAVE_LIBRARY([neo_utl],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_utl not found!])]) + AC_CHECK_LIB([neo_cgi],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_cgi not found!])],[]) + AC_CHECK_LIB([neo_utl],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_utl not found!])],[]) AC_MSG_CHECKING([ClearSilver requires zlib]) saved_CFLAGS=$CFLAGS saved_LIBS=$LIBS LIBS="-lneo_cgi -lneo_cs -lneo_utl" CFLAGS="-I/usr/include/ClearSilver" - AC_TRY_LINK( - [#include ], - [ - NEOERR *err = cgi_display(NULL, NULL); - ], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[NEOERR *err = cgi_display(NULL, NULL);]])], [AC_MSG_RESULT([no]); clearsilver_LIBS="$LIBS"], [AC_MSG_RESULT([yes]); clearsilver_LIBS="$LIBS -lz"] ) AC_SUBST(clearsilver_LIBS) LIBS=$saved_LIBS CFLAGS=$saved_CFLAGS -dnl autoconf does not like CamelCase!? How to fix this? -dnl AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])]) +# autoconf does not like CamelCase!? How to fix this? +# AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])]) - AC_HAVE_LIBRARY([fcgi],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])]) + AC_CHECK_LIB([fcgi],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])],[]) AC_CHECK_HEADER([fcgiapp.h],,[AC_MSG_ERROR([FastCGI header file fcgiapp.h not found!])]) fi @@ -718,40 +751,43 @@ if test x$mysql = xtrue; then fi if test x$sqlite = xtrue; then - AC_HAVE_LIBRARY([sqlite3],[LIBS="$LIBS"],[AC_MSG_ERROR([SQLite library sqlite3 not found])]) + AC_CHECK_LIB([sqlite3],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([SQLite library sqlite3 not found])],[]) AC_CHECK_HEADER([sqlite3.h],,[AC_MSG_ERROR([SQLite header sqlite3.h not found!])]) AC_MSG_CHECKING([sqlite3_prepare_v2]) - AC_TRY_COMPILE( - [#include ], - [ - void *test = sqlite3_prepare_v2; - ], - [AC_MSG_RESULT([yes])]; - AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], [], [have sqlite3_prepare_v2()]), - [AC_MSG_RESULT([no])]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[void *test = sqlite3_prepare_v2;]])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], [], [have sqlite3_prepare_v2()])], + [AC_MSG_RESULT([no])] + ) AC_MSG_CHECKING([sqlite3.h version >= 3.3.1]) - AC_TRY_COMPILE( - [#include ], - [ - #if SQLITE_VERSION_NUMBER < 3003001 - #error bad sqlite - #endif - ], - [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([SQLite version >= 3.3.1 required!])]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[ + #if SQLITE_VERSION_NUMBER < 3003001 + #error bad sqlite + #endif]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR([SQLite version >= 3.3.1 required!])] + ) fi if test x$openssl = xtrue; then - AC_HAVE_LIBRARY([crypto],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL crypto library not found])]) + AC_CHECK_LIB([crypto],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([OpenSSL crypto library not found])],[]) AC_CHECK_HEADER([openssl/evp.h],,[AC_MSG_ERROR([OpenSSL header openssl/evp.h not found!])]) fi if test x$gcrypt = xtrue; then - AC_HAVE_LIBRARY([gcrypt],[LIBS="$LIBS"],[AC_MSG_ERROR([gcrypt library not found])],[-lgpg-error]) + AC_CHECK_LIB([gcrypt],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([gcrypt library not found])],[-lgpg-error]) AC_CHECK_HEADER([gcrypt.h],,[AC_MSG_ERROR([gcrypt header gcrypt.h not found!])]) AC_MSG_CHECKING([gcrypt CAMELLIA cipher]) - AC_TRY_COMPILE( - [#include ], - [enum gcry_cipher_algos alg = GCRY_CIPHER_CAMELLIA128;], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[enum gcry_cipher_algos alg = GCRY_CIPHER_CAMELLIA128;]])], [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_GCRY_CIPHER_CAMELLIA], [], [have GCRY_CIPHER_CAMELLIA128])], [AC_MSG_RESULT([no])] @@ -759,15 +795,15 @@ if test x$gcrypt = xtrue; then fi if test x$uci = xtrue; then - AC_HAVE_LIBRARY([uci],[LIBS="$LIBS"],[AC_MSG_ERROR([UCI library libuci not found])]) + AC_CHECK_LIB([uci],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([UCI library libuci not found])],[]) AC_CHECK_HEADER([uci.h],,[AC_MSG_ERROR([UCI header uci.h not found!])]) fi -if test x$android = xtrue; then - AC_HAVE_LIBRARY([cutils],[LIBS="$LIBS"],[AC_MSG_ERROR([Android library libcutils not found])]) +if test x$android_dns = xtrue; then + AC_CHECK_LIB([cutils],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([Android library libcutils not found])],[]) AC_CHECK_HEADER([cutils/properties.h],,[AC_MSG_ERROR([Android header cutils/properties.h not found!])]) - dnl we have to force the use of libdl here because the autodetection - dnl above does not work correctly when cross-compiling for android. + # we have to force the use of libdl here because the autodetection + # above does not work correctly when cross-compiling for android. DLLIB="-ldl" AC_SUBST(DLLIB) fi @@ -796,21 +832,21 @@ if test x$nm = xtrue; then fi if test x$xauth_pam = xtrue; then - AC_HAVE_LIBRARY([pam],[LIBS="$LIBS"],[AC_MSG_ERROR([PAM library not found])]) + AC_CHECK_LIB([pam],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([PAM library not found])],[]) AC_CHECK_HEADER([security/pam_appl.h],,[AC_MSG_ERROR([PAM header security/pam_appl.h not found!])]) fi if test x$capabilities = xnative; then AC_MSG_NOTICE([Usage of the native Linux capabilities interface is deprecated, use libcap instead]) - dnl Linux requires the following for capset(), Android does not have it, - dnl but defines capset() in unistd.h instead. + # Linux requires the following for capset(), Android does not have it, + # but defines capset() in unistd.h instead. AC_CHECK_HEADERS([sys/capability.h]) AC_CHECK_FUNC(capset,,[AC_MSG_ERROR([capset() not found!])]) AC_DEFINE([CAPABILITIES_NATIVE], [], [have native linux capset()]) fi if test x$capabilities = xlibcap; then - AC_HAVE_LIBRARY([cap],[LIBS="$LIBS"],[AC_MSG_ERROR([libcap library not found])]) + AC_CHECK_LIB([cap],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([libcap library not found])],[]) AC_CHECK_HEADER([sys/capability.h], [AC_DEFINE([HAVE_SYS_CAPABILITY_H], [], [have sys/capability.h])], [AC_MSG_ERROR([libcap header sys/capability.h not found!])]) @@ -819,25 +855,29 @@ fi if test x$integrity_test = xtrue; then AC_MSG_CHECKING([for dladdr()]) - AC_TRY_COMPILE( - [#define _GNU_SOURCE - #include ], - [Dl_info info; dladdr(main, &info);], - [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include ]], + [[Dl_info info; dladdr(main, &info);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR([dladdr() not supported, required by integrity-test!])] ) AC_MSG_CHECKING([for dl_iterate_phdr()]) - AC_TRY_COMPILE( - [#define _GNU_SOURCE - #include ], - [dl_iterate_phdr((void*)0, (void*)0);], - [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include ]], + [[dl_iterate_phdr((void*)0, (void*)0);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR([dl_iterate_phdr() not supported, required by integrity-test!])] ) fi if test x$bfd_backtraces = xtrue; then - AC_HAVE_LIBRARY([bfd],[LIBS="$LIBS"],[AC_MSG_ERROR([binutils libbfd not found!])]) + AC_CHECK_LIB([bfd],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([binutils libbfd not found!])],[]) AC_CHECK_HEADER([bfd.h],[AC_DEFINE([HAVE_BFD_H],,[have binutils bfd.h])], [AC_MSG_ERROR([binutils bfd.h header not found!])]) BFDLIB="-lbfd" @@ -852,9 +892,19 @@ AC_SUBST(dev_headers) CFLAGS="$CFLAGS -include `pwd`/config.h" -dnl ============================================== -dnl collect plugin list for strongSwan components -dnl ============================================== +if test x$tkm = xtrue; then + AC_PATH_PROG([GPRBUILD], [gprbuild], [], [$PATH:/bin:/usr/bin:/usr/local/bin]) +fi + +if test x$unit_tests = xtrue; then + PKG_CHECK_MODULES(CHECK, [check >= 0.9.4]) + AC_SUBST(CHECK_CFLAGS) + AC_SUBST(CHECK_LIBS) +fi + +# =============================================== +# collect plugin list for strongSwan components +# =============================================== m4_include(m4/macros/add-plugin.m4) @@ -880,6 +930,7 @@ s_plugins= ADD_PLUGIN([test-vectors], [s charon openac scepclient pki]) ADD_PLUGIN([curl], [s charon scepclient scripts nm]) ADD_PLUGIN([soup], [s charon scripts nm]) +ADD_PLUGIN([unbound], [s charon scripts]) ADD_PLUGIN([ldap], [s charon scepclient scripts nm]) ADD_PLUGIN([mysql], [s charon pool manager medsrv attest]) ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest]) @@ -903,6 +954,7 @@ ADD_PLUGIN([pkcs7], [s scepclient pki]) ADD_PLUGIN([pkcs8], [s charon openac scepclient pki scripts manager medsrv attest nm]) ADD_PLUGIN([pgp], [s charon]) ADD_PLUGIN([dnskey], [s charon]) +ADD_PLUGIN([ipseckey], [c charon]) ADD_PLUGIN([pem], [s charon openac scepclient pki scripts manager medsrv attest nm]) ADD_PLUGIN([padlock], [s charon]) ADD_PLUGIN([openssl], [s charon openac scepclient pki scripts manager medsrv attest nm]) @@ -953,6 +1005,7 @@ ADD_PLUGIN([eap-tnc], [c charon]) ADD_PLUGIN([xauth-generic], [c charon]) ADD_PLUGIN([xauth-eap], [c charon]) ADD_PLUGIN([xauth-pam], [c charon]) +ADD_PLUGIN([xauth-noauth], [c charon]) ADD_PLUGIN([tnc-ifmap], [c charon]) ADD_PLUGIN([tnc-pdp], [c charon]) ADD_PLUGIN([tnc-imc], [c charon]) @@ -964,13 +1017,14 @@ ADD_PLUGIN([tnccs-dynamic], [c charon]) ADD_PLUGIN([medsrv], [c charon]) ADD_PLUGIN([medcli], [c charon]) ADD_PLUGIN([dhcp], [c charon]) -ADD_PLUGIN([android], [c charon]) +ADD_PLUGIN([android-dns], [c charon]) ADD_PLUGIN([android-log], [c charon]) ADD_PLUGIN([ha], [c charon]) ADD_PLUGIN([whitelist], [c charon]) ADD_PLUGIN([lookip], [c charon]) ADD_PLUGIN([error-notify], [c charon]) ADD_PLUGIN([certexpire], [c charon]) +ADD_PLUGIN([systime-fix], [c charon]) ADD_PLUGIN([led], [c charon]) ADD_PLUGIN([duplicheck], [c charon]) ADD_PLUGIN([coupling], [c charon]) @@ -994,18 +1048,18 @@ AC_SUBST(medsrv_plugins) AC_SUBST(nm_plugins) AC_SUBST(c_plugins) -AC_SUBST(p_plugins) AC_SUBST(h_plugins) AC_SUBST(s_plugins) -dnl ========================= -dnl set Makefile.am vars -dnl ========================= +# ====================== +# set Makefile.am vars +# ====================== -dnl libstrongswan plugins -dnl ===================== +# libstrongswan plugins +# ----------------------- AM_CONDITIONAL(USE_TEST_VECTORS, test x$test_vectors = xtrue) AM_CONDITIONAL(USE_CURL, test x$curl = xtrue) +AM_CONDITIONAL(USE_UNBOUND, test x$unbound = xtrue) AM_CONDITIONAL(USE_SOUP, test x$soup = xtrue) AM_CONDITIONAL(USE_LDAP, test x$ldap = xtrue) AM_CONDITIONAL(USE_AES, test x$aes = xtrue) @@ -1045,17 +1099,18 @@ AM_CONDITIONAL(USE_CCM, test x$ccm = xtrue) AM_CONDITIONAL(USE_GCM, test x$gcm = xtrue) AM_CONDITIONAL(USE_AF_ALG, test x$af_alg = xtrue) -dnl charon plugins -dnl ============== +# charon plugins +# ---------------- AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue) AM_CONDITIONAL(USE_MEDSRV, test x$medsrv = xtrue) AM_CONDITIONAL(USE_MEDCLI, test x$medcli = xtrue) AM_CONDITIONAL(USE_UCI, test x$uci = xtrue) -AM_CONDITIONAL(USE_ANDROID, test x$android = xtrue) +AM_CONDITIONAL(USE_ANDROID_DNS, test x$android_dns = xtrue) AM_CONDITIONAL(USE_ANDROID_LOG, test x$android_log = xtrue) AM_CONDITIONAL(USE_MAEMO, test x$maemo = xtrue) AM_CONDITIONAL(USE_SMP, test x$smp = xtrue) AM_CONDITIONAL(USE_SQL, test x$sql = xtrue) +AM_CONDITIONAL(USE_IPSECKEY, test x$ipseckey = xtrue) AM_CONDITIONAL(USE_UPDOWN, test x$updown = xtrue) AM_CONDITIONAL(USE_DHCP, test x$dhcp = xtrue) AM_CONDITIONAL(USE_UNIT_TESTS, test x$unit_tester = xtrue) @@ -1065,6 +1120,7 @@ AM_CONDITIONAL(USE_WHITELIST, test x$whitelist = xtrue) AM_CONDITIONAL(USE_LOOKIP, test x$lookip = xtrue) AM_CONDITIONAL(USE_ERROR_NOTIFY, test x$error_notify = xtrue) AM_CONDITIONAL(USE_CERTEXPIRE, test x$certexpire = xtrue) +AM_CONDITIONAL(USE_SYSTIME_FIX, test x$systime_fix = xtrue) AM_CONDITIONAL(USE_LED, test x$led = xtrue) AM_CONDITIONAL(USE_DUPLICHECK, test x$duplicheck = xtrue) AM_CONDITIONAL(USE_COUPLING, test x$coupling = xtrue) @@ -1090,6 +1146,7 @@ AM_CONDITIONAL(USE_EAP_RADIUS, test x$eap_radius = xtrue) AM_CONDITIONAL(USE_XAUTH_GENERIC, test x$xauth_generic = xtrue) AM_CONDITIONAL(USE_XAUTH_EAP, test x$xauth_eap = xtrue) AM_CONDITIONAL(USE_XAUTH_PAM, test x$xauth_pam = xtrue) +AM_CONDITIONAL(USE_XAUTH_NOAUTH, test x$xauth_noauth = xtrue) AM_CONDITIONAL(USE_TNC_IFMAP, test x$tnc_ifmap = xtrue) AM_CONDITIONAL(USE_TNC_PDP, test x$tnc_pdp = xtrue) AM_CONDITIONAL(USE_TNC_IMC, test x$tnc_imc = xtrue) @@ -1112,18 +1169,18 @@ AM_CONDITIONAL(USE_FARP, test x$farp = xtrue) AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue) AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue) -dnl hydra plugins -dnl ============= +# hydra plugins +# --------------- AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue) -AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue -o x$sql = xtrue) +AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue) AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue) AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue) AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue) AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue) -dnl other options -dnl ============= +# other options +# --------------- AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue) AM_CONDITIONAL(USE_LOCK_PROFILER, test x$lock_profiler = xtrue) AM_CONDITIONAL(USE_DUMM, test x$dumm = xtrue) @@ -1141,12 +1198,13 @@ AM_CONDITIONAL(USE_NM, test x$nm = xtrue) AM_CONDITIONAL(USE_TOOLS, test x$tools = 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$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue) -AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue) -AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = 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) +AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue) +AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue) AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue) 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_LIBCAP, test x$capabilities = xlibcap) @@ -1158,10 +1216,12 @@ AM_CONDITIONAL(USE_IMCV, test x$imcv = xtrue) AM_CONDITIONAL(USE_PTS, test x$pts = xtrue) AM_CONDITIONAL(USE_TROUSERS, test x$tss = xtrousers) AM_CONDITIONAL(MONOLITHIC, test x$monolithic = xtrue) +AM_CONDITIONAL(UNITTESTS, test x$unit_tests = xtrue) +AM_CONDITIONAL(USE_TKM, test x$tkm = xtrue) -dnl ============================== -dnl set global definitions -dnl ============================== +# ======================== +# set global definitions +# ======================== if test x$mediation = xtrue; then AC_DEFINE([ME], [], [mediation extension support]) @@ -1179,11 +1239,11 @@ if test x$ikev2 = xtrue; then AC_DEFINE([USE_IKEV2], [], [support for IKEv2 protocol]) fi -dnl ============================== -dnl build Makefiles -dnl ============================== +# ================= +# build Makefiles +# ================= -AC_OUTPUT( +AC_CONFIG_FILES([ Makefile man/Makefile init/Makefile @@ -1217,6 +1277,7 @@ AC_OUTPUT( src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile + src/libstrongswan/plugins/unbound/Makefile src/libstrongswan/plugins/soup/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile @@ -1245,6 +1306,7 @@ AC_OUTPUT( src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile + src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile @@ -1257,6 +1319,7 @@ AC_OUTPUT( src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile + src/charon-tkm/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile @@ -1279,6 +1342,7 @@ AC_OUTPUT( src/libcharon/plugins/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile + src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile @@ -1292,6 +1356,7 @@ AC_OUTPUT( src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile + src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile @@ -1302,11 +1367,12 @@ AC_OUTPUT( src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile + src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile - src/libcharon/plugins/android/Makefile + src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile @@ -1332,4 +1398,18 @@ AC_OUTPUT( src/conftest/Makefile scripts/Makefile testing/Makefile -) +]) +AC_OUTPUT + +# ======================== +# report enabled plugins +# ======================== + +AC_MSG_RESULT([]) +AC_MSG_RESULT([ strongSwan will be built with the following plugins]) +AC_MSG_RESULT([-----------------------------------------------------]) + +AC_MSG_RESULT([libstrongswan:$s_plugins]) +AC_MSG_RESULT([libcharon: $c_plugins]) +AC_MSG_RESULT([libhydra: $h_plugins]) +AC_MSG_RESULT([]) diff --git a/depcomp b/depcomp index bd0ac0895..25a39e6cd 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ EOF ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ gcc) ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ sgi) # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ sgi) rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ aix) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ aix) ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ icc) exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ hp2) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ hp2) tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ tru64) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ msvisualcpp) sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/init/Makefile.in b/init/Makefile.in index 7d7346e0c..7603fa066 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -61,6 +78,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -108,6 +130,8 @@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -124,6 +148,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GPERF = @GPERF@ +GPRBUILD = @GPRBUILD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -192,8 +217,6 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ attest_plugins = @attest_plugins@ -axis2c_CFLAGS = @axis2c_CFLAGS@ -axis2c_LIBS = @axis2c_LIBS@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -249,7 +272,6 @@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ -p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ @@ -491,13 +513,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/init/systemd/Makefile.in b/init/systemd/Makefile.in index def76088a..7b95497ab 100644 --- a/init/systemd/Makefile.in +++ b/init/systemd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -97,6 +119,8 @@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -113,6 +137,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GPERF = @GPERF@ +GPRBUILD = @GPRBUILD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -181,8 +206,6 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ attest_plugins = @attest_plugins@ -axis2c_CFLAGS = @axis2c_CFLAGS@ -axis2c_LIBS = @axis2c_LIBS@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -238,7 +261,6 @@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ -p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ @@ -316,8 +338,11 @@ clean-libtool: -rm -rf .libs _libs install-systemdsystemunitDATA: $(systemdsystemunit_DATA) @$(NORMAL_INSTALL) - test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/ltmain.sh b/ltmain.sh index c2852d856..0096fe6c7 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1ubuntu2" TIMESTAMP="" package_revision=1.3337 diff --git a/m4/macros/enable-disable.m4 b/m4/macros/enable-disable.m4 index 3d423652f..2e4552068 100644 --- a/m4/macros/enable-disable.m4 +++ b/m4/macros/enable-disable.m4 @@ -20,6 +20,7 @@ AC_DEFUN([ARG_ENABL_SET], # ARG_DISBL_SET(option, help) # --------------------------- # Create a --disable-$1 option with helptext, set a variable $1 to true/false +# All $1 are collected in the variable $enabled_by_default AC_DEFUN([ARG_DISBL_SET], [AC_ARG_ENABLE( [$1], @@ -32,5 +33,6 @@ AC_DEFUN([ARG_DISBL_SET], fi], [patsubst([$1], [-], [_])=true patsubst([$1], [-], [_])_given=false] - )] + ) + enabled_by_default=${enabled_by_default}" patsubst([$1], [-], [_])"] ) diff --git a/man/Makefile.in b/man/Makefile.in index e313a4fff..daebe3b90 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,6 +71,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -99,6 +121,8 @@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -115,6 +139,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GPERF = @GPERF@ +GPRBUILD = @GPRBUILD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -183,8 +208,6 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ attest_plugins = @attest_plugins@ -axis2c_CFLAGS = @axis2c_CFLAGS@ -axis2c_LIBS = @axis2c_LIBS@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -240,7 +263,6 @@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ -p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ @@ -320,11 +342,18 @@ clean-libtool: -rm -rf .libs _libs install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list=''; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ diff --git a/man/ipsec.conf.5 b/man/ipsec.conf.5 index e24196c2b..554a6e8ca 100644 --- a/man/ipsec.conf.5 +++ b/man/ipsec.conf.5 @@ -1,4 +1,4 @@ -.TH IPSEC.CONF 5 "2012-06-26" "5.0.2" "strongSwan" +.TH IPSEC.CONF 5 "2012-06-26" "5.0.3rc1" "strongSwan" .SH NAME ipsec.conf \- IPsec configuration and connections .SH DESCRIPTION @@ -452,6 +452,11 @@ suites, the strict flag exclamation mark) can be used, e.g: .BR aes256-sha512-modp4096! .TP +.BR ikedscp " = " 000000 " | " +Differentiated Services Field Codepoint to set on outgoing IKE packets sent +from this connection. The value is a six digit binary encoded string defining +the Codepoint to set, as defined in RFC 2474. +.TP .BR ikelifetime " = " 3h " |