From owner-p4-projects@FreeBSD.ORG Thu May 27 19:23:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D57916A4D0; Thu, 27 May 2004 19:23:32 -0700 (PDT) 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 C2AC916A4CE for ; Thu, 27 May 2004 19:23:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B97BD43D48 for ; Thu, 27 May 2004 19:23:31 -0700 (PDT) (envelope-from marcel@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 i4S2MeRd091827 for ; Thu, 27 May 2004 19:22:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4S2MaZu091778 for perforce@freebsd.org; Thu, 27 May 2004 19:22:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 27 May 2004 19:22:36 -0700 (PDT) Message-Id: <200405280222.i4S2MaZu091778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53633 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: Fri, 28 May 2004 02:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=53633 Change 53633 by marcel@marcel_nfs on 2004/05/27 19:21:34 IFC @53623 Affected files ... .. //depot/projects/gdb/bin/df/Makefile#3 integrate .. //depot/projects/gdb/bin/df/df.c#8 integrate .. //depot/projects/gdb/bin/ls/Makefile#2 integrate .. //depot/projects/gdb/bin/ls/print.c#7 integrate .. //depot/projects/gdb/bin/ps/ps.1#10 integrate .. //depot/projects/gdb/bin/ps/ps.c#10 integrate .. //depot/projects/gdb/bin/sh/arith.y#3 integrate .. //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#9 integrate .. //depot/projects/gdb/etc/rc.d/nisdomain#2 integrate .. //depot/projects/gdb/etc/rc.d/nsswitch#1 branch .. //depot/projects/gdb/etc/rc.firewall6#2 integrate .. //depot/projects/gdb/etc/services#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/gdb/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/gdb/include/stdio.h#4 integrate .. //depot/projects/gdb/include/wchar.h#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#8 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_compress.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/gdb/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/euc.c#7 integrate .. //depot/projects/gdb/lib/libc/locale/none.c#4 integrate .. //depot/projects/gdb/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/gdb/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/net/eui64.3#1 branch .. //depot/projects/gdb/lib/libc/net/eui64.c#1 branch .. //depot/projects/gdb/lib/libc/stdio/getwc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/getwchar.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putwc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putwchar.c#2 integrate .. //depot/projects/gdb/lib/libipx/ipx_ntoa.c#2 integrate .. //depot/projects/gdb/lib/libutil/Makefile#3 integrate .. //depot/projects/gdb/lib/libutil/humanize_number.3#1 branch .. //depot/projects/gdb/lib/libutil/humanize_number.c#1 branch .. //depot/projects/gdb/lib/libutil/libutil.h#3 integrate .. //depot/projects/gdb/lib/liby/main.c#2 integrate .. //depot/projects/gdb/libexec/rbootd/rmpproto.c#2 integrate .. //depot/projects/gdb/libexec/rbootd/utils.c#2 integrate .. //depot/projects/gdb/libexec/rexecd/rexecd.c#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/gdb/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/gdb/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/gdb/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/gdb/sbin/gbde/gbde.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/gdb/sbin/geom/core/Makefile#2 integrate .. //depot/projects/gdb/sbin/geom/core/geom.8#1 branch .. //depot/projects/gdb/sbin/geom/core/geom.c#3 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/gdb/sbin/mount_ntfs/mount_ntfs.c#2 integrate .. //depot/projects/gdb/sbin/restore/dirs.c#3 integrate .. //depot/projects/gdb/sbin/restore/extern.h#4 integrate .. //depot/projects/gdb/sbin/restore/interactive.c#3 integrate .. //depot/projects/gdb/sbin/restore/tape.c#4 integrate .. //depot/projects/gdb/sbin/vinum/commands.c#4 integrate .. //depot/projects/gdb/sbin/vinum/vinum.8#3 integrate .. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/gdb/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/gdb/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#10 integrate .. //depot/projects/gdb/share/man/man4/cy.4#1 branch .. //depot/projects/gdb/share/man/man4/ixgb.4#1 branch .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#9 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/cy.4#2 delete .. //depot/projects/gdb/share/man/man4/vlan.4#3 integrate .. //depot/projects/gdb/share/man/man5/Makefile#5 integrate .. //depot/projects/gdb/share/man/man5/eui64.5#1 branch .. //depot/projects/gdb/share/man/man5/libmap.conf.5#3 integrate .. //depot/projects/gdb/share/man/man9/zero_copy.9#3 integrate .. //depot/projects/gdb/share/misc/bsd-family-tree#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/gdb/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/gdb/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/gdb/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/gdb/sys/conf/files#25 integrate .. //depot/projects/gdb/sys/conf/files.amd64#9 integrate .. //depot/projects/gdb/sys/conf/files.i386#17 integrate .. //depot/projects/gdb/sys/conf/files.pc98#12 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#5 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/gdb/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/an/if_an.c#3 integrate .. //depot/projects/gdb/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/gdb/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/gdb/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/gdb/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/gdb/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/gdb/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#6 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/gdb/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/gdb/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/gdb/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/gdb/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/gdb/sys/dev/ixgb/README#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/gdb/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/gdb/sys/dev/musycc/musycc.c#3 integrate .. //depot/projects/gdb/sys/dev/my/if_my.c#3 integrate .. //depot/projects/gdb/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/gdb/sys/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/gdb/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/gdb/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/gdb/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/gdb/sys/dev/pccard/pccarddevs.h#7 delete .. //depot/projects/gdb/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/gdb/sys/dev/pci/pci.c#11 integrate .. //depot/projects/gdb/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#4 integrate .. //depot/projects/gdb/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/gdb/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/gdb/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/gdb/sys/dev/stg/tmc18c30_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/gdb/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ums.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usb.c#3 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/gdb/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/gdb/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/gdb/sys/i386/i386/exception.s#4 integrate .. //depot/projects/gdb/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#5 integrate .. //depot/projects/gdb/sys/i386/i386/support.s#5 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/gdb/sys/i386/isa/atpic_vector.s#6 integrate .. //depot/projects/gdb/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_proc.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#6 integrate .. //depot/projects/gdb/sys/modules/aic/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/an/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/awi/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/cs/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ed/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ep/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ex/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/exca/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/fe/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/gdb/sys/modules/joy/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/owi/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ray/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/sio/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/sn/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/stg/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uart/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/wi/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/xe/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_ef.c#2 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#5 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_hole.c#3 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfsm_subs.h#3 integrate .. //depot/projects/gdb/sys/pci/agp.c#8 integrate .. //depot/projects/gdb/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/gdb/sys/pci/if_dc.c#4 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#6 integrate .. //depot/projects/gdb/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#4 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#9 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/gdb/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/gdb/sys/sys/bus.h#3 integrate .. //depot/projects/gdb/sys/sys/eui64.h#1 branch .. //depot/projects/gdb/sys/sys/mbuf.h#8 integrate .. //depot/projects/gdb/sys/sys/proc.h#13 integrate .. //depot/projects/gdb/sys/sys/sysctl.h#5 integrate .. //depot/projects/gdb/sys/tools/devlist2h.awk#2 delete .. //depot/projects/gdb/sys/tools/miidevs2h.awk#2 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#9 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#6 integrate .. //depot/projects/gdb/tools/regression/lib/libc/net/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64.h#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_aton.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_line.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_ntoa.c#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag#1 branch .. //depot/projects/gdb/usr.bin/du/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/du/du.c#4 integrate .. //depot/projects/gdb/usr.bin/gprof/aout.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/kernel.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/printgprof.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/printlist.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#12 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#7 integrate .. //depot/projects/gdb/usr.sbin/Makefile#8 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi_user.c#5 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.h#4 integrate .. //depot/projects/gdb/usr.sbin/apm/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/gdb/usr.sbin/atm/scspd/scspd.c#2 integrate .. //depot/projects/gdb/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate .. //depot/projects/gdb/usr.sbin/dconschat/dconschat.8#3 integrate .. //depot/projects/gdb/usr.sbin/dconschat/dconschat.c#3 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/gdb/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/gdb/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/gdb/usr.sbin/mrouted/testrsrr/testrsrr.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/gdb/usr.sbin/sliplogin/sliplogin.c#2 integrate .. //depot/projects/gdb/usr.sbin/smbmsg/smbmsg.c#2 integrate .. //depot/projects/gdb/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/gdb/usr.sbin/usbdevs/usbdevs.8#2 integrate .. //depot/projects/gdb/usr.sbin/usbdevs/usbdevs.c#2 integrate .. //depot/projects/gdb/usr.sbin/yppoll/yppoll.c#2 integrate Differences ... ==== //depot/projects/gdb/bin/df/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 -# $FreeBSD: src/bin/df/Makefile,v 1.17 2004/04/18 20:56:31 obrien Exp $ +# $FreeBSD: src/bin/df/Makefile,v 1.18 2004/05/24 22:21:49 pjd Exp $ MOUNT= ${.CURDIR}/../../sbin/mount .PATH: ${MOUNT} @@ -9,7 +9,7 @@ CFLAGS+= -I${MOUNT} -DPADD= ${LIBM} -LDADD= -lm +DPADD= ${LIBUTIL} +LDADD= -lutil .include ==== //depot/projects/gdb/bin/df/df.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.60 2004/04/22 17:05:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.61 2004/05/24 22:21:49 pjd Exp $"); #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,27 +62,9 @@ #include "extern.h" -#define UNITS_SI 1 -#define UNITS_2 2 - -#define KILO_SZ(n) (n) -#define MEGA_SZ(n) ((n) * (n)) -#define GIGA_SZ(n) ((n) * (n) * (n)) -#define TERA_SZ(n) ((n) * (n) * (n) * (n)) -#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n)) +#define UNITS_SI 1 +#define UNITS_2 2 -#define KILO_2_SZ (KILO_SZ(1024ULL)) -#define MEGA_2_SZ (MEGA_SZ(1024ULL)) -#define GIGA_2_SZ (GIGA_SZ(1024ULL)) -#define TERA_2_SZ (TERA_SZ(1024ULL)) -#define PETA_2_SZ (PETA_SZ(1024ULL)) - -#define KILO_SI_SZ (KILO_SZ(1000ULL)) -#define MEGA_SI_SZ (MEGA_SZ(1000ULL)) -#define GIGA_SI_SZ (GIGA_SZ(1000ULL)) -#define TERA_SI_SZ (TERA_SZ(1000ULL)) -#define PETA_SI_SZ (PETA_SZ(1000ULL)) - /* Maximum widths of various fields. */ struct maxwidths { int mntfrom; @@ -93,37 +75,14 @@ int ifree; }; -static uintmax_t vals_si [] = { - 1, - KILO_SI_SZ, - MEGA_SI_SZ, - GIGA_SI_SZ, - TERA_SI_SZ, - PETA_SI_SZ -}; -static uintmax_t vals_base2[] = { - 1, - KILO_2_SZ, - MEGA_2_SZ, - GIGA_2_SZ, - TERA_2_SZ, - PETA_2_SZ -}; -static uintmax_t *valp; - -typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; - -static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; - static void addstat(struct statfs *, struct statfs *); static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); -static void prthumanval(double); +static void prthumanval(int64_t); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); -static unit_t unit_adjust(double *); static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); @@ -175,11 +134,9 @@ break; case 'H': hflag = UNITS_SI; - valp = vals_si; break; case 'h': hflag = UNITS_2; - valp = vals_base2; break; case 'i': iflag = 1; @@ -359,55 +316,29 @@ return (j); } -/* - * Output in "human-readable" format. Uses 3 digits max and puts - * unit suffixes at the end. Makes output compact and easy to read, - * especially on huge disks. - * - */ -static unit_t -unit_adjust(double *val) -{ - double abval; - unit_t unit; - int unit_sz; - - abval = fabs(*val); - - unit_sz = abval ? ilogb(abval) / 10 : 0; - - if (unit_sz >= (int)UNIT_MAX) { - unit = NONE; - } else { - unit = unitp[unit_sz]; - *val /= (double)valp[unit_sz]; - } - - return (unit); -} - static void prthuman(const struct statfs *sfsp, int64_t used) { - prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); - prthumanval((double)used * (double)sfsp->f_bsize); - prthumanval((double)sfsp->f_bavail * (double)sfsp->f_bsize); + prthumanval(sfsp->f_blocks * sfsp->f_bsize); + prthumanval(used * sfsp->f_bsize); + prthumanval(sfsp->f_bavail * sfsp->f_bsize); } static void -prthumanval(double bytes) +prthumanval(int64_t bytes) { + char buf[6]; + int flags; + + flags = HN_B | HN_NOSPACE | HN_DECIMAL; + if (hflag == UNITS_SI) + flags |= HN_DIVISOR_1000; - unit_t unit; - unit = unit_adjust(&bytes); + humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), + bytes, "", HN_AUTOSCALE, flags); - if (bytes == 0) - (void)printf(" 0B"); - else if (bytes > 10) - (void)printf(" % 6.0f%c", bytes, "BKMGTPE"[unit]); - else - (void)printf(" % 6.1f%c", bytes, "BKMGTPE"[unit]); + (void)printf(" %6s", buf); } /* ==== //depot/projects/gdb/bin/ls/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $ +# $FreeBSD: src/bin/ls/Makefile,v 1.26 2004/05/25 14:53:47 pjd Exp $ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBM} -LDADD= -lm +DPADD= ${LIBUTIL} +LDADD= -lutil .if !defined(RELEASE_CRUNCH) CFLAGS+= -DCOLORLS ==== //depot/projects/gdb/bin/ls/print.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.71 2004/05/02 11:25:37 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.72 2004/05/25 14:53:47 pjd Exp $"); #include #include @@ -45,8 +45,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -74,27 +74,6 @@ #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) -#define KILO_SZ(n) (n) -#define MEGA_SZ(n) ((n) * (n)) -#define GIGA_SZ(n) ((n) * (n) * (n)) -#define TERA_SZ(n) ((n) * (n) * (n) * (n)) -#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n)) - -#define KILO_2_SZ (KILO_SZ(1024ULL)) -#define MEGA_2_SZ (MEGA_SZ(1024ULL)) -#define GIGA_2_SZ (GIGA_SZ(1024ULL)) -#define TERA_2_SZ (TERA_SZ(1024ULL)) -#define PETA_2_SZ (PETA_SZ(1024ULL)) - -static unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; - -typedef enum { - NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX -} unit_t; -static unit_t unit_adjust(double *); - -static unit_t unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; - #ifdef COLORLS /* Most of these are taken from */ typedef enum Colors { @@ -613,49 +592,17 @@ static void printsize(size_t width, off_t bytes) { - double dbytes; - unit_t unit; if (f_humanval) { - dbytes = bytes; - unit = unit_adjust(&dbytes); + char buf[5]; - if (unit == 0) - (void)printf("%*d%c ", 4, (int)bytes, 'B'); - else - (void)printf("%*.*f%c ", 4, - dbytes >= 99.95 ? 0 : 1, dbytes, "BKMGTPE"[unit]); + humanize_number(buf, sizeof(buf), (int64_t)bytes, "", + HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); + (void)printf("%5s ", buf); } else (void)printf("%*jd ", (u_int)width, bytes); } -/* - * Output in "human-readable" format. Uses 3 digits max and puts - * unit suffixes at the end. Makes output compact and easy to read, - * especially on huge disks. - * - */ -static unit_t -unit_adjust(double *val) -{ - double abval; - unit_t unit; - u_int unit_sz; - - abval = fabs(*val); - - unit_sz = abval ? (u_int)ilogb(abval) / 10 : 0; - - if (unit_sz >= (u_int)UNIT_MAX) { - unit = NONE; - } else { - unit = unitp[unit_sz]; - *val /= (double)vals_base2[unit_sz]; - } - - return (unit); -} - static void aclmode(char *buf, const FTSENT *p, int *haveacls) { ==== //depot/projects/gdb/bin/ps/ps.1#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.76 2004/05/16 21:35:05 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.78 2004/05/25 14:05:25 gad Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -142,7 +142,7 @@ header per page of information. .It Fl j Print information associated with the following keywords: -.Cm user , pid , ppid , pgid , jobc , state , tt , time , +.Cm user , pid , ppid , pgid , sid , jobc , state , tt , time , and .Cm command . .It Fl L @@ -610,6 +610,8 @@ .El .Sh SEE ALSO .Xr kill 1 , +.Xr pgrep 1 , +.Xr pkill 1 , .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , ==== //depot/projects/gdb/bin/ps/ps.c#10 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.88 2004/04/06 20:06:49 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.91 2004/05/23 21:35:35 gad Exp $"); #include #include @@ -142,7 +142,7 @@ static void usage(void); static char dfmt[] = "pid,tt,state,time,command"; -static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; +static char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command"; static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state," "tt,time,command"; static char o1[] = "pid"; @@ -462,8 +462,11 @@ what = showthreads != 0 ? KERN_PROC_ALL : KERN_PROC_PROC; flag = 0; if (nselectors == 1) { - /* XXX - Apparently there's no KERN_PROC_GID flag. */ - if (pgrplist.count == 1) { + if (gidlist.count == 1) { + what = KERN_PROC_RGID | showthreads; + flag = *gidlist.l.gids; + nselectors = 0; + } else if (pgrplist.count == 1) { what = KERN_PROC_PGRP | showthreads; flag = *pgrplist.l.pids; nselectors = 0; @@ -475,16 +478,10 @@ what = KERN_PROC_RUID | showthreads; flag = *ruidlist.l.uids; nselectors = 0; -#if 0 - /*- - * XXX - KERN_PROC_SESSION causes error in kvm_getprocs? - * For now, always do sid-matching in this routine. - */ } else if (sesslist.count == 1) { what = KERN_PROC_SESSION | showthreads; flag = *sesslist.l.pids; nselectors = 0; -#endif } else if (ttylist.count == 1) { what = KERN_PROC_TTY | showthreads; flag = *ttylist.l.ttys; @@ -1107,11 +1104,12 @@ * of the oldps options -- option string NOT starting with a '-' -- * then convert to 'T' (meaning *this* terminal, i.e. ttyname(0)). * - * However, if a flag accepting a string argument is found in the - * option string, the remainder of the string is the argument to - * that flag; do not modify that argument. + * However, if a flag accepting a string argument is found earlier + * in the option string (including a possible `t' flag), then the + * remainder of the string must be the argument to that flag; so + * do not modify that argument. */ - if (strcspn(s, "MNOoU") == len && *cp == 't' && *s != '-') + if (*cp == 't' && *s != '-' && strcspn(s, "MNOoUt") == len - 1) *cp = 'T'; else { /* ==== //depot/projects/gdb/bin/sh/arith.y#3 (text+ko) ==== @@ -38,9 +38,11 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.18 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19 2004/05/24 10:11:31 stefanf Exp $"); #include +#include + #include "shell.h" #include "var.h" %} ==== //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.8#2 (text+ko) ==== @@ -27,6 +27,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" +.\" $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.8,v 1.2 2004/05/27 23:51:05 mlaier Exp $ +.\" .Dd August 17, 2001 .Dt FTP-PROXY 8 .Os @@ -182,7 +184,7 @@ .Nm on the port from above using .Bd -literal -offset 2n -127.0.0.1:8021 stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy +ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy .Ed .Pp in ==== //depot/projects/gdb/etc/rc.d/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.40 2004/04/17 04:12:27 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.41 2004/05/24 14:17:19 des Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -23,7 +23,7 @@ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain ntpd ntpdate \ + nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ ==== //depot/projects/gdb/etc/rc.d/nisdomain#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/nisdomain,v 1.1 2003/04/18 17:51:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nisdomain,v 1.2 2004/05/24 11:48:58 des Exp $ # # PROVIDE: nisdomain @@ -37,72 +37,8 @@ start_cmd="nisdomain_start" stop_cmd=":" -convert_host_conf() -{ - host_conf=$1; shift; - nsswitch_conf=$1; shift; - awk ' \ - /^[:blank:]*#/ { next } \ - /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \ - /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \ - /nis/ { nsswitch[c] = "nis"; c++; next } \ - { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \ - END { \ - printf "hosts: "; \ - for (i in nsswitch) printf "%s ", nsswitch[i]; \ - printf "\n"; \ - }' < $host_conf > $nsswitch_conf -} - -generate_host_conf() -{ - nsswitch_conf=$1; shift; - host_conf=$1; shift; - - awk ' -BEGIN { - xlat["files"] = "hosts"; - xlat["dns"] = "bind"; - xlat["nis"] = "nis"; - cont = 0; -} -sub(/^[\t ]*hosts:/, "") || cont { - if (!cont) - srcs = "" - sub(/#.*/, "") - gsub(/[][]/, " & ") - cont = sub(/\\$/, "") - srcs = srcs " " $0 -} -END { - print "# Auto-generated from nsswitch.conf, do not edit" - ns = split(srcs, s) - for (n = 1; n <= ns; ++n) { - if (s[n] in xlat) - print xlat[s[n]] - } -} -' <$nsswitch_conf >$host_conf -} - nisdomain_start() { - # Generate host.conf for compatibility - # - if [ -f "/etc/nsswitch.conf" ]; then - echo 'Generating host.conf.' - generate_host_conf /etc/nsswitch.conf /etc/host.conf - fi - - # Convert host.conf to nsswitch.conf if necessary - # - if [ -f "/etc/host.conf" -a ! -f "/etc/nsswitch.conf" ]; then - echo '' - echo 'Warning: /etc/host.conf is no longer used' - echo ' /etc/nsswitch.conf will be created for you' - convert_host_conf /etc/host.conf /etc/nsswitch.conf - fi - # Set the domainname if we're using NIS # case ${nisdomainname} in ==== //depot/projects/gdb/etc/rc.firewall6#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh - ############ # Setup system for IPv6 firewall service. -# $FreeBSD: src/etc/rc.firewall6,v 1.13 2003/11/02 07:31:44 ru Exp $ +# $FreeBSD: src/etc/rc.firewall6,v 1.14 2004/05/24 07:27:26 ume Exp $ # Suck in the configuration variables. if [ -z "${source_rc_confs_defined}" ]; then @@ -55,6 +55,8 @@ # Only in rare cases do you want to change these rules # ${fw6cmd} add 100 pass all from any to any via lo0 + ${fw6cmd} add 200 deny all from any to ::1 + ${fw6cmd} add 300 deny all from ::1 to any # # ND # ==== //depot/projects/gdb/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.98 2003/10/08 08:48:43 bms Exp $ +# $FreeBSD: src/etc/services,v 1.99 2004/05/27 23:42:26 mlaier Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2090,6 +2090,7 @@ fodms 7200/udp #FODMS FLIP dlip 7201/tcp dlip 7201/udp +ftp-proxy 8021/tcp # FTP proxy natd 8668/divert # Network Address Translation jetdirect 9100/tcp #HP JetDirect card man 9535/tcp ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,6 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.134 2004/05/11 17:26:15 fanf Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.135 2004/05/25 19:15:02 wollman Exp $ + % -- Gifts for Children -- @@ -7777,6 +7778,11 @@ qualifications, that field's employment market is glutted. >>> TRUNCATED FOR MAIL (1000 lines) <<<