From 18b830c998d9e59f46dd89c62424942157a3bdab Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 11 Jan 2022 22:47:18 -0600
Subject: [PATCH] New Libreswan version

- Support updating to Libreswan 4.6
---
 extras/vpnupgrade.sh        | 11 ++++++-----
 extras/vpnupgrade_alpine.sh | 11 ++++++-----
 extras/vpnupgrade_amzn.sh   | 10 +++++-----
 extras/vpnupgrade_centos.sh | 10 +++++-----
 extras/vpnupgrade_ubuntu.sh | 10 +++++-----
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index 3973679..713e76a 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.5
+SWAN_VER=4.6
 
 ### DO NOT edit below this line ###
 
@@ -93,27 +93,28 @@ EOF
 check_libreswan() {
   if [ "$os_type" != "alpine" ]; then
     case $SWAN_VER in
-      3.32|4.[1-5])
+      3.32|4.[1-6])
         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.4 or 4.5
+       3.32, 4.1-4.5 or 4.6
 EOF
         exit 1
         ;;
     esac
   else
     case $SWAN_VER in
-      4.5)
+      4.[5-6])
         true
         ;;
       *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
-       This script can install Libreswan 4.5.
+       This script can install one of these versions:
+       4.5 or 4.6
 EOF
         exit 1
         ;;
diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh
index e59c4e7..288bc9f 100755
--- a/extras/vpnupgrade_alpine.sh
+++ b/extras/vpnupgrade_alpine.sh
@@ -14,7 +14,7 @@
 # know how you have improved it!
 
 # Specify which Libreswan version to install. See: https://libreswan.org
-SWAN_VER=4.5
+SWAN_VER=4.6
 
 ### DO NOT edit below this line ###
 
@@ -57,13 +57,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    4.5)
+    4.[5-6])
       true
       ;;
     *)
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
-       This script can install Libreswan 4.5.
+       This script can install one of these versions:
+       4.5 or 4.6
 EOF
       exit 1
       ;;
@@ -114,7 +115,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.5" ]; then
+  if [ "$SWAN_VER" != "4.6" ]; then
 cat <<'EOF'
 WARNING: Older versions of Libreswan could contain known security vulnerabilities.
          See https://libreswan.org/security/ for more information.
@@ -269,7 +270,7 @@ EOF
 }
 
 check_swan_ver() {
-  swan_ver_cur=4.5
+  swan_ver_cur=4.6
   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" | head -n 1)
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index c02f26e..98f990e 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.5
+SWAN_VER=4.6
 
 ### DO NOT edit below this line ###
 
@@ -40,14 +40,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1-5])
+    3.32|4.[1-6])
       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.4 or 4.5
+       3.32, 4.1-4.5 or 4.6
 EOF
       exit 1
       ;;
@@ -98,7 +98,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.5" ]; then
+  if [ "$SWAN_VER" != "4.6" ]; 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.5
+  swan_ver_cur=4.6
   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" | head -n 1)
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index dc6ee9f..3c733e3 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.5
+SWAN_VER=4.6
 
 ### DO NOT edit below this line ###
 
@@ -58,14 +58,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1-5])
+    3.32|4.[1-6])
       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.4 or 4.5
+       3.32, 4.1-4.5 or 4.6
 EOF
       exit 1
       ;;
@@ -116,7 +116,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.5" ]; then
+  if [ "$SWAN_VER" != "4.6" ]; 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.5
+  swan_ver_cur=4.6
   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" | head -n 1)
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index 55ca894..918e8c3 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.5
+SWAN_VER=4.6
 
 ### DO NOT edit below this line ###
 
@@ -63,14 +63,14 @@ check_os() {
 
 check_libreswan() {
   case $SWAN_VER in
-    3.32|4.[1-5])
+    3.32|4.[1-6])
       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.4 or 4.5
+       3.32, 4.1-4.5 or 4.6
 EOF
       exit 1
       ;;
@@ -125,7 +125,7 @@ Note: This script will make the following changes to your VPN configuration:
 
 EOF
 
-  if [ "$SWAN_VER" != "4.5" ]; then
+  if [ "$SWAN_VER" != "4.6" ]; 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.5
+  swan_ver_cur=4.6
   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" | head -n 1)