From owner-p4-projects@FreeBSD.ORG Sat Aug 8 20:09:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E769D10656C6; Sat, 8 Aug 2009 20:09:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A642610656C2 for ; Sat, 8 Aug 2009 20:09:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93AB08FC16 for ; Sat, 8 Aug 2009 20:09:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n78K9S8K071832 for ; Sat, 8 Aug 2009 20:09:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n78K9Kwr071826 for perforce@freebsd.org; Sat, 8 Aug 2009 20:09:20 GMT (envelope-from mav@freebsd.org) Date: Sat, 8 Aug 2009 20:09:20 GMT Message-Id: <200908082009.n78K9Kwr071826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2009 20:09:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=167115 Change 167115 by mav@mav_mavbook on 2009/08/08 20:08:34 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#11 integrate .. //depot/projects/scottl-camlock/src/UPDATING#12 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/version#5 integrate .. //depot/projects/scottl-camlock/src/contrib/less/LICENSE#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.aut#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsb#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsu#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.o2e#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.o9c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.o9u#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/Makefile.wnm#2 integrate .. //depot/projects/scottl-camlock/src/contrib/less/NEWS#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/README#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/brac.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/ch.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/charset.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/charset.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/cmd.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/command.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/configure.ac#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/cvt.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/less/decode.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/defines.ds#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/defines.o2#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/defines.o9#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/defines.wn#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/edit.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/filename.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/forwback.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/funcs.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/ifile.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/input.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/jump.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/less.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/less.man#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/less.nro#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lessecho.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lessecho.man#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lessecho.nro#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lesskey.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lesskey.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lesskey.man#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lesskey.nro#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lglob.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/line.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/linenum.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/lsystem.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/main.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/mark.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/mkhelp.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/optfunc.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/option.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/option.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/opttbl.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/os.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/output.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/pattern.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/less/pattern.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/less/pckeys.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/position.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/position.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/prompt.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/screen.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/scrsize.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/search.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/signal.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/tags.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/ttyin.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/less/version.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/NEWS#3 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/README#3 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/VERSION#4 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/configure#4 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/scottl-camlock/src/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/scottl-camlock/src/etc/portsnap.conf#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid_save#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/zfs#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/zvol#1 branch .. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_vnet.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_compat01.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_int.h#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.8#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/u3g.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/urtw.4#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#96 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#43 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_sym.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amdtemp/amdtemp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/asm_2300.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/asm_2400.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/asm_2500.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pst/pst-iop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/netback/netback.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/smapi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/smbios.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/vpd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/sf_buf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#10 delete .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/isp_2500/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_epair.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_cb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/atm/ng_atm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/dest6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_mcast.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_forward.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_input.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/keysock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipcomp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_klib.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#10 delete .. //depot/projects/scottl-camlock/src/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/less/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpi.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/acpidump.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/getpmac/getpmac.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.204 2009/07/20 19:51:47 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.205 2009/08/01 19:26:27 rwatson Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090801: vimage.h removed in favour of vnet.h +OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 OLD_LIBS+=lib/libalias.so.6 OLD_LIBS+=lib/libavl.so.1 ==== //depot/projects/scottl-camlock/src/UPDATING#12 (text+ko) ==== @@ -65,9 +65,9 @@ 20090624: The ABI of various structures related to the SYSV IPC API have - been changed. As a result, the COMPAT_FREEBSD[456] kernel - options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version - to 800100. + been changed. As a result, the COMPAT_FREEBSD[456] and COMPAT_43 + kernel options now all require COMPAT_FREEBSD7. + Bump __FreeBSD_version to 800100. 20090622: Layout of struct vnet has changed as routing related variables @@ -1665,4 +1665,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.631 2009/07/19 17:25:24 kensmith Exp $ +$FreeBSD: src/UPDATING,v 1.632 2009/07/26 20:12:06 kib Exp $ ==== //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,3 +1,7 @@ + --- 9.6.1-P1 released --- + +2640. [security] A specially crafted update packet will cause named + to exit. [RT #20000] --- 9.6.1 released --- ==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/update.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */ +/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */ #include @@ -979,7 +979,11 @@ if (type == dns_rdatatype_rrsig || type == dns_rdatatype_sig) covers = dns_rdata_covers(&t->rdata); - else + else if (type == dns_rdatatype_any) { + dns_db_detachnode(db, &node); + dns_diff_clear(&trash); + return (DNS_R_NXRRSET); + } else covers = 0; /* ==== //depot/projects/scottl-camlock/src/contrib/bind9/version#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $ +# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=6 PATCHVER=1 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 ==== //depot/projects/scottl-camlock/src/contrib/less/LICENSE#3 (text+ko) ==== @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2008 Mark Nudelman +Copyright (C) 1984-2009 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.aut#2 (text+ko) ==== @@ -10,10 +10,10 @@ SRC = \ main.c screen.c brac.c ch.c charset.c cmdbuf.c \ - command.c decode.c edit.c filename.c forwback.c \ + command.c cvt.c decode.c edit.c filename.c forwback.c \ help.c ifile.c input.c jump.c line.c linenum.c \ lsystem.c mark.c optfunc.c option.c opttbl.c os.c \ - output.c position.c prompt.c search.c signal.c \ + output.c pattern.c position.c prompt.c search.c signal.c \ tags.c ttyin.c version.c DISTFILES_W = \ defines.ds Makefile.dsb Makefile.dsg Makefile.dsu \ @@ -24,7 +24,8 @@ ${SRC} regexp.c regexp.h \ COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \ configure configure.ac lesskey.c lessecho.c scrsize.c \ - charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ + charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h \ + pckeys.h pattern.h position.h \ install.sh defines.h.in mkinstalldirs \ less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \ less.hlp \ @@ -109,6 +110,8 @@ cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \ echo "Creating release/$$REL/$$REL.tar.gz"; \ tar -cf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \ + echo "Signing release/$$REL/$$REL.tar.gz"; \ + gpg --detach-sign release/$$REL/$$REL.tar.gz; \ echo "Creating release/$$REL/$$REL.zip"; \ zip -rq release/$$REL/$$REL.zip $$REL; \ rm -rf $$REL ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsb#2 (text+ko) ==== @@ -18,12 +18,13 @@ .c.obj: $(CC) -c -I. $(CPPFLAGS) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj all: less$(EXT) lesskey$(EXT) ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsg#2 (text+ko) ==== @@ -33,11 +33,12 @@ .c.o: ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} all: less lesskey lessecho ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.dsu#2 (text+ko) ==== @@ -27,12 +27,13 @@ .c.obj: $(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj all: less lesskey ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.in#3 (text+ko) ==== @@ -43,11 +43,12 @@ .c.o: ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} @REGEX_O@ all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT) ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.o2e#2 (text+ko) ==== @@ -18,11 +18,12 @@ .c.${O}: ${CC} -c ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less.exe lesskey.exe scrsize.exe ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.o9c#2 (text+ko) ==== @@ -22,11 +22,12 @@ .c.${O}: ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less lessecho lesskey ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.o9u#2 (text+ko) ==== @@ -21,11 +21,12 @@ .c.${O}: ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ - command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ +OBJ = \ + main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ + command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \ lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \ - output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ + output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} regexp.${O} all: less lesskey ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.wnb#2 (text+ko) ==== @@ -25,12 +25,13 @@ .c.obj: ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj regexp.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj regexp.obj all: less lesskey lessecho ==== //depot/projects/scottl-camlock/src/contrib/less/Makefile.wnm#2 (text+ko) ==== @@ -23,12 +23,13 @@ .c.obj: $(CC) $(CFLAGS) $< -OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ - decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ - input.obj jump.obj line.obj linenum.obj lsystem.obj \ - mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ - position.obj prompt.obj search.obj signal.obj tags.obj \ - ttyin.obj version.obj regexp.obj +OBJ = \ + main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \ + command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \ + help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \ + lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \ + output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \ + tags.obj ttyin.obj version.obj regexp.obj all: less.exe lesskey.exe ==== //depot/projects/scottl-camlock/src/contrib/less/NEWS#3 (text+ko) ==== @@ -12,6 +12,18 @@ ====================================================================== + Major changes between "less" versions 429 and 436 + +* Don't pass "-" to non-pipe LESSOPEN unless it starts with "-". + +* Allow a fraction as the argument to the -# (--shift) option. + +* Fix highlight bug when underlined/overstruck text matches at end of line. + +* Fix non-regex searches with ctrl-R. + +====================================================================== + Major changes between "less" versions 424 and 429 * LESSOPEN pipe will now be used on standard input, if the LESSOPEN ==== //depot/projects/scottl-camlock/src/contrib/less/README#3 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 429 + Less, version 436 - This is the distribution of less, version 429, released 11 Apr 2009. + This is the distribution of less, version 436, released 07 Jul 2009. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/scottl-camlock/src/contrib/less/brac.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/ch.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/charset.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -425,7 +425,7 @@ c &= 0377; if ((c < 128 || !utf_mode) && !control_char(c)) - SNPRINTF1(buf, sizeof(buf), "%c", c); + SNPRINTF1(buf, sizeof(buf), "%c", (int) c); else if (c == ESC) strcpy(buf, "ESC"); #if IS_EBCDIC_HOST @@ -442,7 +442,7 @@ "..V....D....TU.Z"[c]); #else else if (c < 128 && !control_char(c ^ 0100)) - SNPRINTF1(buf, sizeof(buf), "^%c", c ^ 0100); + SNPRINTF1(buf, sizeof(buf), "^%c", (int) (c ^ 0100)); #endif else SNPRINTF1(buf, sizeof(buf), binfmt, c); ==== //depot/projects/scottl-camlock/src/contrib/less/charset.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2008 Mark Nudelman + * Copyright (C) 2005-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/cmd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/cmdbuf.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/command.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.10 2009/05/09 01:35:27 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.11 2009/07/29 09:20:32 delphij Exp $ */ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/configure.ac#3 (text+ko) ==== @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1984-2008 Mark Nudelman +# Copyright (C) 1984-2009 Mark Nudelman # # You may distribute under the terms of either the GNU General Public # License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/decode.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/defines.ds#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/defines.o2#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/defines.o9#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/defines.wn#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/edit.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/filename.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -843,17 +843,17 @@ #else lessopen++; returnfd = 1; - if (*lessopen == '-') { - /* - * Lessopen preprocessor will accept "-" as a filename. - */ - lessopen++; - } else { - if (strcmp(filename, "-") == 0) - return (NULL); - } #endif } + if (*lessopen == '-') { + /* + * Lessopen preprocessor will accept "-" as a filename. + */ + lessopen++; + } else { + if (strcmp(filename, "-") == 0) + return (NULL); + } len = strlen(lessopen) + strlen(filename) + 2; cmd = (char *) ecalloc(len, sizeof(char)); ==== //depot/projects/scottl-camlock/src/contrib/less/forwback.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $FreeBSD: src/contrib/less/forwback.c,v 1.8 2009/05/09 01:35:27 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/forwback.c,v 1.9 2009/07/29 09:20:32 delphij Exp $ */ /* - * Copyright (C) 1984-2008 Mark Nudelman + * Copyright (C) 1984-2009 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/scottl-camlock/src/contrib/less/funcs.h#3 (text+ko) ==== @@ -83,6 +83,9 @@ public void ungetcc (); public void ungetsc (); public void commands (); + public int cvt_length (); + public int * cvt_alloc_chpos (); + public void cvt_text (); public void init_cmds (); public void add_fcmd_table (); public void add_ecmd_table (); @@ -193,6 +196,8 @@ public void opt_l (); public void opt_j (); public void calc_jump_sline (); + public void opt_shift (); + public void calc_shift_count (); public void opt_k (); public void opt_t (); public void opt__T (); @@ -233,6 +238,10 @@ public void error (); public void ierror (); public int query (); + public int compile_pattern (); + public void uncompile_pattern (); + public int is_null_pattern (); + public int match_pattern (); >>> TRUNCATED FOR MAIL (1000 lines) <<<