From: Samuli Seppänen <[email protected]>
Signed-off-by: Samuli Seppänen <[email protected]>
---
generic/build.vars | 18 +++++++++---------
windows-nsis/build-complete.vars | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/generic/build.vars b/generic/build.vars
index df6d2ba..e58697a 100644
--- a/generic/build.vars
+++ b/generic/build.vars
@@ -1,19 +1,19 @@
# -*- mode: sh; -*-
BUILD_VERSION="001"
-OPENSSL_VERSION="${OPENSSL_VERSION:-1.0.0e}"
+OPENSSL_VERSION="${OPENSSL_VERSION:-1.0.1c}"
PKCS11_HELPER_VERSION="${PKCS11_HELPER_VERSION:-1.10}"
LZO_VERSION="${LZO_VERSION:-2.05}"
-TAP_WINDOWS_VERSION="${TAP_WINDOWS_VERSION:-9.9.0_master}"
-OPENVPN_VERSION="${OPENVPN_VERSION:-2.3_master}"
-OPENVPN_GUI_VERSION="${OPENVPN_GUI_VERSION:-1.0.3}"
+TAP_WINDOWS_VERSION="${TAP_WINDOWS_VERSION:-9.9.2}"
+OPENVPN_VERSION="${OPENVPN_VERSION:-2.3.0}"
+OPENVPN_GUI_VERSION="${OPENVPN_GUI_VERSION:-2}"
OPENSSL_URL="${OPENSSL_URL:-http://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz}";
-PKCS11_HELPER_URL="${PKCS11_HELPER_URL:-https://github.com/downloads/alonbl/pkcs11-helper/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2}";
-TAP_WINDOWS_URL="${TAP_WINDOWS_URL:-https://github.com/downloads/OpenVPN/tap-windows/tap-windows-${TAP_WINDOWS_VERSION}.zip}";
+PKCS11_HELPER_URL="${PKCS11_HELPER_URL:-http://sourceforge.net/projects/opensc/files/pkcs11-helper/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2}";
+TAP_WINDOWS_URL="${TAP_WINDOWS_URL:-http://build.openvpn.net/downloads/releases/tap-windows-${TAP_WINDOWS_VERSION}.zip}";
LZO_URL="${LZO_URL:-http://www.oberhumer.com/opensource/lzo/download/lzo-${LZO_VERSION}.tar.gz}";
-OPENVPN_URL="${OPENVPN_URL:-https://github.com/downloads/OpenVPN/openvpn/openvpn-${OPENVPN_VERSION}.tar.gz}";
-OPENVPN_GUI_URL="${OPENVPN_GUI_URL:-https://github.com/downloads/alonbl/openvpn-gui/openvpn-gui-${OPENVPN_GUI_VERSION}.tar.gz}";
+OPENVPN_URL="${OPENVPN_URL:-http://build.openvpn.net/downloads/releases/openvpn-${OPENVPN_VERSION}.tar.gz}";
+OPENVPN_GUI_URL="${OPENVPN_GUI_URL:-http://build.openvpn.net/downloads/releases/openvpn-gui-${OPENVPN_GUI_VERSION}.tar.gz}";
#CHOST
#CTARGET
@@ -39,6 +39,6 @@ fi
#EXTRA_OPENSSL_CONFIG
#EXTRA_LZO_CONFIG
#EXTRA_PKCS11_HELPER_CONFIG
-#EXTRA_OPENVPN_CONFIG
+EXTRA_OPENVPN_CONFIG="--enable-password-save --disable-debug"
TARGET_ROOT="${TARGET_ROOT:-/}"
diff --git a/windows-nsis/build-complete.vars b/windows-nsis/build-complete.vars
index 37a3a84..81d74ae 100644
--- a/windows-nsis/build-complete.vars
+++ b/windows-nsis/build-complete.vars
@@ -1,11 +1,11 @@
# -*- mode: sh; -*-
INSTALLER_VERSION="000_master"
-EASY_RSA_VERSION="${EASY_RSA_VERSION:-2.1.0_master}"
-TAP_WINDOWS_INSTALLER_VERSION="${TAP_WINDOWS_INSTALLER_VERSION:-9.9.0_master}"
+EASY_RSA_VERSION="${EASY_RSA_VERSION:-2.2.0_master}"
+TAP_WINDOWS_VERSION="${TAP_WINDOWS_VERSION:-9.9.2}"
EASY_RSA_URL="${EASY_RSA_URL:-https://github.com/downloads/OpenVPN/easy-rsa/easy-rsa-${EASY_RSA_VERSION}.tar.gz}";
-TAP_WINDOWS_INSTALLER_URL="${TAP_WINDOWS_INSTALLER_URL:-https://github.com/downloads/OpenVPN/tap-windows/tap-windows-${TAP_WINDOWS_INSTALLER_VERSION}.exe}";
+TAP_WINDOWS_INSTALLER_URL="${TAP_WINDOWS_INSTALLER_URL:-http://build.openvpn.net/downloads/releases/tap-windows-${TAP_WINDOWS_VERSION}.exe}";
WGET="${WGET:-wget}"
--
1.7.10.4
