From d8f661f86a3c5769a0397f238a4fa4d624993762 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 29 Jan 2018 17:59:57 +0100
Subject: [PATCH] firmware: remove update glue, we're done

---
 Makefile                                             |  2 +-
 plist                                                |  4 +---
 .../{trusted => revoked}/pkg.opnsense.org.20170625   |  0
 src/opnsense/firmware-message                        | 12 ------------
 src/opnsense/firmware-upgrade                        |  1 -
 5 files changed, 2 insertions(+), 17 deletions(-)
 rename src/etc/pkg/fingerprints/OPNsense/{trusted => revoked}/pkg.opnsense.org.20170625 (100%)
 delete mode 100644 src/opnsense/firmware-message
 delete mode 100644 src/opnsense/firmware-upgrade

diff --git a/Makefile b/Makefile
index 4a89e514c..ccb92892a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ CORE_VERSION=	${CORE_COMMIT:C/-.*$//1}
 CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
 .endif
 
-CORE_ABI?=	17.7
+CORE_ABI?=	18.1
 CORE_ARCH?=	${ARCH}
 CORE_OPENVPN?=	# empty
 CORE_PHP?=	71
diff --git a/plist b/plist
index 16548fb72..fc791c7ce 100644
--- a/plist
+++ b/plist
@@ -67,9 +67,9 @@
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160104
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160630
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20161210
+/usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20170625
 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/opnsense-update.deciso.com.20160725
 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/opnsense-update.deciso.com.20170721
-/usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20170625
 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20171219
 /usr/local/etc/rc
 /usr/local/etc/rc.backup_captiveportal
@@ -323,9 +323,7 @@
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
 /usr/local/opnsense/contrib/tzdata/iso3166.tab
 /usr/local/opnsense/contrib/tzdata/zone.tab
-/usr/local/opnsense/firmware-message
 /usr/local/opnsense/firmware-product
-/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/trusted/pkg.opnsense.org.20170625 b/src/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20170625
similarity index 100%
rename from src/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20170625
rename to src/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20170625
diff --git a/src/opnsense/firmware-message b/src/opnsense/firmware-message
deleted file mode 100644
index 8e29dd5b0..000000000
--- a/src/opnsense/firmware-message
+++ /dev/null
@@ -1,12 +0,0 @@
-<p>OPNsense 17.7 "<em>Free Fox</em>" is now end of life. As such
-it will not receive any more updates, but the upgrade to the new 18.1 series is
-seamless and can be performed right here from the GUI by unlocking it below.</p>
-<p> Another method is to import and reinstall using a new installation image,
-which will retain your settings (selecting "Import Configuration"), then
-reformat the disk and apply a clean system (selecting "Guided Installation").</p>
-<p>You can also upgrade via console / SSH by using option 12 from the menu by
-typing "18.1" when prompted.</p>
-<p>Please backup your configuration, preview the new version via the live CD or
-in a virtual machine. Create snapshots. If all else fails, report back
-<a href="https://forum.opnsense.org/" target="_blank">in the forums</a> for
-assistance.</p>
diff --git a/src/opnsense/firmware-upgrade b/src/opnsense/firmware-upgrade
deleted file mode 100644
index 33718932a..000000000
--- a/src/opnsense/firmware-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-18.1