Subject: getdiskbyname(3) manpage bug, sendmail overlay fix (#273) Index: man/man3/getdisk.3,usr.lib/sendmail/src/Makefile.m4 2.11BSD Description: When disklabels were added the getdiskbyname(3) man page was not updated to reflect the new structures. If libc.a is built with the resolver routines rather than the dbm based hosts file then sendmail will not link due to the base segment being too large. The warp(6) shell scripts had a couple lingering bugs. Repeat-By: Attempt to format the getdisk.3 man page. Note the error which occurs when the old disktab.h file is included. Recompile sendmail. The new syslog(3) routine put sendmail's size over the limit if the resolver routines are also being used. Not that anyone really plays 'warp(6)', but it is nice to have a clean build from /usr/src. A couple of shell scripts and/or makefile prototypes were missing "./" in front of commands. Fix: Apply the small patch below. This updates these files: /usr/src/man/man3/getdisk.3 /usr/src/usr.lib/sendmail/src/Makefile.m4 /usr/src/games/warp/makedir.SH /usr/src/games/warp/Makefile.SH /VERSION Cut where indicated and save the following to a file (/tmp/273). Then: patch -p0 < /tmp/273 cd /usr/src/usr.lib/sendmail/src m4 < Makefile.m4 > Makefile cd /usr/src/man/man3 /usr/man/manroff getdisk.3 > /usr/man/cat3/getdisk.0 No need to recompile sendmail unless you feel like it. This and previous updates to 2.11BSD are available via anonymous ftp to the host FTP.IIPO.GTEGSC.COM in the directory /pub/2.11BSD. =======================cut here================= *** /usr/src/man/man3/getdisk.3.old Sun Dec 14 15:07:09 1986 --- /usr/src/man/man3/getdisk.3 Fri Sep 8 15:31:16 1995 *************** *** 2,18 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)getdisk.3 6.2 (Berkeley) 5/12/86 .\" ! .TH GETDISKBYNAME 3 "May 12, 1986" .UC 5 .SH NAME getdiskbyname \- get disk description by its name .SH SYNOPSIS .nf ! .B #include .PP ! .B struct disktab * .B getdiskbyname(name) .B char *name; .fi --- 2,19 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)getdisk.3 6.2.1 (2.11BSD) 1995/09/08 .\" ! .TH GETDISKBYNAME 3 "September 8, 1995" .UC 5 .SH NAME getdiskbyname \- get disk description by its name .SH SYNOPSIS .nf ! .B #include ! .B #include .PP ! .B struct disklabel * .B getdiskbyname(name) .B char *name; .fi *************** *** 20,39 **** .I Getdiskbyname takes a disk name (e.g. rm03) and returns a structure describing its geometry information and the standard ! disk partition tables. All information obtained from the .IR disktab (5) ! file. ! .PP ! .RI < disktab.h > ! has the following form: ! .PP .nf ! .DT ! .so /usr/include/disktab.h .SH "SEE ALSO" ! disktab(5) .SH BUGS ! This information should be obtained from the system for ! locally available disks (in particular, the disk partition ! tables). --- 21,41 ---- .I Getdiskbyname takes a disk name (e.g. rm03) and returns a structure describing its geometry information and the standard ! disk partition tables. Information obtained from the .IR disktab (5) ! file has the following form: ! .sp ! .cs R 24 .nf ! .so /usr/include/sys/disklabel.h ! .fi ! .cs R .SH "SEE ALSO" ! disktab(5), disklabel(8) .SH BUGS ! This routine is primarily used when the underlying disk driver does ! not support labels. The other use is for supplying default information ! to the ! .IR disklabel (8) ! program. *** /usr/src/usr.lib/sendmail/src/Makefile.m4.old Wed Mar 8 23:39:27 1995 --- /usr/src/usr.lib/sendmail/src/Makefile.m4 Thu Sep 7 23:11:18 1995 *************** *** 30,41 **** OBJS2= sysexits.o arpadate.o convtime.o ctime.o OBJS= $(OBJS1) $(OBJS2) $(EXTRACT) Version.o str.o ! SBASE= conf.o collect.o parseaddr.o alias.o deliver.o headers.o \ recipient.o srvrsmtp.o queue.o util.o \ envelope.o sysexits.o arpadate.o convtime.o Version.o \ $(EXTRACT) str.o SOV1= main.o readcf.o macro.o ctime.o SOV2= daemon.o savemail.o usersmtp.o err.o clock.o stats.o trace.o stab.o SRCS= \ conf.c deliver.c main.c parseaddr.c err.c alias.c savemail.c \ --- 30,42 ---- OBJS2= sysexits.o arpadate.o convtime.o ctime.o OBJS= $(OBJS1) $(OBJS2) $(EXTRACT) Version.o str.o ! SBASE= conf.o parseaddr.o alias.o deliver.o headers.o \ recipient.o srvrsmtp.o queue.o util.o \ envelope.o sysexits.o arpadate.o convtime.o Version.o \ $(EXTRACT) str.o SOV1= main.o readcf.o macro.o ctime.o SOV2= daemon.o savemail.o usersmtp.o err.o clock.o stats.o trace.o stab.o + SOV3= collect.o SRCS= \ conf.c deliver.c main.c parseaddr.c err.c alias.c savemail.c \ *************** *** 65,71 **** sendmail: $(OBJS) ld $(SEPFLAG) $(COPTS) /lib/crt0.o -o sendmail \ ! -Z $(SOV1) -Z $(SOV2) -Y $(SBASE) $(LIBS) -lc chmod $(OBJMODE) sendmail size sendmail; ls -l sendmail --- 66,72 ---- sendmail: $(OBJS) ld $(SEPFLAG) $(COPTS) /lib/crt0.o -o sendmail \ ! -Z $(SOV1) -Z $(SOV2) -Z $(SOV3) -Y $(SBASE) $(LIBS) -lc chmod $(OBJMODE) sendmail size sendmail; ls -l sendmail *** /usr/src/games/warp/makedir.SH.old Fri Jun 19 10:09:27 1987 --- /usr/src/games/warp/makedir.SH Fri Sep 8 17:06:34 1995 *************** *** 1,5 **** case $CONFIG in ! '') . config.sh ;; esac echo "Extracting makedir (with variable substitutions)" $spitshell >makedir <makedir <.clist --- 170,176 ---- cc sm.c $(SMALL) -o sm depend: makedepend ! /bin/sh ./makedepend clist: echo $(c) | tr ' ' '\012' >.clist *************** *** 185,190 **** $(obj): @ echo "You haven't done a "'"make depend" yet!'; exit 1 makedepend: makedepend.SH ! /bin/sh makedepend.SH !NO!SUBS! $eunicefix Makefile --- 185,190 ---- $(obj): @ echo "You haven't done a "'"make depend" yet!'; exit 1 makedepend: makedepend.SH ! /bin/sh ./makedepend.SH !NO!SUBS! $eunicefix Makefile *** /VERSION.old Wed Aug 23 22:24:11 1995 --- /VERSION Fri Sep 8 18:40:25 1995 *************** *** 1,4 **** ! Current Patch Level: 272 2.11 BSD ============ --- 1,4 ---- ! Current Patch Level: 273 2.11 BSD ============