From d472c65f8c5250eaab51fa8d5027433b7e7f49f5 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Mon, 13 Nov 2017 00:17:38 -0600
Subject: [PATCH] Remove RPi workaround

- No longer needed with fix 2dfa587 and 8b40709
- Ref: 1488ac0
---
 extras/vpnupgrade.sh | 20 --------------------
 vpnsetup.sh          |  6 +-----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index 83569e2..b8fdb8e 100644
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -51,26 +51,6 @@ if ! /usr/local/sbin/ipsec --version 2>/dev/null | grep -q "Libreswan"; then
   exiterr "This script requires Libreswan already installed."
 fi
 
-if [ "$SWAN_VER" = "3.22" ]; then
-  if grep -qs raspbian /etc/os-release; then
-    echo "Note: For Raspberry Pi systems, this script will install Libreswan"
-    echo "version 3.21 instead of 3.22, to avoid some recent bugs."
-    echo
-    printf "Do you wish to continue? [y/N] "
-    read -r response
-    case $response in
-      [yY][eE][sS]|[yY])
-        echo
-        SWAN_VER=3.21
-        ;;
-      *)
-        echo "Aborting."
-        exit 1
-        ;;
-    esac
-  fi
-fi
-
 if /usr/local/sbin/ipsec --version 2>/dev/null | grep -qF "$SWAN_VER"; then
   echo "You already have Libreswan version $SWAN_VER installed! "
   echo "If you continue, the same version will be re-installed."
diff --git a/vpnsetup.sh b/vpnsetup.sh
index 22b22c9..3954085 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -177,11 +177,7 @@ apt-get -yq install fail2ban || exiterr2
 
 bigecho "Compiling and installing Libreswan..."
 
-if ! grep -qs raspbian /etc/os-release; then
-  SWAN_VER=3.22
-else
-  SWAN_VER=3.21
-fi
+SWAN_VER=3.22
 swan_file="libreswan-$SWAN_VER.tar.gz"
 swan_url1="https://github.com/libreswan/libreswan/archive/v$SWAN_VER.tar.gz"
 swan_url2="https://download.libreswan.org/$swan_file"