Merge tag 'upstream/2.4.3'

Upstream version 2.4.3

1 files changed, 60 insertions, 39 deletions

diff --git a/src/openvpn/Makefile.in b/src/openvpn/Makefile.in
index 95d4f59..ca4635b 100644
--- a/src/openvpn/Makefile.in
+++ b/src/openvpn/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,17 @@
 # Required to build Windows resource file
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -100,8 +110,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/build/ltrc.inc $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/depcomp
+
 # we want unicode entry point but not the macro
 @WIN32_TRUE@am__append_1 = -municode -UUNICODE
 sbin_PROGRAMS = openvpn$(EXEEXT)
@@ -118,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
 	$(top_srcdir)/compat.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/include/openvpn-plugin.h
@@ -139,21 +149,21 @@ am__openvpn_SOURCES_DIST = argv.c argv.h base64.c base64.h basic.h \
 	console_builtin.c console_systemd.c mroute.c mroute.h mss.c \
 	mss.h mstats.c mstats.h mtcp.c mtcp.h mtu.c mtu.h mudp.c \
 	mudp.h multi.c multi.h ntlm.c ntlm.h occ.c occ.h occ-inline.h \
-	pkcs11.c pkcs11.h pkcs11_backend.h pkcs11_openssl.c \
-	pkcs11_mbedtls.c openvpn.c openvpn.h options.c options.h \
-	otime.c otime.h packet_id.c packet_id.h perf.c perf.h pf.c \
-	pf.h pf-inline.h ping.c ping.h ping-inline.h plugin.c plugin.h \
-	pool.c pool.h proto.c proto.h proxy.c proxy.h ps.c ps.h push.c \
-	push.h pushlist.h reliable.c reliable.h route.c route.h \
-	schedule.c schedule.h session_id.c session_id.h shaper.c \
-	shaper.h sig.c sig.h socket.c socket.h socks.c socks.h ssl.c \
-	ssl.h ssl_backend.h ssl_openssl.c ssl_openssl.h ssl_mbedtls.c \
-	ssl_mbedtls.h ssl_common.h ssl_verify.c ssl_verify.h \
-	ssl_verify_backend.h ssl_verify_openssl.c ssl_verify_openssl.h \
-	ssl_verify_mbedtls.c ssl_verify_mbedtls.h status.c status.h \
-	syshead.h tls_crypt.c tls_crypt.h tun.c tun.h win32.h win32.c \
-	cryptoapi.h cryptoapi.c openvpn_win32_resources.rc block_dns.c \
-	block_dns.h
+	openssl_compat.h pkcs11.c pkcs11.h pkcs11_backend.h \
+	pkcs11_openssl.c pkcs11_mbedtls.c openvpn.c openvpn.h \
+	options.c options.h otime.c otime.h packet_id.c packet_id.h \
+	perf.c perf.h pf.c pf.h pf-inline.h ping.c ping.h \
+	ping-inline.h plugin.c plugin.h pool.c pool.h proto.c proto.h \
+	proxy.c proxy.h ps.c ps.h push.c push.h pushlist.h reliable.c \
+	reliable.h route.c route.h schedule.c schedule.h session_id.c \
+	session_id.h shaper.c shaper.h sig.c sig.h socket.c socket.h \
+	socks.c socks.h ssl.c ssl.h ssl_backend.h ssl_openssl.c \
+	ssl_openssl.h ssl_mbedtls.c ssl_mbedtls.h ssl_common.h \
+	ssl_verify.c ssl_verify.h ssl_verify_backend.h \
+	ssl_verify_openssl.c ssl_verify_openssl.h ssl_verify_mbedtls.c \
+	ssl_verify_mbedtls.h status.c status.h syshead.h tls_crypt.c \
+	tls_crypt.h tun.c tun.h win32.h win32.c cryptoapi.h \
+	cryptoapi.c openvpn_win32_resources.rc block_dns.c block_dns.h
 @WIN32_TRUE@am__objects_1 = openvpn_win32_resources.$(OBJEXT) \
 @WIN32_TRUE@	block_dns.$(OBJEXT)
 am_openvpn_OBJECTS = argv.$(OBJEXT) base64.$(OBJEXT) buffer.$(OBJEXT) \
@@ -253,6 +263,8 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/build/ltrc.inc \
+	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -301,6 +313,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 LZ4_CFLAGS = @LZ4_CFLAGS@
 LZ4_LIBS = @LZ4_LIBS@
 LZO_CFLAGS = @LZO_CFLAGS@
@@ -349,6 +362,7 @@ PKCS11_HELPER_LIBS = @PKCS11_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINDIR = @PLUGINDIR@
 PLUGIN_AUTH_PAM_CFLAGS = @PLUGIN_AUTH_PAM_CFLAGS@
 PLUGIN_AUTH_PAM_LIBS = @PLUGIN_AUTH_PAM_LIBS@
 RANLIB = @RANLIB@
@@ -361,12 +375,14 @@ SHELL = @SHELL@
 SOCKETS_LIBS = @SOCKETS_LIBS@
 STRIP = @STRIP@
 SYSTEMD_ASK_PASSWORD = @SYSTEMD_ASK_PASSWORD@
+SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
 TAP_CFLAGS = @TAP_CFLAGS@
 TAP_WIN_COMPONENT_ID = @TAP_WIN_COMPONENT_ID@
 TAP_WIN_MIN_MAJOR = @TAP_WIN_MIN_MAJOR@
 TAP_WIN_MIN_MINOR = @TAP_WIN_MIN_MINOR@
 TEST_CFLAGS = @TEST_CFLAGS@
 TEST_LDFLAGS = @TEST_LDFLAGS@
+TMPFILES_DIR = @TMPFILES_DIR@
 VENDOR_BUILD_ROOT = @VENDOR_BUILD_ROOT@
 VENDOR_DIST_ROOT = @VENDOR_DIST_ROOT@
 VENDOR_SRC_ROOT = @VENDOR_SRC_ROOT@
@@ -423,7 +439,9 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdunitdir = @systemdunitdir@
 target_alias = @target_alias@
+tmpfilesdir = @tmpfilesdir@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -444,7 +462,8 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(TAP_CFLAGS) $(OPTIONAL_CRYPTO_CFLAGS) \
 	$(OPTIONAL_LZO_CFLAGS) $(OPTIONAL_LZ4_CFLAGS) \
-	$(OPTIONAL_PKCS11_HELPER_CFLAGS) $(am__append_1)
+	$(OPTIONAL_PKCS11_HELPER_CFLAGS) \
+	-DPLUGIN_LIBDIR=\"${plugindir}\" $(am__append_1)
 openvpn_SOURCES = argv.c argv.h base64.c base64.h basic.h buffer.c \
 	buffer.h circ_list.h clinat.c clinat.h common.h comp.c comp.h \
 	compstub.c comp-lz4.c comp-lz4.h crypto.c crypto.h \
@@ -459,20 +478,21 @@ openvpn_SOURCES = argv.c argv.h base64.c base64.h basic.h buffer.c \
 	console_builtin.c console_systemd.c mroute.c mroute.h mss.c \
 	mss.h mstats.c mstats.h mtcp.c mtcp.h mtu.c mtu.h mudp.c \
 	mudp.h multi.c multi.h ntlm.c ntlm.h occ.c occ.h occ-inline.h \
-	pkcs11.c pkcs11.h pkcs11_backend.h pkcs11_openssl.c \
-	pkcs11_mbedtls.c openvpn.c openvpn.h options.c options.h \
-	otime.c otime.h packet_id.c packet_id.h perf.c perf.h pf.c \
-	pf.h pf-inline.h ping.c ping.h ping-inline.h plugin.c plugin.h \
-	pool.c pool.h proto.c proto.h proxy.c proxy.h ps.c ps.h push.c \
-	push.h pushlist.h reliable.c reliable.h route.c route.h \
-	schedule.c schedule.h session_id.c session_id.h shaper.c \
-	shaper.h sig.c sig.h socket.c socket.h socks.c socks.h ssl.c \
-	ssl.h ssl_backend.h ssl_openssl.c ssl_openssl.h ssl_mbedtls.c \
-	ssl_mbedtls.h ssl_common.h ssl_verify.c ssl_verify.h \
-	ssl_verify_backend.h ssl_verify_openssl.c ssl_verify_openssl.h \
-	ssl_verify_mbedtls.c ssl_verify_mbedtls.h status.c status.h \
-	syshead.h tls_crypt.c tls_crypt.h tun.c tun.h win32.h win32.c \
-	cryptoapi.h cryptoapi.c $(am__append_2)
+	openssl_compat.h pkcs11.c pkcs11.h pkcs11_backend.h \
+	pkcs11_openssl.c pkcs11_mbedtls.c openvpn.c openvpn.h \
+	options.c options.h otime.c otime.h packet_id.c packet_id.h \
+	perf.c perf.h pf.c pf.h pf-inline.h ping.c ping.h \
+	ping-inline.h plugin.c plugin.h pool.c pool.h proto.c proto.h \
+	proxy.c proxy.h ps.c ps.h push.c push.h pushlist.h reliable.c \
+	reliable.h route.c route.h schedule.c schedule.h session_id.c \
+	session_id.h shaper.c shaper.h sig.c sig.h socket.c socket.h \
+	socks.c socks.h ssl.c ssl.h ssl_backend.h ssl_openssl.c \
+	ssl_openssl.h ssl_mbedtls.c ssl_mbedtls.h ssl_common.h \
+	ssl_verify.c ssl_verify.h ssl_verify_backend.h \
+	ssl_verify_openssl.c ssl_verify_openssl.h ssl_verify_mbedtls.c \
+	ssl_verify_mbedtls.h status.c status.h syshead.h tls_crypt.c \
+	tls_crypt.h tun.c tun.h win32.h win32.c cryptoapi.h \
+	cryptoapi.c $(am__append_2)
 openvpn_LDADD = $(top_builddir)/src/compat/libcompat.la \
 	$(SOCKETS_LIBS) $(OPTIONAL_LZO_LIBS) $(OPTIONAL_LZ4_LIBS) \
 	$(OPTIONAL_PKCS11_HELPER_LIBS) $(OPTIONAL_CRYPTO_LIBS) \
@@ -494,7 +514,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/build/ltrc.inc $(am_
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/openvpn/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign src/openvpn/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -503,7 +522,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/build/ltrc.inc:
+$(top_srcdir)/build/ltrc.inc $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -655,14 +674,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -884,6 +903,8 @@ uninstall-am: uninstall-sbinPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 .rc.lo:
 	$(LTRCCOMPILE) -i "$<" -o "$@"