aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc17
-rw-r--r--UPDATING6
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile2
-rw-r--r--lib/libcam/Makefile2
-rw-r--r--lib/libdwarf/Makefile2
-rw-r--r--lib/libopie/Makefile2
-rw-r--r--lib/libpcap/Makefile2
-rw-r--r--lib/librtld_db/Makefile2
-rw-r--r--lib/libtacplus/Makefile2
-rw-r--r--lib/libufs/Makefile1
-rw-r--r--sys/sys/param.h2
11 files changed, 33 insertions, 7 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7c742a411124..1b3af12cfa36 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -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.
diff --git a/UPDATING b/UPDATING
index 1df41b8c3b11..f5c6f4de7ad9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
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 --
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index d33808da692e..f21f1d3fc2e4 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -8,7 +8,7 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
.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"'
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index c5773eac2f82..9a21dde65b38 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -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>
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index aa182e7d9b76..dbd7895cd06a 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -22,7 +22,7 @@ INCS= dwarf.h libdwarf.h
CFLAGS+= -I${.CURDIR}
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
WITHOUT_MAN=
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 360dddc474ed..647bfee1b2f1 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -4,7 +4,7 @@
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
KEYFILE?= \"/etc/opiekeys\"
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 80c61d80f203..5b613e7f08a6 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -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
diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
index efaed6283791..2815a073fd23 100644
--- a/lib/librtld_db/Makefile
+++ b/lib/librtld_db/Makefile
@@ -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
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 617f87737085..798c94978a78 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -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
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index 1dfc2429a1f2..78832d88debe 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -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
diff --git a/sys/sys/param.h b/sys/sys/param.h
index dfe4d918f70e..44005ae6c0ce 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -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