From 458b472a78f37dd83cb8c4834bb594fe9bc03f73 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 30 Oct 2024 14:58:01 +0000
Subject: [PATCH] Update OMR-Admin, for update to Debian 12 and fix when IPv6
 is disabled

---
 debian9-x86_64.sh | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 2ca9e36..6437553 100755
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -78,8 +78,8 @@ MLVPN_BINARY_VERSION="3.0.0+20211028.git.ddafba3"
 UBOND_VERSION="31af0f69ebb6d07ed9348dca2fced33b956cedee"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
 OBFS_BINARY_VERSION="0.0.5-1"
-OMR_ADMIN_VERSION="371ce38ec213fb6d18b79a91e5aa354ea36b649f"
-OMR_ADMIN_BINARY_VERSION="0.13+20241016"
+OMR_ADMIN_VERSION="8caecd236d8d8239e7d77fa3f6de62619bd564ee"
+OMR_ADMIN_BINARY_VERSION="0.14+20241025"
 #OMR_ADMIN_BINARY_VERSION="0.3+20220827"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 DSVPN_BINARY_VERSION="0.1.4-2"
@@ -102,7 +102,7 @@ VPSURL="https://www.openmptcprouter.com/"
 REPO="repo.openmptcprouter.com"
 CHINA=${CHINA:-no}
 
-OMR_VERSION="0.1031-test"
+OMR_VERSION="0.1032-test"
 
 DIR=$( pwd )
 #"
@@ -246,21 +246,23 @@ if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "9" ] && [ "$UPDATE_OS" = "yes" ];
 	apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades dist-upgrade
 	VERSION_ID="10"
 fi
-if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "10" ] && [ "$UPDATE_OS" = "yes" ] && [ "$KERNEL" != "5.4" ]; then
+if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "10" ] && [ "$UPDATE_OS" = "yes" ]; then
 	echo "Update Debian 10 Buster to Debian 11 Bullseye"
 	apt-get -y -f --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades upgrade
 	apt-get -y -f --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades dist-upgrade
 	sed -i 's:buster:bullseye:g' /etc/apt/sources.list
+	sed -i 's:archive:deb:g' /etc/apt/sources.list
 	sed -i 's:bullseye/updates:bullseye-security:g' /etc/apt/sources.list
 	apt-get update --allow-releaseinfo-change
 	apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades upgrade
 	apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades dist-upgrade
 	VERSION_ID="11"
 fi
-if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "11" ] && [ "$UPDATE_OS" = "yes" ] && [ "$KERNEL" != "5.4" ]; then
+if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "11" ] && [ "$UPDATE_OS" = "yes" ]; then
 	echo "Update Debian 11 Bullseye to Debian 12 Bookworm"
 	apt-get -y -f --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades upgrade
 	apt-get -y -f --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades dist-upgrade
+	sed -i 's:archive:deb:g' /etc/apt/sources.list
 	sed -i 's:bullseye:bookworm:g' /etc/apt/sources.list
 	apt-get update --allow-releaseinfo-change
 	apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" --allow-downgrades upgrade
@@ -277,7 +279,7 @@ if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ] && [ "$UPDATE_OS" = "yes"
 	apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" dist-upgrade
 	VERSION_ID="20.04"
 fi
-if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ] && [ "$UPDATE_OS" = "yes" ] && [ "$KERNEL" != "5.4" ]; then
+if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ] && [ "$UPDATE_OS" = "yes" ]; then
 	echo "Update Ubuntu 20.04 to Ubuntu 22.04"
 	apt-get -y -f --force-yes --allow-downgrades upgrade
 	apt-get -y -f --force-yes --allow-downgrades dist-upgrade
@@ -1530,17 +1532,17 @@ if [ "$OPENVPN" = "yes" ]; then
 		fi
 	fi
 	if [ "$(ip -6 a 2>/dev/null)" = "" ]; then
-		sed -i 's/proto tcp6-server//' /etc/openvpn.tun0.conf
-		sed -i 's/proto udp6//' /etc/openvpn.tun1.conf
+		sed -i 's/proto tcp6-server//' /etc/openvpn/tun0.conf
+		sed -i 's/proto udp6//' /etc/openvpn/tun1.conf
 		if [ "$OPENVPN_BONDING" = "yes" ]; then
-			sed -i 's/proto udp6//' /etc/openvpn.bonding1.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding2.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding3.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding4.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding5.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding6.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding7.conf
-			sed -i 's/proto udp6//' /etc/openvpn.bonding8.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding1.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding2.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding3.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding4.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding5.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding6.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding7.conf
+			sed -i 's/proto udp6//' /etc/openvpn/bonding8.conf
 		fi
 	fi
 	mkdir -p /etc/openvpn/ccd