diff --git a/LICENSE b/LICENSE index 30718aaad..89e9ffaa0 100644 --- a/LICENSE +++ b/LICENSE @@ -11,7 +11,6 @@ Copyright (c) 2006 Daniel S. Haischt Copyright (c) 2012 Darren Embry Copyright (c) 2005-2012 David Zeller Copyright (c) 2014-2022 Deciso B.V. -Copyright (c) 2006-2015 Devin Teske Copyright (c) 2016-2019 EURO-LOG AG Copyright (c) 2014 Electric Sheep Fencing, LLC Copyright (c) 2010 Erik Fonnesbeck @@ -49,9 +48,9 @@ Copyright (c) 2007 Scott Dale Copyright (c) 2003-2012 Scott Ullrich Copyright (c) 2007-2011 Seth Mos Copyright (c) 2008-2009 Shrew Soft Inc. +Copyright (c) 2022 Stephan de Wit Copyright (c) 2004-2005 T. Lechat Copyright (c) 2008 Tellnet AG -Copyright (c) 2016 Tobias Boertitz Copyright (c) 2010 Vinicius Coque Copyright (c) 2011-2014 Warren Baker All rights reserved. diff --git a/Makefile b/Makefile index e304c0617..ec97c8dbf 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: .include "Mk/defaults.mk" -CORE_ABI?= 21.7 +CORE_ABI?= 22.1 CORE_MESSAGE?= Carry on my wayward son CORE_NAME?= opnsense-devel CORE_NICKNAME?= Not Yet diff --git a/plist b/plist index 9564c680c..515dbda24 100644 --- a/plist +++ b/plist @@ -1,5 +1,3 @@ -/boot/brand-opnsense.4th -/boot/logo-hourglass.4th /boot/lua/brand-opnsense.lua /boot/lua/logo-hourglass.lua /usr/local/bin/python3 diff --git a/src/etc/opnsense-update.conf.in b/src/etc/opnsense-update.conf.in index 9b813c8bf..0a312142d 100644 --- a/src/etc/opnsense-update.conf.in +++ b/src/etc/opnsense-update.conf.in @@ -1,4 +1 @@ # configuration for opnsense-update(8), do not edit - -UPGRADE_HINT="FreeBSD:13:%%CORE_ARCH%%/22.1" -UPGRADE_RELEASE="22.1" diff --git a/src/root/boot/brand-opnsense.4th b/src/root/boot/brand-opnsense.4th deleted file mode 100644 index 04e440e1c..000000000 --- a/src/root/boot/brand-opnsense.4th +++ /dev/null @@ -1,46 +0,0 @@ -\ Copyright (c) 2006-2015 Devin Teske -\ Copyright (c) 2016 Tobias Boertitz -\ 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. -\ -\ $FreeBSD$ - -18 brandX ! 2 brandY ! \ Initialize brand placement defaults - -: brand+ ( x y c-addr/u -- x y' ) - 2swap 2dup at-xy 2swap \ position the cursor - type \ print to the screen - 1+ \ increase y for next time we're called -; - -: brand ( x y -- ) \ "OPNsense" [wide] logo in B/W (6 rows x 47 columns) - - s" ______ _____ _____ " brand+ - s" / __ |/ ___ |/ __ | " brand+ - s" | | | | |__/ | | | |___ ___ _ __ ___ ___ " brand+ - s" | | | | ___/| | | / __|/ _ \ '_ \/ __|/ _ \" brand+ - s" | |__| | | | | | \__ \ __/ | | \__ \ __/" brand+ - s" |_____/|_| |_| /__|___/\___|_| |_|___/\___|" brand+ - - 2drop -; diff --git a/src/root/boot/logo-hourglass.4th.in b/src/root/boot/logo-hourglass.4th.in deleted file mode 100644 index 60f0b8934..000000000 --- a/src/root/boot/logo-hourglass.4th.in +++ /dev/null @@ -1,56 +0,0 @@ -\ Copyright (c) 2006-2015 Devin Teske -\ Copyright (c) 2016-2017 Deciso B.V. -\ 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. -\ -\ $FreeBSD$ - -48 logoX ! 9 logoY ! \ Initialize logo placement defaults - -: logo+ ( x y c-addr/u -- x y' ) - 2swap 2dup at-xy 2swap \ position the cursor - [char] # escc! \ replace # with Esc - type \ print to the screen - 1+ \ increase y for next time we're called -; - -: logo ( x y -- ) \ color hourglass logo (15 rows x 32 columns) - - s" #[37;1m @@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+ - s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+ - s" @@@@@ @@@@@" logo+ - s" @@@@@ @@@@@ " logo+ - s" @@@@@@@@@@@ @@@@@@@@@@@" logo+ - s" #[31;1m\\\\\ ///// " logo+ - s" )))))))))))) (((((((((((" logo+ - s" ///// \\\\\ #[m" logo+ - s" #[37;1m @@@@@@@@@@@ @@@@@@@@@@@" logo+ - s" @@@@@ @@@@@ " logo+ - s" @@@@@ @@@@@" logo+ - s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+ - s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@ " logo+ - s" #[m " logo+ - s" %%CORE_SERIES%% ``The Road Ahead'' #[m" logo+ - - 2drop -;