git: e45bb3902e80 - releng/13.0 - Bump shared library versions after ncurses bump in 13.

John Baldwin jhb at FreeBSD.org
Sat Feb 6 01:20:41 UTC 2021


The branch releng/13.0 has been updated by jhb:

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

commit e45bb3902e80da374500a3dc077d7d11cfb3d6ba
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-02-02 01:09:33 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-02-06 01:18:07 +0000

    Bump shared library versions after ncurses bump in 13.
    
    A few shared libraries in the base system link against ncurses.  An
    upgrade from a 12.x host to 13 results in ABI breakage for existing
    binaries since the newer versions of these libraries link against the
    newer ncurses while the binary itself links against the older ncurses.
    For example, dialog4ports built on 12.x sometimes crashes on 13 since
    it depends on libdialog which links against ncurses internally.
    
    Approved by:    re (gjb)
    
    (cherry picked from commit 0b7f1af804f06a285717b490bef80e24648adcbe)
    (cherry picked from commit 6e1fe6d26ea2939656c8286ccbd105a89d3349a3)
---
 ObsoleteFiles.inc          | 11 +++++++++++
 gnu/lib/libdialog/Makefile |  2 +-
 lib/libdpv/Makefile        |  2 +-
 lib/libedit/Makefile       |  2 +-
 lib/ncurses/form/Makefile  |  1 +
 lib/ncurses/menu/Makefile  |  1 +
 lib/ncurses/panel/Makefile |  1 +
 7 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1d0766ec894a..7ebff0441581 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210204: bump shared libraries which link against ncurses
+OLD_LIBS+=lib/libedit.so.7
+OLD_LIBS+=usr/lib/libdialog.so.8
+OLD_LIBS+=usr/lib/libdpv.so.1
+OLD_LIBS+=usr/lib/libform.so.5
+OLD_LIBS+=usr/lib/libformw.so.5
+OLD_LIBS+=usr/lib/libmenu.so.5
+OLD_LIBS+=usr/lib/libmenuw.so.5
+OLD_LIBS+=usr/lib/libpanel.so.5
+OLD_LIBS+=usr/lib/libpanelw.so.5
+
 # 20210116: if_wl_wavelan.h removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/if_wl_wavelan.h
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 69d8dbd3fdb8..e4f1b62121d9 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -3,7 +3,7 @@
 DIALOG=		${SRCTOP}/contrib/dialog
 
 LIB=		dialog
-SHLIB_MAJOR=	8
+SHLIB_MAJOR=	9
 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 d2334ee38186..be28debc70bc 100644
--- a/lib/libdpv/Makefile
+++ b/lib/libdpv/Makefile
@@ -2,7 +2,7 @@
 
 PACKAGE=	dpv
 LIB=		dpv
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 INCS=		dpv.h
 MAN=		dpv.3
 MLINKS=		dpv.3 dpv_free.3
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index f1dbad42db22..963063ef90fa 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -7,7 +7,7 @@ PACKAGE=clibs
 EDITDIR=	${SRCTOP}/contrib/libedit
 .PATH: ${EDITDIR}
 
-SHLIB_MAJOR=	7
+SHLIB_MAJOR=	8
 SHLIBDIR?= /lib
 
 WARNS?=	3
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index a8e636d6ce1b..a6b186936dc5 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -6,6 +6,7 @@
 SRCDIR=	${NCURSES_DIR}/form
 
 LIB=	formw
+SHLIB_MAJOR=	6
 
 .PATH: ${SRCDIR}
 SRCS=	\
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 7844cd4d936c..9bd92723fed9 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -6,6 +6,7 @@
 SRCDIR=	${NCURSES_DIR}/menu
 
 LIB=	menuw
+SHLIB_MAJOR=	6
 
 .PATH: ${SRCDIR}
 SRCS=	\
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index a22df4d89570..9dd950496b1b 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -6,6 +6,7 @@
 SRCDIR=	${NCURSES_DIR}/panel
 
 LIB=	panelw
+SHLIB_MAJOR=	6
 
 .PATH: ${SRCDIR}
 SRCS=	\


More information about the dev-commits-src-all mailing list