From 61ca8a7b689738cdd172c78a41bf654251b1e8ff Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 9 Apr 2021 08:56:46 +0200
Subject: [PATCH] pkg: add series and nickname to metadata

---
 Makefile                            | 4 ++++
 Mk/defaults.mk                      | 3 ++-
 src/man/man8/opnsense-version.8     | 8 ++++++--
 src/opnsense/version/core.in        | 2 ++
 src/root/boot/logo-hourglass.4th.in | 2 +-
 src/sbin/opnsense-version           | 8 +++++++-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 880cae237..ada10d2ad 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ all:
 .include "Mk/defaults.mk"
 
 CORE_MESSAGE?=	Carry on my wayward son
+CORE_NICKNAME?=	Not Yet
 CORE_NAME?=	opnsense-devel
 CORE_TYPE?=	development
 
@@ -75,6 +76,9 @@ CORE_VERSION?=	${CORE_COMMIT:[1]}
 CORE_REVISION?=	${CORE_COMMIT:[2]}
 CORE_HASH?=	${CORE_COMMIT:[3]}
 
+_CORE_SERIES=	${CORE_VERSION:S/./ /g}
+CORE_SERIES?=	${_CORE_SERIES:[1]}.${_CORE_SERIES:[2]}
+
 .if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
 CORE_PKGVERSION=	${CORE_VERSION}_${CORE_REVISION}
 .else
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 31fce7be0..6f35c6c48 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -85,12 +85,13 @@ REPLACEMENTS=	CORE_ABI \
 		CORE_HASH \
 		CORE_MAINTAINER \
 		CORE_NAME \
-		CORE_NEXT \
+		CORE_NICKNAME \
 		CORE_PACKAGESITE \
 		CORE_PKGVERSION \
 		CORE_PRODUCT \
 		CORE_PYTHON_DOT \
 		CORE_REPOSITORY \
+		CORE_SERIES \
 		CORE_SYSLOGNG \
 		CORE_VERSION \
 		CORE_WWW
diff --git a/src/man/man8/opnsense-version.8 b/src/man/man8/opnsense-version.8
index c3b2e263a..6049ad59a 100644
--- a/src/man/man8/opnsense-version.8
+++ b/src/man/man8/opnsense-version.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 5, 2021
+.Dd April 9, 2021
 .Dt OPNSENSE-VERSION 8
 .Os
 .Sh NAME
@@ -32,7 +32,7 @@
 .Nd OPNsense version utility
 .Sh SYNOPSIS
 .Nm
-.Op Fl AaefHNnsvw
+.Op Fl AaefHiNnsVvw
 .Op Ar package
 .Nm
 .Fl c
@@ -79,12 +79,16 @@ binary, or from package metadata if the binary could
 not be found.
 .It Fl H
 Return the package commit hash.
+.It Fl i
+Return the package nickname.
 .It Fl N
 Return the product name.
 .It Fl n
 Return the package name.
 .It Fl s
 Return the accumulated file size of the package.
+.It Fl V
+Return the package series.
 .It Fl v
 Return the package version.
 .It Fl w
diff --git a/src/opnsense/version/core.in b/src/opnsense/version/core.in
index 7de258dcf..e7aa1b5c9 100644
--- a/src/opnsense/version/core.in
+++ b/src/opnsense/version/core.in
@@ -9,6 +9,8 @@
     "product_hash": "%%CORE_HASH%%",
     "product_id": "%%CORE_NAME%%",
     "product_name": "%%CORE_PRODUCT%%",
+    "product_nickname": "%%CORE_NICKNAME%%",
+    "product_series": "%%CORE_SERIES%%",
     "product_version": "%%CORE_PKGVERSION%%",
     "product_website": "%%CORE_WWW%%"
 }
diff --git a/src/root/boot/logo-hourglass.4th.in b/src/root/boot/logo-hourglass.4th.in
index 852d0a3a9..60f0b8934 100644
--- a/src/root/boot/logo-hourglass.4th.in
+++ b/src/root/boot/logo-hourglass.4th.in
@@ -50,7 +50,7 @@
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@  " logo+
 	s"  #[m                              " logo+
-	s"    %%CORE_NEXT%%  ``The Road Ahead''   #[m" logo+
+	s"    %%CORE_SERIES%%  ``The Road Ahead''   #[m" logo+
 
 	2drop
 ;
diff --git a/src/sbin/opnsense-version b/src/sbin/opnsense-version
index 97a2734ab..6594f972f 100755
--- a/src/sbin/opnsense-version
+++ b/src/sbin/opnsense-version
@@ -32,7 +32,7 @@ OUTPUT=
 
 DO_CHECK=
 
-while getopts AacefHNnsvw OPT; do
+while getopts AacefHiNnsVvw OPT; do
 	case ${OPT} in
 	A)
 		OUTPUT="${OUTPUT} \${product_arch}"
@@ -52,6 +52,9 @@ while getopts AacefHNnsvw OPT; do
 	H)
 		OUTPUT="${OUTPUT} \${product_hash}"
 		;;
+	i)
+		OUTPUT="${OUTPUT} \${product_nickname}"
+		;;
 	N)
 		OUTPUT="${OUTPUT} \${product_name}"
 		;;
@@ -61,6 +64,9 @@ while getopts AacefHNnsvw OPT; do
 	s)
 		OUTPUT="${OUTPUT} \${product_size}"
 		;;
+	V)
+		OUTPUT="${OUTPUT} \${product_series}"
+		;;
 	v)
 		OUTPUT="${OUTPUT} \${product_version}"
 		;;