From 5bb63dac28627cbf06c526c5ad3e08cc7117d67b Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 3 Feb 2024 15:24:29 -0600 Subject: [PATCH] Update Alpine Linux versions - Add Alpine Linux 3.19 and remove 3.17. --- extras/ikev2setup.sh | 8 ++++---- extras/vpnupgrade.sh | 6 +++--- extras/vpnupgrade_alpine.sh | 10 +++++----- vpnsetup.sh | 6 +++--- vpnsetup_alpine.sh | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh index 323e520..bf90737 100755 --- a/extras/ikev2setup.sh +++ b/extras/ikev2setup.sh @@ -8,7 +8,7 @@ # The latest version of this script is available at: # https://github.com/hwdsl2/setup-ipsec-vpn # -# Copyright (C) 2020-2023 Lin Song +# Copyright (C) 2020-2024 Lin Song # # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # Unported License: http://creativecommons.org/licenses/by-sa/3.0/ @@ -96,8 +96,8 @@ EOF esac if [ "$os_type" = "alpine" ]; then os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then - exiterr "This script only supports Alpine Linux 3.17/3.18." + if [ "$os_ver" != "3.18" ] && [ "$os_ver" != "3.19" ]; then + exiterr "This script only supports Alpine Linux 3.18/3.19." fi else os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') @@ -157,7 +157,7 @@ confirm_or_abort() { show_header() { cat <<'EOF' -IKEv2 Script Copyright (c) 2020-2023 Lin Song 13 Dec 2023 +IKEv2 Script Copyright (c) 2020-2024 Lin Song 3 Feb 2024 EOF } diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh index daab388..ddaff43 100755 --- a/extras/vpnupgrade.sh +++ b/extras/vpnupgrade.sh @@ -6,7 +6,7 @@ # The latest version of this script is available at: # https://github.com/hwdsl2/setup-ipsec-vpn # -# Copyright (C) 2021-2023 Lin Song +# Copyright (C) 2021-2024 Lin Song # # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # Unported License: http://creativecommons.org/licenses/by-sa/3.0/ @@ -90,8 +90,8 @@ EOF esac if [ "$os_type" = "alpine" ]; then os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then - exiterr "This script only supports Alpine Linux 3.17/3.18." + if [ "$os_ver" != "3.18" ] && [ "$os_ver" != "3.19" ]; then + exiterr "This script only supports Alpine Linux 3.18/3.19." fi else os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh index c3faf32..04e5c90 100755 --- a/extras/vpnupgrade_alpine.sh +++ b/extras/vpnupgrade_alpine.sh @@ -5,7 +5,7 @@ # The latest version of this script is available at: # https://github.com/hwdsl2/setup-ipsec-vpn # -# Copyright (C) 2021-2023 Lin Song +# Copyright (C) 2021-2024 Lin Song # # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # Unported License: http://creativecommons.org/licenses/by-sa/3.0/ @@ -51,8 +51,8 @@ check_os() { ;; esac os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then - exiterr "This script only supports Alpine Linux 3.17/3.18." + if [ "$os_ver" != "3.18" ] && [ "$os_ver" != "3.19" ]; then + exiterr "This script only supports Alpine Linux 3.18/3.19." fi } @@ -146,8 +146,8 @@ install_pkgs() { bigecho "Installing required packages..." ( set -x - apk add -U -q bash bind-tools coreutils openssl wget iproute2 sed grep \ - libcap-ng libcurl libevent linux-pam musl nspr nss nss-tools \ + apk add -U -q bash bind-tools coreutils openssl wget iptables iproute2 \ + sed grep libcap-ng libcurl libevent linux-pam musl nspr nss nss-tools \ bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev nss-dev \ libcap-ng-dev libevent-dev curl-dev nspr-dev uuidgen openrc ) || exiterr2 diff --git a/vpnsetup.sh b/vpnsetup.sh index cfe33b6..e844191 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -8,7 +8,7 @@ # The latest version of this script is available at: # https://github.com/hwdsl2/setup-ipsec-vpn # -# Copyright (C) 2021-2023 Lin Song +# Copyright (C) 2021-2024 Lin Song # # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # Unported License: http://creativecommons.org/licenses/by-sa/3.0/ @@ -122,8 +122,8 @@ EOF esac if [ "$os_type" = "alpine" ]; then os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then - exiterr "This script only supports Alpine Linux 3.17/3.18." + if [ "$os_ver" != "3.18" ] && [ "$os_ver" != "3.19" ]; then + exiterr "This script only supports Alpine Linux 3.18/3.19." fi else os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index f029612..ce2df0a 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -7,7 +7,7 @@ # The latest version of this script is available at: # https://github.com/hwdsl2/setup-ipsec-vpn # -# Copyright (C) 2021-2023 Lin Song +# Copyright (C) 2021-2024 Lin Song # # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # Unported License: http://creativecommons.org/licenses/by-sa/3.0/ @@ -70,8 +70,8 @@ check_os() { ;; esac os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then - exiterr "This script only supports Alpine Linux 3.17/3.18." + if [ "$os_ver" != "3.18" ] && [ "$os_ver" != "3.19" ]; then + exiterr "This script only supports Alpine Linux 3.18/3.19." fi } @@ -165,7 +165,7 @@ install_setup_pkgs() { bigecho "Installing packages required for setup..." ( set -x - apk add -U -q bash bind-tools coreutils openssl wget iproute2 sed grep + apk add -U -q bash bind-tools coreutils openssl wget iptables iproute2 sed grep ) || exiterr2 }