From owner-p4-projects@FreeBSD.ORG Sun Oct 3 19:39:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 274ED16A4D0; Sun, 3 Oct 2004 19:39:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE0BB16A4CE for ; Sun, 3 Oct 2004 19:39:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C325F43D41 for ; Sun, 3 Oct 2004 19:39:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i93JdirR000299 for ; Sun, 3 Oct 2004 19:39:44 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i93JdiPD000296 for perforce@freebsd.org; Sun, 3 Oct 2004 19:39:44 GMT (envelope-from peter@freebsd.org) Date: Sun, 3 Oct 2004 19:39:44 GMT Message-Id: <200410031939.i93JdiPD000296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2004 19:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=62603 Change 62603 by peter@peter_overcee on 2004/10/03 19:39:39 IFC @62602 Affected files ... .. //depot/projects/hammer/UPDATING#59 integrate .. //depot/projects/hammer/bin/chflags/Makefile#2 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#5 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/hammer/etc/Makefile#29 integrate .. //depot/projects/hammer/etc/namedb/named.conf#6 integrate .. //depot/projects/hammer/etc/rc.d/named#8 integrate .. //depot/projects/hammer/games/random/random.c#4 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/compat/Makefile#2 delete .. //depot/projects/hammer/lib/compat/Makefile.inc#2 delete .. //depot/projects/hammer/lib/compat/compat1x/Makefile#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libc.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libcurses.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libf2c.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libg++.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libgcc.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libgnumalloc.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libgnuregex.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libln.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libm.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libmalloc.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libreadline.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libresolv.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/librpcsvc.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libskey.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libtelnet.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libtermcap.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/libutil.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat1x/liby.so.1.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/Makefile#2 delete .. //depot/projects/hammer/lib/compat/compat20/ld.so.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libdialog.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libforms.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libg++.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libgcc.so.261.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libncurses.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat20/libreadline.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat21/Makefile#2 delete .. //depot/projects/hammer/lib/compat/compat21/ld.so.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat21/libc.so.2.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat21/libg++.so.3.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat21/libgmp.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/Makefile#2 delete .. //depot/projects/hammer/lib/compat/compat22/ld.so.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libalias.so.2.4.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libc.so.3.1.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libc_r.so.3.0.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libcalendar.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libcom_err.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libcurses.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libdialog.so.3.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libedit.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libf2c.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libftpio.so.4.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libg++.so.4.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libgmp.so.3.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libgnuregex.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libipx.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libkvm.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libm.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libmp.so.3.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libmytinfo.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libncurses.so.3.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libopie.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libpcap.so.2.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libreadline.so.3.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/librpcsvc.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libscrypt.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libscsi.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libskey.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libss.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libstdc++.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libtelnet.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libtermcap.so.2.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libutil.so.2.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libvgl.so.1.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libxpg4.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat22/libz.so.2.0.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/Makefile#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libalias.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libc.so.3.gz.uu#3 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libc_r.so.3.gz.uu#3 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libc_r.so.4.gz.uu#3 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libcurses.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libdialog.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libedit.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libf2c.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libfetch.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libftpio.so.4.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libg++.so.4.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libhistory.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libncurses.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libperl.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libreadline.so.3.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libss.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libutil.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libvgl.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libwrap.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/Makefile#4 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libcrypto.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libssl.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libssl.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/Makefile#5 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libc.so.4.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libcrypto.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libfetch.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#3 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libssl.so.1.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libssl.so.2.gz.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libusb.so.0.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#2 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#4 delete .. //depot/projects/hammer/lib/libc/regex/regcomp.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetws.c#4 integrate .. //depot/projects/hammer/lib/libopie/Makefile#5 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#5 integrate .. //depot/projects/hammer/lib/libstand/dosfs.c#3 integrate .. //depot/projects/hammer/lib/libstand/ext2fs.c#3 integrate .. //depot/projects/hammer/lib/libstand/read.c#3 integrate .. //depot/projects/hammer/lib/libstand/sbrk.c#2 integrate .. //depot/projects/hammer/lib/libstand/splitfs.c#3 integrate .. //depot/projects/hammer/lib/libstand/tftp.c#3 integrate .. //depot/projects/hammer/lib/msun/Makefile#17 integrate .. //depot/projects/hammer/release/Makefile#63 integrate .. //depot/projects/hammer/release/alpha/boot_crunch.conf#4 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#4 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#7 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#7 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#5 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#7 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#7 integrate .. //depot/projects/hammer/release/pc98/boot_crunch.conf#6 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#6 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#7 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#23 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#5 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#8 integrate .. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#29 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#32 integrate .. //depot/projects/hammer/sbin/pfctl/Makefile#4 integrate .. //depot/projects/hammer/sbin/ping/ping.c#16 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/io.4#3 integrate .. //depot/projects/hammer/share/man/man4/mem.4#5 integrate .. //depot/projects/hammer/share/man/man4/psm.4#6 integrate .. //depot/projects/hammer/share/man/man4/random.4#7 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#13 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/hammer/share/man/man9/altq.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#20 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#112 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#5 integrate .. //depot/projects/hammer/sys/boot/alpha/common/help.alpha#2 integrate .. //depot/projects/hammer/sys/boot/common/bcache.c#3 integrate .. //depot/projects/hammer/sys/boot/common/help.common#9 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#15 integrate .. //depot/projects/hammer/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/hammer/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/bootinfo.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/help.pc98#2 integrate .. //depot/projects/hammer/sys/conf/files#85 integrate .. //depot/projects/hammer/sys/conf/majors#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#45 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#24 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.c#6 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.h#6 integrate .. //depot/projects/hammer/sys/dev/si/si.c#16 integrate .. //depot/projects/hammer/sys/dev/si/si.h#4 integrate .. //depot/projects/hammer/sys/dev/si/sivar.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#49 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#5 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#14 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#5 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.h#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#57 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#48 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#1 branch .. //depot/projects/hammer/sys/kern/tty.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#55 integrate .. //depot/projects/hammer/sys/libkern/arm/divsi3.S#2 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#42 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#26 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#15 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#7 integrate .. //depot/projects/hammer/sys/netipsec/key.c#11 integrate .. //depot/projects/hammer/sys/netipsec/key.h#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#21 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#5 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#39 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/counter.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#32 integrate .. //depot/projects/hammer/sys/sys/conf.h#22 integrate .. //depot/projects/hammer/sys/sys/proc.h#66 integrate .. //depot/projects/hammer/sys/sys/systm.h#24 integrate .. //depot/projects/hammer/sys/sys/tty.h#18 integrate .. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#4 integrate .. //depot/projects/hammer/tools/tools/syscall_timing/Makefile#1 branch .. //depot/projects/hammer/tools/tools/syscall_timing/syscall_timing.c#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#5 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#5 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.h#8 integrate .. //depot/projects/hammer/usr.bin/gprof/hertz.c#3 integrate .. //depot/projects/hammer/usr.bin/id/id.c#5 integrate .. //depot/projects/hammer/usr.sbin/Makefile#57 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#9 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.8#4 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.c#3 integrate .. //depot/projects/hammer/usr.sbin/mlxcontrol/mlxcontrol.h#2 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#11 integrate .. //depot/projects/hammer/usr.sbin/pw/pwupd.c#3 integrate .. //depot/projects/hammer/usr.sbin/rrenumd/rrenumd.c#3 integrate .. //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#3 integrate Differences ... ==== //depot/projects/hammer/UPDATING#59 (text+ko) ==== @@ -23,6 +23,31 @@ developers choose to disable these features on build machines to maximize performance. +20041001: + The following libraries had their version number bumped up: + /lib/libm.so.2 -> libm.so.3 + /lib/libreadline.so.4 -> libreadline.so.5 + /usr/lib/libhistory.so.4 -> libhistory.so.5 + /usr/lib/libopie.so.2 -> libopie.so.3 + /usr/lib/libpcap.so.2 -> libpcap.so.3 + FreeBSD 4.10 versions of these libraries will be added to the + compat4x collection. If you expect to be able to run old 4.X + executables you will need to remove the old versions of these + libraries. However note that any 5.X executables you have built + will stop working once you remove those old libraries. You should + have all your ports/packages rebuilt before removing the old + libraries. + + As a temporary measure, if you do not have any 4.X executables, + you can add the following lines to /etc/libmap.conf to force + 5.X executables to use the new libraries: + + libhistory.so.4 libhistory.so.5 + libm.so.2 libm.so.3 + libopie.so.2 libopie.so.3 + libpcap.so.2 libpcap.so.3 + libreadline.so.4 libreadline.so.5 + 20040929: The pfil API has gained an additional argument to pass an inpcb. You should rebuild all pfil consuming modules: ipfw, ipfilter @@ -1915,4 +1940,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.366 2004/09/29 04:54:31 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.368 2004/10/03 10:08:12 des Exp $ ==== //depot/projects/hammer/bin/chflags/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/bin/chflags/Makefile,v 1.17 2003/02/19 16:56:30 obrien Exp $ +# $FreeBSD: src/bin/chflags/Makefile,v 1.18 2004/10/03 15:03:15 stefanf Exp $ PROG= chflags +WARNS?= 6 .include ==== //depot/projects/hammer/bin/chflags/chflags.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.20 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.21 2004/10/03 14:55:36 stefanf Exp $"); #include #include @@ -62,22 +62,21 @@ FTSENT *p; u_long clear, set; long val; - int Hflag, Lflag, Pflag, Rflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, ch, fts_options, oct, rval; char *flags, *ep; - Hflag = Lflag = Pflag = Rflag = 0; + Hflag = Lflag = Rflag = 0; while ((ch = getopt(argc, argv, "HLPR")) != -1) switch (ch) { case 'H': Hflag = 1; - Lflag = Pflag = 0; + Lflag = 0; break; case 'L': Lflag = 1; - Hflag = Pflag = 0; + Hflag = 0; break; case 'P': - Pflag = 1; Hflag = Lflag = 0; break; case 'R': ==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.2 2004/09/14 01:07:19 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.3 2004/10/03 10:42:42 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 14, 2004 +.Dd October 3, 2004 .Dt PF.CONF 5 .Os .Sh NAME @@ -1316,6 +1316,17 @@ Similar to .Ar user , this rule only applies to packets of sockets owned by the specified group. +.Pp +The use of +.Ar group +or +.Ar user +in +.Va debug.mpsafenet Ns = Ns 1 +environments may result in a deadlock. +Please see the +.Sx BUGS +section for details. .It Ar user This rule only applies to packets of sockets owned by the specified user. For outgoing connections initiated from the firewall, this is the user @@ -2610,6 +2621,26 @@ .It Pa /usr/share/examples/pf Example rulesets. .El +.Sh BUGS +Due to a lock order reversal (LOR) with the socket layer, the use of the +.Ar group +and +.Ar user +filter parameter in conjuction with a Giant-free netstack +can result in a deadlock. +If you have to use +.Ar group +or +.Ar user +you must set +.Va debug.mpsafenet +to +.Dq 0 +from the +.Xr loader 8 , +for the moment. +This workaround will still produce the LOR, but Giant will protect from the +deadlock. .Sh SEE ALSO .Xr icmp 4 , .Xr icmp6 4 , ==== //depot/projects/hammer/etc/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.332 2004/09/29 06:54:18 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.333 2004/09/30 10:24:24 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -124,7 +124,7 @@ ${MTREE} ${DESTDIR}/etc/mtree .if !defined(NO_BIND_ETC) && !defined(NO_BIND) cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/etc/namedb + ${NAMEDB} ${DESTDIR}/var/named/etc/namedb .endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp ==== //depot/projects/hammer/etc/namedb/named.conf#6 (text+ko) ==== @@ -1,7 +1,9 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.18 2004/09/29 03:49:35 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.19 2004/09/30 09:57:36 dougb Exp $ +// +// Refer to the named.conf(5) and named(8) man pages, and the documentation +// in /usr/share/doc/bind9 for more details. // -// Refer to the named.conf(5) and named(8) man pages for details. If -// you are ever going to set up a primary server, make sure you +// If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. @@ -12,6 +14,16 @@ dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; +// If named is being used only as a local resolver, this is a safe default. +// For named to be accessible to the network, comment this option, specify +// the proper IP address, or delete this option. + listen-on { 127.0.0.1; }; + +// If you have IPv6 enabled on this system, uncomment this option for +// use as a local resolver. To give access to the network, specify +// an IPv6 address, or the keyword "any". +// listen-on-v6 { ::1; }; + // In addition to the "forwarders" clause, you can force your name // server to never initiate queries of its own, but always ask its // forwarders only, by enabling the following line: ==== //depot/projects/hammer/etc/rc.d/named#8 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.14 2004/09/28 09:46:00 dougb Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.15 2004/09/30 09:15:21 dougb Exp $ # # PROVIDE: named @@ -58,6 +58,9 @@ umount ${named_chrootdir}/dev 2>/dev/null mount_devfs devfs ${named_chrootdir}/dev fi + devfs -m ${named_chrootdir}/dev rule apply hide + devfs -m ${named_chrootdir}/dev rule apply path null unhide + devfs -m ${named_chrootdir}/dev rule apply path random unhide # Copy local timezone information if it is not up to date. # ==== //depot/projects/hammer/games/random/random.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/random/random.c,v 1.15 2003/05/05 09:52:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/games/random/random.c,v 1.16 2004/10/03 15:34:15 stefanf Exp $"); #include @@ -70,10 +70,11 @@ double denom; int ch, fd, random_exit, randomize_lines, random_type, ret, selected, unique_output, unbuffer_output; - char *ep, *filename; + char *ep; + const char *filename; denom = 0; - filename = NULL; + filename = "/dev/fd/0"; random_type = RANDOM_TYPE_UNSET; random_exit = randomize_lines = random_type = unbuffer_output = 0; unique_output = 1; @@ -84,9 +85,7 @@ break; case 'f': randomize_lines = 1; - if (!strcmp(optarg, "-")) - filename = strdup("/dev/fd/0"); - else + if (strcmp(optarg, "-") != 0) filename = optarg; break; case 'l': ==== //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#5 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.9 2003/08/31 19:15:34 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.10 2004/10/01 15:38:06 kensmith Exp $ -SHLIB_MAJOR=4 +SHLIB_MAJOR=5 RL_LIBRARY_VERSION=4.3 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline ==== //depot/projects/hammer/lib/libc/regex/regcomp.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.33 2004/09/05 08:30:42 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.34 2004/10/03 15:42:59 stefanf Exp $"); #include #include @@ -50,6 +50,7 @@ #include #include #include +#include #include #include ==== //depot/projects/hammer/lib/libc/stdio/fgetws.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.5 2004/07/21 12:12:48 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $"); #include "namespace.h" #include @@ -74,7 +74,8 @@ * after the null. */ nconv++; - src = memchr(fp->_p, '\0', fp->_r) + 1; + src = memchr(fp->_p, '\0', fp->_r); + src++; } fp->_r -= (unsigned char *)src - fp->_p; fp->_p = (unsigned char *)src; ==== //depot/projects/hammer/lib/libopie/Makefile#5 (text+ko) ==== @@ -1,10 +1,10 @@ # Makefile for libopie # -# $FreeBSD: src/lib/libopie/Makefile,v 1.18 2004/02/05 22:44:23 ru Exp $ +# $FreeBSD: src/lib/libopie/Makefile,v 1.19 2004/10/01 15:38:07 kensmith Exp $ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 KEYFILE?= \"/etc/opiekeys\" ==== //depot/projects/hammer/lib/libpcap/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libpcap -# $FreeBSD: src/lib/libpcap/Makefile,v 1.33 2004/03/31 09:15:09 bms Exp $ +# $FreeBSD: src/lib/libpcap/Makefile,v 1.34 2004/10/01 15:38:07 kensmith Exp $ LIB= pcap SRCS= grammar.y tokdefs.h version.h pcap-bpf.c \ @@ -19,7 +19,7 @@ CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=2 +SHLIB_MAJOR=3 # # Magic to grab sources out of src/contrib ==== //depot/projects/hammer/lib/libstand/dosfs.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/dosfs.c,v 1.7 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/dosfs.c,v 1.8 2004/10/03 15:58:20 stefanf Exp $"); /* * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems, @@ -277,7 +277,7 @@ f->offset += n; f->c = c; off = 0; - buf += n; + buf = (char *)buf + n; cnt -= n; } out: ==== //depot/projects/hammer/lib/libstand/ext2fs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/ext2fs.c,v 1.5 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/ext2fs.c,v 1.6 2004/10/03 15:58:20 stefanf Exp $"); /*- * Copyright (c) 1993 @@ -834,7 +834,7 @@ bcopy(buf, addr, csize); fp->f_seekp += csize; - addr += csize; + addr = (char *)addr + csize; size -= csize; } if (resid) ==== //depot/projects/hammer/lib/libstand/read.c#3 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/read.c,v 1.4 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/read.c,v 1.5 2004/10/03 15:58:20 stefanf Exp $"); #include #include "stand.h" @@ -108,7 +108,7 @@ resid -= ccount; if (resid == 0) return(bcount); - dest += ccount; + dest = (char *)dest + ccount; } /* will filling the readahead buffer again not help? */ ==== //depot/projects/hammer/lib/libstand/sbrk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/sbrk.c,v 1.4 2001/09/30 22:28:01 dillon Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/sbrk.c,v 1.5 2004/10/03 15:58:20 stefanf Exp $"); /* * Minimal sbrk() emulation required for malloc support. @@ -42,7 +42,7 @@ { /* Align start address to 16 bytes for the malloc code. Sigh. */ heapbase = (void *)(((uintptr_t)base + 15) & ~15); - maxheap = top - heapbase; + maxheap = (char *)top - (char *)heapbase; } char * @@ -51,7 +51,7 @@ char *ret; if ((heapsize + incr) <= maxheap) { - ret = heapbase + heapsize; + ret = (char *)heapbase + heapsize; bzero(ret, incr); heapsize += incr; return(ret); ==== //depot/projects/hammer/lib/libstand/splitfs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/splitfs.c,v 1.6 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/splitfs.c,v 1.7 2004/10/03 15:58:20 stefanf Exp $"); #include "stand.h" @@ -207,7 +207,7 @@ sf->tot_pos += nread; sf->file_pos += nread; totread += nread; - buf += nread; + buf = (char *)buf + nread; if (totread < size) { /* EOF */ if (sf->curfile == (sf->filesc - 1)) /* Last slice */ ==== //depot/projects/hammer/lib/libstand/tftp.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.11 2003/03/03 00:58:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.12 2004/10/03 15:58:20 stefanf Exp $"); /* * Simple TFTP implementation for libsa. @@ -340,7 +340,7 @@ bcopy(tftpfile->lastdata.t.th_data + offinblock, addr, count); - addr += count; + addr = (char *)addr + count; tftpfile->off += count; size -= count; ==== //depot/projects/hammer/lib/msun/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.51 2004/08/07 23:03:35 stefanf Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.52 2004/10/01 15:38:07 kensmith Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -68,6 +68,7 @@ LIB= m SHLIBDIR?= /lib +SHLIB_MAJOR= 3 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ ==== //depot/projects/hammer/release/Makefile#63 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.864 2004/09/24 02:10:06 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.865 2004/09/30 22:59:47 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -254,6 +254,13 @@ CD_DISC2= ${CD}/disc2 _MK?= ${CHROOTDIR}/mk +# Some architectures may not have space for the ports tree on disc2. +# For these architectures there is no sense building the README.html +# files no matter what. +.if ${TARGET_ARCH} == "ia64" +NOPORTREADMES= yes +.endif + # Where the bootstrap ports (see DOCPORTS) get installed. LOCALDIR= /usr/local/bin @@ -508,7 +515,7 @@ echo " cd /usr/ports" >> ${_MK} echo " rm -f INDEX*" >> ${_MK} echo " make index -DINDEX_PRISTINE" >> ${_MK} - echo " rm -f INDEX.tmp" >> ${_MK} + echo " rm -f INDEX*.tmp" >> ${_MK} echo " touch /tmp/.skip_ports_index" >> ${_MK} echo " echo \">>> make index finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} echo "fi" >> ${_MK} @@ -915,7 +922,7 @@ @cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf -.if !defined(NOPORTS) +.if !defined(NOPORTS) && !defined(NOPORTREADMES) @tar --exclude CVS --exclude 'ports/distfiles/*' -czf - \ -C /usr ports | (cd ${CD_DISC2}/usr; tar -xpBf -) .endif ==== //depot/projects/hammer/release/alpha/boot_crunch.conf#4 (text+ko) ==== @@ -1,9 +1,13 @@ -# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.53 2004/01/28 10:15:47 ru Exp $ +# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.55 2004/10/01 07:54:36 ru Exp $ buildopts -DRELEASE_CRUNCH -Dlint srcdirs /usr/src/bin -progs hostname pwd rm sh test +progs hostname +progs pwd +progs rm +progs sh +progs test ln sh -sh ln test [ @@ -11,19 +15,31 @@ progs cpio srcdirs /usr/src/sbin -progs dhclient fsck_ffs ifconfig -progs mount_nfs newfs route rtsol -progs slattach tunefs camcontrol +progs camcontrol +progs dhclient +progs fsck_ffs +progs ifconfig +progs mount_nfs +progs newfs +progs route +progs rtsol +progs slattach +progs tunefs srcdirs /usr/src/usr.bin -progs find minigzip sed +progs find +progs minigzip +progs sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat srcdirs /usr/src/usr.sbin -progs arp ppp -progs sysinstall usbd usbdevs +progs arp +progs ppp +progs sysinstall +progs usbd +progs usbdevs -libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs ==== //depot/projects/hammer/release/amd64/boot_crunch.conf#4 (text+ko) ==== @@ -1,9 +1,13 @@ -# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.57 2004/01/28 09:38:40 ru Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $ buildopts -DRELEASE_CRUNCH -Dlint srcdirs /usr/src/bin -progs hostname pwd rm sh test +progs hostname +progs pwd +progs rm +progs sh +progs test ln sh -sh ln test [ @@ -11,19 +15,31 @@ progs cpio srcdirs /usr/src/sbin -progs dhclient fsck_ffs ifconfig -progs mount_nfs newfs route rtsol -progs slattach tunefs camcontrol +progs camcontrol +progs dhclient +progs fsck_ffs +progs ifconfig +progs mount_nfs +progs newfs +progs route +progs rtsol +progs slattach +progs tunefs srcdirs /usr/src/usr.bin -progs find minigzip sed +progs find +progs minigzip +progs sed ln minigzip gzip ln minigzip gunzip ln minigzip zcat srcdirs /usr/src/usr.sbin -progs arp ppp -progs sysinstall usbd usbdevs +progs arp +progs ppp +progs sysinstall +progs usbd +progs usbdevs -libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs ==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#7 (text+ko) ==== @@ -1,10 +1,10 @@