From b8b3da07db27ee7a8300ee478d15e35faa290974 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 14 Nov 2023 09:33:12 +0100
Subject: [PATCH] firmware: fold this down to the portable opnsense-update -X
 call

---
 src/opnsense/scripts/filter/update_bogons.sh | 14 +-------------
 src/opnsense/scripts/firmware/changelog.sh   | 13 +------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/opnsense/scripts/filter/update_bogons.sh b/src/opnsense/scripts/filter/update_bogons.sh
index 0531adc72..aa85bc070 100755
--- a/src/opnsense/scripts/filter/update_bogons.sh
+++ b/src/opnsense/scripts/filter/update_bogons.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+URL="$(opnsense-update -X)/sets/bogons.txz"
 DESTDIR="/usr/local/etc"
 WORKDIR="/tmp/bogons"
 FETCH="fetch -qT 30"
@@ -7,19 +8,6 @@ RETRIES=3
 
 COMMAND=${1}
 
-CORE_ABI=$(opnsense-version -a)
-SYS_ABI=$(opnsense-verify -a)
-
-# force amd64 here since bogons are not published elsewhere
-URLPREFIX="https://pkg.opnsense.org/${SYS_ABI%:*}:amd64/${CORE_ABI}"
-
-if [ -n "$(opnsense-update -x)" ]; then
-	# fix ABI mismatch for business mirror by using it directly
-	URLPREFIX=$(opnsense-update -M)
-fi
-
-URL="${URLPREFIX}/sets/bogons.txz"
-
 echo "bogons update starting" | logger
 
 while [ ${RETRIES} -gt 0 ]; do
diff --git a/src/opnsense/scripts/firmware/changelog.sh b/src/opnsense/scripts/firmware/changelog.sh
index de3f2cdd1..00cb46aeb 100755
--- a/src/opnsense/scripts/firmware/changelog.sh
+++ b/src/opnsense/scripts/firmware/changelog.sh
@@ -48,18 +48,7 @@ changelog_checksum()
 
 changelog_url()
 {
-	CORE_ABI=$(opnsense-version -x)
-	SYS_ABI=$(opnsense-verify -a)
-
-	# force amd64 here since changelogs are not published elsewhere
-	URLPREFIX="https://pkg.opnsense.org/${SYS_ABI%:*}:amd64/${CORE_ABI}"
-
-	if [ -n "$(opnsense-update -x)" ]; then
-		# changelogs differ for business subscriptions
-		URLPREFIX=$(opnsense-update -M)
-	fi
-
-	echo "${URLPREFIX}/sets/changelog.txz"
+	echo "$(opnsense-update -X)/sets/changelog.txz"
 }
 
 changelog_fetch()