From f2b3dda12a731c2e0971cb7889728edaf23f6cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 29 Nov 2021 20:46:00 +0100 Subject: New upstream version 2.5.4 --- build/Makefile.am | 2 +- build/Makefile.in | 7 ++-- build/msvc/Makefile.am | 2 +- build/msvc/Makefile.in | 7 ++-- build/msvc/msvc-generate/Makefile.am | 2 +- build/msvc/msvc-generate/Makefile.in | 7 ++-- build/msvc/msvc-generate/Makefile.mak | 9 ++++- build/msvc/msvc-generate/msvc-generate.vcxproj | 54 +++++++++++++++++++++++--- 8 files changed, 71 insertions(+), 19 deletions(-) (limited to 'build') diff --git a/build/Makefile.am b/build/Makefile.am index b011141..46973b4 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -5,7 +5,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # MAINTAINERCLEANFILES = \ diff --git a/build/Makefile.in b/build/Makefile.in index 727a8d1..a3fb154 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # VPATH = @srcdir@ am__is_gnu_make = { \ @@ -366,6 +366,7 @@ plugindir = @plugindir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sampledir = @sampledir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/build/msvc/Makefile.am b/build/msvc/Makefile.am index 3e9c3fe..820e312 100644 --- a/build/msvc/Makefile.am +++ b/build/msvc/Makefile.am @@ -5,7 +5,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # Copyright (C) 2006-2012 Alon Bar-Lev # diff --git a/build/msvc/Makefile.in b/build/msvc/Makefile.in index c55b593..7aa8bd1 100644 --- a/build/msvc/Makefile.in +++ b/build/msvc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # Copyright (C) 2006-2012 Alon Bar-Lev # VPATH = @srcdir@ @@ -367,6 +367,7 @@ plugindir = @plugindir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sampledir = @sampledir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/build/msvc/msvc-generate/Makefile.am b/build/msvc/msvc-generate/Makefile.am index 4ae850f..3f189cf 100644 --- a/build/msvc/msvc-generate/Makefile.am +++ b/build/msvc/msvc-generate/Makefile.am @@ -5,7 +5,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # Copyright (C) 2006-2012 Alon Bar-Lev # diff --git a/build/msvc/msvc-generate/Makefile.in b/build/msvc/msvc-generate/Makefile.in index cbcd587..80e9bca 100644 --- a/build/msvc/msvc-generate/Makefile.in +++ b/build/msvc/msvc-generate/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2018 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # Copyright (C) 2006-2012 Alon Bar-Lev # @@ -310,6 +310,7 @@ plugindir = @plugindir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sampledir = @sampledir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/build/msvc/msvc-generate/Makefile.mak b/build/msvc/msvc-generate/Makefile.mak index 59fc9f0..6da859e 100644 --- a/build/msvc/msvc-generate/Makefile.mak +++ b/build/msvc/msvc-generate/Makefile.mak @@ -11,7 +11,10 @@ OUTPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h INPUT_PLUGIN_CONFIG=version.m4.in OUTPUT_PLUGIN_CONFIG=version.m4 -all: $(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN) +INPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.rst +OUTPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.html + +all: $(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN) $(OUTPUT_MAN) $(OUTPUT_MSVC_VER): $(INPUT_MSVC_VER) $(CONFIG) cscript //nologo msvc-generate.js --config="$(CONFIG)" --input="$(INPUT_MSVC_VER)" --output="$(OUTPUT_MSVC_VER)" @@ -22,7 +25,11 @@ $(OUTPUT_PLUGIN_CONFIG): $(INPUT_PLUGIN_CONFIG) $(OUTPUT_PLUGIN): $(INPUT_PLUGIN) $(OUTPUT_PLUGIN_CONFIG) cscript //nologo msvc-generate.js --config="$(OUTPUT_PLUGIN_CONFIG)" --input="$(INPUT_PLUGIN)" --output="$(OUTPUT_PLUGIN)" +$(OUTPUT_MAN): $(INPUT_MAN) + -FOR /F %i IN ('where rst2html.py') DO python %i "$(INPUT_MAN)" "$(OUTPUT_MAN)" + clean: -del "$(OUTPUT_MSVC_VER)" -del "$(OUTPUT_PLUGIN)" -del "$(OUTPUT_PLUGIN_CONFIG)" + -del "$(OUTPUT_MAN)" diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/msvc-generate/msvc-generate.vcxproj index 72d310a..dda8b05 100644 --- a/build/msvc/msvc-generate/msvc-generate.vcxproj +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -22,24 +30,32 @@ {8598C2C8-34C4-47A1-99B0-7C295A890615} msvc-generate MakeFileProj - 10.0.17134.0 + 10.0 Makefile - v141 + v142 Makefile - v141 + v142 + + + Makefile + v142 Makefile - v141 + v142 Makefile - v141 + v142 + + + Makefile + v142 @@ -52,6 +68,10 @@ + + + + @@ -60,6 +80,10 @@ + + + + <_ProjectFileVersion>10.0.30319.1 @@ -67,42 +91,60 @@ $(Configuration)\ nmake -f Makefile.mak all nmake -f Makefile.mak all + nmake -f Makefile.mak all nmake -f Makefile.mak clean all nmake -f Makefile.mak clean all + nmake -f Makefile.mak clean all nmake -f Makefile.mak clean nmake -f Makefile.mak clean + nmake -f Makefile.mak clean config-msvc-version.h config-msvc-version.h + config-msvc-version.h WIN32;_DEBUG;$(NMakePreprocessorDefinitions) WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) $(NMakeIncludeSearchPath) $(NMakeIncludeSearchPath) + $(NMakeIncludeSearchPath) $(NMakeForcedIncludes) $(NMakeForcedIncludes) + $(NMakeForcedIncludes) $(NMakeAssemblySearchPath) $(NMakeAssemblySearchPath) + $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) + $(NMakeForcedUsingAssemblies) $(Configuration)\ $(Configuration)\ nmake -f Makefile.mak all nmake -f Makefile.mak all + nmake -f Makefile.mak all nmake -f Makefile.mak clean all nmake -f Makefile.mak clean all + nmake -f Makefile.mak clean all nmake -f Makefile.mak clean nmake -f Makefile.mak clean + nmake -f Makefile.mak clean config-msvc-version.h config-msvc-version.h + config-msvc-version.h WIN32;NDEBUG;$(NMakePreprocessorDefinitions) WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) $(NMakeIncludeSearchPath) $(NMakeIncludeSearchPath) + $(NMakeIncludeSearchPath) $(NMakeForcedIncludes) $(NMakeForcedIncludes) + $(NMakeForcedIncludes) $(NMakeAssemblySearchPath) $(NMakeAssemblySearchPath) + $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) + $(NMakeForcedUsingAssemblies) @@ -113,4 +155,4 @@ - + \ No newline at end of file -- cgit v1.2.3