Imported Upstream version 5.2.0

1 files changed, 34 insertions, 18 deletions

diff --git a/src/libimcv/Makefile.in b/src/libimcv/Makefile.in
index 9d8d86358..4614dd607 100644
--- a/src/libimcv/Makefile.in
+++ b/src/libimcv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -81,13 +81,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@USE_WINDOWS_TRUE@am__append_1 = -lws2_32
 ipsec_PROGRAMS = imv_policy_manager$(EXEEXT)
-@USE_IMC_TEST_TRUE@am__append_1 = plugins/imc_test
-@USE_IMV_TEST_TRUE@am__append_2 = plugins/imv_test
-@USE_IMC_SCANNER_TRUE@am__append_3 = plugins/imc_scanner
-@USE_IMV_SCANNER_TRUE@am__append_4 = plugins/imv_scanner
-@USE_IMC_OS_TRUE@am__append_5 = plugins/imc_os
-@USE_IMV_OS_TRUE@am__append_6 = plugins/imv_os
+@USE_IMC_TEST_TRUE@am__append_2 = plugins/imc_test
+@USE_IMV_TEST_TRUE@am__append_3 = plugins/imv_test
+@USE_IMC_SCANNER_TRUE@am__append_4 = plugins/imc_scanner
+@USE_IMV_SCANNER_TRUE@am__append_5 = plugins/imv_scanner
+@USE_IMC_OS_TRUE@am__append_6 = plugins/imc_os
+@USE_IMV_OS_TRUE@am__append_7 = plugins/imv_os
 subdir = src/libimcv
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(dist_templates_DATA)
@@ -138,14 +139,16 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(ipseclibdir)" "$(DESTDIR)$(ipsecdir)" \
 	"$(DESTDIR)$(ipsecdir)" "$(DESTDIR)$(templatesdir)"
 LTLIBRARIES = $(ipseclib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 libimcv_la_DEPENDENCIES =  \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libtncif/libtncif.la
+	$(top_builddir)/src/libtncif/libtncif.la $(am__DEPENDENCIES_1)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libimcv_la_OBJECTS = imcv.lo imc/imc_agent.lo imc/imc_msg.lo \
-	imv/imv_agent.lo imv/imv_database.lo imv/imv_msg.lo \
-	imv/imv_lang_string.lo imv/imv_reason_string.lo \
-	imv/imv_remediation_string.lo imv/imv_session.lo \
+	imc/imc_os_info.lo imv/imv_agent.lo imv/imv_database.lo \
+	imv/imv_msg.lo imv/imv_lang_string.lo imv/imv_os_info.lo \
+	imv/imv_reason_string.lo imv/imv_remediation_string.lo \
+	imv/imv_session.lo imv/imv_session_manager.lo \
 	imv/imv_workitem.lo ietf/ietf_attr.lo \
 	ietf/ietf_attr_assess_result.lo ietf/ietf_attr_attr_request.lo \
 	ietf/ietf_attr_fwd_enabled.lo \
@@ -343,6 +346,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_LIB = @OPENSSL_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -361,6 +365,7 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
 PTHREADLIB = @PTHREADLIB@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -388,6 +393,7 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aikgen_plugins = @aikgen_plugins@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -479,6 +485,7 @@ srcdir = @srcdir@
 starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
 strongswan_options = @strongswan_options@
+swanctldir = @swanctldir@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 t_plugins = @t_plugins@
@@ -497,22 +504,24 @@ ipseclib_LTLIBRARIES = libimcv.la
 libimcv_la_LDFLAGS = \
 	-no-undefined
 
-libimcv_la_LIBADD = \
+libimcv_la_LIBADD =  \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libtncif/libtncif.la
-
+	$(top_builddir)/src/libtncif/libtncif.la $(am__append_1)
 libimcv_la_SOURCES = \
 	imcv.h imcv.c \
 	imc/imc_agent.h imc/imc_agent.c imc/imc_state.h \
 	imc/imc_msg.h imc/imc_msg.c \
+	imc/imc_os_info.h imc/imc_os_info.c \
 	imv/imv_agent.h imv/imv_agent.c imv/imv_state.h \
 	imv/imv_agent_if.h imv/imv_if.h \
 	imv/imv_database.h imv/imv_database.c \
 	imv/imv_msg.h imv/imv_msg.c \
 	imv/imv_lang_string.h imv/imv_lang_string.c \
+	imv/imv_os_info.h imv/imv_os_info.c \
 	imv/imv_reason_string.h imv/imv_reason_string.c \
 	imv/imv_remediation_string.h imv/imv_remediation_string.c \
 	imv/imv_session.h imv/imv_session.c \
+	imv/imv_session_manager.h imv/imv_session_manager.c \
 	imv/imv_workitem.h imv/imv_workitem.c \
 	ietf/ietf_attr.h ietf/ietf_attr.c \
 	ietf/ietf_attr_assess_result.h ietf/ietf_attr_assess_result.c \
@@ -540,9 +549,9 @@ libimcv_la_SOURCES = \
 	pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c
 
 ipsec_SCRIPTS = imv/_imv_policy
-EXTRA_DIST = imv/_imv_policy
+EXTRA_DIST = imv/_imv_policy Android.mk
 templatesdir = $(pkgdatadir)/templates/database/imv
-dist_templates_DATA = imv/tables.sql imv/data.sql
+dist_templates_DATA = imv/tables.sql imv/tables-mysql.sql imv/data.sql
 imv_policy_manager_SOURCES = \
 	imv/imv_policy_manager.c \
 	imv/imv_policy_manager_usage.h imv/imv_policy_manager_usage.c
@@ -551,8 +560,8 @@ imv_policy_manager_LDADD = \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 #imv/imv_policy_manager.o :	$(top_builddir)/config.status
-SUBDIRS = . $(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5) $(am__append_6)
+SUBDIRS = . $(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7)
 all: all-recursive
 
 .SUFFIXES:
@@ -630,6 +639,7 @@ imc/$(DEPDIR)/$(am__dirstamp):
 	@: > imc/$(DEPDIR)/$(am__dirstamp)
 imc/imc_agent.lo: imc/$(am__dirstamp) imc/$(DEPDIR)/$(am__dirstamp)
 imc/imc_msg.lo: imc/$(am__dirstamp) imc/$(DEPDIR)/$(am__dirstamp)
+imc/imc_os_info.lo: imc/$(am__dirstamp) imc/$(DEPDIR)/$(am__dirstamp)
 imv/$(am__dirstamp):
 	@$(MKDIR_P) imv
 	@: > imv/$(am__dirstamp)
@@ -641,11 +651,14 @@ imv/imv_database.lo: imv/$(am__dirstamp) imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_msg.lo: imv/$(am__dirstamp) imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_lang_string.lo: imv/$(am__dirstamp) \
 	imv/$(DEPDIR)/$(am__dirstamp)
+imv/imv_os_info.lo: imv/$(am__dirstamp) imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_reason_string.lo: imv/$(am__dirstamp) \
 	imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_remediation_string.lo: imv/$(am__dirstamp) \
 	imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_session.lo: imv/$(am__dirstamp) imv/$(DEPDIR)/$(am__dirstamp)
+imv/imv_session_manager.lo: imv/$(am__dirstamp) \
+	imv/$(DEPDIR)/$(am__dirstamp)
 imv/imv_workitem.lo: imv/$(am__dirstamp) imv/$(DEPDIR)/$(am__dirstamp)
 ietf/$(am__dirstamp):
 	@$(MKDIR_P) ietf
@@ -845,15 +858,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@ietf/$(DEPDIR)/ietf_attr_string_version.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imc/$(DEPDIR)/imc_agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imc/$(DEPDIR)/imc_msg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@imc/$(DEPDIR)/imc_os_info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_database.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_lang_string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_msg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_os_info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_policy_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_policy_manager_usage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_reason_string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_remediation_string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_session.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_session_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@imv/$(DEPDIR)/imv_workitem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ita/$(DEPDIR)/ita_attr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ita/$(DEPDIR)/ita_attr_angel.Plo@am__quote@