aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
Diffstat (limited to 'install-win32')
-rw-r--r--install-win32/.svnignore4
-rw-r--r--install-win32/Makefile.am74
-rw-r--r--install-win32/getpkcs11helper2
-rw-r--r--install-win32/makeopenvpn30
-rw-r--r--install-win32/makeservice32
-rw-r--r--install-win32/settings.in12
6 files changed, 107 insertions, 47 deletions
diff --git a/install-win32/.svnignore b/install-win32/.svnignore
index f3e2006..6bf320b 100644
--- a/install-win32/.svnignore
+++ b/install-win32/.svnignore
@@ -1 +1,5 @@
openvpn.nsi
+settings
+Makefile
+Makefile.in
+tmp
diff --git a/install-win32/Makefile.am b/install-win32/Makefile.am
new file mode 100644
index 0000000..80fd4be
--- /dev/null
+++ b/install-win32/Makefile.am
@@ -0,0 +1,74 @@
+#
+# 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-2005 OpenVPN Solutions LLC <info@openvpn.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (see the file COPYING included with this
+# distribution); if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+ openvpn.nsi \
+ setpath.nsi
+
+if WIN32
+
+nodist_doc_DATA = tmp/license.txt
+
+confdir = $(win32datadir)/config
+nodist_conf_DATA = \
+ tmp/openssl.cnf.sample \
+ tmp/client.ovpn \
+ tmp/server.ovpn
+dist_conf_DATA = \
+ sample.ovpn
+
+easyrsadir = $(win32datadir)/easy-rsa/Windows
+nodist_easyrsa_DATA = \
+ $(top_srcdir)/easy-rsa/Windows/*
+
+keysdir = $(win32datadir)/sample-keys
+nodist_keys_DATA = \
+ $(top_srcdir)/sample-keys/*
+
+tmp:
+ mkdir tmp
+
+tmp/client.ovpn: tmp $(top_srcdir)/sample-config-files/client.conf
+ cp $(top_srcdir)/sample-config-files/client.conf tmp/client.ovpn
+
+tmp/server.ovpn: tmp $(top_srcdir)/sample-config-files/server.conf
+ cp $(top_srcdir)/sample-config-files/server.conf tmp/server.ovpn
+
+tmp/license.txt: tmp $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL
+ cat $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL > tmp/license.txt
+
+tmp/openssl.cnf.sample: tmp $(top_srcdir)/easy-rsa/2.0/openssl.cnf
+ cp $(top_srcdir)/easy-rsa/2.0/openssl.cnf tmp/openssl.cnf.sample
+
+clean-local:
+ -rm -fr tmp
+
+else
+
+dist_noinst_DATA += sample.ovpn
+
+endif
+
diff --git a/install-win32/getpkcs11helper b/install-win32/getpkcs11helper
index 2a34c6e..8fcfdd4 100644
--- a/install-win32/getpkcs11helper
+++ b/install-win32/getpkcs11helper
@@ -7,7 +7,7 @@
if [ -d "$PKCS11_HELPER_DIR" ] ; then
mkdir -p $GENOUT/lib &>/dev/null
for f in libpkcs11-helper-1.dll ; do
- cp $PKCS11_HELPER_DIR/bin/$f $GENOUT/lib
+ cp $PKCS11_HELPER_DIR/usr/local/bin/$f $GENOUT/lib
if [ -z "$NO_STRIP" ]; then
strip $GENOUT/lib/$f
fi
diff --git a/install-win32/makeopenvpn b/install-win32/makeopenvpn
index e3aef48..c1a805d 100644
--- a/install-win32/makeopenvpn
+++ b/install-win32/makeopenvpn
@@ -1,19 +1,37 @@
#!/bin/sh
+H=`pwd`
+
# get version.nsi definitions
. autodefs/defs.sh
if gcc --version &>/dev/null && [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; then
# build OpenVPN binary
- [ "$CLEAN" = "yes" ] && make -f makefile.w32 clean
- make -f makefile.w32 -j $MAKE_JOBS
- # copy OpenVPN executable to GENOUT/bin
+ if ! [ -f Makefile ]; then
+ autoreconf -i -v \
+ && ./configure \
+ --enable-strict \
+ --prefix=$H/windest \
+ MAN2HTML=true \
+ --with-ssl-headers=$H/$OPENSSL_DIR/include \
+ --with-ssl-lib=$H/$OPENSSL_DIR/out \
+ --with-lzo-headers=$H/$LZO_DIR/include \
+ --with-lzo-lib=$H/$LZO_DIR \
+ --with-pkcs11-helper-headers=$H/$PKCS11_HELPER_DIR/usr/local/include \
+ --with-pkcs11-helper-lib=$H/$PKCS11_HELPER_DIR/usr/local/lib
+ fi
+
+ make -j $MAKE_JOBS && make install
+
+ # copy OpenVPN and service executables to GENOUT/bin
mkdir -p $GENOUT/bin &>/dev/null
- cp $PRODUCT_UNIX_NAME.exe $GENOUT/bin
+ cp windest/sbin/openvpn.exe $GENOUT/bin
+ cp windest/sbin/openvpnserv.exe $GENOUT/bin
if [ -z "$NO_STRIP" ]; then
- strip $GENOUT/bin/$PRODUCT_UNIX_NAME.exe
+ strip $GENOUT/bin/openvpn.exe
+ strip $GENOUT/bin/openvpnserv.exe
fi
else
- echo DID NOT BUILD openvpn.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing
+ echo DID NOT BUILD openvpn.exe and openvpnserv.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing
fi
diff --git a/install-win32/makeservice b/install-win32/makeservice
deleted file mode 100644
index 647e178..0000000
--- a/install-win32/makeservice
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# get version.nsi definitions
-. autodefs/defs.sh
-
-# build OpenVPN service (openvpnserv.exe)
-if [ -d "$SVC_TEMPLATE" ] ; then
- # silly vista security theatre
- PATCH="/tmp/p.exe"
- cp `which patch` $PATCH
-
- # build service sources
- cp $SVC_TEMPLATE/service.[ch] service-win32
- cd service-win32
- cp service.c service.c.orig
- cp service.h service.h.orig
- $PATCH <service.patch
-
- # compile/link
- [ "$CLEAN" = "yes" ] && make clean
- make -j $MAKE_JOBS
- cd ..
-
- # copy service to GENOUT/bin
- mkdir $GENOUT/bin &>/dev/null
- cp service-win32/${PRODUCT_UNIX_NAME}serv.exe $GENOUT/bin
- if [ -z "$NO_STRIP" ]; then
- strip $GENOUT/bin/${PRODUCT_UNIX_NAME}serv.exe
- fi
-else
- echo OpenVPN service not built -- template directory $SVC_TEMPLATE NOT FOUND
-fi
diff --git a/install-win32/settings.in b/install-win32/settings.in
index b6789ee..ecf7a2c 100644
--- a/install-win32/settings.in
+++ b/install-win32/settings.in
@@ -19,12 +19,12 @@
# Include the OpenVPN XML-based GUI exe in the installer.
# May be undefined.
-!define OPENVPN_XGUI_DIR "../ovpnxml"
+;!define OPENVPN_XGUI_DIR "../ovpnxml"
# Prebuilt libraries. DMALLOC is optional.
!define OPENSSL_DIR "../openssl-0.9.7m"
!define LZO_DIR "../lzo-2.02"
-!define PKCS11_HELPER_DIR "../pkcs11-helper/usr/local"
+!define PKCS11_HELPER_DIR "../pkcs11-helper"
!define DMALLOC_DIR "../dmalloc-5.4.2"
# Optional directory of prebuilt OpenVPN binary components,
@@ -36,10 +36,10 @@
# Not needed if DRVBINSRC is defined.
!define TISRC "../tapinstall"
-# TAP Adapter parameters.
+# TAP Adapter parameters. Note that PRODUCT_TAP_ID is
+# defined in version.m4.
!define PRODUCT_TAP_DEVICE_DESCRIPTION "TAP-Win32 Adapter V9"
!define PRODUCT_TAP_PROVIDER "TAP-Win32 Provider V9"
-!define PRODUCT_TAP_ID "tap0901"
!define PRODUCT_TAP_MAJOR_VER 9
!define PRODUCT_TAP_MINOR_VER 4
!define PRODUCT_TAP_RELDATE "01/22/2008"
@@ -50,10 +50,6 @@
# Build debugging version of TAP driver
;!define PRODUCT_TAP_DEBUG
-# Service template files service.[ch] (get from Platform SDK).
-# If undefined, don't build openvpnserv.exe
-!define SVC_TEMPLATE "../svc-template"
-
# DDK Version.
# DDK distribution is assumed to be in C:\WINDDK\${DDKVER}
!define DDKVER 6001.17121