aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Smith <kensmith@FreeBSD.org>2009-07-19 17:25:24 +0000
committerKen Smith <kensmith@FreeBSD.org>2009-07-19 17:25:24 +0000
commit3ca3047aee082043d90aff2611a349c86c98e97c (patch)
treeec388df935beef7e607d99dc9e13b57bb4a74464
parent030d10ee972b06a59628438eb91b0927af3ddfd9 (diff)
downloadsrc-3ca3047aee082043d90aff2611a349c86c98e97c.tar.gz
src-3ca3047aee082043d90aff2611a349c86c98e97c.zip
Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE. Add the previous version of those libraries to ObsoleteFiles.inc and bump __FreeBSD_Version. Reviewed by: kib Approved by: re (rwatson)
Notes
Notes: svn path=/head/; revision=195767
-rw-r--r--ObsoleteFiles.inc208
-rw-r--r--UPDATING5
-rw-r--r--cddl/lib/Makefile.inc2
-rw-r--r--cddl/lib/libctf/Makefile2
-rw-r--r--cddl/lib/libdtrace/Makefile2
-rw-r--r--gnu/lib/libdialog/Makefile2
-rw-r--r--gnu/lib/libg2c/Makefile2
-rw-r--r--gnu/lib/libobjc/Makefile2
-rw-r--r--gnu/lib/libreadline/Makefile.inc2
-rw-r--r--gnu/lib/libregex/Makefile2
-rw-r--r--lib/Makefile.inc2
-rw-r--r--lib/libalias/libalias/Makefile2
-rw-r--r--lib/libarchive/Makefile2
-rw-r--r--lib/libautofs/Makefile2
-rw-r--r--lib/libbegemot/Makefile2
-rw-r--r--lib/libbluetooth/Makefile2
-rw-r--r--lib/libbsm/Makefile2
-rw-r--r--lib/libbsnmp/Makefile.inc2
-rw-r--r--lib/libbz2/Makefile2
-rw-r--r--lib/libcrypt/Makefile2
-rw-r--r--lib/libdevstat/Makefile2
-rw-r--r--lib/libdwarf/Makefile2
-rw-r--r--lib/libedit/Makefile2
-rw-r--r--lib/libexpat/Makefile2
-rw-r--r--lib/libfetch/Makefile2
-rw-r--r--lib/libftpio/Makefile2
-rw-r--r--lib/libgpib/Makefile2
-rw-r--r--lib/libipsec/Makefile2
-rw-r--r--lib/libkiconv/Makefile2
-rw-r--r--lib/libkse/Makefile2
-rw-r--r--lib/libmagic/Makefile2
-rw-r--r--lib/libmemstat/Makefile2
-rw-r--r--lib/libncp/Makefile2
-rw-r--r--lib/libnetgraph/Makefile2
-rw-r--r--lib/libngatm/Makefile2
-rw-r--r--lib/libopie/Makefile2
-rw-r--r--lib/libpam/Makefile.inc2
-rw-r--r--lib/libpcap/Makefile2
-rw-r--r--lib/libproc/Makefile2
-rw-r--r--lib/libradius/Makefile2
-rw-r--r--lib/libsdp/Makefile2
-rw-r--r--lib/libsmb/Makefile2
-rw-r--r--lib/libtacplus/Makefile2
-rw-r--r--lib/libugidfw/Makefile2
-rw-r--r--lib/libusb/Makefile2
-rw-r--r--lib/libusbhid/Makefile2
-rw-r--r--lib/libutil/Makefile2
-rw-r--r--lib/libvgl/Makefile2
-rw-r--r--lib/libwrap/Makefile2
-rw-r--r--lib/libypclnt/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile2
-rw-r--r--secure/lib/libcrypto/Makefile2
-rw-r--r--secure/lib/libssh/Makefile2
-rw-r--r--secure/lib/libssl/Makefile2
-rw-r--r--sys/sys/param.h2
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile.inc2
56 files changed, 267 insertions, 54 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3f9e064eca19..2e485cb82249 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,214 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090719: library version bump for 8.0
+OLD_LIBS+=lib/libalias.so.6
+OLD_LIBS+=lib/libavl.so.1
+OLD_LIBS+=lib/libbegemot.so.3
+OLD_LIBS+=lib/libbsdxml.so.3
+OLD_LIBS+=lib/libbsnmp.so.4
+OLD_LIBS+=lib/libcam.so.4
+OLD_LIBS+=lib/libcrypt.so.4
+OLD_LIBS+=lib/libcrypto.so.5
+OLD_LIBS+=lib/libctf.so.1
+OLD_LIBS+=lib/libdevstat.so.6
+OLD_LIBS+=lib/libdtrace.so.1
+OLD_LIBS+=lib/libedit.so.6
+OLD_LIBS+=lib/libgeom.so.4
+OLD_LIBS+=lib/libipsec.so.3
+OLD_LIBS+=lib/libipx.so.4
+OLD_LIBS+=lib/libkiconv.so.3
+OLD_LIBS+=lib/libkvm.so.4
+OLD_LIBS+=lib/libmd.so.4
+OLD_LIBS+=lib/libncurses.so.7
+OLD_LIBS+=lib/libncursesw.so.7
+OLD_LIBS+=lib/libnvpair.so.1
+OLD_LIBS+=lib/libpcap.so.6
+OLD_LIBS+=lib/libreadline.so.7
+OLD_LIBS+=lib/libsbuf.so.4
+OLD_LIBS+=lib/libufs.so.4
+OLD_LIBS+=lib/libumem.so.1
+OLD_LIBS+=lib/libutil.so.7
+OLD_LIBS+=lib/libuutil.so.1
+OLD_LIBS+=lib/libz.so.4
+OLD_LIBS+=lib/libzfs.so.1
+OLD_LIBS+=lib/libzpool.so.1
+OLD_LIBS+=usr/lib/libarchive.so.4
+OLD_LIBS+=usr/lib/libauditd.so.4
+OLD_LIBS+=usr/lib/libbluetooth.so.3
+OLD_LIBS+=usr/lib/libbsm.so.2
+OLD_LIBS+=usr/lib/libbz2.so.3
+OLD_LIBS+=usr/lib/libcalendar.so.4
+OLD_LIBS+=usr/lib/libcom_err.so.4
+OLD_LIBS+=usr/lib/libdevinfo.so.4
+OLD_LIBS+=usr/lib/libdialog.so.6
+OLD_LIBS+=usr/lib/libdwarf.so.1
+OLD_LIBS+=usr/lib/libfetch.so.5
+OLD_LIBS+=usr/lib/libform.so.4
+OLD_LIBS+=usr/lib/libformw.so.4
+OLD_LIBS+=usr/lib/libftpio.so.7
+OLD_LIBS+=usr/lib/libgnuregex.so.4
+OLD_LIBS+=usr/lib/libgpib.so.2
+OLD_LIBS+=usr/lib/libhistory.so.7
+OLD_LIBS+=usr/lib/libmagic.so.3
+OLD_LIBS+=usr/lib/libmemstat.so.2
+OLD_LIBS+=usr/lib/libmenu.so.4
+OLD_LIBS+=usr/lib/libmenuw.so.4
+OLD_LIBS+=usr/lib/libmilter.so.4
+OLD_LIBS+=usr/lib/libncp.so.3
+OLD_LIBS+=usr/lib/libnetgraph.so.3
+OLD_LIBS+=usr/lib/libngatm.so.3
+OLD_LIBS+=usr/lib/libobjc.so.3
+OLD_LIBS+=usr/lib/libopie.so.5
+OLD_LIBS+=usr/lib/libpam.so.4
+OLD_LIBS+=usr/lib/libpanel.so.4
+OLD_LIBS+=usr/lib/libpanelw.so.4
+OLD_LIBS+=usr/lib/libpmc.so.4
+OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libradius.so.3
+OLD_LIBS+=usr/lib/librpcsvc.so.4
+OLD_LIBS+=usr/lib/libsdp.so.3
+OLD_LIBS+=usr/lib/libsmb.so.3
+OLD_LIBS+=usr/lib/libssh.so.4
+OLD_LIBS+=usr/lib/libssl.so.5
+OLD_LIBS+=usr/lib/libtacplus.so.3
+OLD_LIBS+=usr/lib/libugidfw.so.3
+OLD_LIBS+=usr/lib/libusb.so.1
+OLD_LIBS+=usr/lib/libusbhid.so.3
+OLD_LIBS+=usr/lib/libwrap.so.5
+OLD_LIBS+=usr/lib/libypclnt.so.3
+OLD_LIBS+=usr/lib/pam_chroot.so.4
+OLD_LIBS+=usr/lib/pam_deny.so.4
+OLD_LIBS+=usr/lib/pam_echo.so.4
+OLD_LIBS+=usr/lib/pam_exec.so.4
+OLD_LIBS+=usr/lib/pam_ftpusers.so.4
+OLD_LIBS+=usr/lib/pam_group.so.4
+OLD_LIBS+=usr/lib/pam_guest.so.4
+OLD_LIBS+=usr/lib/pam_krb5.so.4
+OLD_LIBS+=usr/lib/pam_ksu.so.4
+OLD_LIBS+=usr/lib/pam_lastlog.so.4
+OLD_LIBS+=usr/lib/pam_login_access.so.4
+OLD_LIBS+=usr/lib/pam_nologin.so.4
+OLD_LIBS+=usr/lib/pam_opie.so.4
+OLD_LIBS+=usr/lib/pam_opieaccess.so.4
+OLD_LIBS+=usr/lib/pam_passwdqc.so.4
+OLD_LIBS+=usr/lib/pam_permit.so.4
+OLD_LIBS+=usr/lib/pam_radius.so.4
+OLD_LIBS+=usr/lib/pam_rhosts.so.4
+OLD_LIBS+=usr/lib/pam_rootok.so.4
+OLD_LIBS+=usr/lib/pam_securetty.so.4
+OLD_LIBS+=usr/lib/pam_self.so.4
+OLD_LIBS+=usr/lib/pam_ssh.so.4
+OLD_LIBS+=usr/lib/pam_tacplus.so.4
+OLD_LIBS+=usr/lib/pam_unix.so.4
+OLD_LIBS+=usr/lib/snmp_atm.so.5
+OLD_LIBS+=usr/lib/snmp_bridge.so.5
+OLD_LIBS+=usr/lib/snmp_hostres.so.5
+OLD_LIBS+=usr/lib/snmp_mibII.so.5
+OLD_LIBS+=usr/lib/snmp_netgraph.so.5
+OLD_LIBS+=usr/lib/snmp_pf.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libalias.so.6
+OLD_LIBS+=usr/lib32/libarchive.so.4
+OLD_LIBS+=usr/lib32/libauditd.so.4
+OLD_LIBS+=usr/lib32/libavl.so.1
+OLD_LIBS+=usr/lib32/libbegemot.so.3
+OLD_LIBS+=usr/lib32/libbluetooth.so.3
+OLD_LIBS+=usr/lib32/libbsdxml.so.3
+OLD_LIBS+=usr/lib32/libbsm.so.2
+OLD_LIBS+=usr/lib32/libbsnmp.so.4
+OLD_LIBS+=usr/lib32/libbz2.so.3
+OLD_LIBS+=usr/lib32/libcalendar.so.4
+OLD_LIBS+=usr/lib32/libcam.so.4
+OLD_LIBS+=usr/lib32/libcom_err.so.4
+OLD_LIBS+=usr/lib32/libcrypt.so.4
+OLD_LIBS+=usr/lib32/libcrypto.so.5
+OLD_LIBS+=usr/lib32/libctf.so.1
+OLD_LIBS+=usr/lib32/libdevinfo.so.4
+OLD_LIBS+=usr/lib32/libdevstat.so.6
+OLD_LIBS+=usr/lib32/libdialog.so.6
+OLD_LIBS+=usr/lib32/libdtrace.so.1
+OLD_LIBS+=usr/lib32/libdwarf.so.1
+OLD_LIBS+=usr/lib32/libedit.so.6
+OLD_LIBS+=usr/lib32/libfetch.so.5
+OLD_LIBS+=usr/lib32/libform.so.4
+OLD_LIBS+=usr/lib32/libformw.so.4
+OLD_LIBS+=usr/lib32/libftpio.so.7
+OLD_LIBS+=usr/lib32/libgeom.so.4
+OLD_LIBS+=usr/lib32/libgnuregex.so.4
+OLD_LIBS+=usr/lib32/libgpib.so.2
+OLD_LIBS+=usr/lib32/libhistory.so.7
+OLD_LIBS+=usr/lib32/libipsec.so.3
+OLD_LIBS+=usr/lib32/libipx.so.4
+OLD_LIBS+=usr/lib32/libkiconv.so.3
+OLD_LIBS+=usr/lib32/libkvm.so.4
+OLD_LIBS+=usr/lib32/libmagic.so.3
+OLD_LIBS+=usr/lib32/libmd.so.4
+OLD_LIBS+=usr/lib32/libmemstat.so.2
+OLD_LIBS+=usr/lib32/libmenu.so.4
+OLD_LIBS+=usr/lib32/libmenuw.so.4
+OLD_LIBS+=usr/lib32/libmilter.so.4
+OLD_LIBS+=usr/lib32/libncp.so.3
+OLD_LIBS+=usr/lib32/libncurses.so.7
+OLD_LIBS+=usr/lib32/libncursesw.so.7
+OLD_LIBS+=usr/lib32/libnetgraph.so.3
+OLD_LIBS+=usr/lib32/libngatm.so.3
+OLD_LIBS+=usr/lib32/libnvpair.so.1
+OLD_LIBS+=usr/lib32/libobjc.so.3
+OLD_LIBS+=usr/lib32/libopie.so.5
+OLD_LIBS+=usr/lib32/libpam.so.4
+OLD_LIBS+=usr/lib32/libpanel.so.4
+OLD_LIBS+=usr/lib32/libpanelw.so.4
+OLD_LIBS+=usr/lib32/libpcap.so.6
+OLD_LIBS+=usr/lib32/libpmc.so.4
+OLD_LIBS+=usr/lib32/libproc.so.1
+OLD_LIBS+=usr/lib32/libradius.so.3
+OLD_LIBS+=usr/lib32/libreadline.so.7
+OLD_LIBS+=usr/lib32/librpcsvc.so.4
+OLD_LIBS+=usr/lib32/libsbuf.so.4
+OLD_LIBS+=usr/lib32/libsdp.so.3
+OLD_LIBS+=usr/lib32/libsmb.so.3
+OLD_LIBS+=usr/lib32/libssh.so.4
+OLD_LIBS+=usr/lib32/libssl.so.5
+OLD_LIBS+=usr/lib32/libtacplus.so.3
+OLD_LIBS+=usr/lib32/libufs.so.4
+OLD_LIBS+=usr/lib32/libugidfw.so.3
+OLD_LIBS+=usr/lib32/libumem.so.1
+OLD_LIBS+=usr/lib32/libusb.so.1
+OLD_LIBS+=usr/lib32/libusbhid.so.3
+OLD_LIBS+=usr/lib32/libutil.so.7
+OLD_LIBS+=usr/lib32/libuutil.so.1
+OLD_LIBS+=usr/lib32/libvgl.so.5
+OLD_LIBS+=usr/lib32/libwrap.so.5
+OLD_LIBS+=usr/lib32/libypclnt.so.3
+OLD_LIBS+=usr/lib32/libz.so.4
+OLD_LIBS+=usr/lib32/libzfs.so.1
+OLD_LIBS+=usr/lib32/libzpool.so.1
+OLD_LIBS+=usr/lib32/pam_chroot.so.4
+OLD_LIBS+=usr/lib32/pam_deny.so.4
+OLD_LIBS+=usr/lib32/pam_echo.so.4
+OLD_LIBS+=usr/lib32/pam_exec.so.4
+OLD_LIBS+=usr/lib32/pam_ftpusers.so.4
+OLD_LIBS+=usr/lib32/pam_group.so.4
+OLD_LIBS+=usr/lib32/pam_guest.so.4
+OLD_LIBS+=usr/lib32/pam_krb5.so.4
+OLD_LIBS+=usr/lib32/pam_ksu.so.4
+OLD_LIBS+=usr/lib32/pam_lastlog.so.4
+OLD_LIBS+=usr/lib32/pam_login_access.so.4
+OLD_LIBS+=usr/lib32/pam_nologin.so.4
+OLD_LIBS+=usr/lib32/pam_opie.so.4
+OLD_LIBS+=usr/lib32/pam_opieaccess.so.4
+OLD_LIBS+=usr/lib32/pam_passwdqc.so.4
+OLD_LIBS+=usr/lib32/pam_permit.so.4
+OLD_LIBS+=usr/lib32/pam_radius.so.4
+OLD_LIBS+=usr/lib32/pam_rhosts.so.4
+OLD_LIBS+=usr/lib32/pam_rootok.so.4
+OLD_LIBS+=usr/lib32/pam_securetty.so.4
+OLD_LIBS+=usr/lib32/pam_self.so.4
+OLD_LIBS+=usr/lib32/pam_ssh.so.4
+OLD_LIBS+=usr/lib32/pam_tacplus.so.4
+OLD_LIBS+=usr/lib32/pam_unix.so.4
+.endif
# 20090718: the gdm pam.d file is no longer required.
OLD_FILES+=etc/pam.d/gdm
# 20090713: vimage container structs removed.
diff --git a/UPDATING b/UPDATING
index 14b1f4768a7c..a3d5ae8ef5a8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090719:
+ Bump the shared library version numbers for all libraries that
+ do not use symbol versioning as part of the 8.0-RELEASE cycle.
+ Bump __FreeBSD_version to 800105.
+
20090714:
Due to changes in the implementation of virtual network stack
support, all network-related kernel modules must be recompiled.
diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc
index d97f1abf584c..8f9af1d17e9d 100644
--- a/cddl/lib/Makefile.inc
+++ b/cddl/lib/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib
-SHLIB_MAJOR?= 1
+SHLIB_MAJOR?= 2
.include "../Makefile.inc"
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index b3d3b039ddda..6309ee499564 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -3,7 +3,7 @@
.include "../../Makefile.inc"
LIB= ctf
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= ctf_create.c \
ctf_decl.c \
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 9ffdaed124b7..071d9504c0dd 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -3,7 +3,7 @@
.include "../../Makefile.inc"
LIB= dtrace
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
WARNS= 1
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 0697dee34a80..49e9d0f6c081 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -7,7 +7,7 @@ LIB= dialog
INCS= dialog.h
MAN= dialog.3
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \
lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \
fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index cb053b2ab61e..7e68ea78618a 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -7,7 +7,7 @@ SRCDIR= ${.CURDIR}/../../../contrib/libf2c
.PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77
LIB= g2c
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
# Traditional FORTRAN Library members defined in libF77
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index bc652e4a49f9..cfa38f9f8849 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -7,7 +7,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
.PATH: ${OBJCDIR}/objc ${OBJCDIR}
LIB= objc
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \
nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index dcbf208c8cd9..992f9295294d 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR=7
+SHLIB_MAJOR=8
RL_LIBRARY_VERSION=5.2
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index a3506d25d496..39692d42e2b2 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -3,7 +3,7 @@
SUBDIR= doc
LIB= gnuregex
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
SRCS= gnuregex.c
INCSGROUPS= INCS WRINCS PXINCS
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 2ea740eaf64d..e9cf750939ce 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
# $FreeBSD$
# Default version for system libs (override in <lib>/Makefile if necessary)
-SHLIB_MAJOR?= 4
+SHLIB_MAJOR?= 5
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index 0731b5c513b1..a3f98891842c 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -4,7 +4,7 @@
LIB= alias
SHLIBDIR?= /lib
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
MAN= libalias.3
SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
INCS= alias.h
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 44a6301dd744..c377f9b2d477 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -7,7 +7,7 @@ LDADD= -lbz2 -lz -lmd
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.OBJDIR}
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 889e971ab04c..ea4d8cfa1768 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
LIB= autofs
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
WARNS?= 4
SRCS= libautofs.c
diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile
index 95739bb3af7e..b964e6bd6112 100644
--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@@ -5,7 +5,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
.PATH: ${LIBBEGEMOT_DIR}
LIB= begemot
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SHLIBDIR?= /lib
# WARNS?= 6
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index 763c574a5482..7e2189221b8e 100644
--- a/lib/libbluetooth/Makefile
+++ b/lib/libbluetooth/Makefile
@@ -7,7 +7,7 @@ MAN= bluetooth.3
WARNS?= 2
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= bluetooth.c dev.c hci.c
INCS= bluetooth.h
diff --git a/lib/libbsm/Makefile b/lib/libbsm/Makefile
index fa9b5071b6cc..157b61ead3b8 100644
--- a/lib/libbsm/Makefile
+++ b/lib/libbsm/Makefile
@@ -6,7 +6,7 @@ OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm
LIBBSMDIR= ${OPENBSMDIR}/libbsm
LIB= bsm
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
.PATH: ${LIBBSMDIR}
.PATH: ${OPENBSMDIR}/bsm
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index de9dd2b67ce3..566274c92c5f 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 76ef0bd71767..6ea018bcfa4e 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -4,7 +4,7 @@ BZ2DIR= ${.CURDIR}/../../contrib/bzip2
.PATH: ${BZ2DIR}
LIB= bz2
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \
huffman.c randtable.c
INCS= bzlib.h
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 71f6fce2f93f..be0826dc99e7 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?= /lib
.include <bsd.own.mk>
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
LIB= crypt
.PATH: ${.CURDIR}/../libmd
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 035862870d8f..c6233c2331a8 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -3,7 +3,7 @@
LIB= devstat
SHLIBDIR?= /lib
# Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
SRCS= devstat.c
INCS= devstat.h
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index 0acc6aa635e2..9a1a5498efca 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -21,7 +21,7 @@ INCS= dwarf.h libdwarf.h
CFLAGS+= -I. -I${.CURDIR}
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
WARNS?= 6
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index c472494c6d14..ece60329bac8 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -3,7 +3,7 @@
# $FreeBSD$
LIB= edit
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
SHLIBDIR?= /lib
OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 10961876886b..e39368497e10 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -4,7 +4,7 @@ EXPAT= ${.CURDIR}/../../contrib/expat
LIB= bsdxml
SHLIBDIR?= /lib
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= xmlparse.c xmlrole.c xmltok.c
INCS= bsdxml.h bsdxml_external.h
MAN= libbsdxml.3
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 219a69920205..3576db7b20a6 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -25,7 +25,7 @@ CFLAGS+= -DFTP_COMBINE_CWDS
CSTD?= c99
WARNS?= 2
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
ftperr.h: ftp.errors ${.CURDIR}/Makefile
@echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET}
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index 7b30984cf6be..bb9c9eb6e5da 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
LIB= ftpio
-SHLIB_MAJOR= 7
+SHLIB_MAJOR= 8
SRCS= ftpio.c ftperr.c
INCS= ftpio.h
diff --git a/lib/libgpib/Makefile b/lib/libgpib/Makefile
index 7e53df9ce4cb..5465d8b993ad 100644
--- a/lib/libgpib/Makefile
+++ b/lib/libgpib/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= gpib
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
INCS= gpib.h
INCSDIR= ${INCLUDEDIR}/gpib
SRCS= ibfoo.c
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index a415e262d53a..5455945ddd79 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -32,7 +32,7 @@ SHLIBDIR?= /lib
.include <bsd.own.mk>
LIB= ipsec
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
.if ${MK_INET6_SUPPORT} != "no"
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index e66e71895262..2a0bd6a42121 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -5,7 +5,7 @@ SHLIBDIR?= /lib
SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
SRCS+= quirks.c
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
MAN= kiconv.3
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index 2245f4397b48..9fe09c564bdf 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -19,7 +19,7 @@ SHLIBDIR= /lib
SHLIB=kse
.endif
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 3c0a93b0d068..618a6f5b4274 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -5,7 +5,7 @@ CONTRDIR= ${.CURDIR}/../../contrib/file
.PATH: ${CONTRDIR}
LIB= magic
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
DPADD= ${LIBZ}
LDADD= -lz
MAN= libmagic.3 magic.5
diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile
index 6114bf70ae9f..d26108566a0d 100644
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@@ -2,7 +2,7 @@
WARNS?= 3
LIB= memstat
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
DPADD= ${LIBKVM}
LDADD= -lkvm
SRCS+= memstat.c
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index 6f1274c41aed..1a7ad6b679c8 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -2,7 +2,7 @@
LIB= ncp
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
DPADD= ${LIBIPX}
LDADD= -lipx
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 5d09abfc1014..d0c444eb3095 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -5,7 +5,7 @@ LIB= netgraph
WARNS?= 3
MAN= netgraph.3
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= sock.c msg.c debug.c
INCS= netgraph.h
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index dd8f85965152..dfa33212eb1d 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -3,7 +3,7 @@
# Author: Harti Brandt <harti@freebsd.org>
#
LIB= ngatm
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
WARNS?= 6
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 45f35b9bee03..59406df0bc0f 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= 5
+SHLIB_MAJOR= 6
KEYFILE?= \"/etc/opiekeys\"
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index ec2181794459..1fe2f12efd6b 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -28,5 +28,5 @@
DEBUG_FLAGS+= -DDEBUG
.endif
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
PAM_MOD_DIR= ${LIBDIR}
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 38a213148a97..44ae23cd4b78 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -97,7 +97,7 @@ CFLAGS+=-DINET6
CFLAGS+=-DHAVE_NET_PFVAR_H
.endif
-SHLIB_MAJOR=6
+SHLIB_MAJOR=7
#
# Magic to grab sources out of src/contrib
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 8fc216fba22a..d6d29b3eaaf4 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -11,7 +11,7 @@ INCS= libproc.h
CFLAGS+= -I. -I${.CURDIR}
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
WARNS?= 6
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index f4855dc85a72..5054ea0b9285 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -30,7 +30,7 @@ LIB= radius
SRCS= radlib.c
INCS= radlib.h radlib_vs.h
CFLAGS+= -Wall
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
MAN= libradius.3 radius.conf.5
.if ${MK_OPENSSL} == "no"
diff --git a/lib/libsdp/Makefile b/lib/libsdp/Makefile
index 5f205c856520..fcedb5028cec 100644
--- a/lib/libsdp/Makefile
+++ b/lib/libsdp/Makefile
@@ -7,7 +7,7 @@ MAN= sdp.3
WARNS?= 2
CFLAGS+= -I${.CURDIR}
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= search.c service.c session.c util.c
INCS= sdp.h
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index e7ed8e52c847..3a9a64da9ec1 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -4,7 +4,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
LIB= smb
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
DPADD= ${LIBKICONV}
LDADD= -lkiconv
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 703b525c7b9d..13ceb4327ef1 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -30,7 +30,7 @@ INCS= taclib.h
CFLAGS+= -Wall
DPADD= ${LIBMD}
LDADD= -lmd
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
MAN= libtacplus.3 tacplus.conf.5
.include <bsd.lib.mk>
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 2323403a1c36..23c5ea7aaf5b 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ugidfw
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= ugidfw.c
INCS= ugidfw.h
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 1ee56fee3330..b06f7746082e 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -5,7 +5,7 @@
#
LIB= usb
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SHLIB_MINOR= 0
SRCS= libusb20.c
SRCS+= libusb20_desc.c
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index d681302b1abe..2a58a4b1eb48 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -4,7 +4,7 @@
LIB= usbhid
MAN= usbhid.3
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
usbhid.3 hid_dispose_report_desc.3 \
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index d714c0ee00c0..29336498f590 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?= /lib
.include <bsd.own.mk>
LIB= util
-SHLIB_MAJOR= 7
+SHLIB_MAJOR= 8
SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
hexdump.c humanize_number.c kinfo_getfile.c kinfo_getvmmap.c kld.c \
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 9362ea1b3c67..a379bd0b2938 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
LIB= vgl
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
CFLAGS+=-Wall -I${.CURDIR}
SRCS= main.c simple.c bitmap.c text.c mouse.c keyboard.c
INCS= vgl.h
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 5c655ab03327..456582765f57 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -5,7 +5,7 @@
.include <bsd.own.mk>
LIB= wrap
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 45f9e7e4fcec..53d6a6377542 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ypclnt
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SRCS= ypclnt_connect.c \
ypclnt_error.c \
ypclnt_free.c \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 59f7c35217b6..bdac62218525 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -7,7 +7,7 @@ SHLIBDIR?= /lib
.include "${.CURDIR}/../config.mk"
LIB= ncurses${LIB_SUFFIX}
-SHLIB_MAJOR= 7
+SHLIB_MAJOR= 8
NO_LINT=
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index d6b339f0934b..8a085891b7be 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -6,7 +6,7 @@ SUBDIR= engines
.include <bsd.own.mk>
LIB= crypto
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
NO_LINT=
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 1bec2c1a15aa..ecc1a928165e 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
LIB= ssh
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 5550b9b54598..5dad9692fa38 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ssl
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
NO_LINT=
diff --git a/sys/sys/param.h b/sys/sys/param.h
index a7b59d384b97..f0e0e0d526db 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 800104 /* Master, propagated to newvers */
+#define __FreeBSD_version 800105 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index ecd2538b5fec..adf6d726d72c 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
WARNS?= 6
MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \