git: 2f7f8995367b - main - libdialog: Bump shared library version to 10.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 27 Oct 2021 16:31:21 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=2f7f8995367b3fe1a9e2bf34be6f0684963eed02

commit 2f7f8995367b3fe1a9e2bf34be6f0684963eed02
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-10-27 16:30:24 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-10-27 16:30:24 +0000

    libdialog: Bump shared library version to 10.
    
    The upgrade to libdialog 1.3 included changes to the ABI.
    
    Bump libdpv to 3 since it links against libdialog.
    
    Reported by:    Mark Millard <marklmi@yahoo.com>
    Reviewed by:    bapt
    Fixes:          a96ef4501919 dialog: import dialog 1.3-20210117
    Differential Revision:  https://reviews.freebsd.org/D32675
---
 ObsoleteFiles.inc                        | 6 ++++++
 gnu/lib/libdialog/Makefile               | 2 +-
 lib/libdpv/Makefile                      | 2 +-
 tools/build/mk/OptionalObsoleteFiles.inc | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index c60629197386..43c977e3cff5 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20211027: libdialog shlib bumped to version 10 for dialog 1.3
+OLD_LIBS+=usr/lib/libdialog.so.9
+OLD_LIBS+=usr/lib/libdpv.so.2
+OLD_LIBS+=usr/lib32/libdialog.so.9
+OLD_LIBS+=usr/lib32/libdpv.so.2
+
 # 20211026: retire obsolete iscsi initiator
 OLD_FILES+=sbin/iscontrol
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 6de2460c62a5..73373b1d5827 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -3,7 +3,7 @@
 DIALOG=		${SRCTOP}/contrib/dialog
 
 LIB=		dialog
-SHLIB_MAJOR=	9
+SHLIB_MAJOR=	10
 SRCS=		argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \
 		columns.c dlg_keys.c editbox.c fselect.c formbox.c guage.c \
 		help.c inputbox.c inputstr.c menubox.c mixedform.c \
diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile
index 5b432602ff7b..43cc6bce07c7 100644
--- a/lib/libdpv/Makefile
+++ b/lib/libdpv/Makefile
@@ -2,7 +2,7 @@
 
 PACKAGE=	dpv
 LIB=		dpv
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 INCS=		dpv.h
 MAN=		dpv.3
 MLINKS=		dpv.3 dpv_free.3
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index a8b0329104c4..91822aac492a 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1663,11 +1663,11 @@ OLD_FILES+=usr/bin/dialog
 OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
-OLD_FILES+=usr/lib/libdialog.so.8
+OLD_FILES+=usr/lib/libdialog.so.10
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
-OLD_FILES+=usr/lib/libdpv.so.1
+OLD_FILES+=usr/lib/libdpv.so.3
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/sbin/bsdconfig
 OLD_FILES+=usr/share/man/man1/dialog.1.gz