From 0816f633cec4254ccfd98901252eefe84b0e2648 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Wed, 28 Oct 2020 19:37:21 +0100 Subject: New upstream version 2.5.0 --- ChangeLog | 3 +++ configure | 26 +++++++++++++------------- include/openvpn-plugin.h | 2 +- sample/sample-plugins/Makefile | 8 ++++---- version.m4 | 4 ++-- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b519576..8e06343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ OpenVPN Change Log Copyright (C) 2002-2020 OpenVPN Inc +2020.10.27 -- Version 2.5.0 + (no changes relative to v2.5_rc3) + 2020.10.15 -- Version 2.5_rc3 Arne Schwabe (2): Allow 'none' cipher being specified in --data-ciphers diff --git a/configure b/configure index 2779dfa..c843306 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenVPN 2.5_rc3. +# Generated by GNU Autoconf 2.69 for OpenVPN 2.5.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenVPN' PACKAGE_TARNAME='openvpn' -PACKAGE_VERSION='2.5_rc3' -PACKAGE_STRING='OpenVPN 2.5_rc3' +PACKAGE_VERSION='2.5.0' +PACKAGE_STRING='OpenVPN 2.5.0' PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net' PACKAGE_URL='' @@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenVPN 2.5_rc3 to adapt to many kinds of systems. +\`configure' configures OpenVPN 2.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1536,7 +1536,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenVPN 2.5_rc3:";; + short | recursive ) echo "Configuration of OpenVPN 2.5.0:";; esac cat <<\_ACEOF @@ -1749,7 +1749,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenVPN configure 2.5_rc3 +OpenVPN configure 2.5.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2588,7 +2588,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenVPN $as_me 2.5_rc3, which was +It was created by OpenVPN $as_me 2.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2952,13 +2952,13 @@ if test -z "${htmldir}"; then fi -$as_echo "#define OPENVPN_VERSION_RESOURCE 2,5,0,7" >>confdefs.h +$as_echo "#define OPENVPN_VERSION_RESOURCE 2,5,0,8" >>confdefs.h OPENVPN_VERSION_MAJOR=2 OPENVPN_VERSION_MINOR=5 -OPENVPN_VERSION_PATCH=_rc3 +OPENVPN_VERSION_PATCH=.0 $as_echo "#define OPENVPN_VERSION_MAJOR 2" >>confdefs.h @@ -2967,7 +2967,7 @@ $as_echo "#define OPENVPN_VERSION_MAJOR 2" >>confdefs.h $as_echo "#define OPENVPN_VERSION_MINOR 5" >>confdefs.h -$as_echo "#define OPENVPN_VERSION_PATCH \"_rc3\"" >>confdefs.h +$as_echo "#define OPENVPN_VERSION_PATCH \".0\"" >>confdefs.h ac_aux_dir= @@ -3493,7 +3493,7 @@ fi # Define the identity of the package. PACKAGE='openvpn' - VERSION='2.5_rc3' + VERSION='2.5.0' cat >>confdefs.h <<_ACEOF @@ -18946,7 +18946,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenVPN $as_me 2.5_rc3, which was +This file was extended by OpenVPN $as_me 2.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19012,7 +19012,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenVPN config.status 2.5_rc3 +OpenVPN config.status 2.5.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/include/openvpn-plugin.h b/include/openvpn-plugin.h index 1fa3bc1..f742f6b 100644 --- a/include/openvpn-plugin.h +++ b/include/openvpn-plugin.h @@ -53,7 +53,7 @@ extern "C" { */ #define OPENVPN_VERSION_MAJOR 2 #define OPENVPN_VERSION_MINOR 5 -#define OPENVPN_VERSION_PATCH "_rc3" +#define OPENVPN_VERSION_PATCH ".0" /* * Plug-in types. These types correspond to the set of script callbacks diff --git a/sample/sample-plugins/Makefile b/sample/sample-plugins/Makefile index b1a58ae..1cf5e2c 100644 --- a/sample/sample-plugins/Makefile +++ b/sample/sample-plugins/Makefile @@ -210,7 +210,7 @@ OPENSSL_CFLAGS = OPENSSL_LIBS = -lssl -lcrypto OPENVPN_VERSION_MAJOR = 2 OPENVPN_VERSION_MINOR = 5 -OPENVPN_VERSION_PATCH = _rc3 +OPENVPN_VERSION_PATCH = .0 OPTIONAL_CRYPTO_CFLAGS = OPTIONAL_CRYPTO_LIBS = -lssl -lcrypto OPTIONAL_DL_LIBS = -ldl @@ -231,10 +231,10 @@ P11KIT_LIBS = PACKAGE = openvpn PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net PACKAGE_NAME = OpenVPN -PACKAGE_STRING = OpenVPN 2.5_rc3 +PACKAGE_STRING = OpenVPN 2.5.0 PACKAGE_TARNAME = openvpn PACKAGE_URL = -PACKAGE_VERSION = 2.5_rc3 +PACKAGE_VERSION = 2.5.0 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_rc3 +VERSION = 2.5.0 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 diff --git a/version.m4 b/version.m4 index 69cac0a..66be5d3 100644 --- a/version.m4 +++ b/version.m4 @@ -3,12 +3,12 @@ define([PRODUCT_NAME], [OpenVPN]) define([PRODUCT_TARNAME], [openvpn]) define([PRODUCT_VERSION_MAJOR], [2]) define([PRODUCT_VERSION_MINOR], [5]) -define([PRODUCT_VERSION_PATCH], [_rc3]) +define([PRODUCT_VERSION_PATCH], [.0]) m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MAJOR]) m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MINOR], [[.]]) m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_PATCH], [[]]) define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net]) -define([PRODUCT_VERSION_RESOURCE], [2,5,0,7]) +define([PRODUCT_VERSION_RESOURCE], [2,5,0,8]) dnl define the TAP version define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901]) define([PRODUCT_TAP_WIN_MIN_MAJOR], [9]) -- cgit v1.2.3