Update tests

- Support upgrading to Libreswan 4.7.

.github/workflows/test_set_1.yml

@@ -465,12 +465,13 @@ jobs:
           cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          for ver in 4.4 ""; do
+          for ver in 4.5 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -484,12 +485,13 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5 ""; do
+          for ver in 4.6 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk

.github/workflows/test_set_2.yml

@@ -77,7 +77,7 @@ jobs:
           echo "# hwdsl2" > run.sh
 
           if [ "$os_type" = "alpine" ]; then
-            apk add -U wget rsyslog sed
+            apk add -U wget rsyslog sed bash
             rsyslogd
           else
             export DEBIAN_FRONTEND=noninteractive
@@ -480,8 +480,7 @@ jobs:
           cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          [ "$os_type" = "alpine" ] && ver1=4.5 || ver1=4.4
+          for ver in 4.5 ""; do
-          for ver in "$ver1" ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -490,6 +489,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -503,7 +503,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5 ""; do
+          for ver in 4.6 ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -512,6 +512,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk

README-zh.md

@@ -235,7 +235,7 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgr
 如果无法下载，打开 [vpnupgrade.sh](extras/vpnupgrade.sh)，然后点击右边的 `Raw` 按钮。按快捷键 `Ctrl/Cmd+A` 全选，`Ctrl/Cmd+C` 复制，然后粘贴到你喜欢的编辑器。
 </details>
 
-当前支持的 Libreswan 最新版本是 `4.6`。查看已安装版本：`ipsec --version`。
+当前支持的 Libreswan 最新版本是 `4.7`。查看已安装版本：`ipsec --version`。
 
 **注：** `xl2tpd` 可以使用系统的软件包管理器进行更新，例如 Ubuntu/Debian 上的 `apt-get`。
 

README.md

@@ -235,7 +235,7 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgr
 If you are unable to download, open [vpnupgrade.sh](extras/vpnupgrade.sh), then click the `Raw` button on the right. Press `Ctrl/Cmd+A` to select all, `Ctrl/Cmd+C` to copy, then paste into your favorite editor.
 </details>
 
-The latest supported Libreswan version is `4.6`. Check installed version: `ipsec --version`.
+The latest supported Libreswan version is `4.7`. Check installed version: `ipsec --version`.
 
 **Note:** `xl2tpd` can be updated using your system's package manager, such as `apt-get` on Ubuntu/Debian.
 

extras/vpnupgrade_alpine.sh

@@ -69,7 +69,7 @@ EOF
 }
 
 get_swan_ver() {
-  swan_ver_cur=4.6
+  swan_ver_cur=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

extras/vpnupgrade_amzn.sh

@@ -52,7 +52,7 @@ EOF
 }
 
 get_swan_ver() {
-  swan_ver_cur=4.6
+  swan_ver_cur=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/upg-v1-amzn-2-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

extras/vpnupgrade_centos.sh

@@ -78,7 +78,7 @@ EOF
 }
 
 get_swan_ver() {
-  swan_ver_cur=4.6
+  swan_ver_cur=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

extras/vpnupgrade_ubuntu.sh

@@ -75,7 +75,7 @@ EOF
 }
 
 get_swan_ver() {
-  swan_ver_cur=4.6
+  swan_ver_cur=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

vpnsetup_alpine.sh

@@ -224,7 +224,7 @@ get_helper_scripts() {
 }
 
 get_swan_ver() {
-  SWAN_VER=4.6
+  SWAN_VER=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

vpnsetup_amzn.sh

@@ -224,7 +224,7 @@ get_helper_scripts() {
 }
 
 get_swan_ver() {
-  SWAN_VER=4.6
+  SWAN_VER=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/v1-amzn-2-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

vpnsetup_centos.sh

@@ -306,7 +306,7 @@ get_helper_scripts() {
 }
 
 get_swan_ver() {
-  SWAN_VER=4.6
+  SWAN_VER=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

vpnsetup_ubuntu.sh

@@ -275,7 +275,7 @@ get_helper_scripts() {
 }
 
 get_swan_ver() {
-  SWAN_VER=4.6
+  SWAN_VER=4.7
   base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
   swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
   swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)