[Pkg-swan-devel] [strongswan] 02/12: Merge tag 'upstream/5.3.1'
Yves-Alexis Perez
corsac at moszumanska.debian.org
Mon Jun 8 14:51:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
corsac pushed a commit to branch master
in repository strongswan.
commit 67b61882ae49026bd719fffe5455c7655d38c81a
Merge: 67003dc fc556ec
Author: Yves-Alexis Perez <corsac at debian.org>
Date: Mon Jun 1 15:00:29 2015 +0200
Merge tag 'upstream/5.3.1'
Upstream version 5.3.1
Conflicts:
src/libstrongswan/plugins/aesni/aesni_cbc.h
Android.common.mk | 2 +-
Doxyfile.in | 4 +-
Makefile.am | 6 +-
Makefile.in | 6 +-
NEWS | 16 +
conf/Makefile.am | 1 +
conf/Makefile.in | 1 +
conf/options/imv_policy_manager.conf | 18 +
conf/options/imv_policy_manager.opt | 13 +
conf/plugins/kernel-netlink.conf | 3 +
conf/plugins/kernel-netlink.opt | 3 +
conf/strongswan.conf.5.main | 22 +
config.h.in | 3 +
configure | 1065 ++++++++--
configure.ac | 41 +-
init/Makefile.am | 2 +
init/Makefile.in | 2 +-
man/ipsec.conf.5.in | 2 +-
scripts/Makefile.am | 4 +-
scripts/Makefile.in | 20 +-
scripts/crypt_burn.c | 264 ++-
scripts/timeattack.c | 418 ++++
src/charon-nm/charon-nm.c | 3 +
src/charon-tkm/src/tkm/tkm_encoder.c~ | 106 +
src/charon-tkm/src/tkm/tkm_id_manager.c | 2 -
src/charon-tkm/src/tkm/tkm_kernel_ipsec.c | 17 +-
src/charon-tkm/src/tkm/tkm_kernel_sad.c | 96 +-
src/charon-tkm/src/tkm/tkm_kernel_sad.h | 21 +-
src/charon-tkm/src/tkm/tkm_keymat.c | 15 +-
src/charon-tkm/src/tkm/tkm_listener.c | 9 +
src/charon-tkm/src/tkm/tkm_nonceg.c | 53 +-
src/charon-tkm/src/tkm/tkm_nonceg.h | 8 -
src/charon-tkm/tests/kernel_sad_tests.c | 48 +-
src/charon-tkm/tests/keymat_tests.c | 2 +-
src/charon-tkm/tests/nonceg_tests.c | 1 -
src/ipsec/_ipsec.8 | 2 +-
src/libcharon/bus/bus.c | 34 +-
src/libcharon/bus/bus.h | 13 +-
src/libcharon/bus/listeners/listener.h | 17 +-
src/libcharon/encoding/message.c | 66 +-
.../encoding/payloads/encrypted_payload.c | 5 +
src/libcharon/encoding/payloads/payload.c | 2 +
src/libcharon/encoding/payloads/payload.h | 7 +-
src/libcharon/encoding/payloads/unknown_payload.c | 8 +
src/libcharon/encoding/payloads/unknown_payload.h | 8 +
src/libcharon/network/receiver.c | 2 +-
src/libcharon/plugins/eap_aka/eap_aka_server.c | 5 +-
.../plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c | 3 +-
.../plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c | 3 +-
src/libcharon/plugins/eap_md5/eap_md5.c | 3 +-
src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c | 7 +-
.../plugins/eap_radius/eap_radius_accounting.c | 390 +++-
src/libcharon/plugins/eap_sim/eap_sim_peer.c | 3 +-
src/libcharon/plugins/eap_sim/eap_sim_server.c | 3 +-
.../plugins/eap_sim_file/eap_sim_file_card.c | 3 +-
src/libcharon/plugins/ha/ha_cache.c | 12 +-
src/libcharon/plugins/ha/ha_cache.h | 3 +-
src/libcharon/plugins/ha/ha_plugin.c | 128 +-
src/libcharon/plugins/vici/libvici.h | 29 +-
src/libcharon/plugins/vici/python/Makefile.am | 12 +-
src/libcharon/plugins/vici/python/Makefile.in | 17 +-
src/libcharon/plugins/vici/ruby/Makefile.am | 4 +-
src/libcharon/plugins/vici/ruby/Makefile.in | 14 +-
src/libcharon/plugins/vici/vici_config.c | 37 +
src/libcharon/plugins/vici/vici_dispatcher.c | 41 +
src/libcharon/plugins/vici/vici_dispatcher.h | 33 +
src/libcharon/plugins/vici/vici_plugin.c | 24 +
src/libcharon/plugins/vici/vici_query.c | 85 +
src/libcharon/plugins/vici/vici_query.h | 28 +
src/libcharon/plugins/vici/vici_socket.c | 46 +-
.../plugins/xauth_generic/xauth_generic.c | 2 +-
src/libcharon/processing/jobs/adopt_children_job.c | 20 +-
src/libcharon/sa/ike_sa_manager.c | 4 +-
.../sa/ikev1/authenticators/psk_v1_authenticator.c | 2 +-
src/libcharon/sa/ikev1/task_manager_v1.c | 5 +
.../sa/ikev2/authenticators/eap_authenticator.c | 2 +-
.../sa/ikev2/authenticators/psk_authenticator.c | 2 +-
src/libcharon/sa/ikev2/keymat_v2.c | 15 +-
src/libcharon/sa/ikev2/task_manager_v2.c | 18 +-
src/libcharon/sa/ikev2/tasks/child_create.c | 50 +-
src/libcharon/sa/ikev2/tasks/ike_init.c | 53 +-
src/libcharon/sa/ikev2/tasks/ike_mobike.c | 2 +-
src/libcharon/sa/ikev2/tasks/ike_vendor.c | 10 +
.../plugins/kernel_netlink/kernel_netlink_ipsec.c | 2 +-
.../plugins/kernel_netlink/kernel_netlink_net.c | 24 +
.../plugins/kernel_netlink/kernel_netlink_shared.c | 18 +-
src/libhydra/plugins/kernel_netlink/tests.c | 2 -
src/libimcv/ietf/ietf_attr_attr_request.c | 27 +-
src/libimcv/ietf/ietf_attr_fwd_enabled.h | 2 +-
src/libimcv/ietf/ietf_attr_numeric_version.h | 2 +-
src/libimcv/ietf/ietf_attr_op_status.h | 2 +-
src/libimcv/imc/imc_os_info.c | 4 +-
src/libimcv/imv/imv_policy_manager.c | 22 +-
src/libimcv/pa_tnc/pa_tnc_msg.c | 9 +-
src/libimcv/plugins/imc_os/imc_os.c | 6 +-
.../imv_attestation/imv_attestation_process.c | 7 +-
src/libimcv/pts/components/ita/ita_comp_ima.c | 9 +-
src/libimcv/pts/components/ita/ita_comp_tboot.c | 3 +-
src/libimcv/pts/components/ita/ita_comp_tgrub.c | 2 +-
src/libimcv/pts/pts_database.c | 4 +-
src/libimcv/pts/pts_file_meas.c | 8 +-
src/libipsec/esp_context.c | 9 +-
src/libipsec/ipsec_sa_mgr.c | 2 +-
src/libpttls/sasl/sasl_plain/sasl_plain.c | 2 +-
src/libradius/radius_message.c | 2 +-
src/libradius/radius_socket.c | 104 +-
src/libsimaka/Makefile.am | 4 +
src/libsimaka/Makefile.in | 11 +-
src/libstrongswan/Android.mk | 9 +-
src/libstrongswan/Makefile.am | 23 +-
src/libstrongswan/Makefile.in | 286 +--
src/libstrongswan/asn1/asn1.c | 4 +
src/libstrongswan/crypto/aead.c | 4 +-
src/libstrongswan/crypto/aead.h | 3 +-
src/libstrongswan/crypto/crypto_factory.c | 182 +-
src/libstrongswan/crypto/crypto_factory.h | 21 +-
src/libstrongswan/crypto/crypto_tester.c | 193 +-
src/libstrongswan/crypto/crypto_tester.h | 41 +
src/libstrongswan/crypto/diffie_hellman.h | 12 +
src/libstrongswan/crypto/iv/iv_gen.c | 61 +
src/libstrongswan/crypto/iv/iv_gen.h | 8 +
src/libstrongswan/crypto/iv/iv_gen_seq.c | 24 +
src/libstrongswan/crypto/iv/iv_gen_seq.h | 3 +
src/libstrongswan/crypto/signers/mac_signer.c | 3 +-
src/libstrongswan/crypto/transform.c | 32 +
src/libstrongswan/crypto/transform.h | 8 +
src/libstrongswan/plugins/aesni/Makefile.am | 26 +
.../plugins/aesni}/Makefile.in | 155 +-
src/libstrongswan/plugins/aesni/aesni_cbc.c | 671 ++++++
src/libstrongswan/plugins/aesni/aesni_cbc.h | 48 +
src/libstrongswan/plugins/aesni/aesni_ccm.c | 914 ++++++++
src/libstrongswan/plugins/aesni/aesni_ccm.h | 50 +
src/libstrongswan/plugins/aesni/aesni_cmac.c | 371 ++++
src/libstrongswan/plugins/aesni/aesni_cmac.h | 52 +
src/libstrongswan/plugins/aesni/aesni_ctr.c | 643 ++++++
src/libstrongswan/plugins/aesni/aesni_ctr.h | 48 +
src/libstrongswan/plugins/aesni/aesni_gcm.c | 1447 +++++++++++++
src/libstrongswan/plugins/aesni/aesni_gcm.h | 50 +
src/libstrongswan/plugins/aesni/aesni_key.c | 301 +++
src/libstrongswan/plugins/aesni/aesni_key.h | 65 +
src/libstrongswan/plugins/aesni/aesni_plugin.c | 125 ++
.../iv_gen_seq.h => plugins/aesni/aesni_plugin.h} | 32 +-
src/libstrongswan/plugins/aesni/aesni_xcbc.c | 367 ++++
src/libstrongswan/plugins/aesni/aesni_xcbc.h | 52 +
src/libstrongswan/plugins/af_alg/af_alg_signer.c | 2 +-
src/libstrongswan/plugins/ccm/ccm_aead.c | 2 +-
src/libstrongswan/plugins/fips_prf/fips_prf.c | 2 -
src/libstrongswan/plugins/gcm/gcm_aead.c | 2 +-
src/libstrongswan/plugins/gcrypt/gcrypt_dh.c | 19 +
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c | 3 +
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c | 10 +
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c | 5 +-
.../plugins/openssl/openssl_crypter.c | 2 +
.../plugins/openssl/openssl_diffie_hellman.c | 13 +
.../plugins/openssl/openssl_ec_diffie_hellman.c | 44 +
src/libstrongswan/plugins/openssl/openssl_hmac.c | 22 +-
src/libstrongswan/plugins/openssl/openssl_pkcs7.c | 2 +-
.../plugins/openssl/openssl_rsa_public_key.c | 2 +-
src/libstrongswan/plugins/padlock/padlock_plugin.c | 97 +-
src/libstrongswan/plugins/pkcs12/pkcs12_decode.c | 2 +-
.../plugins/pkcs7/pkcs7_signed_data.c | 2 +-
src/libstrongswan/plugins/plugin_feature.c | 2 +
src/libstrongswan/plugins/rdrand/rdrand_plugin.c | 55 +-
src/libstrongswan/plugins/sqlite/sqlite_database.c | 27 +-
src/libstrongswan/plugins/sqlite/sqlite_plugin.c | 9 +-
src/libstrongswan/plugins/test_vectors/Makefile.am | 4 +
src/libstrongswan/plugins/test_vectors/Makefile.in | 19 +-
.../plugins/test_vectors/test_vectors.h | 32 +
.../plugins/test_vectors/test_vectors/aes_ccm.c | 79 +
.../plugins/test_vectors/test_vectors/aes_gcm.c | 150 ++
.../plugins/test_vectors/test_vectors/ecp.c | 134 ++
.../plugins/test_vectors/test_vectors/ecpbp.c | 113 +
.../plugins/test_vectors/test_vectors/modp.c | 731 +++++++
.../plugins/test_vectors/test_vectors/modpsub.c | 164 ++
.../plugins/test_vectors/test_vectors_plugin.c | 29 +-
src/libstrongswan/tests/suites/test_chunk.c | 27 +
src/libstrongswan/tests/suites/test_enum.c | 10 +
src/libstrongswan/tests/suites/test_threading.c | 31 +
src/libstrongswan/tests/suites/test_utils.c | 86 +
src/libstrongswan/tests/suites/test_vectors.c | 34 +-
src/libstrongswan/tests/test_runner.c | 22 +-
src/libstrongswan/tests/test_runner.h | 4 +
src/libstrongswan/tests/test_suite.h | 6 +-
src/libstrongswan/tests/tests.c | 3 +-
src/libstrongswan/threading/thread.c | 39 +-
src/libstrongswan/threading/thread.h | 10 +
src/libstrongswan/threading/windows/thread.c | 20 +
src/libstrongswan/utils/chunk.h | 13 +
src/libstrongswan/utils/cpu_feature.c | 158 ++
src/libstrongswan/utils/cpu_feature.h | 62 +
src/libstrongswan/utils/enum.c | 6 +-
src/libstrongswan/utils/leak_detective.c | 5 +-
src/libstrongswan/utils/utils.c | 739 +------
src/libstrongswan/utils/utils.h | 895 +-------
src/libstrongswan/utils/utils/align.c | 62 +
src/libstrongswan/utils/utils/align.h | 86 +
src/libstrongswan/utils/utils/atomics.c | 112 +
src/libstrongswan/utils/utils/atomics.h | 130 ++
src/libstrongswan/utils/utils/byteorder.h | 161 ++
src/libstrongswan/utils/utils/memory.c | 237 +++
src/libstrongswan/utils/utils/memory.h | 183 ++
src/libstrongswan/utils/utils/object.h | 126 ++
src/libstrongswan/utils/utils/path.c | 168 ++
src/libstrongswan/utils/utils/path.h | 77 +
.../iv/iv_gen_seq.h => utils/utils/status.c} | 42 +-
src/libstrongswan/utils/utils/status.h | 72 +
src/libstrongswan/utils/utils/strerror.h | 3 +-
src/libstrongswan/utils/utils/string.c | 91 +
src/libstrongswan/utils/utils/string.h | 103 +
src/libstrongswan/utils/utils/time.c | 143 ++
src/libstrongswan/utils/utils/time.h | 91 +
src/libstrongswan/utils/utils/tty.c | 86 +
src/libstrongswan/utils/utils/tty.h | 65 +
src/libstrongswan/utils/utils/types.h | 87 +
src/libtls/tls_peer.c | 9 +-
src/libtls/tls_server.c | 2 +-
src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c | 2 +-
.../plugins/tnccs_20/messages/pb_tnc_msg.h | 2 +-
src/starter/Android.mk | 2 +-
src/starter/Makefile.am | 4 -
src/starter/Makefile.in | 7 +-
src/starter/confread.c | 23 -
src/starter/confread.h | 1 -
src/starter/starter.c | 9 +-
src/starter/starterstroke.c | 308 +--
src/stroke/stroke.c | 281 +--
src/stroke/stroke_msg.h | 18 +-
src/swanctl/command.c | 45 +-
src/swanctl/command.h | 2 +-
src/swanctl/commands/list_sas.c | 86 +-
testing/config/kernel/config-4.0 | 2202 ++++++++++++++++++++
.../hosts/winnetou/etc/openssl/research/index.txt | 3 +-
.../winnetou/etc/openssl/research/index.txt.old | 3 +-
.../winnetou/etc/openssl/research/newcerts/0B.pem | 25 +
testing/hosts/winnetou/etc/openssl/research/serial | 2 +-
.../hosts/winnetou/etc/openssl/research/serial.old | 2 +-
testing/hosts/winnetou/etc/openssl/sales/index.txt | 3 +-
.../hosts/winnetou/etc/openssl/sales/index.txt.old | 3 +-
.../winnetou/etc/openssl/sales/newcerts/09.pem | 24 +
testing/hosts/winnetou/etc/openssl/sales/serial | 2 +-
.../hosts/winnetou/etc/openssl/sales/serial.old | 2 +-
testing/scripts/build-baseimage | 4 +-
testing/scripts/build-guestkernel | 2 +-
testing/scripts/recipes/005_anet.mk | 2 +-
testing/scripts/recipes/006_tkm-rpc.mk | 2 +-
testing/scripts/recipes/010_tkm.mk | 2 +-
testing/scripts/recipes/012_openssl.mk | 2 +-
testing/testing.conf | 8 +-
testing/tests/af-alg/rw-cert/pretest.dat | 2 +-
testing/tests/gcrypt-ikev2/rw-cert/pretest.dat | 2 +-
testing/tests/ha/active-passive/description.txt | 8 +
testing/tests/ha/active-passive/evaltest.dat | 32 +
.../ha/active-passive/hosts/alice/etc/ipsec.conf | 19 +
.../hosts/alice/etc/ipsec.d/certs/marsCert.pem | 25 +
.../hosts/alice/etc/ipsec.d/private/marsKey.pem | 27 +
.../active-passive/hosts/alice/etc/ipsec.secrets | 3 +
.../active-passive/hosts/alice/etc/iptables.rules | 57 +
.../active-passive/hosts/alice/etc/strongswan.conf | 16 +
.../ha/active-passive/hosts/carol/etc/ipsec.conf | 20 +
.../active-passive/hosts/carol/etc/strongswan.conf | 5 +
.../ha/active-passive/hosts/dave/etc/ipsec.conf | 20 +
.../active-passive/hosts/dave/etc/strongswan.conf | 6 +
.../ha/active-passive/hosts/moon/etc/ipsec.conf | 19 +
.../hosts/moon/etc/ipsec.d/certs/marsCert.pem | 25 +
.../hosts/moon/etc/ipsec.d/private/marsKey.pem | 27 +
.../ha/active-passive/hosts/moon/etc/ipsec.secrets | 3 +
.../active-passive/hosts/moon/etc/iptables.rules | 57 +
.../active-passive/hosts/moon/etc/strongswan.conf | 15 +
testing/tests/ha/active-passive/posttest.dat | 15 +
testing/tests/ha/active-passive/pretest.dat | 21 +
.../active-passive}/test.conf | 13 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
.../hosts/carol/etc/ipsec.d/certs/carolCert.pem | 34 +-
.../hosts/carol/etc/ipsec.d/private/carolKey.pem | 50 +-
.../hosts/dave/etc/ipsec.d/certs/daveCert.pem | 32 +-
.../hosts/dave/etc/ipsec.d/private/daveKey.pem | 50 +-
testing/tests/ikev2/rw-cert/pretest.dat | 2 +-
testing/tests/openssl-ikev2/rw-cert/pretest.dat | 2 +-
.../tests/openssl-ikev2/rw-suite-b-128/pretest.dat | 2 +-
.../tests/openssl-ikev2/rw-suite-b-192/pretest.dat | 2 +-
testing/tests/pfkey/rw-cert/pretest.dat | 2 +-
.../hosts/carol/etc/ipsec.d/data.sql | 7 +-
.../carol/etc/ipsec.d/{data.sql => data.sql~} | 8 +-
.../multi-level-ca/hosts/dave/etc/ipsec.d/data.sql | 6 +-
.../hosts/dave/etc/ipsec.d/{data.sql => data.sql~} | 7 +-
testing/tests/sql/rw-cert/pretest.dat | 2 +-
testing/tests/tkm/host2host-initiator/evaltest.dat | 4 +-
testing/tests/tkm/host2host-responder/evaltest.dat | 2 +-
testing/tests/tkm/host2host-xfrmproxy/evaltest.dat | 2 +-
testing/tests/tkm/multiple-clients/evaltest.dat | 4 +-
testing/tests/tkm/net2net-initiator/evaltest.dat | 2 +-
testing/tests/tkm/net2net-xfrmproxy/evaltest.dat | 2 +-
testing/tests/tkm/xfrmproxy-expire/evaltest.dat | 4 +-
testing/tests/tnc/tnccs-11-fhh/description.txt | 2 +-
.../tnc/tnccs-11-radius-block/description.txt | 4 +-
.../tests/tnc/tnccs-11-radius-pts/description.txt | 2 +-
testing/tests/tnc/tnccs-11-radius/description.txt | 2 +-
.../tests/tnc/tnccs-11-supplicant/description.txt | 2 +-
testing/tests/tnc/tnccs-20-fhh/description.txt | 4 +-
testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat | 4 +
.../hosts/alice/etc/iptables.rules | 6 +-
.../hosts/alice/etc/strongswan.conf | 5 +
.../etc/{strongswan.conf => strongswan.conf~} | 5 +
.../tnccs-20-pdp-pt-tls/hosts/moon/etc/ipsec.conf | 3 +
.../hosts/moon/etc/ipsec.secrets | 3 +
.../hosts/moon/etc/strongswan.conf | 3 +
testing/tests/tnc/tnccs-20-pdp-pt-tls/test.conf | 2 +-
342 files changed, 17559 insertions(+), 4015 deletions(-)
diff --cc configure
index 811e452,a7e5faa..1b52902
--- a/configure
+++ b/configure
@@@ -19478,520 -19575,6 +19575,407 @@@ LIBS="-ltspi $LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
++$systemd_daemon_PKG_ERRORS
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tspi_main=yes
+else
+ ac_cv_lib_tspi_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_tspi_main" >&5
+$as_echo "$ac_cv_lib_tspi_main" >&6; }
+if test "x$ac_cv_lib_tspi_main" = xyes; then :
+ LIBS="$LIBS"
+else
+ as_fn_error $? "TrouSerS library libtspi not found" "$LINENO" 5
+fi
+
+ 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 :
+
+else
+ as_fn_error $? "TrouSerS header trousers/tss.h not found!" "$LINENO" 5
+fi
+
+
+
+$as_echo "#define TSS_TROUSERS /**/" >>confdefs.h
+
+fi
+
+if test x$imv_swid = xtrue; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json" >&5
+$as_echo_n "checking for json... " >&6; }
+
+if test -n "$json_CFLAGS"; then
+ pkg_cv_json_CFLAGS="$json_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_CFLAGS=`$PKG_CONFIG --cflags "json-c" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$json_LIBS"; then
+ pkg_cv_json_LIBS="$json_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_LIBS=`$PKG_CONFIG --libs "json-c" 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
+ json_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c" 2>&1`
+ else
+ json_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$json_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json" >&5
+$as_echo_n "checking for json... " >&6; }
+
+if test -n "$json_CFLAGS"; then
+ pkg_cv_json_CFLAGS="$json_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_CFLAGS=`$PKG_CONFIG --cflags "json" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$json_LIBS"; then
+ pkg_cv_json_LIBS="$json_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_LIBS=`$PKG_CONFIG --libs "json" 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
+ json_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json" 2>&1`
+ else
+ json_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$json_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (json) were not met:
+
+$json_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 json_CFLAGS
+and json_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 json_CFLAGS
+and json_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ json_CFLAGS=$pkg_cv_json_CFLAGS
+ json_LIBS=$pkg_cv_json_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json" >&5
+$as_echo_n "checking for json... " >&6; }
+
+if test -n "$json_CFLAGS"; then
+ pkg_cv_json_CFLAGS="$json_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_CFLAGS=`$PKG_CONFIG --cflags "json" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$json_LIBS"; then
+ pkg_cv_json_LIBS="$json_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_json_LIBS=`$PKG_CONFIG --libs "json" 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
+ json_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json" 2>&1`
+ else
+ json_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$json_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (json) were not met:
+
+$json_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 json_CFLAGS
+and json_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 json_CFLAGS
+and json_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ json_CFLAGS=$pkg_cv_json_CFLAGS
+ json_LIBS=$pkg_cv_json_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+else
+ json_CFLAGS=$pkg_cv_json_CFLAGS
+ json_LIBS=$pkg_cv_json_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
- fi
+
- if test x$dumm = xtrue; then
+
+pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
- $as_echo_n "checking for gtk... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemd_journal" >&5
++$as_echo_n "checking for systemd_journal... " >&6; }
+
- if test -n "$gtk_CFLAGS"; then
- pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
++if test -n "$systemd_journal_CFLAGS"; then
++ pkg_cv_systemd_journal_CFLAGS="$systemd_journal_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 vte\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 vte") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 vte" 2>/dev/null`
++ pkg_cv_systemd_journal_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
- if test -n "$gtk_LIBS"; then
- pkg_cv_gtk_LIBS="$gtk_LIBS"
++if test -n "$systemd_journal_LIBS"; then
++ pkg_cv_systemd_journal_LIBS="$systemd_journal_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 vte\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 vte") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 vte" 2>/dev/null`
++ pkg_cv_systemd_journal_LIBS=`$PKG_CONFIG --libs "libsystemd-journal" 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
- gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 vte" 2>&1`
++ systemd_journal_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+ else
- gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 vte" 2>&1`
++ systemd_journal_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
- echo "$gtk_PKG_ERRORS" >&5
++ echo "$systemd_journal_PKG_ERRORS" >&5
+
- as_fn_error $? "Package requirements (gtk+-2.0 vte) were not met:
++ as_fn_error $? "Package requirements (libsystemd-journal) were not met:
+
- $gtk_PKG_ERRORS
++$systemd_journal_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 gtk_CFLAGS
- and gtk_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables systemd_journal_CFLAGS
++and systemd_journal_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 gtk_CFLAGS
- and gtk_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables systemd_journal_CFLAGS
++and systemd_journal_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
- gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
- gtk_LIBS=$pkg_cv_gtk_LIBS
++ systemd_journal_CFLAGS=$pkg_cv_systemd_journal_CFLAGS
++ systemd_journal_LIBS=$pkg_cv_systemd_journal_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
- for ac_prog in ruby
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; 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_prog_RUBY+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$RUBY"; then
- ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- 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_prog_RUBY="$ac_prog"
- $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
-
- fi
- fi
- RUBY=$ac_cv_prog_RUBY
- if test -n "$RUBY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
- $as_echo "$RUBY" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- test -n "$RUBY" && break
- done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby header files" >&5
- $as_echo_n "checking for Ruby header files... " >&6; }
- if test -n "$RUBY"; then
- RUBYINCLUDE=
- RUBYDIR=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG["rubyhdrdir"] || ""') 2>/dev/null`
- if test -n "$RUBYDIR" -a -r "$RUBYDIR/ruby.h"; then
- RUBYARCH=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG["arch"] || ""') 2>/dev/null`
- if test -n "$RUBYARCH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBYDIR" >&5
- $as_echo "$RUBYDIR" >&6; }
- RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH"
- fi
- else
- RUBYDIR=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG["archdir"] || ""') 2>/dev/null`
- if test -n "$RUBYDIR" -a -r "$RUBYDIR/ruby.h"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBYDIR" >&5
- $as_echo "$RUBYDIR" >&6; }
- RUBYINCLUDE="-I$RUBYDIR"
- fi
- fi
- if test -z "$RUBYINCLUDE"; then
- as_fn_error $? "ruby.h not found" "$LINENO" 5
- fi
-
- else
- as_fn_error $? "don't know how to run ruby" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libruby" >&5
- $as_echo_n "checking for libruby... " >&6; }
- saved_LIBS=$LIBS
- LIBS=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG["LIBRUBYARG_SHARED"] || ""') 2>/dev/null`
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
- char ruby_init ();
- int
- main ()
- {
- return ruby_init ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBS" >&5
- $as_echo "$LIBS" >&6; }; RUBYLIB=$LIBS
- else
- as_fn_error $? "not found" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- for ac_func in rb_errinfo
- do :
- ac_fn_c_check_func "$LINENO" "rb_errinfo" "ac_cv_func_rb_errinfo"
- if test "x$ac_cv_func_rb_errinfo" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_RB_ERRINFO 1
- _ACEOF
-
- fi
- done
-
- LIBS=$saved_LIBS
+fi
+
- if test x$fast = xtrue; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lneo_cgi" >&5
- $as_echo_n "checking for main in -lneo_cgi... " >&6; }
- if ${ac_cv_lib_neo_cgi_main+:} false; then :
++if test x$tss = xtrousers; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltspi" >&5
++$as_echo_n "checking for main in -ltspi... " >&6; }
++if ${ac_cv_lib_tspi_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lneo_cgi $LIBS"
++LIBS="-ltspi $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
int
main ()
@@@ -21398,159 -21495,168 +21896,320 @@@ d
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_LCOV="$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
+LCOV=$ac_cv_path_LCOV
+if test -n "$LCOV"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$LCOV = x; then
+ as_fn_error $? "lcov not found" "$LINENO" 5
+ fi
+ # Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; 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_GENHTML+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GENHTML in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GENHTML="$GENHTML" # 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_GENHTML="$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
+GENHTML=$ac_cv_path_GENHTML
+if test -n "$GENHTML"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$GENHTML = x; then
+ as_fn_error $? "genhtml not found" "$LINENO" 5
+ fi
+
+ COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
+ COVERAGE_LDFLAGS="-fprofile-arcs"
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: coverage enabled, adding \"-g -O0\" to CFLAGS" >&5
+$as_echo "$as_me: coverage enabled, adding \"-g -O0\" to CFLAGS" >&6;}
+ CFLAGS="${CFLAGS} -g -O0"
+fi
+
+if test x$ruby_gems = xtrue; then
+ # Extract the first word of "gem", so it can be a program name with args.
+set dummy gem; 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_GEM+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GEM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GEM="$GEM" # 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_GEM="$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
+GEM=$ac_cv_path_GEM
+if test -n "$GEM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEM" >&5
+$as_echo "$GEM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$GEM = x; then
+ as_fn_error $? "RubyGems package manager not found" "$LINENO" 5
+ fi
+ if test "x$rubygemdir" = "xgem environment gemdir"; then
+ rubygemdir=$($GEM environment gemdir)
+ fi
+ RUBYGEMDIR="$rubygemdir"
+
+fi
+
+if test x$python_eggs = xtrue; then
+ # Extract the first word of "easy_install", so it can be a program name with args.
+set dummy easy_install; 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_EASY_INSTALL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $EASY_INSTALL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_EASY_INSTALL="$EASY_INSTALL" # 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_LCOV="$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
+ LCOV=$ac_cv_path_LCOV
+ if test -n "$LCOV"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+ $as_echo "$LCOV" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test x$LCOV = x; then
+ as_fn_error $? "lcov not found" "$LINENO" 5
+ fi
+ # Extract the first word of "genhtml", so it can be a program name with args.
+ set dummy genhtml; 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_GENHTML+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GENHTML in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GENHTML="$GENHTML" # 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_GENHTML="$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
+ GENHTML=$ac_cv_path_GENHTML
+ if test -n "$GENHTML"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+ $as_echo "$GENHTML" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test x$GENHTML = x; then
+ as_fn_error $? "genhtml not found" "$LINENO" 5
+ fi
+
+ COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
+ COVERAGE_LDFLAGS="-fprofile-arcs"
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: coverage enabled, adding \"-g -O0\" to CFLAGS" >&5
+ $as_echo "$as_me: coverage enabled, adding \"-g -O0\" to CFLAGS" >&6;}
+ CFLAGS="${CFLAGS} -g -O0"
+ fi
+
+ if test x$ruby_gems = xtrue; then
+ # Extract the first word of "gem", so it can be a program name with args.
+ set dummy gem; 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_GEM+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GEM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GEM="$GEM" # 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_GEM="$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
+ GEM=$ac_cv_path_GEM
+ if test -n "$GEM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEM" >&5
+ $as_echo "$GEM" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test x$GEM = x; then
+ as_fn_error $? "RubyGems package manager not found" "$LINENO" 5
+ fi
+ if test "x$rubygemdir" = "xgem environment gemdir"; then
+ rubygemdir=$($GEM environment gemdir)
+ fi
+ RUBYGEMDIR="$rubygemdir"
+
+ fi
+ if test "x$ruby_gems_install" = xtrue; then
+ RUBY_GEMS_INSTALL_TRUE=
+ RUBY_GEMS_INSTALL_FALSE='#'
+ else
+ RUBY_GEMS_INSTALL_TRUE='#'
+ RUBY_GEMS_INSTALL_FALSE=
+ fi
+
+
+ if test x$python_eggs = xtrue; then
+ if test x$python_eggs_install = xtrue; then
+ # Extract the first word of "easy_install", so it can be a program name with args.
+ set dummy easy_install; 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_EASY_INSTALL+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $EASY_INSTALL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_EASY_INSTALL="$EASY_INSTALL" # 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_EASY_INSTALL="$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
diff --cc src/libcharon/sa/ikev2/tasks/child_create.c
index 6d9132a,e0f930c..6bae960
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@@ -1199,10 -1205,10 +1205,17 @@@ METHOD(task_t, build_r, status_t
if (this->dh_failed)
{
DBG1(DBG_IKE, "applying DH public value failed");
+ message->add_notify(message, FALSE, NO_PROPOSAL_CHOSEN,
+ chunk_empty);
+ return SUCCESS;
+ }
++ if (this->dh_failed)
++ {
++ DBG1(DBG_IKE, "applying DH public value failed");
+ message->add_notify(message, FALSE, NO_PROPOSAL_CHOSEN,
+ chunk_empty);
+ return SUCCESS;
+ }
no_dh = FALSE;
break;
case IKE_AUTH:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git
More information about the Pkg-swan-devel
mailing list