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 --- sample/Makefile.am | 2 +- sample/Makefile.in | 7 ++++--- sample/sample-keys/gen-sample-keys.sh | 2 +- sample/sample-plugins/Makefile | 21 +++++++++++---------- sample/sample-plugins/Makefile.am | 2 +- sample/sample-plugins/Makefile.in | 9 +++++---- sample/sample-plugins/Makefile.plugins | 2 +- .../client-connect/sample-client-connect.c | 2 +- sample/sample-plugins/defer/simple.c | 2 +- .../keyingmaterialexporter.c | 2 +- sample/sample-plugins/log/log.c | 2 +- sample/sample-plugins/log/log_v3.c | 4 ++-- sample/sample-plugins/simple/base64.c | 2 +- sample/sample-plugins/simple/simple.c | 2 +- 14 files changed, 32 insertions(+), 29 deletions(-) (limited to 'sample') diff --git a/sample/Makefile.am b/sample/Makefile.am index 46d113a..06ba0ff 100644 --- a/sample/Makefile.am +++ b/sample/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/sample/Makefile.in b/sample/Makefile.in index 74a2e1f..3c9335f 100644 --- a/sample/Makefile.in +++ b/sample/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 # @@ -337,6 +337,7 @@ plugindir = @plugindir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sampledir = @sampledir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/sample/sample-keys/gen-sample-keys.sh b/sample/sample-keys/gen-sample-keys.sh index fda4ffe..82f0880 100755 --- a/sample/sample-keys/gen-sample-keys.sh +++ b/sample/sample-keys/gen-sample-keys.sh @@ -3,7 +3,7 @@ # Run this script to set up a test CA, and test key-certificate pair for a # server, and various clients. # -# Copyright (C) 2014 Steffan Karger +# Copyright (C) 2014-2021 Steffan Karger set -eu command -v openssl >/dev/null 2>&1 || { echo >&2 "Unable to find openssl. Please make sure openssl is installed and in your path."; exit 1; } diff --git a/sample/sample-plugins/Makefile b/sample/sample-plugins/Makefile index f709998..8646832 100644 --- a/sample/sample-plugins/Makefile +++ b/sample/sample-plugins/Makefile @@ -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. # sample/sample-plugins/Makefile. Generated from Makefile.in by configure. -# 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,12 +21,12 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2020 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2020 OpenVPN Inc +# Copyright (C) 2020-2021 OpenVPN Inc # am__is_gnu_make = { \ @@ -193,7 +193,7 @@ LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = LZ4_CFLAGS = -LZ4_LIBS = +LZ4_LIBS = -llz4 LZO_CFLAGS = LZO_LIBS = -llzo2 MAKEINFO = ${SHELL} /home/samuli/opt/openvpninc/openvpn-release-scripts/release/openvpn/missing makeinfo @@ -210,14 +210,14 @@ OPENSSL_CFLAGS = OPENSSL_LIBS = -lssl -lcrypto OPENVPN_VERSION_MAJOR = 2 OPENVPN_VERSION_MINOR = 5 -OPENVPN_VERSION_PATCH = .1 +OPENVPN_VERSION_PATCH = .4 OPTIONAL_CRYPTO_CFLAGS = OPTIONAL_CRYPTO_LIBS = -lssl -lcrypto OPTIONAL_DL_LIBS = -ldl OPTIONAL_INOTIFY_CFLAGS = OPTIONAL_INOTIFY_LIBS = OPTIONAL_LZ4_CFLAGS = -OPTIONAL_LZ4_LIBS = +OPTIONAL_LZ4_LIBS = -llz4 OPTIONAL_LZO_CFLAGS = OPTIONAL_LZO_LIBS = -llzo2 OPTIONAL_PKCS11_HELPER_CFLAGS = @@ -231,10 +231,10 @@ P11KIT_LIBS = PACKAGE = openvpn PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net PACKAGE_NAME = OpenVPN -PACKAGE_STRING = OpenVPN 2.5.1 +PACKAGE_STRING = OpenVPN 2.5.4 PACKAGE_TARNAME = openvpn PACKAGE_URL = -PACKAGE_VERSION = 2.5.1 +PACKAGE_VERSION = 2.5.4 PATH_SEPARATOR = : PKCS11_HELPER_CFLAGS = PKCS11_HELPER_LIBS = -lpthread -ldl -lcrypto -lpkcs11-helper @@ -264,7 +264,7 @@ TAP_WIN_MIN_MINOR = 9 TEST_CFLAGS = -I$(top_srcdir)/include TEST_LDFLAGS = -lssl -lcrypto -llzo2 TMPFILES_DIR = -VERSION = 2.5.1 +VERSION = 2.5.4 abs_builddir = /home/samuli/opt/openvpninc/openvpn-release-scripts/release/openvpn/sample/sample-plugins abs_srcdir = /home/samuli/opt/openvpninc/openvpn-release-scripts/release/openvpn/sample/sample-plugins abs_top_builddir = /home/samuli/opt/openvpninc/openvpn-release-scripts/release/openvpn @@ -312,6 +312,7 @@ plugindir = ${libdir}/openvpn/plugins prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} +runstatedir = ${localstatedir}/run sampledir = $(docdir)/sample sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com diff --git a/sample/sample-plugins/Makefile.am b/sample/sample-plugins/Makefile.am index b903a6f..9539d05 100644 --- a/sample/sample-plugins/Makefile.am +++ b/sample/sample-plugins/Makefile.am @@ -5,7 +5,7 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2020 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # MAINTAINERCLEANFILES = \ diff --git a/sample/sample-plugins/Makefile.in b/sample/sample-plugins/Makefile.in index ae3eef3..8be23e0 100644 --- a/sample/sample-plugins/Makefile.in +++ b/sample/sample-plugins/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,12 +21,12 @@ # packet encryption, packet authentication, and # packet compression. # -# Copyright (C) 2002-2020 OpenVPN Inc +# Copyright (C) 2002-2021 OpenVPN Inc # # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2020 OpenVPN Inc +# Copyright (C) 2020-2021 OpenVPN Inc # VPATH = @srcdir@ am__is_gnu_make = { \ @@ -312,6 +312,7 @@ plugindir = @plugindir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sampledir = @sampledir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/sample/sample-plugins/Makefile.plugins b/sample/sample-plugins/Makefile.plugins index 37559a8..44c9cea 100644 --- a/sample/sample-plugins/Makefile.plugins +++ b/sample/sample-plugins/Makefile.plugins @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2020 OpenVPN Inc +# Copyright (C) 2020-2021 OpenVPN Inc # # diff --git a/sample/sample-plugins/client-connect/sample-client-connect.c b/sample/sample-plugins/client-connect/sample-client-connect.c index 6168076..cc85aeb 100644 --- a/sample/sample-plugins/client-connect/sample-client-connect.c +++ b/sample/sample-plugins/client-connect/sample-client-connect.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/defer/simple.c b/sample/sample-plugins/defer/simple.c index 6f08bed..ba2e03e 100644 --- a/sample/sample-plugins/defer/simple.c +++ b/sample/sample-plugins/defer/simple.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c index 27275f3..787fc54 100644 --- a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +++ b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/log/log.c b/sample/sample-plugins/log/log.c index a782aa9..661ec5d 100644 --- a/sample/sample-plugins/log/log.c +++ b/sample/sample-plugins/log/log.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/log/log_v3.c b/sample/sample-plugins/log/log_v3.c index 1344499..7ae77a8 100644 --- a/sample/sample-plugins/log/log_v3.c +++ b/sample/sample-plugins/log/log_v3.c @@ -5,8 +5,8 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc - * Copyright (C) 2010 David Sommerseth + * Copyright (C) 2002-2021 OpenVPN Inc + * Copyright (C) 2010-2021 David Sommerseth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/simple/base64.c b/sample/sample-plugins/simple/base64.c index bd95e79..363a123 100644 --- a/sample/sample-plugins/simple/base64.c +++ b/sample/sample-plugins/simple/base64.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2017 David Sommerseth + * Copyright (C) 2017-2021 David Sommerseth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 diff --git a/sample/sample-plugins/simple/simple.c b/sample/sample-plugins/simple/simple.c index 60cfea4..0f26dd2 100644 --- a/sample/sample-plugins/simple/simple.c +++ b/sample/sample-plugins/simple/simple.c @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc + * Copyright (C) 2002-2021 OpenVPN Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 -- cgit v1.2.3