mirror of
https://github.com/OpenVPN/openvpn.git
synced 2026-04-05 09:05:22 -04:00
sample-plugins: Partially autotoolize the sample-plugins build
The sample-plugins have their own set of build/winbuild scripts in each of these plugin directories. This does not give a good way to reuse various macros the autoconf/automake/configure process enables; which can contain important macros to make some code build without errors or warnings. Normally we would embrace the full autoconf/automake approach. But this is sample code which we only want to build per request and the built code should not be installed anywhere via 'make install'. But since we do use libtool other plug-ins being installed and automake gets kind of cranky when it comes to define certain build targets not following the expected use cases, we try to only embrace just enough of automake to get our main goals achieved. This changeset kicks out the build scripts and replaces them with a single Makefile.plugins file, which defines the plugins we want to build by default when running 'make from the sample-plugins directory. Neither of these plugins are otherwise built by default. No sample-plugins are being installed. But we have enough strings attached to automake to grab the CFLAGS and LDFLAGS used by the rest of the code. This also makes it easy to use #include "config.h" in sample code, to also get various macros defined by the ./configure run. This patch does not touch the winbuild scripts, as it seems building these sample-plugins on Windows requires a bit different compile and linking steps than *nix systems in general. Signed-off-by: David Sommerseth <davids@openvpn.net> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20200916141956.1277-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21020.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
David Sommerseth
Gert Doering
parent
81b6a7e75b
commit
0b5141d8f9
10 changed files with 108 additions and 92 deletions
|
|
@ -1433,6 +1433,7 @@ AC_CONFIG_FILES([
|
|||
doc/doxygen/Makefile
|
||||
doc/doxygen/openvpn.doxyfile
|
||||
include/Makefile
|
||||
sample/sample-plugins/Makefile
|
||||
src/Makefile
|
||||
src/compat/Makefile
|
||||
src/openvpn/Makefile
|
||||
|
|
|
|||
34
sample/sample-plugins/Makefile.am
Normal file
34
sample/sample-plugins/Makefile.am
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#
|
||||
# OpenVPN -- An application to securely tunnel IP networks
|
||||
# over a single UDP port, with support for SSL/TLS-based
|
||||
# session authentication and key exchange,
|
||||
# packet encryption, packet authentication, and
|
||||
# packet compression.
|
||||
#
|
||||
# Copyright (C) 2002-2020 OpenVPN Inc <sales@openvpn.net>
|
||||
#
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
|
||||
# We don't want automake to pull in libtool for building these
|
||||
# sample-plugins. Even though this breaks the conceptual ideas
|
||||
# around autoconf/automake/libtools ... these sample plug-ins
|
||||
# are just sample code, not to be installed or distributed outside
|
||||
# of the source tarball. Not even built by default, by design.
|
||||
#
|
||||
# We only add this as a simple and convenient way to build all
|
||||
# these plug-ins with the same build parameters as the rest
|
||||
# of the OpenVPN code.
|
||||
#
|
||||
# All the plugins which will be built are processed in this
|
||||
# separate Makefile, which disconnects everything just enough
|
||||
# to achieve our goal.
|
||||
include Makefile.plugins
|
||||
|
||||
|
||||
dist-hook :
|
||||
make -f Makefile.plugins clean
|
||||
36
sample/sample-plugins/Makefile.plugins
Normal file
36
sample/sample-plugins/Makefile.plugins
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# Copyright (C) 2020 OpenVPN Inc <sales@openvpn.net>
|
||||
#
|
||||
|
||||
#
|
||||
# Plug-ins to build - listed entries should not carry any extensions
|
||||
#
|
||||
PLUGINS = \
|
||||
defer/simple \
|
||||
keying-material-exporter-demo/keyingmaterialexporter \
|
||||
log/log log/log_v3 \
|
||||
simple/base64 \
|
||||
simple/simple
|
||||
|
||||
# All the plugins to build - rewritten with .so extension
|
||||
all : $(foreach var, $(PLUGINS), $(var).so)
|
||||
|
||||
# Do not automatically remove object files
|
||||
# This is a special Make setting, to avoid adding an implicit
|
||||
# 'rm' command on object files - due to the .c.o/%.so rules below
|
||||
.PRECIOUS: %.o
|
||||
|
||||
# Compile step
|
||||
.c.o :
|
||||
test -d `dirname $@` || $(MKDIR_P) `dirname $@`; \
|
||||
$(CC) -c -o $@ $(CFLAGS) $(AM_CPPFLAGS) -fPIC $<
|
||||
|
||||
# Link step
|
||||
%.so : %.o
|
||||
$(CC) $(LDFLAGS) -shared -fPIC -o $@ $<
|
||||
|
||||
# Clean up all build object and shared object files
|
||||
clean :
|
||||
rm -f $(foreach var, $(PLUGINS), $(var).o) \
|
||||
$(foreach var, $(PLUGINS), $(var).so)
|
||||
37
sample/sample-plugins/README
Normal file
37
sample/sample-plugins/README
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
OpenVPN plug-in examples.
|
||||
|
||||
Examples provided:
|
||||
|
||||
* authentication and logging
|
||||
simple/simple.c -- using the --auth-user-pass-verify callback, verify
|
||||
that the username/password is "foo"/"bar".
|
||||
defer/simple.c -- using the --auth-user-pass-verify callback,
|
||||
test deferred authentication.
|
||||
log/log.c -- Extended variant of simple/simple.c which adds more
|
||||
logging of what is happening inside the plug-in
|
||||
log/log_v3.c -- A variant of log/log.c, which makes use of the
|
||||
OpenVPN plug-in v3 API. This will also log even more
|
||||
information related to certificates in use.
|
||||
|
||||
* cryptography related
|
||||
simple/base64.c -- Example using the OpenVPN exported base64 encode/decode
|
||||
functions
|
||||
keying-material-exporter-demo/keyingmaterialexporter.c
|
||||
-- Example based on TLS Keying Material Exporters over HTTP [RFC-5705]
|
||||
(openvpn/doc/keying-material-exporter.txt). For more details, see
|
||||
keying-material-exporter-demo/README
|
||||
|
||||
|
||||
To build on *BSD/Linux platforms (requires GNU Make):
|
||||
|
||||
gmake (builds a default set of plug-ins)
|
||||
gmake simple/simple.so
|
||||
|
||||
To build on Windows platform (MinGW):
|
||||
|
||||
cd simple; ./winbuild simple.so
|
||||
|
||||
To use in OpenVPN, add to config file:
|
||||
|
||||
plugin simple.so (Linux/BSD/etc.)
|
||||
plugin simple.dll
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
OpenVPN plugin examples.
|
||||
|
||||
Examples provided:
|
||||
|
||||
simple.c -- using the --auth-user-pass-verify callback,
|
||||
test deferred authentication.
|
||||
|
||||
To build:
|
||||
|
||||
./build simple (Linux/BSD/etc.)
|
||||
./winbuild simple (MinGW on Windows)
|
||||
|
||||
To use in OpenVPN, add to config file:
|
||||
|
||||
plugin simple.so (Linux/BSD/etc.)
|
||||
plugin simple.dll (MinGW on Windows)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Build an OpenVPN plugin module on *nix. The argument should
|
||||
# be the base name of the C source file (without the .c).
|
||||
#
|
||||
|
||||
# This directory is where we will look for openvpn-plugin.h
|
||||
CPPFLAGS="${CPPFLAGS:--I../../../include}"
|
||||
|
||||
CC="${CC:-gcc}"
|
||||
CFLAGS="${CFLAGS:--O2 -Wall -g}"
|
||||
|
||||
$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
|
||||
$CC $CFLAGS -fPIC -shared ${LDFLAGS} -Wl,-soname,$1.so -o $1.so $1.o -lc
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Build an OpenVPN plugin module on *nix. The argument should
|
||||
# be the base name of the C source file (without the .c).
|
||||
#
|
||||
|
||||
# This directory is where we will look for openvpn-plugin.h
|
||||
CPPFLAGS="${CPPFLAGS:--I../../..}"
|
||||
|
||||
CC="${CC:-gcc}"
|
||||
CFLAGS="${CFLAGS:--O2 -Wall -g}"
|
||||
|
||||
$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
|
||||
$CC $CFLAGS -fPIC -shared $LDFLAGS -Wl,-soname,$1.so -o $1.so $1.o -lc
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Build an OpenVPN plugin module on *nix. The argument should
|
||||
# be the base name of the C source file (without the .c).
|
||||
#
|
||||
|
||||
# This directory is where we will look for openvpn-plugin.h
|
||||
CPPFLAGS="${CPPFLAGS:--I../../../include}"
|
||||
|
||||
CC="${CC:-gcc}"
|
||||
CFLAGS="${CFLAGS:--O2 -Wall -g}"
|
||||
|
||||
$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
|
||||
$CC $CFLAGS -fPIC -shared $LDFLAGS -Wl,-soname,$1.so -o $1.so $1.o -lc
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
OpenVPN plugin examples.
|
||||
|
||||
Examples provided:
|
||||
|
||||
simple.c -- using the --auth-user-pass-verify callback, verify
|
||||
that the username/password is "foo"/"bar".
|
||||
|
||||
To build:
|
||||
|
||||
./build simple (Linux/BSD/etc.)
|
||||
./winbuild simple (MinGW on Windows)
|
||||
|
||||
To use in OpenVPN, add to config file:
|
||||
|
||||
plugin simple.so (Linux/BSD/etc.)
|
||||
plugin simple.dll (MinGW on Windows)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Build an OpenVPN plugin module on *nix. The argument should
|
||||
# be the base name of the C source file (without the .c).
|
||||
#
|
||||
|
||||
# This directory is where we will look for openvpn-plugin.h
|
||||
CPPFLAGS="${CPPFLAGS:--I../../..}"
|
||||
|
||||
CC="${CC:-gcc}"
|
||||
CFLAGS="${CFLAGS:--O2 -Wall -g}"
|
||||
|
||||
$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
|
||||
$CC $CFLAGS -fPIC -shared $LDFLAGS -Wl,-soname,$1.so -o $1.so $1.o -lc
|
||||
Loading…
Reference in a new issue