From 0175c1e1f0a263fc2ef640f485a60f45d5448b7d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 13 Apr 2026 10:36:53 +0200 Subject: [PATCH] firmware: moved FreeBSD.php duty to opnsense-update PR: https://github.com/opnsense/update/commit/aeb88a8fb9 --- plist | 1 - .../scripts/firmware/repos/FreeBSD.php | 33 ------------------- .../scripts/firmware/repos/OPNsense.php | 5 +-- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100755 src/opnsense/scripts/firmware/repos/FreeBSD.php diff --git a/plist b/plist index 16cb043288..ab6125a51a 100644 --- a/plist +++ b/plist @@ -1209,7 +1209,6 @@ /usr/local/opnsense/scripts/firmware/register.php /usr/local/opnsense/scripts/firmware/reinstall.sh /usr/local/opnsense/scripts/firmware/remove.sh -/usr/local/opnsense/scripts/firmware/repos/FreeBSD.php /usr/local/opnsense/scripts/firmware/repos/OPNsense.php /usr/local/opnsense/scripts/firmware/repos/README /usr/local/opnsense/scripts/firmware/resync.sh diff --git a/src/opnsense/scripts/firmware/repos/FreeBSD.php b/src/opnsense/scripts/firmware/repos/FreeBSD.php deleted file mode 100755 index 299f103970..0000000000 --- a/src/opnsense/scripts/firmware/repos/FreeBSD.php +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/local/bin/php - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -$conf = '/usr/local/etc/pkg/repos/FreeBSD.conf'; - -/* ensure that FreeBSD repo is off to avoid obvious breakage */ -@copy($conf . '.sample', $conf); diff --git a/src/opnsense/scripts/firmware/repos/OPNsense.php b/src/opnsense/scripts/firmware/repos/OPNsense.php index 84d68709f8..9e0e049d20 100755 --- a/src/opnsense/scripts/firmware/repos/OPNsense.php +++ b/src/opnsense/scripts/firmware/repos/OPNsense.php @@ -35,9 +35,10 @@ use OPNsense\Core\Config; $config = Config::getInstance()->object(); $url_sub = ''; -/* calculate the effective ABI */ +/* canonically handles OPNsense.conf, OPNsense-aux.conf and FreeBSD.conf */ + $frmt = ['/usr/local/sbin/opnsense-update -sd -A %s']; -$args = [shell_safe('opnsense-version -x')]; +$args = [shell_safe('opnsense-version -x')]; /* calculate the effective ABI */ if (!empty($config->system->firmware->subscription)) { /*