Update to OpenVPN 2.5.0

This commit is contained in:
lawtancool 2021-01-10 11:33:27 -08:00
parent 2bb96ab343
commit 35347e8c6a
3 changed files with 15 additions and 15 deletions

View File

@ -12,10 +12,10 @@ LABEL maintainer="lawtancool"
# rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* # 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 && \ 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 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.2beta02.zip && unzip v3.8.2beta02.zip && \ wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.9 && \ cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
cd openvpn-2.4.9 && \ cd openvpn-2.5.0 && \
patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \ patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \ patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.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 && \ patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
./configure --disable-systemd --enable-async-push --enable-iproute2 && \ ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
make && make install && \ 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 # Needed by scripts
ENV OPENVPN /etc/openvpn ENV OPENVPN /etc/openvpn

View File

@ -14,10 +14,10 @@ COPY qemu-arm-static /usr/bin
# rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* # 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 && \ 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 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.2beta02.zip && unzip v3.8.2beta02.zip && \ wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.8 && \ cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
cd openvpn-2.4.8 && \ cd openvpn-2.5.0 && \
patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \ patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \ patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.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 && \ patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
./configure --disable-systemd --enable-async-push --enable-iproute2 && \ ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
make && make install && \ 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 # Needed by scripts
ENV OPENVPN /etc/openvpn ENV OPENVPN /etc/openvpn

View File

@ -14,10 +14,10 @@ COPY qemu-aarch64-static /usr/bin
# rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* # 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 && \ 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 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.2beta02.zip && unzip v3.8.2beta02.zip && \ wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.5beta02.zip && unzip v3.8.5beta02.zip && \
cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.8 && \ cp Tunnelblick-3.8.5beta02/third_party/sources/openvpn/openvpn-2.5.0/patches/*.diff openvpn-2.5.0 && \
cd openvpn-2.4.8 && \ cd openvpn-2.5.0 && \
patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \ patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \
patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \ patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \
patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.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 && \ patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \
./configure --disable-systemd --enable-async-push --enable-iproute2 && \ ./configure --disable-systemd --enable-async-push --enable-iproute2 && \
make && make install && \ 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 # Needed by scripts
ENV OPENVPN /etc/openvpn ENV OPENVPN /etc/openvpn