upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Provide compile time OpenVPN version information to plug-ins

Browse source 
This is to provide more fine grained information to plug-ins
about the OpenVPN environment when OpenVPN was built.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1436534548-21507-2-git-send-email-openvpn.list@topphemmelig.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9905
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
David Sommerseth 2015-07-10 15:22:27 +02:00 committed by Gert Doering
parent d40cbf0e26
commit 9de35d4633
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -54,6 +54,7 @@ distro/rpm/openvpn.spec
tests/t_client.sh tests/t_client.sh
tests/t_client-*-20??????-??????/ tests/t_client-*-20??????-??????/
src/openvpn/openvpn src/openvpn/openvpn
include/openvpn-plugin.h
config-version.h config-version.h
nbproject nbproject
test-driver test-driver

4
configure.ac
View file

@ -30,6 +30,9 @@ m4_include(version.m4)
AC_INIT([PRODUCT_NAME], [PRODUCT_VERSION], [PRODUCT_BUGREPORT], [PRODUCT_TARNAME]) AC_INIT([PRODUCT_NAME], [PRODUCT_VERSION], [PRODUCT_BUGREPORT], [PRODUCT_TARNAME])
m4_include(compat.m4) m4_include(compat.m4)
AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format]) AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format])
AC_SUBST([OPENVPN_VERSION_MAJOR], [PRODUCT_VERSION_MAJOR], [OpenVPN major version])
AC_SUBST([OPENVPN_VERSION_MINOR], [PRODUCT_VERSION_MINOR], [OpenVPN minor version])
AC_SUBST([OPENVPN_VERSION_PATCH], [PRODUCT_VERSION_PATCH], [OpenVPN patch level - may be a string or integer])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@ -1223,6 +1226,7 @@ AC_CONFIG_FILES([
distro/rpm/Makefile distro/rpm/Makefile
distro/rpm/openvpn.spec distro/rpm/openvpn.spec
include/Makefile include/Makefile
include/openvpn-plugin.h
src/Makefile src/Makefile
src/compat/Makefile src/compat/Makefile
src/openvpn/Makefile src/openvpn/Makefile

1
include/Makefile.am
View file

@ -11,5 +11,6 @@
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in $(srcdir)/Makefile.in
$(srcdir)/openvpn-plugin.h.in
include_HEADERS = openvpn-plugin.h include_HEADERS = openvpn-plugin.h

7
include/openvpn-plugin.h → include/openvpn-plugin.h.in
View file

@ -49,6 +49,13 @@ typedef X509 openvpn_x509_cert_t;
extern "C" { extern "C" {
#endif #endif
/* Provide some basic version information to plug-ins at OpenVPN compile time
* This is will not be the complete version
*/
#define OPENVPN_VERSION_MAJOR @OPENVPN_VERSION_MAJOR@
#define OPENVPN_VERSION_MINOR @OPENVPN_VERSION_MINOR@
#define OPENVPN_VERSION_PATCH "@OPENVPN_VERSION_PATCH@"
/* /*
* Plug-in types. These types correspond to the set of script callbacks * Plug-in types. These types correspond to the set of script callbacks
* supported by OpenVPN. * supported by OpenVPN.

7
version.m4
View file

@ -1,7 +1,12 @@
dnl define the OpenVPN version dnl define the OpenVPN version
define([PRODUCT_NAME], [OpenVPN]) define([PRODUCT_NAME], [OpenVPN])
define([PRODUCT_TARNAME], [openvpn]) define([PRODUCT_TARNAME], [openvpn])
define([PRODUCT_VERSION], [2.3_git]) define([PRODUCT_VERSION_MAJOR], [2])
define([PRODUCT_VERSION_MINOR], [3])
define([PRODUCT_VERSION_PATCH], [_git])
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_BUGREPORT], [openvpn-users@lists.sourceforge.net])
define([PRODUCT_VERSION_RESOURCE], [2,3,0,0]) define([PRODUCT_VERSION_RESOURCE], [2,3,0,0])
dnl define the TAP version dnl define the TAP version