From f331061387fec778809a5bfd768d567bcb590f8b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 27 Jul 2021 16:04:57 +0200 Subject: [PATCH] firmware: changes for EoL of 21.1 o Remove revoked business fingerprints that were never used o Revoke fingerprint for 21.1 as it is no longer needed o Remove upgrade hint file to avoid development version upgrade loops --- Makefile | 2 +- plist | 7 +------ .../OPNsense/revoked/opnsense-update.deciso.com.20160725 | 2 -- .../OPNsense/revoked/opnsense-update.deciso.com.20170721 | 2 -- .../OPNsense/revoked/opnsense-update.deciso.com.20180627 | 2 -- .../OPNsense/revoked/opnsense-update.deciso.com.20200122 | 2 -- .../{trusted => revoked}/pkg.opnsense.org.20210104 | 0 src/opnsense/firmware-upgrade | 1 - 8 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 delete mode 100644 src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 delete mode 100644 src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20180627 delete mode 100644 src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20200122 rename src/etc/pkg/fingerprints/OPNsense/{trusted => revoked}/pkg.opnsense.org.20210104 (100%) delete mode 100644 src/opnsense/firmware-upgrade diff --git a/Makefile b/Makefile index cdec9788b..bad9c7d64 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: .include "Mk/defaults.mk" -CORE_ABI?= 21.1 +CORE_ABI?= 21.7 CORE_MESSAGE?= Carry on my wayward son CORE_NAME?= opnsense-devel CORE_NICKNAME?= Not Yet diff --git a/plist b/plist index 33ac75282..8e8946f88 100644 --- a/plist +++ b/plist @@ -65,10 +65,6 @@ /usr/local/etc/opnsense-beep.d/low /usr/local/etc/opnsense-beep.d/start /usr/local/etc/opnsense-beep.d/stop -/usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 -/usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 -/usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20180627 -/usr/local/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20200122 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20150402 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160104 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160630 @@ -80,7 +76,7 @@ /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20190702 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20200119 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20200313 -/usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20210104 +/usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20210104 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20210629 /usr/local/etc/rc /usr/local/etc/rc.bootup @@ -249,7 +245,6 @@ /usr/local/opnsense/data/proxy/template_error_pages/error-details.txt /usr/local/opnsense/data/proxy/template_error_pages/errorpage.css /usr/local/opnsense/firmware-message -/usr/local/opnsense/firmware-upgrade /usr/local/opnsense/mvc/app/cache/README /usr/local/opnsense/mvc/app/config/config.php /usr/local/opnsense/mvc/app/config/loader.php diff --git a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 b/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 deleted file mode 100644 index 763858c6d..000000000 --- a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20160725 +++ /dev/null @@ -1,2 +0,0 @@ -function: "sha256" -fingerprint: "c3cf42fa6dd81c9be7decd2c76d1ee834b903b2f0188c90fa773b60673dd47ae" diff --git a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 b/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 deleted file mode 100644 index 3b003774b..000000000 --- a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20170721 +++ /dev/null @@ -1,2 +0,0 @@ -function: "sha256" -fingerprint: "d52b3123ac5bbf8885e6e09b53d622329dfe88c98694b6e421dcffb5749133ef" diff --git a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20180627 b/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20180627 deleted file mode 100644 index b0e85c1b6..000000000 --- a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20180627 +++ /dev/null @@ -1,2 +0,0 @@ -function: "sha256" -fingerprint: "c992349376b95a96a1c728d77907bfde80dd86168b3aef9b85ab483444375f04" diff --git a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20200122 b/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20200122 deleted file mode 100644 index 67742a4cb..000000000 --- a/src/etc/pkg/fingerprints/OPNsense/revoked/opnsense-update.deciso.com.20200122 +++ /dev/null @@ -1,2 +0,0 @@ -function: "sha256" -fingerprint: "d3015d075f1dbf1224323535842970f8dc40ec160ad31454d5d7ea14506a03db" diff --git a/src/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20210104 b/src/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20210104 similarity index 100% rename from src/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20210104 rename to src/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20210104 diff --git a/src/opnsense/firmware-upgrade b/src/opnsense/firmware-upgrade deleted file mode 100644 index 411543d44..000000000 --- a/src/opnsense/firmware-upgrade +++ /dev/null @@ -1 +0,0 @@ -21.7