From owner-freebsd-current Wed Feb 14 18:40:20 2001 Delivered-To: freebsd-current@freebsd.org Received: from rover.village.org (rover.village.org [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id C532437B65D for ; Wed, 14 Feb 2001 18:40:01 -0800 (PST) Received: from billy-club.village.org (billy-club.village.org [10.0.0.3]) by rover.village.org (8.11.2/8.11.0) with ESMTP id f1F2e0h30516; Wed, 14 Feb 2001 19:40:00 -0700 (MST) (envelope-from imp@billy-club.village.org) Received: from billy-club.village.org (localhost [127.0.0.1]) by billy-club.village.org (8.11.1/8.8.3) with ESMTP id f1F2cBE75244; Wed, 14 Feb 2001 19:38:11 -0700 (MST) Message-Id: <200102150238.f1F2cBE75244@billy-club.village.org> To: Bruce Evans Subject: Re: Major bumping of libFOO Cc: current@FreeBSD.ORG In-reply-to: Your message of "Thu, 15 Feb 2001 11:47:06 +1100." References: Date: Wed, 14 Feb 2001 19:38:11 -0700 From: Warner Losh Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG In message Bruce Evans writes: : Please enclose small (< 100K) patches in the mail if you want them : reviewed. They would have to be quoted to be reviewed... OK. See attached. It seems to work for me. : I think the impacted libraries can be found by compiling them with and : without the new field in FILE. I'm not sure I understand this. I just used grep to find the ones that had the new symbols :-) This patch has made it through my two buildworlds and appears to unbreak me. The first buildworld was with Feb 10th, pre change sources to restore my system to a mostly pristine state. The second buildworld verified that these are good patches. I didn't have each and every library in binaries in my /usr/local/bin, so I'm taking some of them on faith. I plan on committing this later tonight or early tomorrow. In two places I followed Peter's lead in major numbering. Warner Index: lib/libalias/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libalias/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- lib/libalias/Makefile 2000/09/15 15:37:16 1.17 +++ lib/libalias/Makefile 2001/02/14 22:16:37 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libalias/Makefile,v 1.17 2000/09/15 15:37:16 ru Exp $ LIB= alias -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SHLIB_MINOR= 0 CFLAGS+= -Wall -Wmissing-prototypes SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ Index: lib/libcam/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libcam/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- lib/libcam/Makefile 2000/05/21 23:57:43 1.7 +++ lib/libcam/Makefile 2001/02/14 22:17:29 @@ -8,6 +8,8 @@ MAN3= cam.3 cam_cdbparse.3 +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 MLINKS+=cam.3 cam_open_device.3 \ cam.3 cam_open_spec_device.3 \ Index: lib/libcom_err/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libcom_err/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libcom_err/Makefile 2000/01/14 07:57:25 1.11 +++ lib/libcom_err/Makefile 2001/02/14 22:17:42 @@ -7,6 +7,9 @@ COM_ERRDIR= ${.CURDIR}/../../contrib/com_err CFLAGS+= -I${COM_ERRDIR} +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 + SUBDIR= doc .include Index: lib/libdevstat/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libdevstat/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- lib/libdevstat/Makefile 2000/01/14 07:57:26 1.4 +++ lib/libdevstat/Makefile 2001/02/14 22:19:03 @@ -8,6 +8,9 @@ MAN3= devstat.3 +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 + MLINKS+=devstat.3 getnumdevs.3 MLINKS+=devstat.3 getgeneration.3 MLINKS+=devstat.3 getversion.3 Index: lib/libedit/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libedit/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- lib/libedit/Makefile 1999/10/03 10:41:40 1.18 +++ lib/libedit/Makefile 2001/02/14 22:19:31 @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libedit/Makefile,v 1.18 1999/10/03 10:41:40 marcel Exp $ LIB= edit -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIB_MINOR= 0 OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ Index: lib/libfetch/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libfetch/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- lib/libfetch/Makefile 2001/01/08 13:17:21 1.20 +++ lib/libfetch/Makefile 2001/02/14 22:19:49 @@ -13,7 +13,7 @@ MAN3= fetch.3 CLEANFILES= ftperr.h httperr.h -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SHLIB_MINOR= 0 ftperr.h: ftp.errors Index: lib/libftpio/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libftpio/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libftpio/Makefile 2000/07/06 20:19:02 1.11 +++ lib/libftpio/Makefile 2001/02/14 22:20:25 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libftpio/Makefile,v 1.11 2000/07/06 20:19:02 ume Exp $ LIB= ftpio -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 5.20010213 SHLIB_MINOR= 0 SRCS= ftpio.c ftperr.c Index: lib/libipsec/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libipsec/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- lib/libipsec/Makefile 2000/12/05 22:10:38 1.10 +++ lib/libipsec/Makefile 2001/02/14 22:20:57 @@ -27,7 +27,7 @@ # $FreeBSD: src/lib/libipsec/Makefile,v 1.10 2000/12/05 22:10:38 obrien Exp $ LIB= ipsec -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIB_MINOR= 0 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC Index: lib/libisc/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libisc/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- lib/libisc/Makefile 2001/02/06 22:27:16 1.3 +++ lib/libisc/Makefile 2001/02/14 22:21:21 @@ -3,7 +3,7 @@ BIND_DIR= ${.CURDIR}/../../contrib/bind LIB= isc -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIB_MINOR= 0 .PATH: ${BIND_DIR}/lib/isc Index: lib/libkvm/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libkvm/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- lib/libkvm/Makefile 2000/01/14 07:57:32 1.9 +++ lib/libkvm/Makefile 2001/02/14 22:21:54 @@ -2,6 +2,9 @@ # $FreeBSD: src/lib/libkvm/Makefile,v 1.9 2000/01/14 07:57:32 rgrimes Exp $ LIB= kvm +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 + CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_proc.c Index: lib/libm/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libm/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- lib/libm/Makefile 1999/11/14 13:54:36 1.8 +++ lib/libm/Makefile 2001/02/14 22:22:49 @@ -11,6 +11,8 @@ # vax - for the vax D_floating format LIB= m +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 CFLAGS+=-I${.CURDIR}/common_source .if (${MACHINE_ARCH} == "ieee") Index: lib/libncp/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libncp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- lib/libncp/Makefile 1999/11/12 15:09:56 1.3 +++ lib/libncp/Makefile 2001/02/14 22:23:16 @@ -4,7 +4,7 @@ LIB= ncp -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIB_MINOR= 0 NOMAN= Index: lib/libncurses/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libncurses/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- lib/libncurses/Makefile 2000/12/05 12:40:14 1.45 +++ lib/libncurses/Makefile 2001/02/14 22:23:58 @@ -3,7 +3,7 @@ NCURSES=${.CURDIR}/../../contrib/ncurses LIB= ncurses -SHLIB_MAJOR=5 +SHLIB_MAJOR=5.20010213 SHLIB_MINOR=0 # Should be elsewhere Index: lib/libopie/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libopie/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libopie/Makefile 2000/05/15 04:20:54 1.11 +++ lib/libopie/Makefile 2001/02/14 22:24:39 @@ -4,8 +4,8 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 2 -SHLIB_MINOR= 1 +SHLIB_MAJOR= 3 +SHLIB_MINOR= 0 KEYFILE?= \"/etc/opiekeys\" Index: lib/libpam/Makefile.inc =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libpam/Makefile.inc,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile.inc --- lib/libpam/Makefile.inc 1998/11/18 01:44:37 1.1.1.1 +++ lib/libpam/Makefile.inc 2001/02/14 22:25:54 @@ -24,5 +24,5 @@ # # $FreeBSD: src/lib/libpam/Makefile.inc,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $ -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIB_MINOR= 0 Index: lib/libpcap/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libpcap/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- lib/libpcap/Makefile 2000/04/15 20:45:51 1.25 +++ lib/libpcap/Makefile 2001/02/14 22:26:53 @@ -18,8 +18,8 @@ CFLAGS+=-I. -Dyylval=pcap_lval ${DEFS} -SHLIB_MAJOR=2 -SHLIB_MINOR=4 +SHLIB_MAJOR=3 +SHLIB_MINOR=0 # # Magic to grab sources out of src/contrib Index: lib/libskey/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libskey/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- lib/libskey/Makefile 2000/01/14 07:57:40 1.15 +++ lib/libskey/Makefile 2001/02/14 22:27:29 @@ -2,6 +2,8 @@ # $FreeBSD: src/lib/libskey/Makefile,v 1.15 2000/01/14 07:57:40 rgrimes Exp $ LIB= skey +SHLIB_MAJOR=3 +SHLIB_MINOR=0 SRCS= skeyaccess.c put.c skey_crypt.c skey_getpass.c skeylogin.c skeysubr.c INCS= skey.h MAN1= skey.1 Index: lib/libss/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libss/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- lib/libss/Makefile 1999/09/29 15:18:44 1.22 +++ lib/libss/Makefile 2001/02/14 22:27:55 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libss/Makefile,v 1.22 1999/09/29 15:18:44 marcel Exp $ LIB= ss -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIB_MINOR= 0 SRCS= data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ Index: lib/libutil/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/lib/libutil/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- lib/libutil/Makefile 2000/10/27 01:19:02 1.37 +++ lib/libutil/Makefile 2001/02/14 22:28:15 @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libutil/Makefile,v 1.37 2000/10/27 01:19:02 green Exp $ LIB= util -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIB_MINOR= 0 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../../sys CFLAGS+=-DINET6 Index: gnu/lib/libdialog/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/lib/libdialog/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- gnu/lib/libdialog/Makefile 2000/09/16 04:27:30 1.32 +++ gnu/lib/libdialog/Makefile 2001/02/14 22:31:38 @@ -4,7 +4,7 @@ LIB= dialog MAN3= dialog.3 -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SHLIB_MINOR= 0 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 \ Index: gnu/lib/libg2c/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/lib/libg2c/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- gnu/lib/libg2c/Makefile 1999/11/15 04:16:16 1.8 +++ gnu/lib/libg2c/Makefile 2001/02/14 22:32:01 @@ -5,7 +5,7 @@ .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIB_MINOR= 0 # Traditional FORTRAN Library members defined in libF77 Index: gnu/lib/libgmp/Makefile.inc =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/lib/libgmp/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- gnu/lib/libgmp/Makefile.inc 1999/08/27 23:32:50 1.4 +++ gnu/lib/libgmp/Makefile.inc 2001/02/14 22:32:46 @@ -2,7 +2,7 @@ # $FreeBSD: src/gnu/lib/libgmp/Makefile.inc,v 1.4 1999/08/27 23:32:50 peter Exp $ # -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIB_MINOR= 0 .if exists(${.OBJDIR}) Index: gnu/lib/libreadline/Makefile.inc =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/lib/libreadline/Makefile.inc,v retrieving revision 1.5 diff -u -r1.5 Makefile.inc --- gnu/lib/libreadline/Makefile.inc 2000/03/19 22:26:49 1.5 +++ gnu/lib/libreadline/Makefile.inc 2001/02/14 22:31:15 @@ -1,8 +1,8 @@ # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.5 2000/03/19 22:26:49 ache Exp $ -SHLIB_MAJOR= 4 -SHLIB_MINOR= 1 -RL_LIBRARY_VERSION= 4.1 +SHLIB_MAJOR= 5 +SHLIB_MINOR= 0 +RL_LIBRARY_VERSION= 5.0 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline .PATH: ${SRCDIR} ${.CURDIR}/.. Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/lib/libstdc++/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- gnu/lib/libstdc++/Makefile 2000/06/04 06:56:22 1.25 +++ gnu/lib/libstdc++/Makefile 2001/02/14 22:30:10 @@ -7,7 +7,7 @@ SUBDIR= doc LIB= stdc++ -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIB_MINOR= 0 CFLAGS+= -I${.CURDIR} -I${SRCDIR}/include -I${SRCDIR}/../libio -I. Index: gnu/usr.bin/perl/Makefile.inc =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/gnu/usr.bin/perl/Makefile.inc,v retrieving revision 1.19 diff -u -r1.19 Makefile.inc --- gnu/usr.bin/perl/Makefile.inc 2000/11/20 02:17:31 1.19 +++ gnu/usr.bin/perl/Makefile.inc 2001/02/14 22:34:33 @@ -6,7 +6,7 @@ BINDIR?= /usr/bin -SHLIB_MAJOR?= 4 +SHLIB_MAJOR?= 5 VERSION= 5.6.0 Index: secure/lib/libcrypto/Makefile =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/secure/lib/libcrypto/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- secure/lib/libcrypto/Makefile 2000/11/15 07:45:23 1.28 +++ secure/lib/libcrypto/Makefile 2001/02/14 22:29:12 @@ -21,7 +21,7 @@ .endif LIB= crypto -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAINTAINER= kris To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message