From 35347e8c6a36243c4a24d209d805da2af194cbff Mon Sep 17 00:00:00 2001
From: lawtancool <26829131+lawtancool@users.noreply.github.com>
Date: Sun, 10 Jan 2021 11:33:27 -0800
Subject: [PATCH] Update to OpenVPN 2.5.0

---
 Dockerfile         | 10 +++++-----
 Dockerfile.arm32v7 | 10 +++++-----
 Dockerfile.arm64v8 | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75e8440..4c8ac07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,10 @@ LABEL maintainer="lawtancool"
 #    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 
 RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-dev iproute2 liblz4-dev liblzo2-dev libpam0g-dev libpkcs11-helper1-dev libsystemd-dev easy-rsa iptables pkg-config && \
-    wget http://swupdate.openvpn.org/community/releases/openvpn-2.4.9.tar.gz && tar xvf openvpn-2.4.9.tar.gz && \
-    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.2beta02.zip && unzip v3.8.2beta02.zip && \
-    cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.9 && \
-    cd openvpn-2.4.9 && \
+    wget http://swupdate.openvpn.org/community/releases/openvpn-2.5.0.tar.gz && tar xvf openvpn-2.5.0.tar.gz && \
+    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
+    cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
+    cd openvpn-2.5.0 && \
     patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
     patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
     patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.diff && \
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-d
     patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
     ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
     make && make install && \
-    cd .. && rm -r openvpn-2.4.9 && rm -r Tunnelblick-3.8.2beta02
+    cd .. && rm -r openvpn-2.5.0 && rm -r Tunnelblick-3.8.5beta02
 
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 9da0fc3..adc6ab4 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -14,10 +14,10 @@ COPY qemu-arm-static /usr/bin
 #    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 
 RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-dev iproute2 liblz4-dev liblzo2-dev libpam0g-dev libpkcs11-helper1-dev libsystemd-dev easy-rsa iptables pkg-config && \
-    wget http://swupdate.openvpn.org/community/releases/openvpn-2.4.8.tar.gz && tar xvf openvpn-2.4.8.tar.gz && \
-    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.2beta02.zip && unzip v3.8.2beta02.zip && \
-    cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.8 && \
-    cd openvpn-2.4.8 && \
+    wget http://swupdate.openvpn.org/community/releases/openvpn-2.5.0.tar.gz && tar xvf openvpn-2.5.0.tar.gz && \
+    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
+    cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
+    cd openvpn-2.5.0 && \
     patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
     patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
     patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.diff && \
@@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-d
     patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
     ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
     make && make install && \
-    cd .. && rm -r openvpn-2.4.8 && rm -r Tunnelblick-3.8.2beta02
+    cd .. && rm -r openvpn-2.5.0 && rm -r Tunnelblick-3.8.5beta02
 
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 7e261da..6c8b1e1 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -14,10 +14,10 @@ COPY qemu-aarch64-static /usr/bin
 #    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 
 RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-dev iproute2 liblz4-dev liblzo2-dev libpam0g-dev libpkcs11-helper1-dev libsystemd-dev easy-rsa iptables pkg-config && \
-    wget http://swupdate.openvpn.org/community/releases/openvpn-2.4.8.tar.gz && tar xvf openvpn-2.4.8.tar.gz && \
-    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.2beta02.zip && unzip v3.8.2beta02.zip && \
-    cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.8 && \
-    cd openvpn-2.4.8 && \
+    wget http://swupdate.openvpn.org/community/releases/openvpn-2.5.0.tar.gz && tar xvf openvpn-2.5.0.tar.gz && \
+    wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
+    cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
+    cd openvpn-2.5.0 && \
     patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
     patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
     patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.diff && \
@@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-d
     patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
     ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
     make && make install && \
-    cd .. && rm -r openvpn-2.4.8 && rm -r Tunnelblick-3.8.2beta02
+    cd .. && rm -r openvpn-2.5.0 && rm -r Tunnelblick-3.8.5beta02
 
 # Needed by scripts
 ENV OPENVPN /etc/openvpn