Update docs

- Add support for Ubuntu 24.04 LTS
  Ref: https://github.com/libreswan/libreswan/commit/46e9115

README-zh.md

@@ -72,7 +72,7 @@ https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh
 
 一个云服务器，虚拟专用服务器 (VPS) 或者专用服务器，安装以下操作系统之一：
 
-- Ubuntu 22.04 或者 20.04
+- Ubuntu 24.04, 22.04 或者 20.04
 - Debian 12, 11 或者 10
 - CentOS 7 或者 CentOS Stream 9/8
 - Rocky Linux 或者 AlmaLinux 9/8

README.md

@@ -72,7 +72,7 @@ A pre-built [Docker image](https://github.com/hwdsl2/docker-ipsec-vpn-server) is
 
 A cloud server, virtual private server (VPS) or dedicated server, with an install of:
 
-- Ubuntu 22.04 or 20.04
+- Ubuntu 24.04, 22.04 or 20.04
 - Debian 12, 11 or 10
 - CentOS 7 or CentOS Stream 9/8
 - Rocky Linux or AlmaLinux 9/8

extras/vpnupgrade_ubuntu.sh

@@ -167,11 +167,13 @@ update_apt_cache() {
 }
 
 install_pkgs() {
+  p1=libcurl4-nss-dev
+  [ "$os_ver" = "trixiesid" ] && p1=libcurl4-gnutls-dev
   (
     set -x
     apt-get -yqq install libnss3-dev libnspr4-dev pkg-config \
       libpam0g-dev libcap-ng-dev libcap-ng-utils libselinux1-dev \
-      libcurl4-nss-dev libnss3-tools libevent-dev libsystemd-dev \
+      $p1 libnss3-tools libevent-dev libsystemd-dev \
       flex bison gcc make wget sed >/dev/null
   ) || exiterr2
 }

vpnsetup_ubuntu.sh

@@ -254,11 +254,13 @@ detect_ip() {
 
 install_vpn_pkgs() {
   bigecho "Installing packages required for the VPN..."
+  p1=libcurl4-nss-dev
+  [ "$os_ver" = "trixiesid" ] && p1=libcurl4-gnutls-dev
   (
     set -x
     apt-get -yqq install libnss3-dev libnspr4-dev pkg-config \
       libpam0g-dev libcap-ng-dev libcap-ng-utils libselinux1-dev \
-      libcurl4-nss-dev flex bison gcc make libnss3-tools \
+      $p1 flex bison gcc make libnss3-tools \
       libevent-dev libsystemd-dev uuid-runtime ppp xl2tpd >/dev/null
   ) || exiterr2
   if [ "$os_type" = "debian" ] && [ "$os_ver" = 12 ]; then