From b58e65eb3cc0ac8c572194a96e11be5642dd7e95 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 27 Apr 2024 11:03:58 -0500 Subject: [PATCH] Add Ubuntu 24.04 - Add support for Ubuntu 24.04 LTS Ref: https://github.com/libreswan/libreswan/commit/46e9115 --- extras/vpnupgrade_ubuntu.sh | 4 +++- vpnsetup_ubuntu.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh index 24a88d2ed..1a5745392 100755 --- a/extras/vpnupgrade_ubuntu.sh +++ b/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 } diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh index 9775bf9dc..7ddda1e44 100755 --- a/vpnsetup_ubuntu.sh +++ b/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