From bd291e91a15e53cff9431332c73c85eb42e4d5d7 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Fri, 7 Oct 2022 00:19:00 -0500
Subject: [PATCH] Cleanup

---
 extras/vpnupgrade_alpine.sh |  1 -
 extras/vpnupgrade_ubuntu.sh |  2 +-
 vpnsetup_alpine.sh          |  1 -
 vpnsetup_ubuntu.sh          | 10 +---------
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh
index a60e51a..c5f1ae9 100755
--- a/extras/vpnupgrade_alpine.sh
+++ b/extras/vpnupgrade_alpine.sh
@@ -169,7 +169,6 @@ install_libreswan() {
   cd "libreswan-$SWAN_VER" || exit 1
   sed -i '1c\#!/sbin/openrc-run' /etc/init.d/ipsec
   service ipsec stop >/dev/null 2>&1
-  sed -i '28s/stdlib\.h/sys\/types.h/' include/fd.h
 cat > Makefile.inc.local <<'EOF'
 WERROR_CFLAGS=-w -s
 USE_DNSSEC=false
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index aed0900..f8114eb 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -191,7 +191,7 @@ cat > Makefile.inc.local <<'EOF'
 WERROR_CFLAGS=-w -s
 USE_DNSSEC=false
 EOF
-  if [ "$SWAN_VER" = "3.32" ] || ! grep -qs 'VERSION_CODENAME=' /etc/os-release; then
+  if [ "$SWAN_VER" = "3.32" ]; then
 cat >> Makefile.inc.local <<'EOF'
 USE_DH31=false
 USE_NSS_AVA_COPY=true
diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh
index dabfa09..14e175b 100755
--- a/vpnsetup_alpine.sh
+++ b/vpnsetup_alpine.sh
@@ -282,7 +282,6 @@ install_libreswan() {
   if [ "$check_result" = 0 ]; then
     bigecho "Compiling and installing Libreswan, please wait..."
     cd "libreswan-$SWAN_VER" || exit 1
-    sed -i '28s/stdlib\.h/sys\/types.h/' include/fd.h
 cat > Makefile.inc.local <<'EOF'
 WERROR_CFLAGS=-w -s
 USE_DNSSEC=false
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index 87bcd83..b749115 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -349,14 +349,6 @@ USE_DH2=true
 USE_NSS_KDF=false
 FINALNSSDIR=/etc/ipsec.d
 EOF
-    if ! grep -qs 'VERSION_CODENAME=' /etc/os-release; then
-cat >> Makefile.inc.local <<'EOF'
-USE_DH31=false
-USE_NSS_AVA_COPY=true
-USE_NSS_IPSEC_PROFILE=false
-USE_GLIBC_KERN_FLIP_HEADERS=true
-EOF
-    fi
     if ! grep -qs IFLA_XFRM_LINK /usr/include/linux/if_link.h; then
       echo "USE_XFRM_INTERFACE_IFLA_HEADER=true" >> Makefile.inc.local
     fi
@@ -680,7 +672,7 @@ VPN client setup: https://vpnsetup.net/clients
 EOF
   if [ ! -e /dev/ppp ]; then
 cat <<'EOF'
-WARNING: /dev/ppp is missing, and IPsec/L2TP mode may not work.
+Warning: /dev/ppp is missing, and IPsec/L2TP mode may not work.
          Please use IKEv2 or IPsec/XAuth mode to connect.
          Debian 11/10 users, see https://vpnsetup.net/debian10