From da20e723e82459674570c2fdfe09a5838fd07b16 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 2 Jun 2019 22:44:12 -0500
Subject: [PATCH] Remove xl2tpd workaround

---
 vpnsetup.sh        | 18 ------------------
 vpnsetup_centos.sh | 18 ------------------
 2 files changed, 36 deletions(-)

diff --git a/vpnsetup.sh b/vpnsetup.sh
index 464f3ea..5767e5e 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -164,24 +164,6 @@ apt-get -yq install libnss3-dev libnspr4-dev pkg-config \
   libcurl4-nss-dev flex bison gcc make libnss3-tools \
   libevent-dev ppp xl2tpd || exiterr2
 
-case "$(uname -r)" in
-  4.1[456]*)
-    if ! printf '%s' "$os_type" | head -n 1 | grep -qiF ubuntu; then
-      L2TP_VER=1.3.12
-      l2tp_dir="xl2tpd-$L2TP_VER"
-      l2tp_file="$l2tp_dir.tar.gz"
-      l2tp_url="https://github.com/xelerance/xl2tpd/archive/v$L2TP_VER.tar.gz"
-      apt-get -yq install libpcap0.8-dev || exiterr2
-      wget -t 3 -T 30 -nv -O "$l2tp_file" "$l2tp_url" || exit 1
-      /bin/rm -rf "/opt/src/$l2tp_dir"
-      tar xzf "$l2tp_file" && /bin/rm -f "$l2tp_file"
-      cd "$l2tp_dir" && make -s 2>/dev/null && PREFIX=/usr make -s install
-      cd /opt/src || exit 1
-      /bin/rm -rf "/opt/src/$l2tp_dir"
-    fi
-    ;;
-esac
-
 bigecho "Installing Fail2Ban to protect SSH..."
 
 apt-get -yq install fail2ban || exiterr2
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 6e93482..21588f4 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -154,24 +154,6 @@ else
   yum "$REPO2" "$REPO3" -y install libevent-devel fipscheck-devel || exiterr2
 fi
 
-case "$(uname -r)" in
-  4.1[456]*)
-    if grep -qs "release 6" /etc/redhat-release; then
-      L2TP_VER=1.3.12
-      l2tp_dir="xl2tpd-$L2TP_VER"
-      l2tp_file="$l2tp_dir.tar.gz"
-      l2tp_url="https://github.com/xelerance/xl2tpd/archive/v$L2TP_VER.tar.gz"
-      yum "$REPO2" "$REPO3" -y install libpcap-devel || exiterr2
-      wget -t 3 -T 30 -nv -O "$l2tp_file" "$l2tp_url" || exit 1
-      /bin/rm -rf "/opt/src/$l2tp_dir"
-      tar xzf "$l2tp_file" && /bin/rm -f "$l2tp_file"
-      cd "$l2tp_dir" && make -s 2>/dev/null && PREFIX=/usr make -s install
-      cd /opt/src || exit 1
-      /bin/rm -rf "/opt/src/$l2tp_dir"
-    fi
-    ;;
-esac
-
 bigecho "Installing Fail2Ban to protect SSH..."
 
 yum "$REPO1" -y install fail2ban || exiterr2