From 0e8e6a020c045e421591cc2f587287543367e6d5 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 22 Aug 2021 11:49:35 -0500
Subject: [PATCH] New Libreswan version

- Support updating to Libreswan 4.5
---
 extras/vpnupgrade.sh        | 10 +++++-----
 extras/vpnupgrade_amzn.sh   | 10 +++++-----
 extras/vpnupgrade_centos.sh | 10 +++++-----
 extras/vpnupgrade_ubuntu.sh | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index 437d217..be4b0f7 100755
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -15,7 +15,7 @@
 # know how you have improved it!
 
 # Specify which Libreswan version to install. See: https://libreswan.org
-SWAN_VER=4.4
+SWAN_VER=4.5
 
 ### DO NOT edit below this line ###
 
@@ -75,16 +75,16 @@ check_os() {
   fi
 }
 
-check_swan_ver() {
+check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1234])
+    3.32|4.[1-5])
       true
       ;;
     *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.3 or 4.4
+       3.32, 4.1-4.4 or 4.5
 EOF
       exit 1
       ;;
@@ -158,7 +158,7 @@ vpnupgrade() {
   check_root
   check_vz
   check_os
-  check_swan_ver
+  check_libreswan
   install_wget
   get_setup_url
   run_setup
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index acbe4a1..a60600d 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -14,7 +14,7 @@
 # know how you have improved it!
 
 # Specify which Libreswan version to install. See: https://libreswan.org
-SWAN_VER=4.4
+SWAN_VER=4.5
 
 ### DO NOT edit below this line ###
 
@@ -40,14 +40,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1234])
+    3.32|4.[1-5])
       true
       ;;
     *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.3 or 4.4
+       3.32, 4.1-4.4 or 4.5
 EOF
       exit 1
       ;;
@@ -98,7 +98,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.4" ]; then
+  if [ "$SWAN_VER" != "4.5" ]; then
 cat <<'EOF'
 WARNING: Older versions of Libreswan could contain known security vulnerabilities.
          See https://libreswan.org/security/ for more information.
@@ -258,7 +258,7 @@ EOF
 }
 
 check_swan_ver() {
-  swan_ver_cur=4.4
+  swan_ver_cur=4.5
   swan_ver_url="https://dl.ls20.com/v1/amzn/2/swanverupg?arch=$os_arch&ver1=$swan_ver_old&ver2=$SWAN_VER"
   [ "$1" != "0" ] && swan_ver_url="$swan_ver_url&e=$2"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url")
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index ff2c5d0..72096e1 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -14,7 +14,7 @@
 # know how you have improved it!
 
 # Specify which Libreswan version to install. See: https://libreswan.org
-SWAN_VER=4.4
+SWAN_VER=4.5
 
 ### DO NOT edit below this line ###
 
@@ -58,14 +58,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1234])
+    3.32|4.[1-5])
       true
       ;;
     *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.3 or 4.4
+       3.32, 4.1-4.4 or 4.5
 EOF
       exit 1
       ;;
@@ -116,7 +116,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.4" ]; then
+  if [ "$SWAN_VER" != "4.5" ]; then
 cat <<'EOF'
 WARNING: Older versions of Libreswan could contain known security vulnerabilities.
          See https://libreswan.org/security/ for more information.
@@ -294,7 +294,7 @@ EOF
 }
 
 check_swan_ver() {
-  swan_ver_cur=4.4
+  swan_ver_cur=4.5
   swan_ver_url="https://dl.ls20.com/v1/$os_type/$os_ver/swanverupg?arch=$os_arch&ver1=$swan_ver_old&ver2=$SWAN_VER"
   [ "$1" != "0" ] && swan_ver_url="$swan_ver_url&e=$2"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url")
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index abf6bfb..8a12a14 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -14,7 +14,7 @@
 # know how you have improved it!
 
 # Specify which Libreswan version to install. See: https://libreswan.org
-SWAN_VER=4.4
+SWAN_VER=4.5
 
 ### DO NOT edit below this line ###
 
@@ -63,14 +63,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1234])
+    3.32|4.[1-5])
       true
       ;;
     *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.3 or 4.4
+       3.32, 4.1-4.4 or 4.5
 EOF
       exit 1
       ;;
@@ -125,7 +125,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.4" ]; then
+  if [ "$SWAN_VER" != "4.5" ]; then
 cat <<'EOF'
 WARNING: Older versions of Libreswan could contain known security vulnerabilities.
          See https://libreswan.org/security/ for more information.
@@ -301,7 +301,7 @@ EOF
 }
 
 check_swan_ver() {
-  swan_ver_cur=4.4
+  swan_ver_cur=4.5
   swan_ver_url="https://dl.ls20.com/v1/$os_type/$os_ver/swanverupg?arch=$os_arch&ver1=$swan_ver_old&ver2=$SWAN_VER"
   [ "$1" != "0" ] && swan_ver_url="$swan_ver_url&e=$2"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url")