From e4c36b7aa9521701ef407f7c24c19f88d056837a Mon Sep 17 00:00:00 2001
From: Kristof Provost <kp@FreeBSD.org>
Date: Thu, 21 Jul 2022 20:07:22 +0200
Subject: [PATCH] libnv: bump library version

Now that we version symbols we should bump the library major version.
While here use version FBSD_1.7 to match the current HEAD FreeBSD
namespace and remove extraneous 'All rights reserved' and incorrect
copyright statement.

Reviewed by:	kevans
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D35875
---
 ObsoleteFiles.inc      | 3 +++
 lib/libnv/Makefile     | 2 +-
 lib/libnv/Version.map  | 2 +-
 sys/sys/nv_namespace.h | 4 ----
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7d2b0a338f1b..299fea6f84b1 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20220721: libnv version bumps
+OLD_LIBS+=lib/libnv.so.0
+
 # 20220624: unix_passfd_test -> unix_passfd_stream/unix_passfd_dgram
 OLD_FILES+=usr/tests/sys/kern/unix_passfd_test
 
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 933dacb3eac6..7d04486e88bf 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?= /lib
 
 PACKAGE=	runtime
 LIB=	nv
-SHLIB_MAJOR= 0
+SHLIB_MAJOR= 1
 
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 VERSION_MAP=	${.CURDIR}/Version.map
diff --git a/lib/libnv/Version.map b/lib/libnv/Version.map
index 98349c2356d3..55dd6e1a5116 100644
--- a/lib/libnv/Version.map
+++ b/lib/libnv/Version.map
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FBSD_1.0 {
+FBSD_1.7 {
 	global:
 		FreeBSD_cnvlist_free_binary;
 		FreeBSD_cnvlist_free_bool;
diff --git a/sys/sys/nv_namespace.h b/sys/sys/nv_namespace.h
index e18629dc0f05..ab88db8e8a7a 100644
--- a/sys/sys/nv_namespace.h
+++ b/sys/sys/nv_namespace.h
@@ -1,13 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- * All rights reserved.
  *
  * Copyright (c) 2022 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
- * This software was developed by Pawel Jakub Dawidek under sponsorship from
- * the FreeBSD Foundation.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met: