From a3e3b97e537437f18e454f2237d16db34847b7c1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 28 Jul 2020 10:33:42 +0200
Subject: [PATCH] firmware: switch to 20.7

---
 Makefile                         | 17 ++++++-----------
 Mk/defaults.mk                   | 12 ------------
 plist                            |  2 --
 src/opnsense/firmware-message    | 14 --------------
 src/opnsense/firmware-upgrade    |  1 -
 src/root/boot/logo-hourglass.4th |  2 +-
 6 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 src/opnsense/firmware-message
 delete mode 100644 src/opnsense/firmware-upgrade

diff --git a/Makefile b/Makefile
index 8d213d25f..65bcccb6e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,17 +28,14 @@ all:
 
 .include "Mk/defaults.mk"
 
-CORE_ABI?=	20.1
+CORE_ABI?=	20.7
 CORE_PHP?=	72
 CORE_PYTHON?=	37
-CORE_SURICATA?=	-devel
-CORE_SYSLOGD?=	# empty
 CORE_SYSLOGNG?=	3.27
-CORE_UPDATE?=	# empty
 
 .if exists(${GIT}) && exists(${GITVERSION})
-. if ${CORE_ABI} == "20.1"
-CORE_COMMIT!=	${GITVERSION} --exclude=20.7.r\*
+. if ${CORE_ABI} == "20.7"
+CORE_COMMIT!=	${GITVERSION} --exclude=21.1.r\*
 . else
 CORE_COMMIT!=	${GITVERSION}
 . endif
@@ -83,9 +80,7 @@ CORE_COPYRIGHT_YEARS?=	2014-2020
 
 CORE_DEPENDS_amd64?=	beep \
 			bsdinstaller \
-			suricata${CORE_SURICATA}
-
-CORE_DEPENDS_i386?=	${CORE_DEPENDS_amd64}
+			suricata
 
 CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			ca_root_nss \
@@ -110,7 +105,7 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			openssh-portable \
 			openvpn \
 			opnsense-lang \
-			opnsense-update${CORE_UPDATE} \
+			opnsense-update \
 			pam_opnsense \
 			pftop \
 			php${CORE_PHP}-ctype \
@@ -148,7 +143,7 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			strongswan \
 			sudo \
 			syslog-ng${CORE_SYSLOGNG:S/.//g} \
-			syslogd${CORE_SYSLOGD} \
+			syslogd \
 			unbound \
 			wpa_supplicant \
 			zip
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 017bf3b8e..62ae0c3bf 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -34,18 +34,6 @@ GITVERSION=	${.CURDIR}/Scripts/version.sh
 _CORE_ARCH!=	uname -p
 CORE_ARCH?=	${_CORE_ARCH}
 
-# detect current runtime dependencies to unbreak development "make upgrade"
-.if exists(${PKG})
-_CORE_UPDATE!=	${PKG} query -g %n 'opnsense-update*'
-CORE_UPDATE?=	${_CORE_UPDATE:S/opnsense-update//g}
-
-_CORE_SURICATA!=${PKG} query -g %n 'suricata*'
-CORE_SURICATA?=	${_CORE_SURICATA:S/suricata//g}
-
-_CORE_SYSLOGD!=	${PKG} query -g %n 'syslogd*'
-CORE_SYSLOGD?=	${_CORE_SYSLOGD:S/syslogd//g}
-.endif
-
 OPENSSL=	${LOCALBASE}/bin/openssl
 
 .if ! defined(CORE_FLAVOUR)
diff --git a/plist b/plist
index d6afb3ba7..65bca21e2 100644
--- a/plist
+++ b/plist
@@ -237,8 +237,6 @@
 /usr/local/opnsense/data/proxy/template_error_pages/ERR_ZERO_SIZE_OBJECT.html
 /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/opnsense/firmware-message b/src/opnsense/firmware-message
deleted file mode 100644
index f55d2017d..000000000
--- a/src/opnsense/firmware-message
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>OPNsense 20.1 "<em>Keen Kingfisher</em>" has reached its end of life. As such
-it will not receive any more updates, but the upgrade to the new 20.7 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 "20.7" when prompted.</p>
-<p>Make sure to read the migration notes and adjust for possible minor breaking
-changes.</p>
-<p>Please backup your configuration, preview the new version via live image 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 b1b396bcf..000000000
--- a/src/opnsense/firmware-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-20.7
diff --git a/src/root/boot/logo-hourglass.4th b/src/root/boot/logo-hourglass.4th
index 75036246c..038cc63fd 100644
--- a/src/root/boot/logo-hourglass.4th
+++ b/src/root/boot/logo-hourglass.4th
@@ -50,7 +50,7 @@
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@  " logo+
 	s"  #[m                              " logo+
-	s"    20.7  ``The Road Ahead''   #[m" logo+
+	s"    21.1  ``The Road Ahead''   #[m" logo+
 
 	2drop
 ;