From 365d87d577211ff1e3753ff2a6c1d79da587208c Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sat, 25 Apr 2026 21:55:17 -0500
Subject: [PATCH] Improve VPN setup

- Install package libcrypt-dev on Ubuntu/Debian, and package
  libxcrypt-devel on CentOS 8+, which are needed for Libreswan
  compilation. This change fixes VPN setup on Ubuntu 26.04.
---
 extras/vpnupgrade_centos.sh | 6 ++++++
 extras/vpnupgrade_ubuntu.sh | 2 +-
 vpnsetup_centos.sh          | 6 ++++++
 vpnsetup_ubuntu.sh          | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 39a4c92..f4a1c6d 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -171,6 +171,12 @@ install_pkgs_1() {
       libcap-ng-devel libselinux-devel curl-devel nss-tools \
       flex bison gcc make wget sed tar >/dev/null
   ) || exiterr2
+  if [ "$os_ver" != 7 ]; then
+    (
+      set -x
+      yum -y -q install libxcrypt-devel >/dev/null
+    ) || exiterr2
+  fi
 }
 
 install_pkgs_2() {
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index 661148a..8611f22 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -177,7 +177,7 @@ install_pkgs() {
     set -x
     apt-get -yqq install libnss3-dev libnspr4-dev pkg-config \
       libpam0g-dev libcap-ng-dev libcap-ng-utils libselinux1-dev \
-      $p1 libnss3-tools libevent-dev libsystemd-dev \
+      $p1 libnss3-tools libevent-dev libsystemd-dev libcrypt-dev \
       flex bison gcc make wget sed >/dev/null
   ) || exiterr2
   if { [ "$os_type" = "ubuntu" ] && [ -n "$ubuntu_ver" ] \
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 085b0b7..e3b527b 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -277,6 +277,12 @@ install_vpn_pkgs_1() {
       libcap-ng-devel libselinux-devel curl-devel nss-tools \
       flex bison gcc make util-linux ppp >/dev/null
   ) || exiterr2
+  if [ "$os_ver" != 7 ]; then
+    (
+      set -x
+      yum -y -q install libxcrypt-devel >/dev/null
+    ) || exiterr2
+  fi
 }
 
 install_vpn_pkgs_2() {
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index b695ddd..1c5ead4 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -282,7 +282,7 @@ install_vpn_pkgs() {
     set -x
     apt-get -yqq install libnss3-dev libnspr4-dev pkg-config \
       libpam0g-dev libcap-ng-dev libcap-ng-utils libselinux1-dev \
-      $p1 flex bison gcc make libnss3-tools \
+      $p1 flex bison gcc make libnss3-tools libcrypt-dev \
       libevent-dev libsystemd-dev uuid-runtime ppp xl2tpd >/dev/null
   ) || exiterr2
   if { [ "$os_type" = "ubuntu" ] && [ -n "$ubuntu_ver" ] \