svn commit: r225227 - in head: . lib/libbsnmp/libbsnmp lib/libcam lib/libdwarf lib/libopie lib/libpcap lib/librtld_db lib/libtacplus lib/libufs sys/sys

Sun Aug 28 09:26:49 UTC 2011

Author: kib
Date: Sun Aug 28 09:26:48 2011
New Revision: 225227
URL: http://svn.freebsd.org/changeset/base/225227

Log:
  Bump shared libraries version numbers in preparation for 9.0.
  This time, only libraries which ABI has been changed compared to
  stable/8, are bumped.
  
  ABI analysis done by:	Gleb Kurtsou
  Approved by:	re (kensmith)

Modified:
  head/ObsoleteFiles.inc
  head/UPDATING
  head/lib/libbsnmp/libbsnmp/Makefile
  head/lib/libcam/Makefile
  head/lib/libdwarf/Makefile
  head/lib/libopie/Makefile
  head/lib/libpcap/Makefile
  head/lib/librtld_db/Makefile
  head/lib/libtacplus/Makefile
  head/lib/libufs/Makefile
  head/sys/sys/param.h

Modified: head/ObsoleteFiles.inc
==============================================================================

--- head/ObsoleteFiles.inc	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/ObsoleteFiles.inc	Sun Aug 28 09:26:48 2011	(r225227)
@@ -38,6 +38,23 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20110828: library version bump for 9.0
+OLD_LIBS+=lib/libufs.so.5
+OLD_LIBS+=usr/lib/libbsnmp.so.5
+OLD_LIBS+=usr/lib/libdwarf.so.2
+OLD_LIBS+=usr/lib/libopie.so.6
+OLD_LIBS+=usr/lib/libpcap.so.7
+OLD_LIBS+=usr/lib/librtld_db.so.1
+OLD_LIBS+=usr/lib/libtacplus.so.4
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libufs.so.5
+OLD_LIBS+=usr/lib32/libbsnmp.so.5
+OLD_LIBS+=usr/lib32/libdwarf.so.2
+OLD_LIBS+=usr/lib32/libopie.so.6
+OLD_LIBS+=usr/lib32/libpcap.so.7
+OLD_LIBS+=usr/lib32/librtld_db.so.1
+OLD_LIBS+=usr/lib32/libtacplus.so.4
+.endif
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions.

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/UPDATING	Sun Aug 28 09:26:48 2011	(r225227)
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20110828:
+	Bump the shared library version numbers for libraries that
+	do not use symbol versioning, have changed the ABI compared
+	to stable/8 and which shared library version was not bumped.
+	Done as part of 9.0-RELEASE cycle.
+
 20110815:
 	During the merge of Capsicum features, the fget(9) KPI was modified.
 	This may require the rebuilding of out-of-tree device drivers --

Modified: head/lib/libbsnmp/libbsnmp/Makefile
==============================================================================
--- head/lib/libbsnmp/libbsnmp/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libbsnmp/libbsnmp/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -8,7 +8,7 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsn
 .PATH: ${CONTRIB}
 
 LIB=	bsnmp
-SHLIBDIR?= /lib
+SHLIB_MAJOR=	6
 
 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'

Modified: head/lib/libcam/Makefile
==============================================================================
--- head/lib/libcam/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libcam/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -42,4 +42,6 @@ MLINKS+=	cam.3 cam_open_device.3 \
 SDIR=		${.CURDIR}/../../sys
 CFLAGS+=	-I${.CURDIR} -I${SDIR}
 
+SHLIB_MAJOR=	6
+
 .include <bsd.lib.mk>

Modified: head/lib/libdwarf/Makefile
==============================================================================
--- head/lib/libdwarf/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libdwarf/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -22,7 +22,7 @@ INCS=	dwarf.h libdwarf.h
 
 CFLAGS+=	-I${.CURDIR}
 
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 
 WITHOUT_MAN=
 

Modified: head/lib/libopie/Makefile
==============================================================================
--- head/lib/libopie/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libopie/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -4,7 +4,7 @@
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR=    6
+SHLIB_MAJOR=    7
 
 KEYFILE?=	\"/etc/opiekeys\"
 

Modified: head/lib/libpcap/Makefile
==============================================================================
--- head/lib/libpcap/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libpcap/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -99,7 +99,7 @@ CFLAGS+=-DHAVE_NET_PFVAR_H
 
 WARNS?=	0
 
-SHLIB_MAJOR=7
+SHLIB_MAJOR=	8
 
 #
 # Magic to grab sources out of src/contrib

Modified: head/lib/librtld_db/Makefile
==============================================================================
--- head/lib/librtld_db/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/librtld_db/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 LIB=		rtld_db
-SHLIB_MAJOR= 	1
+SHLIB_MAJOR= 	2
 MAN=		librtld_db.3
 
 SRCS=		rtld_db.c

Modified: head/lib/libtacplus/Makefile
==============================================================================
--- head/lib/libtacplus/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libtacplus/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -30,7 +30,7 @@ INCS=		taclib.h
 CFLAGS+=	-Wall
 DPADD=		${LIBMD}
 LDADD=		-lmd
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 MAN=		libtacplus.3 tacplus.conf.5
 
 WARNS?=		2

Modified: head/lib/libufs/Makefile
==============================================================================
--- head/lib/libufs/Makefile	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/lib/libufs/Makefile	Sun Aug 28 09:26:48 2011	(r225227)
@@ -2,6 +2,7 @@
 
 LIB=	ufs
 SHLIBDIR?= /lib
+SHLIB_MAJOR=	6
 
 SRCS=	block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c
 INCS=	libufs.h

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Sun Aug 28 05:27:34 2011	(r225226)
+++ head/sys/sys/param.h	Sun Aug 28 09:26:48 2011	(r225227)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 900041	/* Master, propagated to newvers */
+#define __FreeBSD_version 900042	/* Master, propagated to newvers */
 
 #ifdef _KERNEL
 #define	P_OSREL_SIGSEGV		700004
