From owner-p4-projects@FreeBSD.ORG Sun Nov 29 00:06:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5045E1065679; Sun, 29 Nov 2009 00:06:17 +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 EFB1E1065670 for ; Sun, 29 Nov 2009 00:06:16 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DAB6B8FC08 for ; Sun, 29 Nov 2009 00:06:16 +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 nAT06GAL050200 for ; Sun, 29 Nov 2009 00:06:16 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAT06GMf050198 for perforce@freebsd.org; Sun, 29 Nov 2009 00:06:16 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 29 Nov 2009 00:06:16 GMT Message-Id: <200911290006.nAT06GMf050198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 00:06:17 -0000 http://p4web.freebsd.org/chv.cgi?CH=171151 Change 171151 by pgj@beehive on 2009/11/29 00:05:24 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/images/articles/releng/branches-releng8.pic#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#12 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#24 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#10 integrate .. //depot/projects/docproj_hu/www/en/marketing/os-comparison.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/8.0R/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/releases/8.0R/announce.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/8.0R/pressrelease.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/8.0R/relnotes-detailed.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/8.0R/relnotes.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/index.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#32 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#24 integrate .. //depot/projects/docproj_hu/www/hu/security/security.sgml#13 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#76 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#19 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#12 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + - - + + ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#24 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.491 2009/11/25 22:49:59 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.492 2009/11/26 19:47:35 hrs Exp $ --> @@ -4349,8 +4349,8 @@ + - ==== //depot/projects/docproj_hu/www/en/administration.sgml#10 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -265,7 +265,7 @@
  • Steven Beedle <steven@zna.com>
  • Denise Ebery <denise@offmyserver.com>
    • + href="mailto:denise@ixsystems.com">denise@ixsystems.com>
  • Deb Goodkin <deb@FreeBSD.org>
  • &a.jkoshy; <jkoshy@FreeBSD.org>
  • Dru Lavigne < - + @@ -414,7 +414,7 @@ performance and consistency differences between journaled and soft updates consistency mechanisms. This paper is available online from http://www.ece.cmu.edu/~gnager/papers/usenix2000.ps. + href="http://www.ece.cmu.edu/~ganger/papers/usenix2000.ps">http://www.ece.cmu.edu/~ganger/papers/usenix2000.ps. This paper also discusses two different journaling implementations based on FFS and developed on FreeBSD. Clearly, FreeBSD is at the forefront of filesystem research and this is the source of many of @@ -425,7 +425,7 @@

    "Soft Updates: A Technique for Eliminating Most Synchronous Writes in the Fast Filesystem" by Marshall Kirk McKusick and Gregory R. Ganger.
    http://www.ece.cmu.edu/~gnager/papers/mckusick99.ps.

    + href="http://www.ece.cmu.edu/~ganger/papers/mckusick99.ps">http://www.ece.cmu.edu/~ganger/papers/mckusick99.ps.

    Performance Benchmarks

    ==== //depot/projects/docproj_hu/www/en/releases/8.0R/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/8.0R/Makefile,v 1.2 2009/11/26 01:20:07 hrs Exp $ +# $FreeBSD: www/en/releases/8.0R/Makefile,v 1.4 2009/11/27 11:35:05 rwatson Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,7 +7,8 @@ .include "../Makefile.inc" .endif -#DOCS= announce.sgml +DOCS= announce.sgml +DOCS+= pressrelease.sgml DOCS+= relnotes.sgml DOCS+= schedule.sgml ==== //depot/projects/docproj_hu/www/en/releases/8.0R/relnotes-detailed.html#2 (text+ko) ==== @@ -20,7 +20,7 @@ 2008, 2009 The FreeBSD Documentation Project

    $FreeBSD: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml -196375 2009-08-19 03:58:12Z edwin $
    +199849 2009-11-26 22:09:37Z hrs $

    @@ -395,16 +395,14 @@ to avoid panic (trap 9) at map_invalidate_cache_range() even if Intel CPU is used. This tunable can be set to -1 (default), 0 and 1. The -1 is same as the current behavior, which automatically disable -1 is same as the current behavior, which automatically disables CLFLUSH on Intel CPUs without CPUID_SS -(this should be occurred on Xen only). You can specify 1 when -this panic happened on non-Intel CPUs (such as AMD's). Because disabling 1 when this +panic happens on non-Intel CPUs (such as AMD's). Because disabling CLFLUSH can reduce performance, you can try with setting 0 on Intel CPUs without SS to use CLFLUSH feature.

    -

    The FreeBSD newbus subsystem is now MPSAFE.

    -

    The jail(8) @@ -420,9 +418,9 @@ options VIMAGE -

    Note that an option SCTP in the GENERIC kernel is not compatible with the VIMAGE. This limitation will be fixed in the next release.

    +

    Note that options SCTP in the GENERIC kernel is not compatible with options +VIMAGE. This limitation will be fixed in the next release.

    The vimage is a jail with a virtualized instance of the FreeBSD network stack. It can be created by using

    The vimage has own loopback interface and a separated network stack including the L3 -routing table. Network interfaces on the system can be moved by using ifconfig(8) vnet option between the different vimage jails and outside of @@ -447,8 +445,10 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=epair&sektion=4&manpath=FreeBSD+8.0-RELEASE"> epair(4) pseudo-interface driver has been added to help communication between vimage jails. It -emulates a pair of back-to-back connected Ethernet interfaces. For example, following -commands create the interface pair:

    +emulates a pair of back-to-back connected Ethernet interfaces. For example, the following +commands create an interface pair of +epair(4):

     # ifconfig epair0 create
@@ -468,19 +468,19 @@
 jails by using 
 ifconfig(8)
-vnet option. Even after one of an vnet option as described above. Even after half of an 
 epair(4) pair is
 moved, the back-to-back connection still valid and can be used for inter-jail
 communication.
    
 
-
    Note that the vimage is still considered as an experimental feature.
    
+
    Note that vimage is still considered as an experimental feature.
  • -

    A jail can have arbitrary named parameters similar to environmental variables and the -fixed jail parameters in the previous releases have been replaced with them. The jail -name can be used for identifying the jail in A jail can now have arbitrary named parameters similar to environmental variables and +the fixed jail parameters in the previous releases have been replaced with them. The jail +name can now be used for identifying the jail in jexec(8) and @@ -488,9 +488,9 @@

  • -

    Multiple addresses of both IPv4 and IPv6 per jail has been supported. It is even -possible to have jails without an IP address at all, which basically gives one a chrooted -environment with restricted process view and no networking.

    +

    Multiple IPv4 and/or IPv6 addresses per jail are now supported. It is even possible to +have jails without an IP address at all, which basically gives one a chrooted environment +with restricted process view and no networking.

  • @@ -516,10 +516,10 @@
  • -

    A show jails subcommand in The -ddb(8) has been -added.

    +ddb(8) kernel +debugger now supports a show jails subcommand.

  • @@ -547,6 +547,19 @@ the default Linux infrastructure port is emulators/linux_base-f10 (Fedora 10).

    +

    [arm] The FreeBSD/arm now supports mini dump.

    + +

    [powerpc] The FreeBSD/powerpc now supports kernel core dump.

    + +

    [amd64, i386] The FreeBSD virtual memory subsystem now supports fully transparent use +of superpages for application memory; application memory pages +are dynamically promoted to or demoted from superpages without any modification to +application code. This change offers the benefit of large page sizes such as improved +virtual memory efficiency and reduced TLB (translation lookaside buffer) misses without +downsides like application changes and virtual memory inflexibility. This can be enabled +by setting a loader tunable vm.pmap.pg_ps_enabled to 1 and is enabled by default on amd64.

    +

    [7.2R] The ddb(8) kernel @@ -555,12 +568,13 @@

    [7.2R] The FreeBSD DTrace subsystem now supports a probe for process execution.

    [7.2R] [amd64] The FreeBSD kernel virtual address space has been increased to 6GB. -This allows subsystems to use larger virtual memory space than before. For example, zfs(8) adaptive replacement cache (ARC) requires large kernel memory space to cache file system data, so it benefits from the increased address space. Note that the ceiling on the kernel map -size is now 60% of the size rather than an absolute quantity.

    +size is now 60% of the size of physical memory rather than an absolute quantity.

    [7.2R] The @@ -591,20 +605,11 @@

    [7.2R] The FreeBSD 32-bit system call translation layer now supports installing 32-bit system calls for VFS_AIO.

    -

    [7.2R] [amd64, i386] The FreeBSD virtual memory subsystem now supports fully -transparent use of superpages for application memory; -application memory pages are dynamically promoted to or demoted from superpages without -any modification to application code. This change offers the benefit of large page sizes -such as improved virtual memory efficiency and reduced TLB (translation lookaside buffer) -misses without downsides like application changes and virtual memory inflexibility. This -is disabled by default and can be enabled by setting a loader tunable vm.pmap.pg_ps_enabled to 1.

    -

    [7.1R] The clock_gettime(2) and the related system calls now support a clock ID CLOCK_THREAD_CPUTIME_ID, defined in POSIX.

    +class="LITERAL">CLOCK_THREAD_CPUTIME_ID, as defined in POSIX.

    [7.1R] The @@ -671,7 +676,7 @@ call now supports F_DUP2FD command. This is equivalent to dup(2), and -compatible with Sun Solaris and IBM AIX.

    +compatible with the Sun Solaris and the IBM AIX.

    [7.1R] The FreeBSD's @@ -683,8 +688,8 @@

    [7.1R] The procstat(1) -utility has been added. This is a process inspection utility which provides both some of -the missing functionality from procfs(5) and new functionality for monitoring and debugging specific processes.

    @@ -692,8 +697,8 @@

    [7.1R] The client side functionality of rpc.lockd(8) has -been implemented in FreeBSD kernel. This implementation provides the correct semantics -for flock(2) style locks which are used by the WSTOPPED which is equivalent to WUNTRACED.

    -

    [7.1R] [amd64, i386, sparc64] The FreeBSD kernel now supports initial support of -binding interrupts to CPUs.

    +

    [7.1R] [amd64, i386, sparc64] The FreeBSD kernel now has initial support of binding +interrupts to CPUs.

    [7.1R] [amd64, i386] The @@ -753,12 +758,17 @@ utility now supports a new -i option to set the volume ID.

    +

    [arm, powerpc] The +loader(8) now +supports U-Boot support library.

    +

    [7.2R] The boot(8) now supports 4-byte volume ID that certain versions of Windows® put into the MBR and invoking PXE by pressing F6 -key on some supported BIOSes.

    +class="TRADEMARK">Windows® put into the MBR and invoking PXE by pressing the +F6 key on some supported BIOSes.

    [7.2R] [i386] The @@ -800,54 +810,76 @@

    2.2.2 Hardware Support

    -

    The FreeBSD now includes an experimental support for MIPS platform.

    +

    The FreeBSD now includes experimental support for MIPS platform.

    + +

    Support for RTC on Dallas Semiconductor chips has been improved. The DS133x and DS1553 +are now supported.

    + +

    [arm] The FreeBSD/arm now supports Feroceon and Sheeva embedded CPU, Marvell Orion +(88F5281), Kirkwood (88F6281), Discovery Innovation (MV-78100) systems-on-chip CPU.

    + +

    [powerpc] The FreeBSD/powerpc now supports SMP machines

    + +

    [powerpc] The FreeBSD/powerpc now supports E500 (Book-E) embedded CPU and Freescale +PowerQUICCIII MPC85xx system-on-chip (including single and dual-core).

    The acpi(4) -subsystem now supports System Resource Affinity Table (SRAT) used to describe affinity -relationships between CPUs and memory, ACPI 3.0 fields in the MADT including X2APIC -entries and UIDs for local SAPICs, and ACPI 3.0 flags in the FADT.

    +subsystem now supports the System Resource Affinity Table (SRAT) used to describe +affinity relationships between CPUs and memory, ACPI 3.0 fields in the MADT including +X2APIC entries and UIDs for local SAPICs, and ACPI 3.0 flags in the FADT.

    [powerpc] The -cpufreq(4) now -supports PowerPC G5, along with a skeleton SMU driver in order to slew CPU voltage during -frequency changes.

    +cpufreq(4) +framework now supports PowerPC G5, along with a skeleton SMU driver in order to slew CPU +voltage during frequency changes.

    The sec(4) driver has been added to provide support for the integrated security engine found in Freescale system-on-chip devices.

    The FreeBSD TTY layer has been replaced with a new one which has better support for SMP and robust resource handling. A tty now has own mutex and it is expected to improve -scalability when compared to the old implementation based on Giant lock.

    +scalability when compared to the old implementation based on the Giant lock.

    [amd64, i386] The -uart(4) is now -the default driver for serial port devices in favor of the uart(4) driver +is now the default driver for serial port devices in favor of the sio(4) driver. -Note that the device nodes have been renamed with /dev/cuau/dev/cuadN and /dev/ttydN to /dev/cuauN and /dev/ttyuN.

    +
    +
    +

    Important: Users who are upgrading will need to change their kernel +configurations and possibly also /boot/loader.conf and /boot/device.hints.

    +
    +
    +

    The FreeBSD USB subsystem has been reimplemented to support modern devices and better -SMP scalability. The new implementation includes Giant-lock-free device drivers, Linux +SMP scalability. The new implementation includes Giant-lock-free device drivers, a Linux compatibility layer, usbconfig(8) -utility, full support for split transaction and isochronous transaction, and so on. -Device node names for USB devices are now in a the form of /dev/usb/bus.dev.iface./dev/usb/bus.dev.endpoint, and /dev/usbctl -is the master device node. The name /dev/ugen0.1 in the -previous releases has been renamed as /dev/ugen/0.1.0.0, for -example.

    +is the master device node. Note that the +ugen(4) driver +has nodes for each device as /dev/ugenbus.dev for +backward compatibility.

    -

    [7.2R] [sparc64] The FreeBSD now supports Ultra SPARC III (Cheetah) processor -family.

    +

    [7.2R] [sparc64] FreeBSD now supports Ultra SPARC III (Cheetah) processor family.

    [7.2R] The @@ -916,7 +948,7 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=u3g&sektion=4&manpath=FreeBSD+8.0-RELEASE"> u3g(4) driver for USB based 3G cards and dongles including Vodafone Mobile Connect Card 3G, Qualcomm -CDMA MSM, Huawei E220, Novatel U740, Sierra MC875U, and so on has been added. This +CDMA MSM, Huawei E220, Novatel U740, Sierra MC875U, and more has been added. This provides support for the multiple USB-to-serial interfaces exposed by many 3G USB/PC Card modems, and the device is accessed through the @@ -928,11 +960,11 @@

    [7.2R] The sched_ule(4) -scheduler now supports a loader tunable machdep.hyperthreading_enabled as the machdep.hyperthreading_enabled just like -sched_4bsd(4) -does. Note that it cannot be modified at run-time.

    +sched_4bsd(4). +Note that it cannot be modified at run-time.

    [7.1R] The @@ -942,10 +974,10 @@

    [7.1R] [sparc64] The kbdmux(4) driver -has been added. The -sunkbd(4) now -supports sunkbd(4) driver +now supports atkbd(4) emulation like [7.1R] An option of the -puc(4) driver -PUC_FASTINTR has been no longer supported.

    +puc(4) driver, +PUC_FASTINTR, is no longer supported.

    [7.1R] The @@ -978,7 +1010,7 @@

    The FreeBSD audio subsystem has been improved. The changes include volume per channel, high quality fixed-point band-limited SINC sampling rate converter, bit-perfect mode, -transparent/adaptive virtual channel, and exclusive stream. For more details, see snd(4) manual page.

    @@ -988,21 +1020,22 @@ agp(4) driver now supports Intel G4X series graphics chipsets.

    -

    [7.2R] The DRM, a kernel module named Direct Rendering Manager that gives direct -hardware access to DRI clients, has been updated. Support for AMD/ATI r500, r600, r700, -and IGP based chips, XGI V3XE/V5/V8, and Intel i915 chipsets has been improved.

    +

    [7.2R] The Direct Rendering Manager (DRM), a kernel module +that gives direct hardware access to DRI clients, has been updated. Support for AMD/ATI +r500, r600, r700, and IGP based chips, XGI V3XE/V5/V8, and Intel i915 chipsets has been +improved.

    [7.2R] A new loader tunable hw.drm.msi has been added to control if DRM uses MSI or not. This is set to 1 (enabled) by default.

    [7.2R] The snd_au88x0(4) driver for Aureal Vortex 1/2/Advantage PCI has been removed -because this was broken for a long time.

    +because it has been broken for a long time.

    [7.2R] The snd_hda(4) -driver has been updated. This changes include support for multiple codec per HDA bus, +driver has been updated. These changes include support for multiple codecs per HDA bus, multiple functional groups per codec, multiple audio devices per functional group, digital (SPDIF/HDMI) audio input/output, suspend/resume, and part of multichannel audio.

    @@ -1011,8 +1044,8 @@ updated driver often provides several PCM devices. This means that in some cases the system default audio device no longer corresponds to the users's habitual audio connectors. In such cases the default device can be specified in audio applications' -setup or defined globally via hw.snd.default_unit sysctl, as -described in the hw.snd.default_unit sysctl +variable, as described in the sound(4) manual page.

    @@ -1020,7 +1053,7 @@

    [7.1R] The agp(4) driver -now supports Intel G33 and G45.

    +now supports the Intel G33 and G45.

    [7.1R] [i386] The dpms(4) driver has been added to use the VESA BIOS for DPMS during suspend and resume.

    @@ -1057,7 +1090,7 @@
    • -

      The multicast filter re-programming becomes robust.

      +

      The multicast filter re-programming is now more robust.

    • @@ -1084,15 +1117,19 @@

    • [7.2R] VLAN hardware tag insertion/stripping support and Tx/Rx checksum offload for -VLAN frames support have been added. Note that the VLAN hardware assistance is available +VLAN frames support has been added. Note that the VLAN hardware assistance is available only on 82550 or 82551-based controllers.

    +

    [arm, powerpc] The mge(4) driver has been added to provide support for Marvell Gigabit +Ethernet controllers found on ARM-based SOCs (Orion, Kirkwood, Discovery), as well as on +system controllers for PowerPC processors (MV64430, MV6446x).

    +

    The miibus(4) driver -now supports Marvell 88E3016.

    +now supports the Marvell 88E3016.

    The @@ -1116,6 +1153,10 @@ nge(4) driver has been improved and now works on all platforms.

    +

    The tsec(4) driver has been added to provide support for Freescale integrated +Three-Speed Ethernet Controller (TSEC). This driver also works with the enhanced version +of the controller (eTSEC).

    +

    The uath(4) driver @@ -1155,7 +1196,7 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=axe&sektion=4&manpath=FreeBSD+8.0-RELEASE"> axe(4) driver has been improved in performance by eliminating extra context switches and now supports -Apple USB Ethernet adapter.

    +the Apple USB Ethernet adapter.

    [7.2R] The @@ -1172,7 +1213,7 @@

    [7.2R] A bug in the igb(4) driver, -which prevents the loader tunable hw.igb.ave_latency from +which prevented the loader tunable hw.igb.ave_latency from working, has been fixed.

    [7.2R] The [7.2R] The msk(4) driver -has been improved. An issue which makes it hang up in a certain condition has been fixed. +has been improved. An issue which made it hang up in a certain condition has been fixed. Hardware MAC statistics support has been added and users can get the information via sysctl variables named dev.msk.N.stats.

    @@ -1209,7 +1250,7 @@

    [7.2R] The rl(4) driver has been -improved. It now detects the link status and a bug which prevents it from working on +improved. It now detects the link status and a bug which prevented it from working on systems with more than 4GB memory has been fixed.

    [7.2R] A bug in hme(4) driver has been improved.

    -

    [7.1R] The -ixgbe(4) driver -has been updated to version 1.6.2 from Intel.

    -

    [7.1R] A bug in some of the miibus(4) @@ -1346,7 +1382,7 @@ This is a kernel network dispatch interface which allows device drivers (and other packet sources) to direct packets to protocols for directly dispatched or deferred processing. The new implementation supports up to one netisr thread per CPU, and several benchmarks -on SMP machines show substantial performance improvement over the old one.

    +on SMP machines show substantial performance improvement over the previous version.

    A bug in the @@ -1374,8 +1410,8 @@ page.

    The IGMPv3 and SSM (Source-Specific Multicast) including IPv6 SSM and MLDv2 have been -added. Although the old KAME MLDv2 hooks has been replaced with the new implementation, -the related kernel programming interface is preserved.

    +added. Although the old KAME MLDv2 hooks have been replaced with the new implementation, +the related kernel programming interfaces have been preserved.

    The multicast routing code has been improved and the IPv4 and IPv6 support has been split.

    @@ -1501,14 +1537,14 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=bpf&sektion=4&manpath=FreeBSD+8.0-RELEASE"> bpf(4)     now supports an ioctl BIOCSETFNR. This is just like BIOCSETF but it does not drop all the packets buffered on the +class="LITERAL">BIOCSETF    , but it does not drop all the packets buffered on the descriptor and reset the statistics.

    [7.1R] The -if_bridge(4) now -allow to limit the number of source MACs that can be behind a bridge interface via ifmaxaddr parameter of if_bridge(4) +interface can limit the number of source MACs that can be behind a bridge interface via +ifmaxaddr parameter of ifconfig(8).

    @@ -1529,8 +1565,8 @@

    [7.1R] The -enc(4) now -supports sysctl variables to control whether the firewalls or enc(4) interface +now supports sysctl variables to control whether the firewalls or bpf(4) will see inner and outer headers or just inner or outer headers for incoming and outgoing IPsec @@ -1548,7 +1584,7 @@ subsystem that PMTU was broken in those cases when there was a route with a lower MTU than the MTU of the outgoing interface, has been fixed.

    -

    [7.1R] The netatm subsystem has been removed due to lacking of multiprocessor +

    [7.1R] The netatm subsystem has been removed due to lacking multiprocessor support.

    [7.1R] The -

    [7.1R] A socket option TCP_CONGESTION for TCP socket has been -added. This is for setting and retrieving the congestion control algorithm. The name used -is to allow compatibility with Linux.

    +

    [7.1R] A socket option TCP_CONGESTION for TCP sockets has +been added. This is for setting and retrieving the congestion control algorithm. The name +used is to allow compatibility with Linux.

    [7.1R] The @@ -1701,19 +1737,19 @@ file and rebuild the kernel:

    -device ahci
-device  siis
+device    ahci
+device    siis

    The current implementation supports AHCI-compliant controllers and SiliconImage SiI3124/SiI3132/SiI3531 controllers. The device node of an ATA drive is ada and one of an ATAPI drive is cd.

    +class="LITERAL">ada     and an ATAPI drive is cd.

    The FreeBSD iSCSI initiator implementation has been improved and supports IPv6.

    A userland utility -mftutil(8) for +href="http://www.FreeBSD.org/cgi/man.cgi?query=mfiutil&sektion=8&manpath=FreeBSD+8.0-RELEASE"> +mfiutil(8) for the mfi(4) devices @@ -1736,7 +1772,8 @@ siis(4) driver has been added to provide support for SiliconImage SiI3124/3132/3531 SATA2 controllers. It supports Serial ATA and ATAPI devices, port multipliers (including FIS-based -switching), hardware command queues (31 command per port) and Native Command Queuing.

    +switching), hardware command queues (31 commands per port) and Native Command +Queuing.

    [7.2R] The @@ -1806,7 +1843,7 @@

    [7.2R] The hptmv(4) driver -has been updated to version 1.16 from the vendor.

    +has been updated to version 1.16 from HighPoint.

    [7.2R] The @@ -1914,6 +1951,16 @@

    2.2.5 File Systems

    +

    “dangerously dedicated” mode for the UFS file system is no longer +supported.

    + +
    +
    +

    Important: Such disks will need to be reformatted to work with this +release.

    +
    +
    +

    The gvinum(8) now @@ -1959,7 +2006,8 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=mount_newnfs&sektion=8&manpath=FreeBSD+8.0-RELEASE"> mount_newnfs(8) program has also been added. The old, unmaintained NFSv4 client based on an -implementation at University of Michigan was removed from the FreeBSD source tree.

    +implementation from the University of Michigan was removed from the FreeBSD source +tree.

    The FreeBSD NFS subsystem now uses TCP as the default transport.

    @@ -2037,7 +2085,7 @@

    The awk(1) utility -now supports 64 files. The upper limit was 20 in the prior releases.

    +now supports 64 files. The upper limit was 20 in prior releases.

    The @@ -2055,7 +2103,7 @@ href="http://www.FreeBSD.org/cgi/man.cgi?query=cp&sektion=1&manpath=FreeBSD+8.0-RELEASE">cp(1) now use a larger buffer if the number of pages of the physical memory on the system is grater than -32k. This reduces a number of context switches.

    +32k. This reduces the number of context switches.

    A new BSD-licensed @@ -2162,6 +2210,11 @@ name for use by the backup. This is enabled by default.

    The +gdbserver(1) now +supports arm and powerpc platforms.

    + +

    The gpt(8) program has been removed in favor of route(8) utility now supports show, weights, and sticky commands. For more details, see sticky commands. For more details, see the route(8) manual page.

    @@ -2264,6 +2317,46 @@ translation relies on the AT_EXECPATH auxinfo supplied by the FreeBSD kernel.

    +

    It is no longer possible to create UFS filesystems in “dangerously +dedicated” mode using +sysinstall(8) +since this mode is no longer supported.

    + +

    +sysinstall(8) +menus have been simplified to reduce confusion and duplication with other parts of the +system. The Xorg window system should be installed just like +any other package. Configuration of Linux and OSF/1 emulation should be done via kernel rebuilds. Support for +installation from tape media was removed as it was believed to be broken. Obsolete code +to support OLDCARD was also removed.

    + +

    +sysinstall(8) +now understands how to use unsliced USB drives as installation source media via /dev/daXa

    + +

    +sysinstall(8) +now recognizes the new /dev/adaX disk devices, if compiled into the kernel.

    + +

    +sysinstall(8) +now uses the freebsd-doc-* +packages for localized documents.

    + +

    +sysinstall(8) +now ejects the CDROM after installation if it was used as source media.

    +

    The traceroute(8) @@ -2708,13 +2801,14 @@

    [7.1R] The -ifconfig(8) now -supports display of WPS IE (Wireless Provisioning Services Information Element).

    +ifconfig(8) +command now supports display of WPS IE (Wireless Provisioning Services Information +Element).

    [7.1R] The -kgdb(1) now -supports an add-kld kld +kgdb(1) command +now supports an add-kld kld command to locate a kld(4) and load @@ -2722,8 +2816,8 @@

    [7.1R] The -kgdb(1) now has -a shared library backend for kernel files that treats kgdb(1) command +now has a shared library backend for kernel files that treats kld(4) as shared libraries and auto-loading symbols for [7.1R] The -mdconfig(8) now -supports a -v (verbose) flag to mdconfig(8) +command now supports a -v (verbose) flag to -l command. It shows size and backing store of all md(4) devices at one @@ -2796,8 +2890,9 @@

    [7.1R] The mv(1) now support -POSIX specification when moving a directory to an existing directory across devices.

    + class="CITEREFENTRY">mv(1) command now +support POSIX specification when moving a directory to an existing directory across +devices.

    [7.1R] The @@ -2843,8 +2938,8 @@

    [7.1R] The realpath(1) -utility now supports a -q flag to suppress warnings; it now -also accepts multiple paths on its command line.

    +utility now supports a -q flag to suppress warnings and +accepts multiple paths on its command line.

    [7.1R] The @@ -2867,15 +2962,16 @@

    [7.1R] A bug in telnetd(8) that -it attempts authentication even when -a off option is -specified has been fixed.

    +caused it to attempt authentication even when -a off option +is specified has been fixed.

    [7.1R] The top(1) and -vmstat(8) now -support -P flag which displays per-CPU statistics.

    +vmstat(8) +commands now support -P flag which displays per-CPU +statistics.

    [7.1R] The @@ -2902,9 +2998,9 @@

    [7.1R] The -ypserv(8) now -supports a -P option to specify the port number on which it -should listen.

    >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 29 01:01:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 383BA1065672; Sun, 29 Nov 2009 01:01:12 +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 EDE3D106566B for ; Sun, 29 Nov 2009 01:01:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB11F8FC1C for ; Sun, 29 Nov 2009 01:01:11 +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 nAT11Br5064463 for ; Sun, 29 Nov 2009 01:01:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAT11BWd064461 for perforce@freebsd.org; Sun, 29 Nov 2009 01:01:11 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 29 Nov 2009 01:01:11 GMT Message-Id: <200911290101.nAT11BWd064461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 01:01:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=171152 Change 171152 by pgj@beehive on 2009/11/29 01:00:21 MFen (www): 1.30 -> 1.31 hu/administration.sgml 1.278 -> 1.280 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#25 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#66 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#25 (text+ko) ==== @@ -9,7 +9,7 @@ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#66 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,44 @@ 11 + 27 + + + Sajtókiadvány a &os; 8.0 + megjelenésérõl + +

    Megjelent a &os; 8.0 + megjelenésérõl szóló + sajtókiadvány.

    +     +     + + + 26 + + + Megjelent a &os; 8.0-RELEASE! + +

    Megjelent a &os; 8.0-RELEASE. + A kiadáshoz kapcsolódó legfrissebb + információk és/vagy + problémák miatt a telepítés + elõtt ne felejtsük el átolvasni a + kiadáshoz mellékelt jegyzeteket + valamint hibajegyzéket. + A különbözõ &os; + kiadásokról részletesebben a kiadási + információkkal foglalkozó oldalon + olvashatunk.

    +     +     + + 18 From owner-p4-projects@FreeBSD.ORG Sun Nov 29 01:35:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3F7106568D; Sun, 29 Nov 2009 01:35:46 +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 B087B106566C for ; Sun, 29 Nov 2009 01:35:46 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C4068FC24 for ; Sun, 29 Nov 2009 01:35:46 +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 nAT1Zk2f067945 for ; Sun, 29 Nov 2009 01:35:46 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAT1Zk4o067943 for perforce@freebsd.org; Sun, 29 Nov 2009 01:35:46 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 29 Nov 2009 01:35:46 GMT Message-Id: <200911290135.nAT1Zk4o067943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 01:35:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=171153 Change 171153 by pgj@beehive on 2009/11/29 01:34:58 MFen (doc): 1.90 -> 1.91 hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml 1.135 -> 1.136 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.19 -> 1.20 hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml 1.469 -> 1.471 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.8 -> 1.9 hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml 1.118 -> 1.119 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#22 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#24 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#14 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#38 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#25 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#11 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -127,18 +127,6 @@ minimális ismerete (). - - - Jelenleg a ZFS támogatása - még nem tekinthetõ hétköznapi - használatra alkalmasnak. Ennek - következményeképpen bizonyos funkciók - nem megfelelõen vagy egyáltalán nem - mûködnek. Ahogy ez a támogatás - megbízhatóvá válik, úgy - fogjuk tovább finomítani a - dokumentációt. - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#22 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -318,26 +318,34 @@ &os;-n. - A PF rendszermagmodul használata + A PF rendszermagmodulok használata + + A PF modul + betöltéséhez a következõ sort kell + felvennünk az /etc/rc.conf + állományba: + + pf_enable="YES" + + Ezt követõen futtassuk le a + hozzátartozó rendszerindító + szkriptet: + + &prompt.root; /etc/rc.d/pf start + + A PF modul abban az esetben nem fog + betöltõdni, ha nem találja a szabályokat + tartalmazó konfigurációs + állományt. Ez alapértelmezés + szerint az /etc/pf.conf + állomány. Ha a szabályok + leírása rendszerünkön máshol + található, akkor az + /etc/rc.conf állományban a + következõ módon adhatjuk meg annak pontos + helyét: - A &os; 5.3 megjelenése óta a - PF az alaprendszer része mint - futás közben betölthetõ rendszermagmodul. - A rendszer induláskor tehát képes - automatikusan betölteni, ha az &man.rc.conf.5; - állományban megadjuk a - pf_enable="YES" sort. A - PF modul azonban csak akkor fog - mûködésbe lépni, ha talál - hozzátartozó szabályrendszert, amely - alapértelmezés szerint az - /etc/pf.conf állományban - található. Amennyiben a PF - szabályrendszere a mi esetünkben máshol - található, akkor az rc.conf - állományban ne felejtsük megadni a - pf_rules="/elérési/útvonal/pf.szabályok" - sor használatával. + pf_rules="/elérési/út/pf.conf" A &os; 7.0 kiadással a minta @@ -358,14 +366,25 @@ &prompt.root; kldload pf.ko - A betölthetõ modul tartalmazza a &man.pflog.4; - támogatását, amely - segítségével naplózni is tudunk. - Amennyiben a PF további - szolgáltatásaira is szükségünk - lenne, akkor a PF - támogatását be kell - építenünk a rendszermagba. + A PF mûködésének + naplózását a pflog.ko + teszi lehetõvé, amelyet az alábbi sor + hozzáadásával engedélyezhetünk + az /etc/rc.conf + állományban: + + pflog_enable="YES" + + A modul betöltését a + hozzátartozó rendszerindító szkript + segítségével kérhetjük: + + &prompt.root; /etc/rc.d/pflog start + + Ha a PF többi + funkcióját is használni szeretnénk, + akkor ehhez egy új rendszermagot kell fordítanunk + PF támogatással. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#24 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.135 + %SRCID% 1.136 --> @@ -908,29 +908,33 @@ ezúttal a RELENG_6 ágnak adott életet. A 6.0-RELEASE az 6.X ág elsõ kiadásaként 2005 novemberében jelent meg. A legújabb - &rel2.current;-RELEASE &rel2.current.date; - hónapjában jelentkezett. A RELENG_6 - ágból már nem készülnek - további kiadások. + 6.4-RELEASE 2008 november hónapjában jelentkezett. + A RELENG_6 ágból már nem + készülnek további kiadások. A RELENG_7 ág 2007 októberében jött létre. Ebbõl az elsõ kiadás 2008 februárjában a 7.0-RELEASE volt. A - legfrissebb &rel.current;-RELEASE kiadás - &rel.current.date; hónapban készült el. A + legfrissebb &rel2.current;-RELEASE kiadás + &rel2.current.date; hónapban készült el. A RELENG_7 ágból további kiadások is várhatóak. + A fejlesztési fából 2009 + augusztusában ismét levált egy ág, + amely ezúttal a RELENG_8 volt. A 8.0-RELEASE, a 8.X + ág elsõ kiadása &rel.current.date; + hónapban jelent meg. + Jelen pillanatban a hosszabb távú - fejlesztések a 8.X-CURRENT (törzs) ágban - kapnak helyet, és a 8.X-bõl készült + fejlesztések a 9.X-CURRENT (törzs) ágban + kapnak helyet, és a 9.X-bõl készült idõközönkénti pillanatkiadások folyamatosan elérhetõek CD-n (és természetesen interneten keresztül is) a pillanatkiadásokat tároló szerverrõl. - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml - %SRCID% 1.19 + %SRCID% 1.20 --> @@ -355,12 +355,6 @@ &prompt.root; cd /usr/src &prompt.root; make buildworld &prompt.root; make installworld DESTDIR=$D -&prompt.root; cd etc/ - - Ez a lépés nem szükséges a - &os; 6.0-ás vagy annál újabb - verziójában. - &prompt.root; make distribution DESTDIR=$D &prompt.root; mount -t devfs devfs $D/dev ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#38 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.469 + %SRCID% 1.471 --> @@ -3844,14 +3844,19 @@ Oroszország - rsync://cvsup4.ru.FreeBSD.org + rsync://ftp.mtu.ru Elérhetõ gyûjtemények: + FreeBSD: A &os; FTP szerver teljes + tartalma. FreeBSD-gnats: A GNATS hibanyilvántartó adatbázis. + FreeBSD-Archive: A &os; archívumait + tároló FTP szerver + tükrözése. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#25 (text+ko) ==== @@ -12,7 +12,7 @@ - - + + - - + + From owner-p4-projects@FreeBSD.ORG Sun Nov 29 03:49:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FC521065698; Sun, 29 Nov 2009 03:49:09 +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 34C02106568B for ; Sun, 29 Nov 2009 03:49:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F69F8FC12 for ; Sun, 29 Nov 2009 03:49:09 +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 nAT3n9vB080927 for ; Sun, 29 Nov 2009 03:49:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAT3n2gb080918 for perforce@freebsd.org; Sun, 29 Nov 2009 03:49:02 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 29 Nov 2009 03:49:02 GMT Message-Id: <200911290349.nAT3n2gb080918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 03:49:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=171156 Change 171156 by pgj@petymeg-current on 2009/11/29 03:49:02 IFC Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/UPDATING#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pwait/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/bin/pwait/pwait.1#1 branch .. //depot/projects/soc2009/pgj_libstat/src/bin/pwait/pwait.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/cd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/histedit.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/output.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/output.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/redir.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/trap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ee/ee.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_namespace.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.arm/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.ia64/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.pc98/ttys#1 branch .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/root/dot.profile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/games/factor/factor.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/include/signal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fts.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fts.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/getcap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isblank.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isgraph.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isprint.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/C.msg#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_from_text.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#65 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_if.c#5 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#62 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#70 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librt/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librt/mq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libthr/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/picobsd/floppy.tree/etc/ttys#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck/fsck.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/ipfw/dummynet.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount/mount.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/reboot/reboot.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/secure/lib/libssh/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/queue.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ada.4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ata.4#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/atp.4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/msk.4#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/wi.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/rc.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/bsd-family-tree#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-ports.dot#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/organization.dot#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/skel/dot.profile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/timedef/ja_JP.SJIS.src#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/timedef/ja_JP.eucJP.src#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/antarctica#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/australasia#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/etcetera#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsboot/zfsboot.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_queue.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_queue.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/NOTES#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/options#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-usb.c#4 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/et/if_et.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mwl/if_mwlvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ste/if_ste.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/tl/if_tl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uhcireg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_var.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_ext2fs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_gpt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/isa/vga_isa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/tty.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_default.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/libkern/inet_aton.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/pcb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/ata/atausb/Makefile#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/ichwd/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/usb/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/usb/atp/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_var.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_mcast.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/key.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/opencrypto/deflate.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/rpc/clnt_vc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/ata.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/param.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/priv.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/proc.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/sdt.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/signal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/signalvar.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/sockio.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/teken/teken.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/teken/teken.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/cd1.0#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/cd2.0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/fc1.0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/trap3.0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parser/for1.0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0080.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/test-flopen.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/test-grp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/test-pidfile.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/ALIX_DSK#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/ALIX_NFS#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/etc/rc.conf#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/etc/ttys#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/.cshrc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/.k5login#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/.login#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/change_password#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/save_cfg#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/save_sshkeys#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/updatep1#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/root/updatep2#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/Files/usr/ports/.keepme#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/alix_dsk.conf#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/alix_nfs.conf#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/build.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/common.conf#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/pcengines/test.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gcore/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gcore/gcore.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gcore/gcore.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gencat/gencat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/gzip/unbzip2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/make/arch.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/make/dir.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/make/job.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/if.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/perror/perror.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/systat/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/systat/main.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/unifdef/unifdef.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/unifdef/unifdefall.sh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/w/w.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/acpi.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/acpidump.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/biosmptable.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/termcap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij 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. # +# 20091117: removal of rc.early(8) link +OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed ==== //depot/projects/soc2009/pgj_libstat/src/UPDATING#5 (text+ko) ==== @@ -22,6 +22,30 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091113: + The default terminal emulation for syscons(4) has been changed + from cons25 to xterm on all platforms except pc98. This means + that the /etc/ttys file needs to be updated to ensure correct + operation of applications on the console. + + The terminal emulation style can be toggled per window by using + vidcontrol(1)'s -T flag. The TEKEN_CONS25 kernel configuration + options can be used to change the compile-time default back to + cons25. + + To prevent graphical artifacts, make sure the TERM environment + variable is set to match the terminal emulation that is being + performed by syscons(4). + +20091109: + The layout of the structure ieee80211req_scan_result has changed. + Applications that require wireless scan results (e.g. ifconfig(8)) + from net80211 need to be recompiled. + + Applications such as wpa_supplicant(8) may require a full world + build without using NO_CLEAN in order to get synchronized with the + new structure. + 20091025: The iwn(4) driver has been updated to support the 5000 and 5150 series. There's one kernel module for each firmware. Adding "device iwnfw" @@ -1052,4 +1076,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ ==== //depot/projects/soc2009/pgj_libstat/src/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ +# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $ .include @@ -27,6 +27,7 @@ pax \ pkill \ ps \ + pwait \ pwd \ ${_rcp} \ realpath \ ==== //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $"); #include #include @@ -330,6 +330,7 @@ errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); + free(realfmt); } return ((VAR *)NULL); } ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); #include #include @@ -70,7 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); -STATIC char *getpwd2(char *, size_t); +STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -263,10 +263,8 @@ * any more because we traversed a symbolic link or something * we couldn't stat(). */ - if (dir == NULL || curdir == NULL) { - p = stalloc(PATH_MAX); - return getpwd2(p, PATH_MAX); - } + if (dir == NULL || curdir == NULL) + return getpwd2(); cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); STARTSTACKSTR(new); @@ -313,7 +311,7 @@ int pwdcmd(int argc, char **argv) { - char buf[PATH_MAX]; + char *p; int ch, phys; optreset = 1; optind = 1; opterr = 0; /* initialize getopt */ @@ -341,9 +339,9 @@ out1str(curdir); out1c('\n'); } else { - if (getcwd(buf, sizeof(buf)) == NULL) + if ((p = getpwd2()) == NULL) error(".: %s", strerror(errno)); - out1str(buf); + out1str(p); out1c('\n'); } @@ -356,36 +354,45 @@ char * getpwd(void) { - char buf[PATH_MAX]; char *p; if (curdir) return curdir; - p = getpwd2(buf, sizeof(buf)); + p = getpwd2(); if (p != NULL) curdir = savestr(p); return curdir; } +#define MAXPWD 256 + /* * Return the current directory. */ STATIC char * -getpwd2(char *buf, size_t size) +getpwd2(void) { - if (getcwd(buf, size) == NULL) { - char *pwd = getenv("PWD"); - struct stat stdot, stpwd; + struct stat stdot, stpwd; + char *pwd; + int i; - if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && - stat(pwd, &stpwd) != -1 && - stdot.st_dev == stpwd.st_dev && - stdot.st_ino == stpwd.st_ino) { + for (i = MAXPWD;; i *= 2) { + pwd = stalloc(i); + if (getcwd(pwd, i) != NULL) return pwd; - } - return NULL; + stunalloc(pwd); + if (errno != ERANGE) + break; + } + + pwd = getenv("PWD"); + if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && + stat(pwd, &stpwd) != -1 && + stdot.st_dev == stpwd.st_dev && + stdot.st_ino == stpwd.st_ino) { + return pwd; } - return buf; + return NULL; } ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); /* * Errors and exceptions. @@ -73,11 +73,15 @@ * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ */ /* @@ -72,6 +72,8 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.69 2009/11/22 18:23:30 jilles Exp $"); #include #include @@ -593,6 +593,7 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; @@ -781,7 +782,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -797,6 +797,7 @@ longjmp(handler->loc, 1); } handler = &jmploc; + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); funcnest++; @@ -833,6 +834,7 @@ mode |= REDIR_BACKQ; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -867,6 +869,7 @@ if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); + popfilesupto(savetopfile); FORCEINTON; } if (cmdentry.u.index != EXECCMD) ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/histedit.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 29 04:02:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 353F81065679; Sun, 29 Nov 2009 04:02:23 +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 DC0271065672 for ; Sun, 29 Nov 2009 04:02:22 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF7E48FC12 for ; Sun, 29 Nov 2009 04:02:22 +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 nAT42Mih082261 for ; Sun, 29 Nov 2009 04:02:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAT42M1B082259 for perforce@freebsd.org; Sun, 29 Nov 2009 04:02:22 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 29 Nov 2009 04:02:22 GMT Message-Id: <200911290402.nAT42M1B082259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 04:02:23 -0000 http://p4web.freebsd.org/chv.cgi?CH=171157 Change 171157 by pgj@beehive on 2009/11/29 04:01:57 Fix a typo that made one of the press release translations unavailable Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#27 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#27 (text+ko) ==== @@ -36,7 +36,7 @@ Hogyan frissítsük szoftvereinket egy &os; rendszeren - http://vlogs.techrepublic.com.com/security/?p=2615 + http://blogs.techrepublic.com.com/security/?p=2615 Tech Republic http://www.techrepublic.com/ 2009. november 9. From owner-p4-projects@FreeBSD.ORG Sun Nov 29 17:30:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A5381065672; Sun, 29 Nov 2009 17:30:50 +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 11892106566C for ; Sun, 29 Nov 2009 17:30:50 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F17E88FC0C for ; Sun, 29 Nov 2009 17:30:49 +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 nATHUnJW095774 for ; Sun, 29 Nov 2009 17:30:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nATHUn7k095772 for perforce@freebsd.org; Sun, 29 Nov 2009 17:30:49 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 29 Nov 2009 17:30:49 GMT Message-Id: <200911291730.nATHUn7k095772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 17:30:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=171161 Change 171161 by rene@rene_self on 2009/11/29 17:30:45 MFen: * contributing-ports article 1.4 -> 1.5 * handbook: - filesystems 1.8 -> 1.9 - firewalls 1.90 -> 1.91 - introduction 1.135 -> 1.136 - jails 1.19 -> 1.20 - mirrors 1.469 -> 1.471 * www/nl/administration.sgml 1.30 -> 1.31 (SRCID bump only, content by brd@) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#10 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#12 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#15 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#21 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#17 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#34 edit .. //depot/projects/docproj_nl/www/nl/administration.sgml#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ Controleer regelmatig het geautomatiseerde portbouwcluster, pointyhat, - en het - overzicht van distributiebestanden om te zien + en de + scanner voor distributiebestanden om te zien of er ports zijn die u onderhoudt die er niet in slagen om gebouwd of opgehaald te worden (bekijk bronnen voor meer informatie @@ -829,9 +829,9 @@ en niet-onderhouden ports te vinden die gerepareerd moeten worden. - Bill Fenners overzicht - van distributiebestanden kan u ports laten zien waarvoor + De scanner voor distributiebestanden voor + &os; ports kan u ports laten zien waarvoor de distributiebestanden niet kunnen worden opgehaald. U kunt uw eigen ports controleren of u kunt het gebruiken om ports te vinden waarvan de MASTER_SITES moet worden ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml,v 1.4 2009/08/26 06:04:10 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml - %SRCID% 1.8 + %SRCID% 1.9 --> @@ -114,21 +114,6 @@ apparaatnamen in &os; (). - - - - - Ondersteuning van ZFS wordt - beschouwd als experimenteel. Sommige opties kunnen beperkt - zijn in functionaliteit, andere onderdelen werken mogelijk in - het geheel niet. Op een zeker moment zal deze ondersteuning - klaar voor productie zijn en zal deze documentatie worden - aangepast aan de nieuwe situatie. - ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#15 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.11 2009/09/06 20:51:35 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.90 + %SRCID% 1.91 --> @@ -253,20 +253,25 @@ . - De laadbare kernelmodule voor PF gebruiken + De laadbare kernelmodules voor PF gebruiken + + Voeg de volgende regel toe aan /etc/rc.conf om + de kernelmodule PF te laden: + + pf_enable="YES" + + Draai vervolgens het opstartscript om de module te laden: + + &prompt.root; /etc/rc.d/pf start + + Merk op dat de PF Module niet laadt als het het instellingenbestand + met de regelverzameling niet kan vinden. De standaardlocatie is + /etc/pf.conf. Als de regelverzameling voor PF zich + elders bevindt, kan PF worden verteld om daar te kijken een regel + analoog aan de volgende aan /etc/rc.conf toe te + voegen: - Sinds de uitgave van &os; 5.3 wordt PF geleverd in de - basisinstallatie als een aparte tijdens runtime laadbare module. Het - systeem zal de PF kernelmodule dynamisch laden wanneer het - statement pf_enable="YES" voor - &man.rc.conf.5; aanwezig is. De PF module - zal echter niet geladen worden als het systeem geen instellingenbestand - met een PF-regelverzameling kan vinden. De - standaardplaats is /etc/pf.conf. Indien uw - PF-regelverzameling ergens anders staat, voeg dan - pf_rules="/pad/pf.rules" - aan uw instellingenbestand /etc/rc.conf toe - om de plaats te specificeren. + pf_rules="/pad/naar/pf.conf" Sinds &os; 7.0 is het voorbeeld @@ -282,10 +287,18 @@ &prompt.root; kldload pf.ko - De laadbare module was gemaakt met &man.pflog.4; aangezet - dat ondersteuning biedt voor logging. Indien u andere - mogelijkheden van PF nodig heeft dient u - ondersteuning voor PF in de kernel te + Logondersteuning voor PF wordt geleverd door + pflog.ko en kan worden geladen door de volgende regel + aan /etc/rc.conf toe te voegen: + + pflog_enable="YES" + + Draai vervolgens het opstartscript om de module te laden: + + &prompt.root; /etc/rc.d/pflog start + + Als u andere mogelijkheden van PF nodig heeft + dient u ondersteuning voor PF in de kernel te compileren. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#21 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.17 2009/06/08 18:54:12 rene Exp $ - $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.135 + %SRCID% 1.136 --> @@ -780,17 +779,21 @@ De RELENG_6 tak is gemaakt in juli 2005, de eerste uitgave van de 6.X tak werd vrijgegeven in november 2005. De meest - recente &rel2.current;-RELEASE kwam uit op &rel2.current.date;. - Er zullen geen verdere uitgaven komen van de 6.X tak. + recente 6.4-RELEASE kwam uit in november 2008. + Er zullen geen verdere uitgaven komen van de RELENG_6 tak. De RELENG_7 tak is gemaakt in oktober 2007. De eerste uitgave van deze tak is 7.0-RELEASE, welke is uitgekomen in - februari 2008. De meest recente &rel.current;-RELEASE kwam uit - in &rel.current.date;. Er zullen nog andere uitgaven van de + februari 2008. De meest recente &rel2.current;-RELEASE kwam uit + in &rel2.current.date;. Er zullen nog andere uitgaven van de RELENG_7 tak uitkomen. + De RELENG_8 tak is gemaakt in augustus 2009. De eerste + uitgave van de 8.X tak is 8.0-RELEASE, vrijgegeven in + &rel.current.date;. + Op dit moment vinden lange-termijn ontwikkelprojecten - plaats in de 8.X-CURRENT tak, en snapshot uitgaven van 8.X op + plaats in de 9.X-CURRENT tak, en snapshot uitgaven van 9.X op CD-ROM (en natuurlijk op het Net) worden continu beschikbaar gemaakt op de ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#17 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.5 2009/11/11 18:46:15 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml - %SRCID% 1.19 + %SRCID% 1.20 --> @@ -267,8 +267,6 @@ &prompt.root; cd /usr/src &prompt.root; make buildworld &prompt.root; make installworld DESTDIR=$D -&prompt.root; cd etc/ Deze stap -s niet benodigd onder &os; 6.0 en later. &prompt.root; make distribution DESTDIR=$D &prompt.root; mount -t devfs devfs $D/dev ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#34 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.469 + %SRCID% 1.471 --> @@ -3294,12 +3294,17 @@ Rusland - rsync://cvsup4.ru.FreeBSD.org/ + rsync://ftp.mtu.ru/ Beschikbare collecties: - FreeBSD-gnats: De GNATS bug-tracking database. + &os;: een volledige spiegel van de FTP-server van + &os;. + &os;-gnats: De GNATS bug-tracking + database. + &os;-archief: spiegel van de &os; Archive + FTP-server. ==== //depot/projects/docproj_nl/www/nl/administration.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ &header; From owner-p4-projects@FreeBSD.ORG Sun Nov 29 19:31:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D38331065697; Sun, 29 Nov 2009 19:31:52 +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 97DDC1065695 for ; Sun, 29 Nov 2009 19:31:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85F4D8FC18 for ; Sun, 29 Nov 2009 19:31:52 +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 nATJVqTw007854 for ; Sun, 29 Nov 2009 19:31:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nATJVqkq007852 for perforce@freebsd.org; Sun, 29 Nov 2009 19:31:52 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 29 Nov 2009 19:31:52 GMT Message-Id: <200911291931.nATJVqkq007852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 19:31:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=171174 Change 171174 by rene@rene_self on 2009/11/29 19:31:11 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#21 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#35 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#15 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#21 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2735,6 +2735,14 @@ + RELENG_8_0_0_RELEASE + + + FreeBSD 8.0 + + + + RELENG_7_2_0_RELEASE ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#11 (text+ko) ==== @@ -1,5 +1,5 @@ ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#13 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -2873,6 +2873,14 @@ + RELENG_8_0_0_RELEASE + + + &os; 8.0 + + + + RELENG_7_2_0_RELEASE From owner-p4-projects@FreeBSD.ORG Mon Nov 30 08:36:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B1741065692; Mon, 30 Nov 2009 08:36:01 +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 F3E8F106568B for ; Mon, 30 Nov 2009 08:36:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0AF88FC23 for ; Mon, 30 Nov 2009 08:36:00 +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 nAU8a0H5009341 for ; Mon, 30 Nov 2009 08:36:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAU8a01v009339 for perforce@freebsd.org; Mon, 30 Nov 2009 08:36:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 30 Nov 2009 08:36:00 GMT Message-Id: <200911300836.nAU8a01v009339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 08:36:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=171195 Change 171195 by hselasky@hselasky_laptop001 on 2009/11/30 08:35:11 USB serial: - add new device ID. PR: usb/140951 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#84 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#18 (text+ko) ==== @@ -221,6 +221,7 @@ {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_WIRELESSHANDHELDTERMINAL, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C, UFTDI_TYPE_8U232AM)}, + {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232D, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM4, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20, UFTDI_TYPE_8U232AM)}, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#84 (text+ko) ==== @@ -1320,6 +1320,7 @@ product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial product FTDI SERIAL_8U232AM4 0x6004 8U232AM Serial product FTDI SERIAL_2232C 0x6010 FT2232C Dual port Serial +product FTDI SERIAL_2232D 0x9e90 FT2232D Dual port Serial /* Gude Analog- und Digitalsysteme products also uses FTDI's id: */ product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru From owner-p4-projects@FreeBSD.ORG Mon Nov 30 09:46:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E223D106568F; Mon, 30 Nov 2009 09:46:10 +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 A6B3F106568B for ; Mon, 30 Nov 2009 09:46:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93C998FC0A for ; Mon, 30 Nov 2009 09:46:10 +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 nAU9kAL1025509 for ; Mon, 30 Nov 2009 09:46:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAU9kA6f025507 for perforce@freebsd.org; Mon, 30 Nov 2009 09:46:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 30 Nov 2009 09:46:10 GMT Message-Id: <200911300946.nAU9kA6f025507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 09:46:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=171196 Change 171196 by hselasky@hselasky_laptop001 on 2009/11/30 09:45:33 Kernel: - fix two USB syntax errors in conf/files PR: usb/140904 Affected files ... .. //depot/projects/usb/src/sys/conf/files#86 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#86 (text+ko) ==== @@ -1656,8 +1656,8 @@ dev/usb/net/if_kue.c optional kue dev/usb/net/if_rue.c optional rue dev/usb/net/if_udav.c optional udav -dev/usb/net/usb_ethernet.c \ - optional (aue | axe | cdce | cue | kue | rue | udav) +dev/usb/net/usb_ethernet.c optional uether | \ + aue | axe | cdce | cue | kue | rue | udav # # USB WLAN drivers # @@ -1689,7 +1689,7 @@ dev/usb/serial/uvisor.c optional uvisor dev/usb/serial/uvscom.c optional uvscom dev/usb/serial/usb_serial.c optional ucom | \ - (u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom) + u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom # # USB misc drivers # From owner-p4-projects@FreeBSD.ORG Mon Nov 30 21:18:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C3F4106568F; Mon, 30 Nov 2009 21:18:54 +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 11082106568B for ; Mon, 30 Nov 2009 21:18:54 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 002388FC1D for ; Mon, 30 Nov 2009 21:18:53 +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 nAULIrYJ019332 for ; Mon, 30 Nov 2009 21:18:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAULIrqU019330 for perforce@freebsd.org; Mon, 30 Nov 2009 21:18:53 GMT (envelope-from gabor@freebsd.org) Date: Mon, 30 Nov 2009 21:18:53 GMT Message-Id: <200911302118.nAULIrqU019330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 21:18:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=171209 Change 171209 by gabor@gabor_server on 2009/11/30 21:18:28 - Change order of if's and for's so that conditions are only checked once Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#92 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#92 (text+ko) ==== @@ -609,11 +609,12 @@ * XXX: fgrepcomp() and fastcomp() are workarounds for regexec() performance. * Optimizations should be done there. */ - for (i = 0; i < patterns; ++i) { /* Check if cheating is allowed (always is for fgrep). */ - if (grepbehave == GREP_FIXED) + if (grepbehave == GREP_FIXED) { + for (i = 0; i < patterns; ++i) fgrepcomp(&fg_pattern[i], pattern[i]); - else { + } else { + for (i = 0; i < patterns; ++i) { if (fastcomp(&fg_pattern[i], pattern[i])) { /* Fall back to full regex library */ c = regcomp(&r_pattern[i], pattern[i], cflags); From owner-p4-projects@FreeBSD.ORG Mon Nov 30 21:41:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 634B41065672; Mon, 30 Nov 2009 21:41:17 +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 0F8F2106566C for ; Mon, 30 Nov 2009 21:41:17 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F21D18FC14 for ; Mon, 30 Nov 2009 21:41:16 +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 nAULfGiv021121 for ; Mon, 30 Nov 2009 21:41:16 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAULfGfF021119 for perforce@freebsd.org; Mon, 30 Nov 2009 21:41:16 GMT (envelope-from gk@FreeBSD.org) Date: Mon, 30 Nov 2009 21:41:16 GMT Message-Id: <200911302141.nAULfGfF021119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 21:41:17 -0000 http://p4web.freebsd.org/chv.cgi?CH=171213 Change 171213 by gk@gk_h1 on 2009/11/30 21:40:21 add -f option to *chain commands. to make'em work on unmounted filesystems add pefs.8 man page Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#8 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs.8#1 add .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#13 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS+= hmac_sha512.c sha2.c SRCS+= pkcs5v2.c -NO_MAN= +MAN= pefs.8 CFLAGS+=-I${SYS} WARNS?= 6 ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#13 (text+ko) ==== @@ -72,6 +72,8 @@ typedef int (*keyop_func_t)(struct pefs_keychain_head *kch, int fd, int verbose); +static int ignore_fscheck = 0; + struct command { const char *name; command_func_t func; @@ -113,6 +115,7 @@ pefs_getfsroot(const char *path, char *fsroot, size_t size) { struct statfs fs; + const char *realfsroot; int error; if (statfs(path, &fs) == -1) { @@ -121,13 +124,18 @@ return (error); } + realfsroot = fs.f_mntonname; if (strcmp(PEFS_FSTYPE, fs.f_fstypename) != 0) { - warnx("invalid filesystem type: %s", path); - return (EINVAL); + if (ignore_fscheck != 0) { + realfsroot = path; + } else { + warnx("invalid filesystem type: %s", path); + return (EINVAL); + } } if (fsroot != NULL) - strlcpy(fsroot, fs.f_mntonname, size); + strlcpy(fsroot, realfsroot, size); return (0); } @@ -547,11 +555,14 @@ pefs_keyparam_init(&p[0].kp); pefs_keyparam_init(&p[1].kp); - while ((i = getopt(argc, argv, "pPvZa:A:i:I:k:K:")) != -1) + while ((i = getopt(argc, argv, "a:A:i:I:k:K:fpPvZ")) != -1) switch(i) { case 'v': verbose = 1; break; + case 'f': + ignore_fscheck = 1; + break; case 'Z': zerochainedkey = 1; break; @@ -681,6 +692,7 @@ while ((i = getopt(argc, argv, "fvpi:k:")) != -1) switch(i) { case 'f': + ignore_fscheck = 1; force = 1; break; case 'v': @@ -748,8 +760,11 @@ int error, i; pefs_keyparam_init(&kp); - while ((i = getopt(argc, argv, "pi:k:")) != -1) + while ((i = getopt(argc, argv, "fpi:k:")) != -1) switch(i) { + case 'f': + ignore_fscheck = 1; + break; case 'p': kp.kp_nopassphrase = 1; break; @@ -808,6 +823,9 @@ case 'v': verbose = 1; break; + case 'f': + ignore_fscheck = 1; + break; case 'n': if ((nmin = atoi(optarg)) <= 0) { warnx("invalid lower bound argument: %s", @@ -885,11 +903,11 @@ " pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n" " pefs flushkeys filesystem\n" " pefs showkeys [-t] filesystem\n" -" pefs addchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n" +" pefs addchain [-fpPvZ] [-a alg] [-i iterations] [-k keyfile]\n" " [-A alg] [-I iterations] [-K keyfile] filesystem\n" -" pefs delchain [-pv] [-i iterations] [-k keyfile] filesystem\n" -" pefs randomchain [-v] [-a alg] [-n min] [-N max] filesystem\n" -" pefs showchains [-p] [-i iterations] [-k keyfile] filesystem\n" +" pefs delchain [-fpv] [-i iterations] [-k keyfile] filesystem\n" +" pefs randomchain [-fv] [-n min] [-N max] filesystem\n" +" pefs showchains [-fp] [-i iterations] [-k keyfile] filesystem\n" " pefs showalgs\n" ); exit(EX_USAGE); From owner-p4-projects@FreeBSD.ORG Tue Dec 1 00:03:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC5521065676; Tue, 1 Dec 2009 00:03:39 +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 7A74A1065672 for ; Tue, 1 Dec 2009 00:03:39 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A62C8FC08 for ; Tue, 1 Dec 2009 00:03:39 +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 nB103dVg034025 for ; Tue, 1 Dec 2009 00:03:39 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB103d7Q034023 for perforce@freebsd.org; Tue, 1 Dec 2009 00:03:39 GMT (envelope-from gk@FreeBSD.org) Date: Tue, 1 Dec 2009 00:03:39 GMT Message-Id: <200912010003.nB103d7Q034023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 00:03:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=171215 Change 171215 by gk@gk_h1 on 2009/12/01 00:03:14 sync sources before moving to github: http://github.com/glk/pefs it's likely to be last commit to this branch. implement pefs getkey command Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs.8#2 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#14 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#17 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#28 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs.8#2 (text+ko) ==== @@ -49,13 +49,6 @@ .Op Fl k Ar keyfile .Ar filesystem .Nm -.Cm setkey -.Op Fl cCpvx -.Op Fl a Ar alg -.Op Fl i Ar iterations -.Op Fl k Ar keyfile -.Ar directory -.Nm .Cm delkey .Op Fl cCpv .Op Fl i Ar iterations @@ -65,6 +58,17 @@ .Cm flushkeys .Ar filesystem .Nm +.Cm getkey +.Op Fl t +.Ar file +.Nm +.Cm setkey +.Op Fl cCpvx +.Op Fl a Ar alg +.Op Fl i Ar iterations +.Op Fl k Ar keyfile +.Ar directory +.Nm .Cm showkeys .Op Fl t .Ar filesystem @@ -154,6 +158,20 @@ .It Cm addkey Ar filesystem Add key to the .Ar filesystem +.It Cm delkey Ar filesystem +Delete key from +.Ar filesystem . +Command doesn't accept +.Fl a Ar alg +argument because the key fingerprint generated from the key doesn't depend on +encryption algorithm. +.It Cm getkey Ar file +Print fingerprint of the key used by +.Ar file . +.It Cm flushkeys Ar filesystem +Delete all keys from +.Ar filesystem . +After the command all opened files would become unavailable. .It Cm setkey Ar directory Change default key for the .Ar directory . @@ -165,17 +183,6 @@ are not changed and no data is re-encrypted with new key. .Fl x option can be used to add a new key to file system if it isn't found. -.It Cm delkey Ar filesystem -Delete key from -.Ar filesystem . -Command doesn't accept -.Fl a Ar alg -argument because the key fingerprint generated from the key doesn't depend on -encryption algorithm. -.It Cm flushkeys Ar filesystem -Delete all keys from -.Ar filesystem . -After the command all opened files would become unavailable. .It Cm showkeys Ar filesystem Print fingerprints if all active keys. .It Cm addchain Ar filesystem ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#14 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ static int pefs_delchain(int argc, char *argv[]); static int pefs_randomchain(int argc, char *argv[]); static int pefs_showkeys(int argc, char *argv[]); +static int pefs_getkey(int argc, char *argv[]); static int pefs_showchains(int argc, char *argv[]); static int pefs_showalgs(int argc, char *argv[]); @@ -88,6 +90,7 @@ { "delkey", pefs_delkey }, { "flushkeys", pefs_flushkeys }, { "showkeys", pefs_showkeys }, + { "getkey", pefs_getkey }, { "status", pefs_showkeys }, { "randomchain", pefs_randomchain }, { "addchain", pefs_addchain }, @@ -174,12 +177,25 @@ } static inline void -pefs_key_show(struct pefs_xkey *xk, int ind) +pefs_key_showind(struct pefs_xkey *xk, int ind) { printf("\t%-4d %016jx %s\n", ind, pefs_keyid_as_int(xk->pxk_keyid), pefs_alg_name(xk)); } +static inline void +pefs_key_shownode(struct pefs_xkey *xk, const char *path) +{ + const char *basepath; + + basepath = basename(path); + if (xk == NULL) + printf("Key(%s): \n", basepath); + else + printf("Key(%s): %016jx %s\n", basepath, + pefs_keyid_as_int(xk->pxk_keyid), pefs_alg_name(xk)); +} + static int pefs_keyop(keyop_func_t func, int argc, char *argv[]) { @@ -385,7 +401,7 @@ warn("cannot set key"); error = EX_OSERR; } else if (verbose) { - printf("New key: %016jx\n", pefs_keyid_as_int(k.pxk_keyid)); + pefs_key_shownode(&k, argv[0]); } close(fd); @@ -414,6 +430,64 @@ } static int +pefs_getkey(int argc, char *argv[]) +{ + struct pefs_xkey k; + int testonly = 0; + int error = 0; + int fd, i; + + while ((i = getopt(argc, argv, "t")) != -1) + switch(i) { + case 't': + testonly = 1; + break; + case '?': + default: + pefs_usage(); + } + argc -= optind; + argv += optind; + + if (argc != 1) { + if (argc == 0) + warnx("missing file argument"); + else + warnx("too many arguments"); + pefs_usage(); + } + + /* only check filesystem type */ + if (pefs_getfsroot(argv[0], NULL, 0) != 0) + return (EX_DATAERR); + + fd = open(argv[0], O_RDONLY); + if (fd == -1) { + warn("cannot open %s", argv[0]); + return (EX_IOERR); + } + + bzero(&k, sizeof(k)); + if (ioctl(fd, PEFS_GETNODEKEY, &k) == -1) { + if (errno == ENOENT) { + if (testonly == 0) + pefs_key_shownode(NULL, argv[0]); + else + error = 1; + } else { + warn("cannot get key"); + error = EX_OSERR; + } + } else if (testonly == 0) { + pefs_key_shownode(&k, argv[0]); + } + + close(fd); + + return (error); +} + +static int pefs_showkeys(int argc, char *argv[]) { struct pefs_xkey k; @@ -457,7 +531,7 @@ } printf("Keys:\n"); while (1) { - pefs_key_show(&k, k.pxk_index); + pefs_key_showind(&k, k.pxk_index); k.pxk_index++; if (ioctl(fd, PEFS_GETKEY, &k) == -1) break; @@ -802,7 +876,7 @@ printf("Key chain:\n"); i = 1; TAILQ_FOREACH(kc, &kch, kc_entry) { - pefs_key_show(&kc->kc_key, i++); + pefs_key_showind(&kc->kc_key, i++); } pefs_keychain_free(&kch); @@ -899,9 +973,10 @@ "usage: pefs mount [-o options] [from filesystem]\n" " pefs unmount [-fv] filesystem\n" " pefs addkey [-cCpv] [-a alg] [-i iterations] [-k keyfile] filesystem\n" -" pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" " pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n" " pefs flushkeys filesystem\n" +" pefs getkey [-t] file\n" +" pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" " pefs showkeys [-t] filesystem\n" " pefs addchain [-fpPvZ] [-a alg] [-i iterations] [-k keyfile]\n" " [-A alg] [-I iterations] [-K keyfile] filesystem\n" ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#17 (text+ko) ==== @@ -52,6 +52,7 @@ #define PEFS_SETKEY _IOWR('p', 2, struct pefs_xkey) #define PEFS_DELKEY _IOWR('p', 3, struct pefs_xkey) #define PEFS_FLUSHKEYS _IO('p', 4) +#define PEFS_GETNODEKEY _IOWR('p', 5, struct pefs_xkey) #endif #ifdef _KERNEL ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#28 (text+ko) ==== @@ -2115,6 +2115,7 @@ struct thread *td = ap->a_td; struct mount *mp = vp->v_mount; struct pefs_mount *pm = VFS_TO_PEFS(mp); + struct pefs_node *pn; struct pefs_key *pk; int error = 0, i; @@ -2152,6 +2153,21 @@ if (pk == NULL) error = ENOENT; break; + case PEFS_GETNODEKEY: + PEFSDEBUG("pefs_ioctl: set key: %8D\n", xk->pxk_keyid, ""); + pn = VP_TO_PN(vp); + if ((pn->pn_flags & PN_HASKEY) != 0) { + mtx_lock(&pm->pm_keys_lock); + pk = pn->pn_tkey.ptk_key; + memcpy(xk->pxk_keyid, pk->pk_keyid, PEFS_KEYID_SIZE); + xk->pxk_alg = pk->pk_algid; + xk->pxk_keybits = pk->pk_keybits; + mtx_unlock(&pm->pm_keys_lock); + } else { + PEFSDEBUG("pefs_ioctl: key not found\n"); + error = ENOENT; + } + break; case PEFS_SETKEY: PEFSDEBUG("pefs_ioctl: set key: %8D\n", xk->pxk_keyid, ""); mtx_lock(&pm->pm_keys_lock); From owner-p4-projects@FreeBSD.ORG Tue Dec 1 13:37:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BE78106568D; Tue, 1 Dec 2009 13:37:13 +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 30311106566C for ; Tue, 1 Dec 2009 13:37:13 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E7708FC1A for ; Tue, 1 Dec 2009 13:37:13 +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 nB1DbDII047162 for ; Tue, 1 Dec 2009 13:37:13 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1DbCNc047160 for perforce@freebsd.org; Tue, 1 Dec 2009 13:37:12 GMT (envelope-from jona@FreeBSD.org) Date: Tue, 1 Dec 2009 13:37:12 GMT Message-Id: <200912011337.nB1DbCNc047160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 13:37:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=171227 Change 171227 by jona@jona-capsicum-kent64 on 2009/12/01 13:36:52 Plans for *at system calls Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#15 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#15 (text+ko) ==== @@ -27,6 +27,22 @@ Low-level TODO list: +- Add support for capability-mode *at() system calls: + faccessat INPROGRESS JA + fchmodat ---- + fchownat ---- + fstatat ---- + futimesat ---- + linkat ---- + mkdirat ---- + mkfifoat ---- + mknodat ---- + openat DONE 25 Nov 2009 JA + readlinkat ---- + renameat ---- + symlinkat ---- + unlinkat ---- + - Review poll/select/kqueue behavior, and in particular decide if/how we want CAP_EVENT to work. From owner-p4-projects@FreeBSD.ORG Tue Dec 1 21:46:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F37C8106568D; Tue, 1 Dec 2009 21:46:22 +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 9EB9C1065672 for ; Tue, 1 Dec 2009 21:46:22 +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 8A9C88FC13 for ; Tue, 1 Dec 2009 21:46:22 +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 nB1LkMAV017187 for ; Tue, 1 Dec 2009 21:46:22 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1LkMSF017185 for perforce@freebsd.org; Tue, 1 Dec 2009 21:46:22 GMT (envelope-from mav@freebsd.org) Date: Tue, 1 Dec 2009 21:46:22 GMT Message-Id: <200912012146.nB1LkMSF017185@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 Precedence: bulk Cc: Subject: PERFORCE change 171234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 21:46:23 -0000 http://p4web.freebsd.org/chv.cgi?CH=171234 Change 171234 by mav@mav_mavbook on 2009/12/01 21:45:39 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#8 integrate .. //depot/projects/scottl-camlock/src/bin/sh/redir.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#6 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/types.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/version#6 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_io.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/externs.h#3 integrate .. //depot/projects/scottl-camlock/src/include/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/include/termios.h#1 branch .. //depot/projects/scottl-camlock/src/lib/bind/config.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strcat.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.h#7 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#16 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/ipsec.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#22 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#58 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#26 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/sysmouse.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_ext2fs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_gpt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_msdosfs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_reiserfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_ufs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#27 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#39 integrate .. //depot/projects/scottl-camlock/src/sys/modules/amdsbwd/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_dead.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#28 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipcomp_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipcomp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptosoft.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/deflate.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/deflate.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/cpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/md_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_termios.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/sdt.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/termios.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/tty.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#30 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/fc1.0#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/errors/backquote-error1.0#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/redir1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/redir2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/environ/Makefile.envctl#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ldd/ldd.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/if.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/ipsec.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.69 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $"); #include #include @@ -883,7 +883,6 @@ #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); ==== //depot/projects/scottl-camlock/src/bin/sh/redir.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.28 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.29 2009/11/29 22:33:59 jilles Exp $"); #include #include @@ -63,6 +63,7 @@ #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; ==== //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#6 (text+ko) ==== @@ -1,3 +1,9 @@ + --- 9.6.1-P2 released --- + +2772. [security] When validating, track whether pending data was from + the additional section or not and only return it if + validates as secure. [RT #20438] + --- 9.6.1-P1 released --- 2640. [security] A specially crafted update packet will cause named ==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/query.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.313.20.7 2009/03/13 01:38:51 marka Exp $ */ +/* $Id: query.c,v 1.313.20.7.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -116,6 +116,8 @@ #define DNS_GETDB_NOLOG 0x02U #define DNS_GETDB_PARTIAL 0x04U +#define PENDINGOK(x) (((x) & DNS_DBFIND_PENDINGOK) != 0) + typedef struct client_additionalctx { ns_client_t *client; dns_rdataset_t *rdataset; @@ -1761,8 +1763,8 @@ */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -1801,8 +1803,8 @@ */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -2601,14 +2603,14 @@ /* * Attempt to validate RRsets that are pending or that are glue. */ - if ((rdataset->trust == dns_trust_pending || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_pending)) + if ((DNS_TRUST_PENDING(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_PENDING(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && - (client->query.dboptions & DNS_DBFIND_PENDINGOK) == 0) + !PENDINGOK(client->query.dboptions)) goto cleanup; - if ((rdataset->trust == dns_trust_glue || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_glue)) && + if ((DNS_TRUST_GLUE(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_GLUE(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && SECURE(client) && WANTDNSSEC(client)) goto cleanup; @@ -3716,6 +3718,8 @@ dns_rdataset_t *noqname; isc_boolean_t resuming; int line = -1; + dns_rdataset_t tmprdataset; + unsigned int dboptions; CTRACE("query_find"); @@ -3933,9 +3937,49 @@ /* * Now look for an answer in the database. */ + dboptions = client->query.dboptions; + if (sigrdataset == NULL && client->view->enablednssec) { + /* + * If the client doesn't want DNSSEC we still want to + * look for any data pending validation to save a remote + * lookup if possible. + */ + dns_rdataset_init(&tmprdataset); + sigrdataset = &tmprdataset; + dboptions |= DNS_DBFIND_PENDINGOK; + } + refind: result = dns_db_find(db, client->query.qname, version, type, - client->query.dboptions, client->now, - &node, fname, rdataset, sigrdataset); + dboptions, client->now, &node, fname, + rdataset, sigrdataset); + /* + * If we have found pending data try to validate it. + * If the data does not validate as secure and we can't + * use the unvalidated data requery the database with + * pending disabled to prevent infinite looping. + */ + if (result != ISC_R_SUCCESS || !DNS_TRUST_PENDING(rdataset->trust)) + goto validation_done; + if (validate(client, db, fname, rdataset, sigrdataset)) + goto validation_done; + if (rdataset->trust != dns_trust_pending_answer || + !PENDINGOK(client->query.dboptions)) { + dns_rdataset_disassociate(rdataset); + if (sigrdataset != NULL && + dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + if (sigrdataset == &tmprdataset) + sigrdataset = NULL; + dns_db_detachnode(db, &node); + dboptions &= ~DNS_DBFIND_PENDINGOK; + goto refind; + } + validation_done: + if (sigrdataset == &tmprdataset) { + if (dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + sigrdataset = NULL; + } resume: CTRACE("query_find: resume"); ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/api#5 (text+ko) ==== @@ -1,3 +1,3 @@ -LIBINTERFACE = 52 +LIBINTERFACE = 53 LIBREVISION = 0 -LIBAGE = 2 +LIBAGE = 0 ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/types.h#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.130.50.3 2009/01/29 22:40:35 jinmei Exp $ */ +/* $Id: types.h,v 1.130.50.3.12.1 2009/11/18 23:58:04 marka Exp $ */ #ifndef DNS_TYPES_H #define DNS_TYPES_H 1 @@ -258,40 +258,52 @@ dns_trust_none = 0, #define dns_trust_none ((dns_trust_t)dns_trust_none) - /*% Subject to DNSSEC validation but has not yet been validated */ - dns_trust_pending = 1, -#define dns_trust_pending ((dns_trust_t)dns_trust_pending) + /*% + * Subject to DNSSEC validation but has not yet been validated + * dns_trust_pending_additional (from the additional section). + */ + dns_trust_pending_additional = 1, +#define dns_trust_pending_additional \ + ((dns_trust_t)dns_trust_pending_additional) + + dns_trust_pending_answer = 2, +#define dns_trust_pending_answer ((dns_trust_t)dns_trust_pending_answer) /*% Received in the additional section of a response. */ - dns_trust_additional = 2, + dns_trust_additional = 3, #define dns_trust_additional ((dns_trust_t)dns_trust_additional) /* Received in a referral response. */ - dns_trust_glue = 3, + dns_trust_glue = 4, #define dns_trust_glue ((dns_trust_t)dns_trust_glue) /* Answer from a non-authoritative server */ - dns_trust_answer = 4, + dns_trust_answer = 5, #define dns_trust_answer ((dns_trust_t)dns_trust_answer) /* Received in the authority section as part of an authoritative response */ - dns_trust_authauthority = 5, + dns_trust_authauthority = 6, #define dns_trust_authauthority ((dns_trust_t)dns_trust_authauthority) /* Answer from an authoritative server */ - dns_trust_authanswer = 6, + dns_trust_authanswer = 7, #define dns_trust_authanswer ((dns_trust_t)dns_trust_authanswer) /* Successfully DNSSEC validated */ - dns_trust_secure = 7, + dns_trust_secure = 8, #define dns_trust_secure ((dns_trust_t)dns_trust_secure) /* This server is authoritative */ - dns_trust_ultimate = 8 + dns_trust_ultimate = 9 #define dns_trust_ultimate ((dns_trust_t)dns_trust_ultimate) }; +#define DNS_TRUST_PENDING(x) ((x) == dns_trust_pending_answer || \ + (x) == dns_trust_pending_additional) +#define DNS_TRUST_GLUE(x) ((x) == dns_trust_glue) + + /*% * Name checking severities. */ ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/masterdump.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.94.50.2 2009/01/18 23:47:40 tbox Exp $ */ +/* $Id: masterdump.c,v 1.94.50.2.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -775,7 +775,8 @@ static const char *trustnames[] = { "none", - "pending", + "pending-additional", + "pending-answer", "additional", "glue", "answer", ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/rbtdb.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.270.12.6 2009/05/06 23:34:30 jinmei Exp $ */ +/* $Id: rbtdb.c,v 1.270.12.6.10.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4005,7 +4005,7 @@ } if (dname_header != NULL && - (dname_header->trust != dns_trust_pending || + (!DNS_TRUST_PENDING(dname_header->trust) || (search->options & DNS_DBFIND_PENDINGOK) != 0)) { /* * We increment the reference count on node to ensure that @@ -4548,7 +4548,7 @@ if (found == NULL || (found->trust == dns_trust_glue && ((options & DNS_DBFIND_GLUEOK) == 0)) || - (found->trust == dns_trust_pending && + (DNS_TRUST_PENDING(found->trust) && ((options & DNS_DBFIND_PENDINGOK) == 0))) { /* * If there is an NS rdataset at this node, then this is the ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/resolver.c#5 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.384.14.14 2009/06/02 23:47:13 tbox Exp $ */ +/* $Id: resolver.c,v 1.384.14.14.8.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4293,6 +4293,7 @@ * for it, unless it is glue. */ if (secure_domain && rdataset->trust != dns_trust_glue) { + dns_trust_t trust; /* * RRSIGs are validated as part of validating the * type they cover. @@ -4329,12 +4330,34 @@ } /* + * Reject out of bailiwick additional records + * without RRSIGs as they can't possibly validate + * as "secure" and as we will never never want to + * store these as "answers" after validation. + */ + if (rdataset->trust == dns_trust_additional && + sigrdataset == NULL && EXTERNAL(rdataset)) + continue; + + /* + * XXXMPA: If we store as "answer" after validating + * then we need to do bailiwick processing and + * also need to track whether RRsets are in or + * out of bailiwick. This will require a another + * pending trust level. + * * Cache this rdataset/sigrdataset pair as - * pending data. + * pending data. Track whether it was additional + * or not. */ - rdataset->trust = dns_trust_pending; + if (rdataset->trust == dns_trust_additional) + trust = dns_trust_pending_additional; + else + trust = dns_trust_pending_answer; + + rdataset->trust = trust; if (sigrdataset != NULL) - sigrdataset->trust = dns_trust_pending; + sigrdataset->trust = trust; if (!need_validation || !ANSWER(rdataset)) { addedrdataset = ardataset; result = dns_db_addrdataset(fctx->cache, node, @@ -4682,7 +4705,7 @@ for (trdataset = ISC_LIST_HEAD(tname->list); trdataset != NULL; trdataset = ISC_LIST_NEXT(trdataset, link)) - trdataset->trust = dns_trust_pending; + trdataset->trust = dns_trust_pending_answer; result = dns_message_nextname(fctx->rmessage, DNS_SECTION_AUTHORITY); } ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.9 2009/05/07 23:47:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.9.8.1 2009/11/18 23:58:04 marka Exp $ */ #include @@ -1607,7 +1607,7 @@ * We have an rrset for the given keyname. */ val->keyset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { /* @@ -1622,7 +1622,7 @@ if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * Having a pending key with no signature means that * something is broken. @@ -2243,7 +2243,7 @@ * We have DS records. */ val->dsset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { result = create_validator(val, @@ -2256,7 +2256,7 @@ if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * There should never be an unsigned DS. */ @@ -3337,7 +3337,7 @@ * There is no DS. If this is a delegation, * we maybe done. */ - if (val->frdataset.trust == dns_trust_pending) { + if (DNS_TRUST_PENDING(val->frdataset.trust)) { result = create_fetch(val, tname, dns_rdatatype_ds, dsfetched2, ==== //depot/projects/scottl-camlock/src/contrib/bind9/version#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ +# $Id: version,v 1.43.12.5.8.2 2009/11/18 23:58:04 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=6 PATCHVER=1 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_io.c#3 (text+ko) ==== @@ -65,6 +65,12 @@ #endif /* IPV6 Multicast Support */ #endif /* IPv6 Support */ +#ifdef INCLUDE_IPV6_SUPPORT +#include +#include +#include +#endif /* !INCLUDE_IPV6_SUPPORT */ + extern int listen_to_virtual_ips; extern const char *specific_interface; @@ -1137,6 +1143,36 @@ } #endif /* OS_NEEDS_REUSEADDR_FOR_IFADDRBIND */ +#ifdef INCLUDE_IPV6_SUPPORT +static isc_boolean_t +is_anycast(struct sockaddr *sa, char *name) +{ +#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST) + struct in6_ifreq ifr6; + int fd; + u_int32_t flags6; + + if (sa->sa_family != AF_INET6) + return ISC_FALSE; + if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) + return ISC_FALSE; + memset(&ifr6, 0, sizeof(ifr6)); + memcpy(&ifr6.ifr_addr, (struct sockaddr_in6 *)sa, + sizeof(struct sockaddr_in6)); + strlcpy(ifr6.ifr_name, name, IF_NAMESIZE); + if (ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) < 0) { + close(fd); + return ISC_FALSE; + } + close(fd); + flags6 = ifr6.ifr_ifru.ifru_flags6; + if ((flags6 & IN6_IFF_ANYCAST) != 0) + return ISC_TRUE; +#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */ + return ISC_FALSE; +} +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * update_interface strategy * @@ -1276,6 +1312,11 @@ if (is_wildcard_addr(&interface.sin)) continue; +#ifdef INCLUDE_IPV6_SUPPORT + if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name)) + continue; +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * map to local *address* in order * to map all duplicate interfaces to an interface structure ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/externs.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)externs.h 8.3 (Berkeley) 5/30/95 - * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.11 2007/07/01 12:08:04 gnn Exp $ + * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.12 2009/11/28 11:57:25 ed Exp $ */ #ifndef BSD @@ -57,7 +57,7 @@ #include #ifdef USE_TERMIO # ifndef VINTR -# include +# include # endif # define termio termios #endif ==== //depot/projects/scottl-camlock/src/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.291 2009/08/13 23:18:45 scottl Exp $ +# $FreeBSD: src/include/Makefile,v 1.292 2009/11/28 23:50:48 ed Exp $ # # Doing a "make install" builds /usr/include. @@ -21,7 +21,7 @@ res_update.h resolv.h runetype.h search.h setjmp.h \ signal.h spawn.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ - strings.h sysexits.h tar.h tgmath.h \ + strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ wctype.h wordexp.h @@ -31,7 +31,7 @@ PHDRS= sched.h semaphore.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ - termios.h ucontext.h + ucontext.h LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ netipsec ${_netipx} netnatm ${_netncp} netsmb \ ==== //depot/projects/scottl-camlock/src/lib/bind/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.11 2009/05/31 05:42:58 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.12 2009/11/30 03:38:34 dougb Exp $ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -277,6 +277,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Defined if extern char *optarg is not declared. */ /* #undef NEED_OPTARG */ ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.5 2009/11/28 11:27:37 danger Exp $ .\" .Dd December 15, 2006 .Dt SCTP_SEND 3 @@ -111,7 +111,7 @@ argument is an opaque 32 bit value that is passed transparently through the stack to the peer endpoint. It will be available on reception of a message (see -.Xr sctp_recvmsg 2 ) . +.Xr sctp_recvmsg 3 ) . Note that the stack passes this value without regard to byte order. .Pp ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.5 2009/11/28 11:27:37 danger Exp $ .\" .Dd December 15, 2006 .Dt SCTP_SENDMSG 3 @@ -103,13 +103,13 @@ the message is not transmitted. .Pp No indication of failure to deliver is implicit in a -.Xr sctp_sendmsg 2 +.Xr sctp_sendmsg 3 call. Locally detected errors are indicated by a return value of -1. .Pp If no space is available at the socket to hold the message to be transmitted, then -.Xr sctp_sendmsg 2 +.Xr sctp_sendmsg 3 normally blocks, unless the socket has been placed in non-blocking I/O mode. The @@ -123,7 +123,7 @@ through the stack to the peer endpoint. It will be available on reception of a message (see -.Xr sctp_recvmsg 2 ) . +.Xr sctp_recvmsg 3 ) . Note that the stack passes this value without regard to byte order. .Pp ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.15 2008/08/03 22:47:23 scf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.17 2009/12/01 06:42:47 green Exp $"); #include "namespace.h" ==== //depot/projects/scottl-camlock/src/lib/libc/string/strcat.3#3 (text+ko) ==== @@ -30,13 +30,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcat.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcat.3,v 1.16 2009/04/07 13:42:53 trasz Exp $ +.\" $FreeBSD: src/lib/libc/string/strcat.3,v 1.17 2009/12/01 07:28:56 brueffer Exp $ .\" -.Dd June 4, 1993 +.Dd December 1, 2009 .Dt STRCAT 3 .Os .Sh NAME -.Nm strcat +.Nm strcat , +.Nm strncat .Nd concatenate strings .Sh LIBRARY .Lb libc ==== //depot/projects/scottl-camlock/src/lib/libc/sys/setpgid.2#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setpgid.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/setpgid.2,v 1.16 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/setpgid.2,v 1.17 2009/12/01 06:12:31 keramida Exp $ .\" .Dd February 8, 2004 .Dt SETPGID 2 @@ -54,6 +54,11 @@ If .Fa pid is zero, then the call applies to the current process. +If +.Fa pgrp +is zero, then the process id of the process specified by +.Fa pid +is used instead. .Pp If the affected process is not the invoking process, then it must be a child of the invoking process, it must not have performed an ==== //depot/projects/scottl-camlock/src/lib/libthr/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.41 2009/11/26 14:01:14 kib Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.42 2009/11/28 14:34:28 kib Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -25,7 +25,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-I${.CURDIR}/../libthread_db CFLAGS+=-Winline -LDFLAGS+=-Wl,-znodelete -Wl,-znodlopen +LDFLAGS+=-Wl,-znodelete VERSION_DEF=${.CURDIR}/../libc/Versions.def SYMBOL_MAPS=${.CURDIR}/pthread.map ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.143 2009/11/26 13:57:20 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.145 2009/12/01 02:57:06 cperciva Exp $ */ /* @@ -366,12 +366,12 @@ * future processes to honor the potentially un-safe variables. */ if (!trust) { - unsetenv(LD_ "PRELOAD"); - unsetenv(LD_ "LIBMAP"); - unsetenv(LD_ "LIBRARY_PATH"); - unsetenv(LD_ "LIBMAP_DISABLE"); - unsetenv(LD_ "DEBUG"); - unsetenv(LD_ "ELF_HINTS_PATH"); + if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") || + unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBMAP_DISABLE") || + unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH")) { + _rtld_error("environment corrupt; aborting"); + die(); + } } ld_debug = getenv(LD_ "DEBUG"); libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL; @@ -1571,9 +1571,10 @@ object_add_name(obj, name); obj->path = path; digest_dynamic(obj, 0); - if (obj->z_noopen && (flags & RTLD_LO_DLOPEN)) { + if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) == + RTLD_LO_DLOPEN) { dbg("refusing to load non-loadable \"%s\"", obj->path); - _rtld_error("Cannot dlopen non-loadable %s\n", obj->path); + _rtld_error("Cannot dlopen non-loadable %s", obj->path); munmap(obj->mapbase, obj->mapsize); obj_free(obj); return (NULL); @@ -2006,6 +2007,8 @@ lo_flags = RTLD_LO_DLOPEN; if (mode & RTLD_NOLOAD) lo_flags |= RTLD_LO_NOLOAD; + if (ld_tracing != NULL) + lo_flags |= RTLD_LO_TRACE; objlist_init(&initlist); ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.44 2009/11/26 13:57:20 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.45 2009/11/28 14:29:32 kib Exp $ */ #ifndef RTLD_H /* { */ @@ -242,8 +242,9 @@ dlsym. */ /* Flags for load_object(). */ -#define RTLD_LO_NOLOAD 0x01 /* dlopen() specified RTLD_NOLOAD */ -#define RTLD_LO_DLOPEN 0x02 /* load_object() called from dlopen(). */ +#define RTLD_LO_NOLOAD 0x01 /* dlopen() specified RTLD_NOLOAD. */ +#define RTLD_LO_DLOPEN 0x02 /* Load_object() called from dlopen(). */ +#define RTLD_LO_TRACE 0x04 /* Only tracing. */ /* * Symbol cache entry used during relocation to avoid multiple lookups ==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.465 2009/11/19 16:19:05 mav Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.466 2009/11/30 11:44:03 avg Exp $ MAN= aac.4 \ acpi.4 \ @@ -31,6 +31,7 @@ ale.4 \ altq.4 \ amd.4 \ + ${_amdsbwd.4} \ ${_amdsmb.4} \ ${_amdtemp.4} \ amr.4 \ @@ -610,6 +611,7 @@ _acpi_sony.4= acpi_sony.4 _acpi_toshiba.4=acpi_toshiba.4 _acpi_wmi.4= acpi_wmi.4 +_amdsbwd.4= amdsbwd.4 _amdsmb.4= amdsmb.4 _amdtemp.4= amdtemp.4 _asmc.4= asmc.4 ==== //depot/projects/scottl-camlock/src/share/man/man4/ipsec.4#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.23 2009/05/23 16:42:38 bz Exp $ +.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.25 2009/11/29 21:03:54 bz Exp $ .\" -.Dd May 23, 2009 +.Dd November 29, 2009 .Dt IPSEC 4 .Os .Sh NAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 1 22:04:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE7E1065676; Tue, 1 Dec 2009 22:04:42 +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 931A8106566B for ; Tue, 1 Dec 2009 22:04:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7ED1D8FC0A for ; Tue, 1 Dec 2009 22:04:42 +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 nB1M4gS3020201 for ; Tue, 1 Dec 2009 22:04:42 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1M4fL2020196 for perforce@freebsd.org; Tue, 1 Dec 2009 22:04:41 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 1 Dec 2009 22:04:41 GMT Message-Id: <200912012204.nB1M4fL2020196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 22:04:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=171237 Change 171237 by thompsa@thompsa_pea on 2009/12/01 22:04:19 IFC @171233 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#19 integrate .. //depot/projects/usb/src/lib/libusb/libusb10.h#11 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.3#6 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.c#12 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.h#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#19 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#28 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#20 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#23 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#10 integrate .. //depot/projects/usb/src/sys/amd64/include/param.h#10 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#16 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#16 integrate .. //depot/projects/usb/src/sys/boot/Makefile#11 integrate .. //depot/projects/usb/src/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/usb/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/usb/src/sys/boot/i386/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/elf32_freebsd.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#8 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/conf.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.c#5 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.h#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#7 integrate .. //depot/projects/usb/src/sys/cam/cam_ccb.h#10 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#15 integrate .. //depot/projects/usb/src/sys/cam/cam_queue.c#3 integrate .. //depot/projects/usb/src/sys/cam/cam_queue.h#3 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#13 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#8 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#50 integrate .. //depot/projects/usb/src/sys/conf/files#87 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#27 integrate .. //depot/projects/usb/src/sys/conf/files.i386#32 integrate .. //depot/projects/usb/src/sys/conf/options#43 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslerror.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asloperands.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfield.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acconfig.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acmacros.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsinit.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psloop.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/usb/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_command.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_dock.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/usb/src/sys/dev/adb/adb.h#3 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_bus.c#6 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_mouse.c#4 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#7 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/usb/src/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/usb/src/sys/dev/an/if_an.c#9 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#18 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#16 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#24 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#47 delete .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.c#6 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#5 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwivar.h#3 integrate .. //depot/projects/usb/src/sys/dev/ce/if_ce.c#9 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6.c#6 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/usb/src/sys/dev/cp/if_cp.c#9 integrate .. //depot/projects/usb/src/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/usb/src/sys/dev/cx/if_cx.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#11 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#25 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#9 integrate .. //depot/projects/usb/src/sys/dev/de/if_devar.h#5 integrate .. //depot/projects/usb/src/sys/dev/dpms/dpms.c#4 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/et/if_et.c#4 integrate .. //depot/projects/usb/src/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/usb/src/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#6 integrate .. //depot/projects/usb/src/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/usb/src/sys/dev/fe/if_fe_pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#9 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#15 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.h#3 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#13 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#8 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.c#6 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.h#4 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#18 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#8 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwlvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/my/if_my.c#9 integrate .. //depot/projects/usb/src/sys/dev/my/if_myreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/nve/if_nve.c#10 integrate .. //depot/projects/usb/src/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/usb/src/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#30 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/pcn/if_pcn.c#5 integrate .. //depot/projects/usb/src/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/pdq/if_fea.c#3 integrate .. //depot/projects/usb/src/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/usb/src/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/usb/src/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#24 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#7 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.h#3 integrate .. //depot/projects/usb/src/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/usb/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/usb/src/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#38 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#63 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#4 integrate .. //depot/projects/usb/src/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#11 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvidctl.c#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/usb/src/sys/dev/ti/if_ti.c#9 integrate .. //depot/projects/usb/src/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/usb/src/sys/dev/tl/if_tl.c#4 integrate .. //depot/projects/usb/src/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.c#7 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#46 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhcireg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#32 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#59 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#174 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#85 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#18 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#12 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/usb/src/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/usb/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/wb/if_wb.c#4 integrate .. //depot/projects/usb/src/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#8 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/block.h#3 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#10 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#13 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/usb/src/sys/geom/label/g_label.c#7 integrate .. //depot/projects/usb/src/sys/geom/label/g_label.h#4 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_ext2fs.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_gpt.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_msdosfs.c#5 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_reiserfs.c#3 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#16 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#28 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#17 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#17 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/usb/src/sys/i386/xen/exception.s#3 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#17 integrate .. //depot/projects/usb/src/sys/ia64/ia64/db_machdep.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/usb/src/sys/ia64/include/param.h#7 integrate .. //depot/projects/usb/src/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/usb/src/sys/isa/vga_isa.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#33 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#21 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#21 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#34 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#16 integrate .. //depot/projects/usb/src/sys/kern/tty.c#33 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/usb/src/sys/libkern/inet_aton.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#6 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admswvar.h#3 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#46 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#11 integrate .. //depot/projects/usb/src/sys/modules/amdsbwd/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ata/atausb/Makefile#5 delete .. //depot/projects/usb/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/usb/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/usb/src/sys/net/if.c#42 integrate .. //depot/projects/usb/src/sys/net/if.h#13 integrate .. //depot/projects/usb/src/sys/net/if_dead.c#2 integrate .. //depot/projects/usb/src/sys/net/if_var.h#30 integrate .. //depot/projects/usb/src/sys/net/route.c#26 integrate .. //depot/projects/usb/src/sys/netinet/in.h#14 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#20 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_proxy.c#6 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#31 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#22 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#26 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#26 integrate .. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#28 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#26 integrate .. //depot/projects/usb/src/sys/netipsec/ipcomp_var.h#4 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#27 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#11 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_fha.c#5 integrate .. //depot/projects/usb/src/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptosoft.c#8 integrate .. //depot/projects/usb/src/sys/opencrypto/deflate.c#3 integrate .. //depot/projects/usb/src/sys/opencrypto/deflate.h#2 integrate .. //depot/projects/usb/src/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/ofw_machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#24 integrate .. //depot/projects/usb/src/sys/powerpc/include/cpu.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/md_var.h#9 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/pci_ocp.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#13 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#18 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#11 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/trap.c#8 integrate .. //depot/projects/usb/src/sys/sys/_termios.h#1 branch .. //depot/projects/usb/src/sys/sys/ata.h#9 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#14 integrate .. //depot/projects/usb/src/sys/sys/param.h#47 integrate .. //depot/projects/usb/src/sys/sys/priv.h#22 integrate .. //depot/projects/usb/src/sys/sys/sdt.h#3 integrate .. //depot/projects/usb/src/sys/sys/signal.h#4 integrate .. //depot/projects/usb/src/sys/sys/signalvar.h#8 integrate .. //depot/projects/usb/src/sys/sys/sockio.h#7 integrate .. //depot/projects/usb/src/sys/sys/termios.h#8 integrate .. //depot/projects/usb/src/sys/sys/tty.h#13 integrate .. //depot/projects/usb/src/sys/vm/vm.h#9 integrate .. //depot/projects/usb/src/sys/vm/vm_extern.h#12 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#20 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#23 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#11 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.5 2009/11/20 08:57:25 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/lib/libusb/libusb10.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.h,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.h,v 1.4 2009/11/20 08:57:25 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20.3#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.4 2009/07/30 00:11:41 alfred Exp $ +.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.5 2009/11/20 08:57:25 thompsa Exp $ .\" .Dd November 18, 2009 .Dt LIBUSB20 3 ==== //depot/projects/usb/src/lib/libusb/libusb20.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.6 2009/11/20 08:57:25 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.5 2009/06/12 16:07:06 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.6 2009/11/20 08:57:25 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. ==== //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (C) 2005-2008 Jung-uk Kim + * Copyright (C) 2005-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.21 2009/11/23 22:23:19 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -42,6 +42,9 @@ #include #else #include +#include +#include +#include #endif #include @@ -51,21 +54,22 @@ #include -bpf_filter_func bpf_jit_compile(struct bpf_insn *, u_int, int *); +bpf_filter_func bpf_jit_compile(struct bpf_insn *, u_int, size_t *); /* - * emit routine to update the jump table + * Emit routine to update the jump table. */ static void emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len) { - (stream->refs)[stream->bpf_pc] += len; + if (stream->refs != NULL) + (stream->refs)[stream->bpf_pc] += len; stream->cur_ip += len; } /* - * emit routine to output the actual binary code + * Emit routine to output the actual binary code. */ static void emit_code(bpf_bin_stream *stream, u_int value, u_int len) @@ -92,53 +96,120 @@ } /* - * Function that does the real stuff + * Scan the filter program and find possible optimization. + */ +static int +bpf_jit_optimize(struct bpf_insn *prog, u_int nins) +{ + int flags; + u_int i; + + /* Do we return immediately? */ + if (BPF_CLASS(prog[0].code) == BPF_RET) + return (BPF_JIT_FRET); + + for (flags = 0, i = 0; i < nins; i++) { + switch (prog[i].code) { + case BPF_LD|BPF_W|BPF_ABS: + case BPF_LD|BPF_H|BPF_ABS: + case BPF_LD|BPF_B|BPF_ABS: + case BPF_LD|BPF_W|BPF_IND: + case BPF_LD|BPF_H|BPF_IND: + case BPF_LD|BPF_B|BPF_IND: + case BPF_LDX|BPF_MSH|BPF_B: + flags |= BPF_JIT_FPKT; + break; + case BPF_LD|BPF_MEM: + case BPF_LDX|BPF_MEM: + case BPF_ST: + case BPF_STX: + flags |= BPF_JIT_FMEM; + break; + case BPF_LD|BPF_W|BPF_LEN: + case BPF_LDX|BPF_W|BPF_LEN: + flags |= BPF_JIT_FLEN; + break; + case BPF_JMP|BPF_JA: + case BPF_JMP|BPF_JGT|BPF_K: + case BPF_JMP|BPF_JGE|BPF_K: + case BPF_JMP|BPF_JEQ|BPF_K: + case BPF_JMP|BPF_JSET|BPF_K: + case BPF_JMP|BPF_JGT|BPF_X: + case BPF_JMP|BPF_JGE|BPF_X: + case BPF_JMP|BPF_JEQ|BPF_X: + case BPF_JMP|BPF_JSET|BPF_X: + flags |= BPF_JIT_FJMP; + break; + } + if (flags == BPF_JIT_FLAG_ALL) + break; + } + + return (flags); +} + +/* + * Function that does the real stuff. */ bpf_filter_func -bpf_jit_compile(struct bpf_insn *prog, u_int nins, int *mem) +bpf_jit_compile(struct bpf_insn *prog, u_int nins, size_t *size) { + bpf_bin_stream stream; struct bpf_insn *ins; + int flags, fret, fpkt, fmem, fjmp, flen; u_int i, pass; - bpf_bin_stream stream; /* - * NOTE: do not modify the name of this variable, as it's used by + * NOTE: Do not modify the name of this variable, as it's used by * the macros to emit code. */ emit_func emitm; - /* Allocate the reference table for the jumps */ + flags = bpf_jit_optimize(prog, nins); + fret = (flags & BPF_JIT_FRET) != 0; + fpkt = (flags & BPF_JIT_FPKT) != 0; + fmem = (flags & BPF_JIT_FMEM) != 0; + fjmp = (flags & BPF_JIT_FJMP) != 0; + flen = (flags & BPF_JIT_FLEN) != 0; + + if (fret) + nins = 1; + + memset(&stream, 0, sizeof(stream)); + + /* Allocate the reference table for the jumps. */ + if (fjmp) { #ifdef _KERNEL - stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), - M_BPFJIT, M_NOWAIT); + stream.refs = malloc((nins + 1) * sizeof(u_int), M_BPFJIT, + M_NOWAIT | M_ZERO); #else - stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int)); + stream.refs = calloc(nins + 1, sizeof(u_int)); #endif - if (stream.refs == NULL) - return (NULL); + if (stream.refs == NULL) + return (NULL); + } - /* Reset the reference table */ - for (i = 0; i < nins + 1; i++) - stream.refs[i] = 0; - - stream.cur_ip = 0; - stream.bpf_pc = 0; - /* - * the first pass will emit the lengths of the instructions - * to create the reference table + * The first pass will emit the lengths of the instructions + * to create the reference table. */ emitm = emit_length; - pass = 0; - for (;;) { + for (pass = 0; pass < 2; pass++) { ins = prog; - /* create the procedure header */ - MOVrq2(RBX, R8); - MOVrq(RDI, RBX); - MOVrd2(ESI, R9D); - MOVrd(EDX, EDI); + /* Create the procedure header. */ + if (fmem) { + PUSH(RBP); + MOVrq(RSP, RBP); + SUBib(BPF_MEMWORDS * sizeof(uint32_t), RSP); + } + if (flen) + MOVrd2(ESI, R9D); + if (fpkt) { + MOVrq2(RDI, R8); + MOVrd(EDX, EDI); + } for (i = 0; i < nins; i++) { stream.bpf_pc++; @@ -153,12 +224,14 @@ case BPF_RET|BPF_K: MOVid(ins->k, EAX); - MOVrq3(R8, RBX); + if (fmem) + LEAVE(); RET(); break; case BPF_RET|BPF_A: - MOVrq3(R8, RBX); + if (fmem) + LEAVE(); RET(); break; @@ -169,11 +242,17 @@ MOVrd(EDI, ECX); SUBrd(ESI, ECX); CMPid(sizeof(int32_t), ECX); - JAEb(6); - ZEROrd(EAX); - MOVrq3(R8, RBX); + if (fmem) { + JAEb(4); + ZEROrd(EAX); + LEAVE(); + } else { + JAEb(3); + ZEROrd(EAX); + } RET(); - MOVobd(RBX, RSI, EAX); + MOVrq3(R8, RCX); + MOVobd(RCX, RSI, EAX); BSWAP(EAX); break; @@ -185,10 +264,14 @@ MOVrd(EDI, ECX); SUBrd(ESI, ECX); CMPid(sizeof(int16_t), ECX); - JAEb(4); - MOVrq3(R8, RBX); + if (fmem) { + JAEb(2); + LEAVE(); + } else + JAEb(1); RET(); - MOVobw(RBX, RSI, AX); + MOVrq3(R8, RCX); + MOVobw(RCX, RSI, AX); SWAP_AX(); break; @@ -196,10 +279,14 @@ ZEROrd(EAX); MOVid(ins->k, ESI); CMPrd(EDI, ESI); - JBb(4); - MOVrq3(R8, RBX); + if (fmem) { + JBb(2); + LEAVE(); + } else + JBb(1); RET(); - MOVobb(RBX, RSI, AL); + MOVrq3(R8, RCX); + MOVobb(RCX, RSI, AL); break; case BPF_LD|BPF_W|BPF_LEN: @@ -222,11 +309,17 @@ MOVrd(EDI, ECX); SUBrd(ESI, ECX); CMPid(sizeof(int32_t), ECX); - JAEb(6); - ZEROrd(EAX); - MOVrq3(R8, RBX); + if (fmem) { + JAEb(4); + ZEROrd(EAX); + LEAVE(); + } else { + JAEb(3); + ZEROrd(EAX); + } RET(); - MOVobd(RBX, RSI, EAX); + MOVrq3(R8, RCX); + MOVobd(RCX, RSI, EAX); BSWAP(EAX); break; @@ -243,10 +336,14 @@ MOVrd(EDI, ECX); SUBrd(ESI, ECX); CMPid(sizeof(int16_t), ECX); - JAEb(4); - MOVrq3(R8, RBX); + if (fmem) { + JAEb(2); + LEAVE(); + } else + JAEb(1); RET(); - MOVobw(RBX, RSI, AX); + MOVrq3(R8, RCX); + MOVobw(RCX, RSI, AX); SWAP_AX(); break; @@ -258,22 +355,32 @@ MOVrd(EDI, ECX); SUBrd(EDX, ECX); CMPrd(ESI, ECX); - JAb(4); - MOVrq3(R8, RBX); + if (fmem) { + JAb(2); + LEAVE(); + } else + JAb(1); RET(); + MOVrq3(R8, RCX); ADDrd(EDX, ESI); - MOVobb(RBX, RSI, AL); + MOVobb(RCX, RSI, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ESI); CMPrd(EDI, ESI); - JBb(6); - ZEROrd(EAX); - MOVrq3(R8, RBX); + if (fmem) { + JBb(4); + ZEROrd(EAX); + LEAVE(); + } else { + JBb(3); + ZEROrd(EAX); + } RET(); ZEROrd(EDX); - MOVobb(RBX, RSI, DL); + MOVrq3(R8, RCX); + MOVobb(RCX, RSI, DL); ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -287,15 +394,13 @@ break; case BPF_LD|BPF_MEM: - MOViq((uintptr_t)mem, RCX); - MOVid(ins->k * 4, ESI); - MOVobd(RCX, RSI, EAX); + MOVid(ins->k * sizeof(uint32_t), ESI); + MOVobd(RSP, RSI, EAX); break; case BPF_LDX|BPF_MEM: - MOViq((uintptr_t)mem, RCX); - MOVid(ins->k * 4, ESI); - MOVobd(RCX, RSI, EDX); + MOVid(ins->k * sizeof(uint32_t), ESI); + MOVobd(RSP, RSI, EDX); break; case BPF_ST: @@ -304,15 +409,13 @@ * be optimized if the previous instruction * was already of this type */ - MOViq((uintptr_t)mem, RCX); - MOVid(ins->k * 4, ESI); - MOVomd(EAX, RCX, RSI); + MOVid(ins->k * sizeof(uint32_t), ESI); + MOVomd(EAX, RSP, RSI); break; case BPF_STX: - MOViq((uintptr_t)mem, RCX); - MOVid(ins->k * 4, ESI); - MOVomd(EDX, RCX, RSI); + MOVid(ins->k * sizeof(uint32_t), ESI); + MOVomd(EDX, RSP, RSI); break; case BPF_JMP|BPF_JA: @@ -392,9 +495,14 @@ case BPF_ALU|BPF_DIV|BPF_X: TESTrd(EDX, EDX); - JNEb(6); - ZEROrd(EAX); - MOVrq3(R8, RBX); + if (fmem) { + JNEb(4); + ZEROrd(EAX); + LEAVE(); + } else { + JNEb(3); + ZEROrd(EAX); + } RET(); MOVrd(EDX, ECX); ZEROrd(EDX); @@ -474,47 +582,56 @@ ins++; } - pass++; - if (pass == 2) - break; + if (pass > 0) + continue; + *size = stream.cur_ip; #ifdef _KERNEL - stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); - if (stream.ibuf == NULL) { - free(stream.refs, M_BPFJIT); - return (NULL); - } + stream.ibuf = malloc(*size, M_BPFJIT, M_NOWAIT); + if (stream.ibuf == NULL) + break; #else - stream.ibuf = (char *)malloc(stream.cur_ip); - if (stream.ibuf == NULL) { - free(stream.refs); - return (NULL); + stream.ibuf = mmap(NULL, *size, PROT_READ | PROT_WRITE, + MAP_ANON, -1, 0); + if (stream.ibuf == MAP_FAILED) { + stream.ibuf = NULL; + break; } #endif /* - * modify the reference table to contain the offsets and - * not the lengths of the instructions + * Modify the reference table to contain the offsets and + * not the lengths of the instructions. */ - for (i = 1; i < nins + 1; i++) - stream.refs[i] += stream.refs[i - 1]; + if (fjmp) + for (i = 1; i < nins + 1; i++) + stream.refs[i] += stream.refs[i - 1]; - /* Reset the counters */ + /* Reset the counters. */ stream.cur_ip = 0; stream.bpf_pc = 0; - /* the second pass creates the actual code */ + /* The second pass creates the actual code. */ emitm = emit_code; } /* - * the reference table is needed only during compilation, - * now we can free it + * The reference table is needed only during compilation, + * now we can free it. */ + if (fjmp) #ifdef _KERNEL - free(stream.refs, M_BPFJIT); + free(stream.refs, M_BPFJIT); #else - free(stream.refs); + free(stream.refs); +#endif + +#ifndef _KERNEL + if (stream.ibuf != NULL && + mprotect(stream.ibuf, *size, PROT_READ | PROT_EXEC) != 0) { + munmap(stream.ibuf, *size); + stream.ibuf = NULL; + } #endif return ((bpf_filter_func)stream.ibuf); ==== //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (C) 2005-2008 Jung-uk Kim + * Copyright (C) 2005-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.14 2009/11/23 22:23:19 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -85,7 +85,17 @@ #define DL 2 #define BL 3 -/* A stream of native binary code.*/ +/* Optimization flags */ +#define BPF_JIT_FRET 0x01 +#define BPF_JIT_FPKT 0x02 +#define BPF_JIT_FMEM 0x04 +#define BPF_JIT_FJMP 0x08 +#define BPF_JIT_FLEN 0x10 + +#define BPF_JIT_FLAG_ALL \ + (BPF_JIT_FPKT | BPF_JIT_FMEM | BPF_JIT_FJMP | BPF_JIT_FLEN) + +/* A stream of native binary code */ typedef struct bpf_bin_stream { /* Current native instruction pointer. */ int cur_ip; @@ -117,7 +127,7 @@ typedef void (*emit_func)(bpf_bin_stream *stream, u_int value, u_int n); /* - * native Instruction Macros + * Native instruction macros */ /* movl i32,r32 */ @@ -215,8 +225,18 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* ret */ -#define RET() do { \ +/* pushq r64 */ +#define PUSH(r64) do { \ + emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +} while (0) + +/* leaveq */ +#define LEAVE() do { \ + emitm(&stream, 0xc9, 1); \ +} while (0) + +/* retq */ +#define RET() do { \ emitm(&stream, 0xc3, 1); \ } while (0) @@ -253,6 +273,13 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 1 22:31:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921B71065692; Tue, 1 Dec 2009 22:31:09 +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 3D21D106568D for ; Tue, 1 Dec 2009 22:31:09 +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 21D2D8FC22 for ; Tue, 1 Dec 2009 22:31:09 +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 nB1MV96j022385 for ; Tue, 1 Dec 2009 22:31:09 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1MV915022383 for perforce@freebsd.org; Tue, 1 Dec 2009 22:31:09 GMT (envelope-from mav@freebsd.org) Date: Tue, 1 Dec 2009 22:31:09 GMT Message-Id: <200912012231.nB1MV915022383@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 Precedence: bulk Cc: Subject: PERFORCE change 171239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 22:31:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=171239 Change 171239 by mav@mav_mavbook on 2009/12/01 22:31:03 Add some more commands. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#28 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#28 edit .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#28 (text+ko) ==== @@ -93,8 +93,8 @@ case 0x39: return ("WRITE_MUL48"); case 0x3a: return ("WRITE_STREAM_DMA48"); case 0x3b: return ("WRITE_STREAM48"); - case 0x3d: return ("WRITE_DMA_FUA"); - case 0x3e: return ("WRITE_DMA_FUA48"); + case 0x3d: return ("WRITE_DMA_FUA48"); + case 0x3e: return ("WRITE_DMA_QUEUED_FUA48"); case 0x3f: return ("WRITE_LOG_EXT"); case 0x40: return ("READ_VERIFY"); case 0x42: return ("READ_VERIFY48"); @@ -312,6 +312,7 @@ if (cmd == ATA_READ_DMA || cmd == ATA_READ_DMA_QUEUED || cmd == ATA_WRITE_DMA || + cmd == ATA_WRITE_DMA_FUA || cmd == ATA_WRITE_DMA_QUEUED) ataio->cmd.flags |= CAM_ATAIO_DMA; ataio->cmd.command = cmd; @@ -331,8 +332,12 @@ ataio->cmd.flags = CAM_ATAIO_48BIT; if (cmd == ATA_READ_DMA48 || cmd == ATA_READ_DMA_QUEUED48 || + cmd == ATA_READ_STREAM_DMA48 || cmd == ATA_WRITE_DMA48 || - cmd == ATA_WRITE_DMA_QUEUED48) + cmd == ATA_WRITE_DMA_FUA48 || + cmd == ATA_WRITE_DMA_QUEUED48 || + cmd == ATA_WRITE_DMA_QUEUED_FUA48 || + cmd == ATA_WRITE_STREAM_DMA48) ataio->cmd.flags |= CAM_ATAIO_DMA; ataio->cmd.command = cmd; ataio->cmd.features = features; ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#28 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#17 (text+ko) ==== @@ -291,12 +291,21 @@ #define ATA_READ_DMA_QUEUED48 0x26 /* read DMA QUEUED 48bit LBA */ #define ATA_READ_NATIVE_MAX_ADDRESS48 0x27 /* read native max addr 48bit */ #define ATA_READ_MUL48 0x29 /* read multi 48bit LBA */ +#define ATA_READ_STREAM_DMA48 0x2a /* read DMA stream 48bit LBA */ +#define ATA_READ_STREAM48 0x2b /* read stream 48bit LBA */ #define ATA_WRITE 0x30 /* write */ #define ATA_WRITE48 0x34 /* write 48bit LBA */ #define ATA_WRITE_DMA48 0x35 /* write DMA 48bit LBA */ #define ATA_WRITE_DMA_QUEUED48 0x36 /* write DMA QUEUED 48bit LBA*/ #define ATA_SET_MAX_ADDRESS48 0x37 /* set max address 48bit */ #define ATA_WRITE_MUL48 0x39 /* write multi 48bit LBA */ +#define ATA_WRITE_STREAM_DMA48 0x3a +#define ATA_WRITE_STREAM48 0x3b +#define ATA_WRITE_DMA_FUA48 0x3d +#define ATA_WRITE_DMA_QUEUED_FUA48 0x3e +#define ATA_WRITE_LOG_EXT 0x3f +#define ATA_READ_VERIFY 0x40 +#define ATA_READ_VERIFY48 0x42 #define ATA_READ_FPDMA_QUEUED 0x60 /* read DMA NCQ */ #define ATA_WRITE_FPDMA_QUEUED 0x61 /* write DMA NCQ */ #define ATA_SEEK 0x70 /* seek */ From owner-p4-projects@FreeBSD.ORG Tue Dec 1 22:41:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 421EE1065672; Tue, 1 Dec 2009 22:41:20 +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 069231065670 for ; Tue, 1 Dec 2009 22:41:20 +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 E89418FC0A for ; Tue, 1 Dec 2009 22:41:19 +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 nB1MfJn0023256 for ; Tue, 1 Dec 2009 22:41:19 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1MfJqi023254 for perforce@freebsd.org; Tue, 1 Dec 2009 22:41:19 GMT (envelope-from mav@freebsd.org) Date: Tue, 1 Dec 2009 22:41:19 GMT Message-Id: <200912012241.nB1MfJqi023254@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 Precedence: bulk Cc: Subject: PERFORCE change 171243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 22:41:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=171243 Change 171243 by mav@mav_mavbook on 2009/12/01 22:40:32 Some missed parts Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#29 edit .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#18 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#29 (text+ko) ==== @@ -312,7 +312,6 @@ if (cmd == ATA_READ_DMA || cmd == ATA_READ_DMA_QUEUED || cmd == ATA_WRITE_DMA || - cmd == ATA_WRITE_DMA_FUA || cmd == ATA_WRITE_DMA_QUEUED) ataio->cmd.flags |= CAM_ATAIO_DMA; ataio->cmd.command = cmd; ==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#18 (text+ko) ==== @@ -321,6 +321,7 @@ #define ATA_READ_DMA 0xc8 /* read DMA */ #define ATA_WRITE_DMA 0xca /* write DMA */ #define ATA_WRITE_DMA_QUEUED 0xcc /* write DMA QUEUED */ +#define ATA_WRITE_MULTIPLE_FUA48 0xce #define ATA_STANDBY_IMMEDIATE 0xe0 /* standby immediate */ #define ATA_IDLE_IMMEDIATE 0xe1 /* idle immediate */ #define ATA_STANDBY_CMD 0xe2 /* standby */ From owner-p4-projects@FreeBSD.ORG Tue Dec 1 22:56:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 984FD1065672; Tue, 1 Dec 2009 22:56:35 +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 5CFFB106566C for ; Tue, 1 Dec 2009 22:56:35 +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 4AFBE8FC18 for ; Tue, 1 Dec 2009 22:56:35 +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 nB1MuZF9024296 for ; Tue, 1 Dec 2009 22:56:35 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB1MuZTe024294 for perforce@freebsd.org; Tue, 1 Dec 2009 22:56:35 GMT (envelope-from mav@freebsd.org) Date: Tue, 1 Dec 2009 22:56:35 GMT Message-Id: <200912012256.nB1MuZTe024294@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 Precedence: bulk Cc: Subject: PERFORCE change 171244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 22:56:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=171244 Change 171244 by mav@mav_mavbook on 2009/12/01 22:56:25 Unify pronouce. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#30 edit .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#19 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#30 (text+ko) ==== @@ -119,7 +119,7 @@ case 0xca: return ("WRITE_DMA"); case 0xcc: return ("WRITE_DMA_QUEUED"); case 0xcd: return ("CFA_WRITE_MULTIPLE_WITHOUT_ERASE"); - case 0xce: return ("WRITE_MULTIPLE_FUA48"); + case 0xce: return ("WRITE_MUL_FUA48"); case 0xd1: return ("CHECK_MEDIA_CARD_TYPE"); case 0xda: return ("GET_MEDIA_STATUS"); case 0xde: return ("MEDIA_LOCK"); ==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#19 (text+ko) ==== @@ -321,7 +321,7 @@ #define ATA_READ_DMA 0xc8 /* read DMA */ #define ATA_WRITE_DMA 0xca /* write DMA */ #define ATA_WRITE_DMA_QUEUED 0xcc /* write DMA QUEUED */ -#define ATA_WRITE_MULTIPLE_FUA48 0xce +#define ATA_WRITE_MUL_FUA48 0xce #define ATA_STANDBY_IMMEDIATE 0xe0 /* standby immediate */ #define ATA_IDLE_IMMEDIATE 0xe1 /* idle immediate */ #define ATA_STANDBY_CMD 0xe2 /* standby */ From owner-p4-projects@FreeBSD.ORG Wed Dec 2 08:57:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 673B61065693; Wed, 2 Dec 2009 08:57:37 +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 2B863106568F for ; Wed, 2 Dec 2009 08:57:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F380A8FC0A for ; Wed, 2 Dec 2009 08:57:36 +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 nB28va2w009746 for ; Wed, 2 Dec 2009 08:57:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB28va4L009744 for perforce@freebsd.org; Wed, 2 Dec 2009 08:57:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 2 Dec 2009 08:57:36 GMT Message-Id: <200912020857.nB28va4L009744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 08:57:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=171257 Change 171257 by hselasky@hselasky_laptop001 on 2009/12/02 08:57:32 USB controller: - add more device ID's - patch by: Mitya Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#20 (text+ko) ==== @@ -189,11 +189,17 @@ return "Intel 82801H (ICH8) USB 2.0 controller USB2-A"; case 0x283a8086: return "Intel 82801H (ICH8) USB 2.0 controller USB2-B"; + case 0x293a8086: return "Intel 82801I (ICH9) USB 2.0 controller"; case 0x293c8086: return "Intel 82801I (ICH9) USB 2.0 controller"; + case 0x3a3a8086: + return "Intel 82801IJ (ICH10) USB 2.0 controller USB-A"; + case 0x3a3c8086: + return "Intel 82801IJ (ICH10) USB 2.0 controller USB-B"; + case 0x00e01033: return ("NEC uPD 720100 USB 2.0 controller"); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#15 (text+ko) ==== @@ -218,6 +218,7 @@ return ("Intel 82801H (ICH8) USB controller USB-D"); case 0x28358086: return ("Intel 82801H (ICH8) USB controller USB-E"); + case 0x29348086: return ("Intel 82801I (ICH9) USB controller"); case 0x29358086: @@ -231,6 +232,19 @@ case 0x29398086: return ("Intel 82801I (ICH9) USB controller"); + case 0x3a348086: + return ("Intel 82801IJ (ICH10) USB controller USB-A"); + case 0x3a358086: + return ("Intel 82801IJ (ICH10) USB controller USB-B"); + case 0x3a368086: + return ("Intel 82801IJ (ICH10) USB controller USB-C"); + case 0x3a378086: + return ("Intel 82801IJ (ICH10) USB controller USB-D"); + case 0x3a388086: + return ("Intel 82801IJ (ICH10) USB controller USB-E"); + case 0x3a398086: + return ("Intel 82801IJ (ICH10) USB controller USB-F"); + case 0x719a8086: return ("Intel 82443MX USB controller"); From owner-p4-projects@FreeBSD.ORG Wed Dec 2 09:54:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 435D4106568B; Wed, 2 Dec 2009 09:54:34 +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 06DAC1065672 for ; Wed, 2 Dec 2009 09:54:34 +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 E64308FC13 for ; Wed, 2 Dec 2009 09:54:33 +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 nB29sXB0014749 for ; Wed, 2 Dec 2009 09:54:33 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB29sXAV014745 for perforce@freebsd.org; Wed, 2 Dec 2009 09:54:33 GMT (envelope-from mav@freebsd.org) Date: Wed, 2 Dec 2009 09:54:33 GMT Message-Id: <200912020954.nB29sXAV014745@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 Precedence: bulk Cc: Subject: PERFORCE change 171258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 09:54:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=171258 Change 171258 by mav@mav_mavbook on 2009/12/02 09:53:34 IFC Affected files ... .. //depot/projects/scottl-camlock/src/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_t3fw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#18 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/vmparam.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#20 integrate Differences ... ==== //depot/projects/scottl-camlock/src/lib/libc/stdio/printf.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.63 2009/03/04 03:38:51 das Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.64 2009/12/02 07:51:25 brueffer Exp $ .\" -.Dd March 3, 2009 +.Dd December 2, 2009 .Dt PRINTF 3 .Os .Sh NAME @@ -55,7 +55,7 @@ .Ft int .Fn asprintf "char **ret" "const char *format" ... .Ft int -.Fn dprintf "int" "const char * restrict format" ... +.Fn dprintf "int fd" "const char * restrict format" ... .In stdarg.h .Ft int .Fn vprintf "const char * restrict format" "va_list ap" ==== //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $ ident AVILA @@ -132,6 +132,7 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 +device ath_ar9280 device usb #options USB_DEBUG ==== //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $ ident CAMBRIA @@ -135,11 +135,8 @@ # #device ath_ar5416 #options AH_SUPPORT_AR5416 # NB: for 11n descriptor format -#device ath_rf2133 #device ath_ar9160 #device ath_ar9280 -#device ath_rf9280 -#device ath_ar9285 # NB: 2 USB 2.0 ports standard device usb ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.9 2009/11/26 08:49:46 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.10 2009/12/01 23:01:29 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#29 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.8 2009/11/26 08:49:46 mav Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.9 2009/12/01 23:01:29 mav Exp $ */ #ifndef CAM_ATA_ALL_H ==== //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.16 2009/10/05 20:21:41 np Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.17 2009/12/01 22:23:15 np Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H @@ -97,7 +97,7 @@ enum { FW_VERSION_MAJOR = 7, - FW_VERSION_MINOR = 7, + FW_VERSION_MINOR = 8, FW_VERSION_MICRO = 0 }; ==== //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_t3fw.h#4 (text+ko) ==== @@ -26,14 +26,14 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_t3fw.h,v 1.3 2009/10/05 20:21:41 np Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_t3fw.h,v 1.4 2009/12/01 22:23:15 np Exp $ ***************************************************************************/ #define U (unsigned char) -static unsigned int t3fw_length = 30772; -static unsigned char t3fw[30772] = { +static unsigned int t3fw_length = 30840; +static unsigned char t3fw[30840] = { U 0x60, U 0x00, U 0x74, U 0x00, U 0x20, U 0x03, U 0x80, U 0x00, U 0x20, U 0x03, U 0x70, U 0x00, @@ -55,13 +55,13 @@ U 0x1F, U 0xFF, U 0xC0, U 0x00, U 0xE3, U 0x00, U 0x04, U 0x3C, U 0x02, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x6B, U 0xE8, + U 0x20, U 0x00, U 0x6C, U 0x34, U 0x1F, U 0xFF, U 0xC2, U 0x90, - U 0x20, U 0x00, U 0x6C, U 0x30, + U 0x20, U 0x00, U 0x6C, U 0x7C, U 0x1F, U 0xFF, U 0xC2, U 0x94, - U 0x20, U 0x00, U 0x6C, U 0x70, + U 0x20, U 0x00, U 0x6C, U 0xBC, U 0x1F, U 0xFF, U 0xC2, U 0x98, - U 0x20, U 0x00, U 0x6C, U 0xE4, + U 0x20, U 0x00, U 0x6D, U 0x30, U 0x1F, U 0xFF, U 0xC2, U 0x9C, U 0x20, U 0x00, U 0x03, U 0xC0, U 0xC0, U 0x00, U 0x00, U 0xE4, @@ -396,11 +396,11 @@ U 0x20, U 0x00, U 0x03, U 0xB0, U 0xE3, U 0x00, U 0x0D, U 0x3C, U 0x20, U 0x00, U 0x03, U 0xB0, - U 0x20, U 0x00, U 0x6E, U 0x08, + U 0x20, U 0x00, U 0x6E, U 0x54, U 0xE3, U 0x00, U 0x0D, U 0x3C, - U 0x20, U 0x00, U 0x6E, U 0x08, - U 0x20, U 0x00, U 0x6E, U 0x08, - U 0xE3, U 0x00, U 0x77, U 0x94, + U 0x20, U 0x00, U 0x6E, U 0x54, + U 0x20, U 0x00, U 0x6E, U 0x54, + U 0xE3, U 0x00, U 0x77, U 0xE0, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, @@ -408,8 +408,8 @@ U 0x1F, U 0xFC, U 0x00, U 0x00, U 0x1F, U 0xFF, U 0xC5, U 0x90, U 0x1F, U 0xFF, U 0xC6, U 0x70, - U 0x20, U 0x00, U 0x6E, U 0x08, - U 0x20, U 0x00, U 0x6E, U 0x08, + U 0x20, U 0x00, U 0x6E, U 0x58, + U 0x20, U 0x00, U 0x6E, U 0x58, U 0xDE, U 0xFF, U 0xFE, U 0x00, U 0x00, U 0x00, U 0x08, U 0x0C, U 0xDE, U 0xAD, U 0xBE, U 0xEF, @@ -616,47 +616,47 @@ U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x55, U 0x08, - U 0x20, U 0x00, U 0x53, U 0xD8, - U 0x20, U 0x00, U 0x55, U 0x08, - U 0x20, U 0x00, U 0x55, U 0x08, - U 0x20, U 0x00, U 0x53, U 0x14, - U 0x20, U 0x00, U 0x53, U 0x14, - U 0x20, U 0x00, U 0x53, U 0x14, - U 0x20, U 0x00, U 0x51, U 0x54, - U 0x20, U 0x00, U 0x51, U 0x54, - U 0x20, U 0x00, U 0x51, U 0x4C, - U 0x20, U 0x00, U 0x50, U 0xB8, - U 0x20, U 0x00, U 0x4F, U 0x60, - U 0x20, U 0x00, U 0x4D, U 0x40, - U 0x20, U 0x00, U 0x4B, U 0x14, + U 0x20, U 0x00, U 0x55, U 0x54, + U 0x20, U 0x00, U 0x54, U 0x24, + U 0x20, U 0x00, U 0x55, U 0x54, + U 0x20, U 0x00, U 0x55, U 0x54, + U 0x20, U 0x00, U 0x53, U 0x60, + U 0x20, U 0x00, U 0x53, U 0x60, + U 0x20, U 0x00, U 0x53, U 0x60, + U 0x20, U 0x00, U 0x51, U 0xA0, + U 0x20, U 0x00, U 0x51, U 0xA0, + U 0x20, U 0x00, U 0x51, U 0x98, + U 0x20, U 0x00, U 0x51, U 0x04, + U 0x20, U 0x00, U 0x4F, U 0xAC, + U 0x20, U 0x00, U 0x4D, U 0x8C, + U 0x20, U 0x00, U 0x4B, U 0x60, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x54, U 0xD8, - U 0x20, U 0x00, U 0x53, U 0xA4, - U 0x20, U 0x00, U 0x54, U 0x48, - U 0x20, U 0x00, U 0x54, U 0x48, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x51, U 0x44, - U 0x20, U 0x00, U 0x51, U 0xFC, - U 0x20, U 0x00, U 0x4E, U 0x80, - U 0x20, U 0x00, U 0x4C, U 0xF0, - U 0x20, U 0x00, U 0x4A, U 0xC0, + U 0x20, U 0x00, U 0x55, U 0x24, + U 0x20, U 0x00, U 0x53, U 0xF0, + U 0x20, U 0x00, U 0x54, U 0x94, + U 0x20, U 0x00, U 0x54, U 0x94, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x51, U 0x90, + U 0x20, U 0x00, U 0x52, U 0x48, + U 0x20, U 0x00, U 0x4E, U 0xCC, + U 0x20, U 0x00, U 0x4D, U 0x3C, + U 0x20, U 0x00, U 0x4B, U 0x0C, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, U 0x20, U 0x00, U 0x0B, U 0xE8, U 0x20, U 0x00, U 0x3A, U 0xA8, U 0x20, U 0x00, U 0x04, U 0xC0, - U 0x20, U 0x00, U 0x46, U 0xB4, + U 0x20, U 0x00, U 0x46, U 0xFC, U 0x20, U 0x00, U 0x0B, U 0xE0, U 0x20, U 0x00, U 0x41, U 0xC0, U 0x20, U 0x00, U 0x03, U 0xF0, - U 0x20, U 0x00, U 0x46, U 0x74, - U 0x20, U 0x00, U 0x4A, U 0x9C, + U 0x20, U 0x00, U 0x46, U 0xBC, + U 0x20, U 0x00, U 0x4A, U 0xE8, U 0x20, U 0x00, U 0x3E, U 0xCC, U 0x20, U 0x00, U 0x3D, U 0xE8, U 0x20, U 0x00, U 0x3A, U 0x24, @@ -666,7 +666,7 @@ U 0x20, U 0x00, U 0x3C, U 0x44, U 0x20, U 0x00, U 0x2D, U 0xB0, U 0x20, U 0x00, U 0x28, U 0x44, - U 0x20, U 0x00, U 0x67, U 0x8C, + U 0x20, U 0x00, U 0x67, U 0xD8, U 0x20, U 0x00, U 0x23, U 0xD0, U 0x20, U 0x00, U 0x20, U 0xB0, U 0x20, U 0x00, U 0x20, U 0x5C, @@ -851,22 +851,22 @@ U 0x0B, U 0xBB, U 0x90, U 0x00, U 0x53, U 0x00, U 0x00, U 0x00, U 0x63, U 0xFF, U 0xFC, U 0x00, - U 0x20, U 0x00, U 0x6B, U 0xC4, + U 0x20, U 0x00, U 0x6C, U 0x10, U 0x10, U 0xFF, U 0xFF, U 0x0A, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x6B, U 0xE8, + U 0x20, U 0x00, U 0x6C, U 0x34, U 0x00, U 0xD2, U 0x31, U 0x10, U 0xFF, U 0xFE, U 0x0A, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x6C, U 0x30, + U 0x20, U 0x00, U 0x6C, U 0x7C, U 0x00, U 0xD3, U 0x31, U 0x10, U 0xFF, U 0xFE, U 0x0A, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x6C, U 0x70, + U 0x20, U 0x00, U 0x6C, U 0xBC, U 0x00, U 0xD4, U 0x31, U 0x10, U 0xFF, U 0xFE, U 0x0A, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, - U 0x20, U 0x00, U 0x6C, U 0xE4, + U 0x20, U 0x00, U 0x6D, U 0x30, U 0x00, U 0xD5, U 0x31, U 0x10, U 0xFF, U 0xFE, U 0x0A, U 0x00, U 0x00, U 0x00, U 0x00, U 0x00, @@ -893,8 +893,8 @@ U 0xFA, U 0xD3, U 0x0F, U 0x77, U 0x6B, U 0x06, U 0x90, U 0x60, U 0xB4, U 0x66, U 0x77, U 0x63, - U 0xF8, U 0x54, U 0x15, U 0xD3, - U 0x54, U 0x1A, U 0x7E, U 0x0F, + U 0xF8, U 0x54, U 0x15, U 0xE6, + U 0x54, U 0x1A, U 0x91, U 0x0F, U 0x14, U 0x00, U 0x63, U 0xFF, U 0xF9, U 0x00, U 0x00, U 0x00, U 0x6C, U 0x10, U 0x04, U 0xC0, @@ -1107,7 +1107,7 @@ U 0xFC, U 0x13, U 0x2C, U 0x16, U 0x18, U 0x2B, U 0x12, U 0x1A, U 0x2A, U 0x12, U 0x1B, U 0xDC, - U 0x50, U 0x58, U 0x19, U 0x91, + U 0x50, U 0x58, U 0x19, U 0xA4, U 0xC0, U 0xD0, U 0xC0, U 0x90, U 0x2E, U 0x5C, U 0xF4, U 0x2C, U 0x12, U 0x17, U 0x28, U 0x12, @@ -1345,7 +1345,7 @@ U 0xFC, U 0x2A, U 0x00, U 0x00, U 0x64, U 0x50, U 0xC0, U 0xDA, U 0x20, U 0xDB, U 0xC0, U 0x58, - U 0x16, U 0x65, U 0xC0, U 0x20, + U 0x16, U 0x78, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xC0, U 0x91, U 0x63, U 0xFD, U 0x7A, U 0x00, U 0xC0, U 0x91, U 0x63, U 0xFA, @@ -1354,7 +1354,7 @@ U 0x0A, U 0x80, U 0xC0, U 0x9A, U 0x29, U 0x24, U 0x68, U 0x2C, U 0x70, U 0x07, U 0x58, U 0x15, - U 0x55, U 0xD2, U 0xA0, U 0xD1, + U 0x68, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x03, U 0x47, U 0x0B, U 0x18, U 0xED, U 0x4F, U 0xDB, U 0x70, U 0xA8, U 0x28, U 0x78, @@ -1362,7 +1362,7 @@ U 0xF8, U 0xD9, U 0xB0, U 0x63, U 0xFA, U 0x61, U 0x00, U 0x00, U 0x2A, U 0x2C, U 0x74, U 0xDB, - U 0x40, U 0x58, U 0x0E, U 0xD1, + U 0x40, U 0x58, U 0x0E, U 0xE3, U 0x63, U 0xFA, U 0xE4, U 0x00, U 0x00, U 0x29, U 0x22, U 0x1D, U 0x2D, U 0x25, U 0x02, U 0x7B, @@ -1386,7 +1386,7 @@ U 0xC0, U 0xD1, U 0x2E, U 0x0A, U 0x80, U 0xC0, U 0x9E, U 0x29, U 0x24, U 0x68, U 0x2C, U 0x70, - U 0x07, U 0x58, U 0x15, U 0x34, + U 0x07, U 0x58, U 0x15, U 0x47, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xC0, U 0x94, U 0x63, U 0xFB, U 0xC9, U 0xC0, U 0x96, U 0x63, @@ -1472,7 +1472,7 @@ U 0x28, U 0x2D, U 0xF6, U 0x85, U 0xC8, U 0x5A, U 0x2A, U 0x2C, U 0x74, U 0xDB, U 0x40, U 0x58, - U 0x0E, U 0x64, U 0xD2, U 0xA0, + U 0x0E, U 0x76, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0x00, U 0x00, U 0x29, U 0xCC, U 0xF9, @@ -1497,26 +1497,26 @@ U 0x75, U 0x63, U 0xFF, U 0x7D, U 0x00, U 0xCC, U 0x57, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, - U 0x40, U 0x58, U 0x15, U 0x3A, + U 0x40, U 0x58, U 0x15, U 0x4D, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x15, U 0xC9, + U 0xB6, U 0x58, U 0x15, U 0xDC, U 0x63, U 0xFF, U 0xE5, U 0x00, U 0xDA, U 0x20, U 0x58, U 0x15, - U 0xC7, U 0x63, U 0xFF, U 0xDC, + U 0xDA, U 0x63, U 0xFF, U 0xDC, U 0x00, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, U 0x40, U 0xDD, - U 0x50, U 0x58, U 0x16, U 0x55, + U 0x50, U 0x58, U 0x16, U 0x68, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC8, U 0x58, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x58, U 0x14, - U 0xA7, U 0x2A, U 0x21, U 0x02, + U 0xBA, U 0x2A, U 0x21, U 0x02, U 0x65, U 0xAF, U 0xBD, U 0xC0, U 0x94, U 0x09, U 0xA9, U 0x02, U 0x29, U 0x25, U 0x02, U 0x63, U 0xFF, U 0xB2, U 0x00, U 0x00, U 0x2B, U 0x21, U 0x04, U 0x58, - U 0x14, U 0x53, U 0x1D, U 0xEC, + U 0x14, U 0x66, U 0x1D, U 0xEC, U 0xAF, U 0xC0, U 0xE0, U 0x2E, U 0x24, U 0x66, U 0x8F, U 0x30, U 0x2B, U 0x20, U 0x0C, U 0x0F, @@ -1527,7 +1527,7 @@ U 0xFC, U 0x50, U 0x64, U 0xCF, U 0x56, U 0x2B, U 0x21, U 0x04, U 0xC0, U 0xC0, U 0x58, U 0x14, - U 0x48, U 0x1D, U 0xEC, U 0xA4, + U 0x5B, U 0x1D, U 0xEC, U 0xA4, U 0xC0, U 0xE0, U 0x8F, U 0x30, U 0x2B, U 0x20, U 0x0C, U 0x0F, U 0x8F, U 0x14, U 0x63, U 0xFF, @@ -1535,7 +1535,7 @@ U 0x2B, U 0x21, U 0x04, U 0xB1, U 0xCC, U 0x0C, U 0x0C, U 0x47, U 0x2C, U 0x24, U 0x66, U 0x58, - U 0x14, U 0x40, U 0x1D, U 0xEC, + U 0x14, U 0x53, U 0x1D, U 0xEC, U 0x9C, U 0xC0, U 0xE0, U 0x2E, U 0x24, U 0x66, U 0x8F, U 0x30, U 0x2B, U 0x20, U 0x0C, U 0x0F, @@ -1574,7 +1574,7 @@ U 0xAC, U 0xFD, U 0x65, U 0xA0, U 0xC2, U 0xCC, U 0x5F, U 0xDB, U 0x30, U 0xDA, U 0x20, U 0x8C, - U 0x11, U 0x58, U 0x14, U 0xED, + U 0x11, U 0x58, U 0x15, U 0x00, U 0xC0, U 0x51, U 0x9A, U 0x13, U 0xC7, U 0xBF, U 0x9B, U 0xA9, U 0x8E, U 0x13, U 0x2E, U 0xE2, @@ -1613,19 +1613,19 @@ U 0x20, U 0x7F, U 0x89, U 0x05, U 0x29, U 0xD2, U 0x85, U 0x65, U 0x91, U 0x65, U 0xDA, U 0x20, - U 0x58, U 0x15, U 0x58, U 0xC9, + U 0x58, U 0x15, U 0x6B, U 0xC9, U 0x5C, U 0x60, U 0x01, U 0xFF, U 0x00, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x15, U 0x55, + U 0xB6, U 0x58, U 0x15, U 0x68, U 0x60, U 0x00, U 0x0C, U 0x00, U 0xC0, U 0x90, U 0x63, U 0xFF, U 0xB5, U 0x00, U 0x00, U 0xDA, - U 0x20, U 0x58, U 0x15, U 0x51, + U 0x20, U 0x58, U 0x15, U 0x64, U 0x65, U 0x51, U 0xE4, U 0x8D, U 0x13, U 0x8C, U 0x11, U 0xDB, U 0xD0, U 0x8D, U 0xD0, U 0x02, U 0x2A, U 0x02, U 0x0D, U 0x6D, - U 0x51, U 0x58, U 0x13, U 0xC3, + U 0x51, U 0x58, U 0x13, U 0xD6, U 0x9A, U 0x13, U 0x64, U 0xA1, U 0xCE, U 0xC7, U 0x5F, U 0x8F, U 0xA1, U 0x95, U 0xA9, U 0xC0, @@ -1643,7 +1643,7 @@ U 0x09, U 0x9D, U 0x02, U 0x64, U 0x81, U 0x59, U 0xC9, U 0xD3, U 0x8A, U 0x10, U 0x2B, U 0x21, - U 0x04, U 0x58, U 0x13, U 0xD3, + U 0x04, U 0x58, U 0x13, U 0xE6, U 0x8A, U 0x13, U 0xC0, U 0xB0, U 0x2B, U 0x24, U 0x66, U 0x2E, U 0xA2, U 0x09, U 0x2A, U 0xA0, @@ -1700,7 +1700,7 @@ U 0xE4, U 0xCF, U 0x2B, U 0xBC, U 0x20, U 0x2B, U 0xC6, U 0x85, U 0x2A, U 0x2C, U 0x74, U 0x8B, - U 0x11, U 0x58, U 0x0D, U 0x7F, + U 0x11, U 0x58, U 0x0D, U 0x91, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x28, U 0x20, U 0x3D, U 0xC0, U 0xE0, U 0x7C, U 0x87, U 0x7F, @@ -1734,14 +1734,14 @@ U 0xF0, U 0x63, U 0xFE, U 0x95, U 0x00, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x8C, U 0x11, U 0xDD, - U 0x50, U 0x58, U 0x15, U 0x71, + U 0x50, U 0x58, U 0x15, U 0x84, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC0, U 0xE1, U 0x63, U 0xFF, U 0x7A, U 0x8B, U 0x13, U 0x8C, U 0x11, U 0xDD, U 0x50, U 0xC0, U 0xAA, U 0x2E, U 0x0A, U 0x80, U 0x2A, U 0x24, U 0x68, U 0xDA, - U 0x20, U 0x58, U 0x13, U 0xD1, + U 0x20, U 0x58, U 0x13, U 0xE4, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x6C, U 0x10, U 0x06, U 0x29, @@ -1851,19 +1851,19 @@ U 0x72, U 0x63, U 0xFF, U 0x66, U 0x00, U 0xCC, U 0x57, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, - U 0x40, U 0x58, U 0x13, U 0xD8, + U 0x40, U 0x58, U 0x13, U 0xEB, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0x58, U 0x14, - U 0x68, U 0x63, U 0xFF, U 0xE8, + U 0x7B, U 0x63, U 0xFF, U 0xE8, U 0xC0, U 0xA0, U 0x63, U 0xFE, U 0x82, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x14, U 0x64, + U 0xB6, U 0x58, U 0x14, U 0x77, U 0x63, U 0xFF, U 0xD9, U 0x00, U 0xDB, U 0x40, U 0x2A, U 0x2C, - U 0x74, U 0x58, U 0x0C, U 0xDF, + U 0x74, U 0x58, U 0x0C, U 0xF1, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x8A, U 0x10, U 0x2B, U 0x21, - U 0x04, U 0x58, U 0x12, U 0xF7, + U 0x04, U 0x58, U 0x13, U 0x0A, U 0x1E, U 0xEB, U 0x46, U 0xC0, U 0xD0, U 0x2D, U 0x24, U 0x66, U 0x63, U 0xFE, U 0xB1, U 0x00, @@ -1893,14 +1893,14 @@ U 0x22, U 0xD2, U 0x85, U 0xCF, U 0x25, U 0x60, U 0x00, U 0x0D, U 0x00, U 0xDA, U 0x60, U 0xC0, - U 0xB6, U 0x58, U 0x14, U 0x40, + U 0xB6, U 0x58, U 0x14, U 0x53, U 0xC8, U 0x5A, U 0x60, U 0x01, U 0x0F, U 0x00, U 0xDA, U 0x60, - U 0x58, U 0x14, U 0x3D, U 0x65, + U 0x58, U 0x14, U 0x50, U 0x65, U 0x51, U 0x06, U 0xDC, U 0x40, U 0xDB, U 0x30, U 0x8D, U 0x30, U 0xDA, U 0x60, U 0x0D, U 0x6D, - U 0x51, U 0x58, U 0x12, U 0xB0, + U 0x51, U 0x58, U 0x12, U 0xC3, U 0xD3, U 0xA0, U 0x64, U 0xA0, U 0xF3, U 0x84, U 0xA1, U 0xC0, U 0x51, U 0x04, U 0x04, U 0x47, @@ -1911,7 +1911,7 @@ U 0x2C, U 0x64, U 0x66, U 0x6F, U 0xC6, U 0x02, U 0x70, U 0x96, U 0x0A, U 0x2B, U 0x61, U 0x04, - U 0x58, U 0x12, U 0xC7, U 0xC0, + U 0x58, U 0x12, U 0xDA, U 0xC0, U 0xB0, U 0x2B, U 0x64, U 0x66, U 0x65, U 0x50, U 0xB4, U 0x2A, U 0x3C, U 0x10, U 0xC0, U 0xE7, @@ -1961,7 +1961,7 @@ U 0xFF, U 0x60, U 0x00, U 0x00, U 0x2A, U 0x6C, U 0x74, U 0xC0, U 0xB2, U 0xDC, U 0x20, U 0xDD, - U 0x40, U 0x58, U 0x12, U 0xA5, + U 0x40, U 0x58, U 0x12, U 0xB8, U 0xC0, U 0xB0, U 0x63, U 0xFF, U 0x63, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0x00, U 0x00, @@ -2013,7 +2013,7 @@ U 0xA6, U 0x9D, U 0x2F, U 0x35, U 0x02, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xDA, U 0x30, U 0xC0, - U 0xB6, U 0x58, U 0x13, U 0xC8, + U 0xB6, U 0x58, U 0x13, U 0xDB, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x6C, U 0x10, U 0x06, U 0x2A, U 0x20, U 0x06, U 0x94, U 0x10, @@ -2024,7 +2024,7 @@ U 0x92, U 0x0A, U 0xCC, U 0x5F, U 0xDB, U 0x30, U 0xDA, U 0x20, U 0x8C, U 0x10, U 0x58, U 0x13, - U 0x2C, U 0xC0, U 0x51, U 0xD3, + U 0x3F, U 0xC0, U 0x51, U 0xD3, U 0xA0, U 0xC7, U 0xAF, U 0x9A, U 0x3A, U 0xC0, U 0xD0, U 0x1C, U 0xEA, U 0xA5, U 0x14, U 0xEA, @@ -2154,37 +2154,37 @@ U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0xCC, U 0x57, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x8C, - U 0x10, U 0x58, U 0x12, U 0xA9, + U 0x10, U 0x58, U 0x12, U 0xBC, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xC0, U 0x91, U 0x63, U 0xFF, U 0x8F, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x13, U 0x37, + U 0xB6, U 0x58, U 0x13, U 0x4A, U 0x63, U 0xFF, U 0xE1, U 0x00, U 0xDA, U 0x20, U 0x58, U 0x13, - U 0x35, U 0x63, U 0xFF, U 0xD8, + U 0x48, U 0x63, U 0xFF, U 0xD8, U 0x2B, U 0x21, U 0x04, U 0x58, - U 0x11, U 0xCC, U 0x1E, U 0xEA, + U 0x11, U 0xDF, U 0x1E, U 0xEA, U 0x1D, U 0x2B, U 0x20, U 0x0C, U 0xC0, U 0xD0, U 0x2D, U 0x24, U 0x66, U 0x8F, U 0x3A, U 0x63, U 0xFE, U 0x4D, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, U 0x40, U 0xDD, U 0x50, U 0x58, U 0x13, - U 0xBE, U 0xD2, U 0xA0, U 0xD1, + U 0xD1, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x2A, U 0x2C, U 0x74, U 0x8B, U 0x10, U 0x58, U 0x0B, - U 0xA7, U 0xD2, U 0xA0, U 0xD1, + U 0xB9, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x29, U 0x21, U 0x38, U 0xC0, U 0x88, U 0x79, U 0x83, U 0x2E, U 0x8C, U 0x31, U 0x0C, U 0xFC, U 0x50, U 0x64, U 0xCE, U 0x22, U 0x2B, U 0x21, U 0x04, U 0xC0, U 0xC0, U 0x58, U 0x11, - U 0xBB, U 0xC0, U 0xD0, U 0x1E, + U 0xCE, U 0xC0, U 0xD0, U 0x1E, U 0xEA, U 0x0C, U 0x8F, U 0x3A, U 0x2B, U 0x20, U 0x0C, U 0x63, U 0xFE, U 0x0D, U 0xDA, U 0x20, - U 0x58, U 0x13, U 0x1D, U 0x63, + U 0x58, U 0x13, U 0x30, U 0x63, U 0xFF, U 0x7A, U 0xDA, U 0x20, U 0x5B, U 0xFF, U 0x22, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x00, @@ -2192,7 +2192,7 @@ U 0x21, U 0x04, U 0xB1, U 0xCC, U 0x0C, U 0x0C, U 0x47, U 0x2C, U 0x24, U 0x66, U 0x58, U 0x11, - U 0xAF, U 0x1E, U 0xEA, U 0x00, + U 0xC2, U 0x1E, U 0xEA, U 0x00, U 0x2B, U 0x20, U 0x0C, U 0xC0, U 0xD0, U 0x2D, U 0x24, U 0x66, U 0x8F, U 0x3A, U 0x63, U 0xFD, @@ -2376,7 +2376,7 @@ U 0xCF, U 0x0B, U 0x4B, U 0x0B, U 0x2B, U 0xC6, U 0x85, U 0xC0, U 0xB0, U 0x8C, U 0x15, U 0x58, - U 0x11, U 0x9C, U 0xD2, U 0xA0, + U 0x11, U 0xAF, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x8A, U 0x35, U 0x6F, U 0xA5, U 0x46, U 0xD8, U 0x30, U 0x8B, U 0xD5, U 0x6D, @@ -2388,7 +2388,7 @@ U 0x08, U 0x0B, U 0x47, U 0x65, U 0xB1, U 0x0B, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x2C, U 0x12, - U 0x05, U 0x58, U 0x11, U 0xBF, + U 0x05, U 0x58, U 0x11, U 0xD2, U 0xD3, U 0xA0, U 0xC0, U 0xC1, U 0xC0, U 0xD0, U 0x2D, U 0xA4, U 0x03, U 0x9C, U 0x14, U 0x63, @@ -2401,25 +2401,25 @@ U 0x88, U 0x14, U 0xCC, U 0x87, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x8C, U 0x15, U 0x58, U 0x11, - U 0xB3, U 0xC0, U 0x20, U 0xD1, + U 0xC6, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x12, U 0x42, + U 0xB6, U 0x58, U 0x12, U 0x55, U 0x63, U 0xFF, U 0xE4, U 0x00, U 0x00, U 0xDA, U 0x20, U 0x8B, - U 0x10, U 0x58, U 0x12, U 0x3F, + U 0x10, U 0x58, U 0x12, U 0x52, U 0x63, U 0xFF, U 0xD8, U 0x00, U 0x9E, U 0x17, U 0x8A, U 0x12, U 0x2B, U 0x21, U 0x04, U 0x58, - U 0x10, U 0xD5, U 0x8E, U 0x17, + U 0x10, U 0xE8, U 0x8E, U 0x17, U 0xC0, U 0x90, U 0x29, U 0x24, U 0x66, U 0x63, U 0xFE, U 0x34, U 0xC0, U 0x80, U 0x63, U 0xFE, U 0x06, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x8C, U 0x15, U 0xDD, - U 0x50, U 0x58, U 0x12, U 0xC7, + U 0x50, U 0x58, U 0x12, U 0xDA, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0x58, U 0x12, - U 0x33, U 0x63, U 0xFF, U 0xA7, + U 0x46, U 0x63, U 0xFF, U 0xA7, U 0x00, U 0x2B, U 0x21, U 0x38, U 0xC0, U 0xA8, U 0x7B, U 0xAB, U 0x02, U 0x60, U 0x01, U 0x04, @@ -2427,7 +2427,7 @@ U 0x50, U 0x64, U 0xCE, U 0x04, U 0x8A, U 0x12, U 0x2B, U 0x21, U 0x04, U 0xC0, U 0xC0, U 0x98, - U 0x17, U 0x58, U 0x10, U 0xC3, + U 0x17, U 0x58, U 0x10, U 0xD6, U 0x8E, U 0x17, U 0x63, U 0xFD, U 0xF3, U 0x2D, U 0x21, U 0x38, U 0x2D, U 0xDC, U 0xFF, U 0x0D, @@ -2458,7 +2458,7 @@ U 0x8D, U 0x14, U 0x2E, U 0x0A, U 0x80, U 0xC0, U 0x8E, U 0x28, U 0x24, U 0x68, U 0x58, U 0x11, - U 0x05, U 0xD2, U 0xA0, U 0xD1, + U 0x18, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x2E, U 0x7C, U 0x48, U 0x19, U 0xE8, U 0xF5, U 0x2A, U 0x32, U 0x16, U 0x2B, U 0x76, @@ -2483,7 +2483,7 @@ U 0x0C, U 0x47, U 0x2C, U 0x24, U 0x66, U 0xC9, U 0xC0, U 0x9E, U 0x17, U 0x8A, U 0x12, U 0x58, - U 0x10, U 0x8C, U 0x8E, U 0x17, + U 0x10, U 0x9F, U 0x8E, U 0x17, U 0xC0, U 0x34, U 0x8F, U 0x20, U 0xC0, U 0xD0, U 0x2D, U 0x24, U 0x66, U 0xC0, U 0x68, U 0x26, @@ -2493,7 +2493,7 @@ U 0x66, U 0x98, U 0x17, U 0xB1, U 0xCC, U 0x0C, U 0x0C, U 0x47, U 0x2C, U 0x24, U 0x66, U 0x58, - U 0x10, U 0x82, U 0x8E, U 0x17, + U 0x10, U 0x95, U 0x8E, U 0x17, U 0x87, U 0x16, U 0xC0, U 0xD0, U 0x2D, U 0x24, U 0x66, U 0x63, U 0xFC, U 0xE6, U 0x8D, U 0x35, @@ -2578,13 +2578,13 @@ U 0xCD, U 0x2D, U 0x25, U 0x23, U 0xC8, U 0x55, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x58, U 0x10, - U 0x7B, U 0x29, U 0x21, U 0x02, + U 0x8E, U 0x29, U 0x21, U 0x02, U 0xCC, U 0x96, U 0xC0, U 0xE8, U 0x0E, U 0x9E, U 0x02, U 0x2E, U 0x25, U 0x02, U 0xCC, U 0x57, U 0xDA, U 0x20, U 0xDB, U 0x30, - U 0xDC, U 0x40, U 0x58, U 0x10, - U 0xFC, U 0xC0, U 0x20, U 0xD1, + U 0xDC, U 0x40, U 0x58, U 0x11, + U 0x0F, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x2C, U 0x20, U 0x66, U 0x89, U 0x31, U 0xB1, U 0xCC, U 0x0C, U 0x0C, U 0x47, U 0x2C, @@ -2694,28 +2694,28 @@ U 0x20, U 0xD1, U 0x0F, U 0x00, U 0xC0, U 0x9A, U 0x63, U 0xFF, U 0xC6, U 0xDA, U 0x20, U 0x58, - U 0x11, U 0x20, U 0x63, U 0xFE, + U 0x11, U 0x33, U 0x63, U 0xFE, U 0x38, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x11, U 0x1D, + U 0xB6, U 0x58, U 0x11, U 0x30, U 0x63, U 0xFE, U 0x2E, U 0x00, U 0x68, U 0x97, U 0x3C, U 0x2B, U 0x9C, U 0xFD, U 0x64, U 0xBE, U 0x24, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0xDB, - U 0x70, U 0x58, U 0x10, U 0xD9, + U 0x70, U 0x58, U 0x10, U 0xEC, U 0xC0, U 0xC0, U 0xC0, U 0xD1, U 0x0A, U 0xDA, U 0x39, U 0x0A, U 0xDC, U 0x38, U 0x65, U 0xCD, U 0xE0, U 0x63, U 0xFE, U 0x09, U 0x8A, U 0x10, U 0x2B, U 0x21, - U 0x04, U 0x58, U 0x0F, U 0xAA, + U 0x04, U 0x58, U 0x0F, U 0xBD, U 0xC0, U 0xB0, U 0x2B, U 0x24, U 0x66, U 0x63, U 0xFE, U 0x21, U 0xDB, U 0x40, U 0x2A, U 0x2C, - U 0x74, U 0x58, U 0x09, U 0x8B, + U 0x74, U 0x58, U 0x09, U 0x9D, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0x58, U 0x0F, - U 0xAF, U 0x63, U 0xFC, U 0xF7, + U 0xC2, U 0x63, U 0xFC, U 0xF7, U 0x6C, U 0x10, U 0x04, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0x6C, U 0x10, U 0x04, U 0x29, @@ -2744,7 +2744,7 @@ U 0x9B, U 0x68, U 0x98, U 0x0B, U 0x2A, U 0x9C, U 0xF9, U 0x65, U 0xA1, U 0xB2, U 0x02, U 0x2A, - U 0x02, U 0x58, U 0x0F, U 0x91, + U 0x02, U 0x58, U 0x0F, U 0xA4, U 0x89, U 0x37, U 0x1B, U 0xE7, U 0xD7, U 0xC8, U 0x91, U 0x64, U 0x52, U 0x0E, U 0x2A, U 0x21, @@ -2787,7 +2787,7 @@ U 0x55, U 0x60, U 0x00, U 0x1E, U 0x2A, U 0x20, U 0x0C, U 0xC1, U 0xB2, U 0x8C, U 0x20, U 0x58, - U 0x11, U 0x03, U 0x9A, U 0x18, + U 0x11, U 0x16, U 0x9A, U 0x18, U 0x64, U 0xA2, U 0x45, U 0x8D, U 0x67, U 0x63, U 0xFF, U 0xCF, U 0xC0, U 0xC0, U 0x63, U 0xFF, @@ -2802,7 +2802,7 @@ U 0x01, U 0x99, U 0xD7, U 0xA0, U 0xDA, U 0x20, U 0xDB, U 0x70, U 0xC1, U 0xC8, U 0x2D, U 0x21, - U 0x20, U 0x58, U 0x10, U 0x9D, + U 0x20, U 0x58, U 0x10, U 0xB0, U 0x8C, U 0x26, U 0x8B, U 0x27, U 0x9A, U 0x16, U 0x0C, U 0xBB, U 0x0C, U 0x7A, U 0xB3, U 0x34, @@ -2820,7 +2820,7 @@ U 0x02, U 0x60, U 0x00, U 0x97, U 0xCF, U 0x58, U 0x60, U 0x00, U 0x1F, U 0xDA, U 0x20, U 0x8B, - U 0x16, U 0x58, U 0x10, U 0x63, + U 0x16, U 0x58, U 0x10, U 0x76, U 0x65, U 0xA1, U 0x38, U 0x63, U 0xFF, U 0xBD, U 0xC0, U 0x81, U 0xC0, U 0x90, U 0x8F, U 0x18, @@ -2829,7 +2829,7 @@ U 0x97, U 0xF5, U 0x63, U 0xFF, U 0xD2, U 0xDB, U 0x30, U 0xDA, U 0x20, U 0xDC, U 0x40, U 0x58, - U 0x10, U 0x07, U 0xC0, U 0x51, + U 0x10, U 0x1A, U 0xC0, U 0x51, U 0xD6, U 0xA0, U 0xC0, U 0xC0, U 0x2B, U 0xA0, U 0x10, U 0x2C, U 0xA4, U 0x03, U 0x9B, U 0x17, @@ -2854,7 +2854,7 @@ U 0x26, U 0x18, U 0x63, U 0xFE, U 0x96, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, U 0x40, U 0xDD, - U 0x50, U 0x58, U 0x11, U 0x11, + U 0x50, U 0x58, U 0x11, U 0x24, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC0, U 0x30, U 0x2C, U 0x20, U 0x66, U 0x89, U 0x61, U 0xB1, @@ -2877,7 +2877,7 @@ U 0x16, U 0xDC, U 0x40, U 0x2F, U 0x22, U 0x13, U 0xDD, U 0x50, U 0xB1, U 0xFF, U 0x2F, U 0x26, - U 0x13, U 0x58, U 0x0F, U 0xA6, + U 0x13, U 0x58, U 0x0F, U 0xB9, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x00, U 0x28, U 0x20, U 0x3D, U 0x08, U 0x48, U 0x40, U 0x65, @@ -2902,28 +2902,28 @@ U 0xD1, U 0x00, U 0x00, U 0x00, U 0x65, U 0x50, U 0x81, U 0xDA, U 0x20, U 0xDB, U 0x60, U 0xDC, - U 0x40, U 0x58, U 0x0F, U 0xBD, + U 0x40, U 0x58, U 0x0F, U 0xD0, U 0xC0, U 0x20, U 0xC0, U 0xF0, U 0x2F, U 0xA4, U 0x03, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0xC0, - U 0xB6, U 0x58, U 0x10, U 0x4B, + U 0xB6, U 0x58, U 0x10, U 0x5E, U 0x63, U 0xFF, U 0xE0, U 0x00, U 0x00, U 0x6F, U 0x95, U 0x02, U 0x63, U 0xFD, U 0x6C, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, U 0x40, U 0xDD, U 0x50, U 0xC4, - U 0xE0, U 0x58, U 0x0F, U 0x3E, + U 0xE0, U 0x58, U 0x0F, U 0x51, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0x8A, U 0x15, U 0x2B, U 0x21, - U 0x04, U 0x58, U 0x0E, U 0xDB, + U 0x04, U 0x58, U 0x0E, U 0xEE, U 0x23, U 0x24, U 0x66, U 0x28, U 0x60, U 0x10, U 0x98, U 0x17, U 0x63, U 0xFF, U 0x21, U 0x00, U 0xDA, U 0x20, U 0x58, U 0x10, - U 0x3E, U 0x63, U 0xFF, U 0xAB, + U 0x51, U 0x63, U 0xFF, U 0xAB, U 0xC8, U 0x58, U 0xDB, U 0x30, U 0xDA, U 0x20, U 0x58, U 0x0F, - U 0x22, U 0x2A, U 0x21, U 0x02, + U 0x35, U 0x2A, U 0x21, U 0x02, U 0x65, U 0xAF, U 0x9C, U 0xC0, U 0x94, U 0x09, U 0xA9, U 0x02, U 0x29, U 0x25, U 0x02, U 0x63, @@ -2932,11 +2932,11 @@ U 0xC0, U 0xA3, U 0x2E, U 0x0A, U 0x80, U 0x2A, U 0x24, U 0x68, U 0xDA, U 0x20, U 0x58, U 0x0F, - U 0x2B, U 0xD2, U 0xA0, U 0xD1, + U 0x3E, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0x2B, U 0x20, U 0x0C, U 0x58, U 0x10, - U 0x53, U 0x63, U 0xFF, U 0x6B, + U 0x66, U 0x63, U 0xFF, U 0x6B, U 0x6C, U 0x10, U 0x04, U 0x28, U 0x20, U 0x06, U 0xC0, U 0x62, U 0x28, U 0x8C, U 0xF8, U 0x65, @@ -3007,7 +3007,7 @@ U 0xAF, U 0xE7, U 0x63, U 0xFF, U 0xA6, U 0x2A, U 0x2C, U 0x74, U 0xC0, U 0xB0, U 0x2C, U 0x0A, - U 0x02, U 0x58, U 0x0E, U 0x15, + U 0x02, U 0x58, U 0x0E, U 0x28, U 0x1C, U 0xE6, U 0xFB, U 0x9C, U 0xA0, U 0x8B, U 0x20, U 0x08, U 0xBB, U 0x11, U 0x06, U 0xBB, @@ -3017,10 +3017,10 @@ U 0x26, U 0x24, U 0x68, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0xDC, U 0x40, U 0xDD, U 0x50, U 0x58, - U 0x10, U 0x6F, U 0xD2, U 0xA0, + U 0x10, U 0x82, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xDA, U 0x20, U 0x2B, U 0x20, U 0x0C, U 0x58, - U 0x0F, U 0xDA, U 0xC0, U 0x20, + U 0x0F, U 0xED, U 0xC0, U 0x20, U 0xD1, U 0x0F, U 0x00, U 0x00, U 0x6C, U 0x10, U 0x06, U 0x07, U 0x3D, U 0x14, U 0xC0, U 0x80, @@ -3239,7 +3239,7 @@ U 0x21, U 0x23, U 0x65, U 0xD4, U 0xA0, U 0xC0, U 0xA6, U 0x2B, U 0x0A, U 0x03, U 0x2C, U 0x22, - U 0x00, U 0x58, U 0x0F, U 0x17, + U 0x00, U 0x58, U 0x0F, U 0x2A, U 0x64, U 0xA3, U 0xB9, U 0x17, U 0xE5, U 0xE6, U 0x8E, U 0x38, U 0x9A, U 0x16, U 0x64, U 0xE3, @@ -3248,11 +3248,11 @@ U 0xF3, U 0x7E, U 0x83, U 0x11, U 0xC2, U 0xB0, U 0x8C, U 0x20, U 0x2A, U 0x20, U 0x0C, U 0x58, - U 0x0F, U 0x36, U 0xD7, U 0xA0, + U 0x0F, U 0x49, U 0xD7, U 0xA0, U 0xCD, U 0xA1, U 0x60, U 0x04, U 0xA2, U 0x00, U 0xC2, U 0xB0, U 0x8C, U 0x20, U 0x2A, U 0x20, - U 0x0C, U 0x58, U 0x0F, U 0x0A, + U 0x0C, U 0x58, U 0x0F, U 0x1D, U 0xD7, U 0xA0, U 0x64, U 0xA4, U 0x86, U 0x2F, U 0x21, U 0x2E, U 0x8B, U 0x68, U 0x0F, U 0xBF, @@ -3264,7 +3264,7 @@ U 0x4C, U 0xDA, U 0x20, U 0xDB, U 0x50, U 0xC1, U 0xC4, U 0x2D, U 0x21, U 0x1F, U 0x58, U 0x0E, - U 0xD0, U 0x8B, U 0x26, U 0x9A, + U 0xE3, U 0x8B, U 0x26, U 0x9A, U 0x18, U 0x9A, U 0x19, U 0x89, U 0x27, U 0x2A, U 0xAC, U 0x38, U 0x0B, U 0x99, U 0x0C, U 0x7A, @@ -3291,11 +3291,11 @@ U 0x93, U 0xC0, U 0xE0, U 0x63, U 0xFF, U 0xE2, U 0xDA, U 0x20, U 0x8B, U 0x18, U 0x58, U 0x0E, - U 0x8D, U 0x65, U 0xA2, U 0xB1, + U 0xA0, U 0x65, U 0xA2, U 0xB1, U 0x63, U 0xFF, U 0x9E, U 0x00, U 0x00, U 0xDA, U 0x20, U 0xDB, U 0x30, U 0x8C, U 0x15, U 0x58, - U 0x0E, U 0x35, U 0xD6, U 0xA0, + U 0x0E, U 0x48, U 0xD6, U 0xA0, U 0xC0, U 0xC0, U 0xC0, U 0xD1, U 0x2D, U 0x16, U 0x04, U 0x2C, U 0xA4, U 0x03, U 0xDC, U 0x70, @@ -3346,12 +3346,12 @@ U 0x64, U 0x41, U 0x81, U 0xC0, U 0x44, U 0x2B, U 0x0A, U 0x00, U 0x8C, U 0x20, U 0x2A, U 0x20, - U 0x0C, U 0x58, U 0x0E, U 0xAC, + U 0x0C, U 0x58, U 0x0E, U 0xBF, U 0x0A, U 0xA7, U 0x02, U 0x65, U 0xA0, U 0x0F, U 0xC0, U 0xB0, U 0x2C, U 0x22, U 0x00, U 0x2A, U 0x20, U 0x0C, U 0x58, U 0x0E, - U 0xA8, U 0xD7, U 0xA0, U 0x64, + U 0xBB, U 0xD7, U 0xA0, U 0x64, U 0xAF, U 0xEF, U 0xDA, U 0x20, U 0xC1, U 0xBC, U 0xC1, U 0xC8, U 0x2D, U 0x21, U 0x20, U 0x8F, @@ -3360,7 +3360,7 @@ U 0x26, U 0x0E, U 0x99, U 0x0C, U 0x09, U 0x09, U 0x48, U 0x29, U 0x25, U 0x25, U 0x58, U 0x0E, - U 0x70, U 0xC0, U 0x90, U 0xC0, + U 0x83, U 0xC0, U 0x90, U 0xC0, U 0x50, U 0xC0, U 0xC2, U 0x88, U 0x60, U 0x9A, U 0x19, U 0x1E, U 0xE5, U 0x6E, U 0xC0, U 0xA1, @@ -3442,7 +3442,7 @@ U 0xFD, U 0x0B, U 0x2D, U 0xE6, U 0x85, U 0xDA, U 0x20, U 0x8B, U 0x19, U 0x8C, U 0x15, U 0x8D, - U 0x14, U 0x58, U 0x0D, U 0x71, + U 0x14, U 0x58, U 0x0D, U 0x84, U 0xD2, U 0xA0, U 0xD1, U 0x0F, U 0xDC, U 0x70, U 0xDF, U 0x50, U 0xDB, U 0x60, U 0x2D, U 0x6C, @@ -3467,20 +3467,20 @@ U 0xFF, U 0xE8, U 0x88, U 0x14, U 0x65, U 0x81, U 0x68, U 0xDA, U 0x20, U 0xDB, U 0x60, U 0x8C, - U 0x15, U 0x58, U 0x0D, U 0x88, + U 0x15, U 0x58, U 0x0D, U 0x9B, U 0xC0, U 0x20, U 0xC0, U 0x90, U 0x29, U 0xA4, U 0x03, U 0xD1, U 0x0F, U 0x8A, U 0x16, U 0x2B, U 0x21, U 0x04, U 0x58, U 0x0C, - U 0xAF, U 0xC0, U 0xA0, U 0x2A, + U 0xC2, U 0xC0, U 0xA0, U 0x2A, U 0x24, U 0x66, U 0x8E, U 0x68, U 0x63, U 0xFD, U 0xCA, U 0x00, U 0x00, U 0x2B, U 0x9C, U 0xF9, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 2 10:56:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666281065672; Wed, 2 Dec 2009 10:56:50 +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 276CC1065676 for ; Wed, 2 Dec 2009 10:56:50 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12DD68FC08 for ; Wed, 2 Dec 2009 10:56:50 +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 nB2AuoIT020392 for ; Wed, 2 Dec 2009 10:56:50 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2AubET020382 for perforce@freebsd.org; Wed, 2 Dec 2009 10:56:37 GMT (envelope-from marinosi@FreeBSD.org) Date: Wed, 2 Dec 2009 10:56:37 GMT Message-Id: <200912021056.nB2AubET020382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 10:56:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=171261 Change 171261 by marinosi@revolver on 2009/12/02 10:56:37 IFC. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/Makefile.inc1#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/UPDATING#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/cat/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/ls/ls.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/ls/print.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/mv/mv.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/pwait/Makefile#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/bin/pwait/pwait.1#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/bin/pwait/pwait.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/cd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/error.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/error.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/eval.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/exec.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/expand.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/histedit.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/input.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/input.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/main.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/output.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/output.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/parser.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/redir.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/sh.1#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/trap.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/sh/var.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/bin/uuidgen/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/bind9/version#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ee/ee.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/tcsh/sh.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/README#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/README.platform#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth1.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/auth2.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/canohost.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/canohost.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/channels.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/config.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/config.h.in#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/defines.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/includes.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/jpake.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/jpake.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/kex.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/kex.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/monitor.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/packet.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/packet.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/readconf.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/readconf.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/roaming.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/schnorr.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/servconf.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/session.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh_config#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/ssh_namespace.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshd_config#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/crypto/openssh/version.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.arm/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.ia64/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.pc98/ttys#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/gettytab#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/inetd.conf#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/BSD.local.dist#3 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/BSD.x11-4.dist#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/BSD.x11.dist#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/mtree/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/network.subr#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/ftpd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/kde#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/other#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/sshd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/system#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/telnetd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/pam.d/xdm#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/auto_linklocal#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/bgfsck#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/devd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/faith#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/fsck#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/hostid#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/jail#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/motd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/moused#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/mroute6d#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/netif#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/network_ipv6#3 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/nfsclient#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/pf#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ppp#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/route6d#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/routed#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/routing#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/savecore#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/static_arp#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/stf#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.subr#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/root/dot.profile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/services#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/factor/factor.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/number/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/games/number/number.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/gnu/usr.bin/patch/common.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/gnu/usr.bin/patch/pch.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/include/Makefile#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/include/langinfo.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/include/libgen.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/include/signal.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/include/termios.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/kerberos5/lib/libgssapi_krb5/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/bind/config.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/Versions.def#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/basename.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/getcap.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/pselect.3#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/pselect.c#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/include/namespace.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isphonogram.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isrune.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isspecial.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/nl_langinfo.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/C.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/posix1e/acl_from_text.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/pselect.2#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/stack_protector.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libdisk/change.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libfetch/common.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libjail/jail.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libradius/libradius.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libradius/radlib.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/librt/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/librt/mq.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libstand/net.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libstand/open.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libstand/rpc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libstand/udp.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb10.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb20.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb20.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb20.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/libexec/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/Makefile#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/README#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/picobsd/floppy.tree/etc/ttys#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/release/scripts/package-split.py#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/atacontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/badsect/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ccdconfig/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/clri/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/comcontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ddb/ddb_capture.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dhclient/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dhclient/packet.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dmesg/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dump/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dumpfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/dumpon/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/fsck/fsck.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/growfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/gvinum/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/ifgif.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/init/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ipfw/dummynet.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/kldunload/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/md5/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mknod/mknod.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount/mount.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/newfs_msdos/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/nfsiod/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/pfctl/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/rcorder/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/reboot/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/reboot/reboot.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/route/route.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/routed/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/savecore/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/savecore/savecore.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/sconfig/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/shutdown/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/swapon/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/tunefs/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/libexec/sftp-server/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/colldef/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/colldef/la_LN.ISO8859-13.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/colldef/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man3/queue.3#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man3/tree.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ada.4#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ata.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/atapicam.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/atp.4#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/bce.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/bge.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/de.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/dpms.4#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/hifn.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ichwd.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ips.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/ipsec.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/iwn.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/lindev.4#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/malo.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/msk.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/pts.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/pty.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/targ.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/tty.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/umass.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/unix.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/urtw.4#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/wi.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man4/zyd.4#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/ar.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/procfs.5#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man5/regdomain.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man7/adding_user.7#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man8/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man8/rc.8#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/Makefile#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/acl.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/fail.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/fetch.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/get_cyclecount.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/store.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/vaccess.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/misc/iso3166#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/misc/organization.dot#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/mklocale/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/mklocale/la_LN.ISO8859-13.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/mklocale/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/share/monetdef/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/monetdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/msgdef/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/msgdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/msgdef/lv_LV.UTF-8.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/numericdef/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/skel/dot.profile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/ja_JP.SJIS.src#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/ja_JP.eucJP.src#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/timedef/lv_LV.UTF-8.src#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/antarctica#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/asia#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/australasia#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/etcetera#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/europe#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/include/_align.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/include/param.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/NOTES#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.i386#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/conf/options.amd64#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/ata-usb.c#3 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 2 11:13:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3EBF1065679; Wed, 2 Dec 2009 11:13:06 +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 73C341065672 for ; Wed, 2 Dec 2009 11:13:06 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FD3C8FC21 for ; Wed, 2 Dec 2009 11:13:06 +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 nB2BD66o022545 for ; Wed, 2 Dec 2009 11:13:06 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2BD6Im022543 for perforce@freebsd.org; Wed, 2 Dec 2009 11:13:06 GMT (envelope-from marinosi@FreeBSD.org) Date: Wed, 2 Dec 2009 11:13:06 GMT Message-Id: <200912021113.nB2BD6Im022543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 11:13:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=171262 Change 171262 by marinosi@revolver on 2009/12/02 11:12:24 Resolved items during Integrate. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ifnet.9#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.h#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sysproto.h#5 integrate Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/contrib/ntp/ntpd/ntp_io.c#2 (text+ko) ==== @@ -65,6 +65,12 @@ #endif /* IPV6 Multicast Support */ #endif /* IPv6 Support */ +#ifdef INCLUDE_IPV6_SUPPORT +#include +#include +#include +#endif /* !INCLUDE_IPV6_SUPPORT */ + extern int listen_to_virtual_ips; extern const char *specific_interface; @@ -1137,6 +1143,36 @@ } #endif /* OS_NEEDS_REUSEADDR_FOR_IFADDRBIND */ +#ifdef INCLUDE_IPV6_SUPPORT +static isc_boolean_t +is_anycast(struct sockaddr *sa, char *name) +{ +#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST) + struct in6_ifreq ifr6; + int fd; + u_int32_t flags6; + + if (sa->sa_family != AF_INET6) + return ISC_FALSE; + if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) + return ISC_FALSE; + memset(&ifr6, 0, sizeof(ifr6)); + memcpy(&ifr6.ifr_addr, (struct sockaddr_in6 *)sa, + sizeof(struct sockaddr_in6)); + strlcpy(ifr6.ifr_name, name, IF_NAMESIZE); + if (ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) < 0) { + close(fd); + return ISC_FALSE; + } + close(fd); + flags6 = ifr6.ifr_ifru.ifru_flags6; + if ((flags6 & IN6_IFF_ANYCAST) != 0) + return ISC_TRUE; +#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */ + return ISC_FALSE; +} +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * update_interface strategy * @@ -1276,6 +1312,11 @@ if (is_wildcard_addr(&interface.sin)) continue; +#ifdef INCLUDE_IPV6_SUPPORT + if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name)) + continue; +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * map to local *address* in order * to map all duplicate interfaces to an interface structure ==== //depot/projects/soc2009/marinosi_appaudit/src/lib/libc/stdio/printf.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.63 2009/03/04 03:38:51 das Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.64 2009/12/02 07:51:25 brueffer Exp $ .\" -.Dd March 3, 2009 +.Dd December 2, 2009 .Dt PRINTF 3 .Os .Sh NAME @@ -55,7 +55,7 @@ .Ft int .Fn asprintf "char **ret" "const char *format" ... .Ft int -.Fn dprintf "int" "const char * restrict format" ... +.Fn dprintf "int fd" "const char * restrict format" ... .In stdarg.h .Ft int .Fn vprintf "const char * restrict format" "va_list ap" ==== //depot/projects/soc2009/marinosi_appaudit/src/share/man/man9/ifnet.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.54 2008/12/11 22:51:11 kmacy Exp $ +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.55 2009/12/01 14:56:00 bz Exp $ .\" -.Dd March 14, 2007 +.Dd December 1, 2009 .Os .Dt IFNET 9 .Sh NAME @@ -279,13 +279,6 @@ .Xr link_addr 3 ) . (Initialized by .Fn if_alloc . ) -.It Va if_timer -.Pq Vt short -Number of seconds until the watchdog timer -.Fn if_watchdog -is called, or zero if the timer is disabled. -(Set by driver, -decremented by generic watchdog code.) .It Va if_flags .Pq Vt int Flags describing operational parameters of this interface (see below). @@ -401,11 +394,6 @@ See the description of .Fn ifioctl below for more information. -.It Fn if_watchdog -Routine called by the generic code when the watchdog timer, -.Va if_timer , -expires. -Usually this will reset the interface. .\" .It Fn if_poll_recv .\" .It Fn if_poll_xmit .\" .It Fn if_poll_slowinput @@ -415,7 +403,7 @@ .\" section, below. .It Fn if_init Initialize and bring up the hardware, -e.g., reset the chip and the watchdog timer and enable the receiver unit. +e.g., reset the chip and enable the receiver unit. Should mark the interface running, but not active .Dv ( IFF_RUNNING , ~IIF_OACTIVE ) . ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/AVILA#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $ ident AVILA @@ -132,6 +132,7 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 +device ath_ar9280 device usb #options USB_DEBUG ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/arm/conf/CAMBRIA#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $ ident CAMBRIA @@ -135,11 +135,8 @@ # #device ath_ar5416 #options AH_SUPPORT_AR5416 # NB: for 11n descriptor format -#device ath_rf2133 #device ath_ar9160 #device ath_ar9280 -#device ath_rf9280 -#device ath_ar9285 # NB: 2 USB 2.0 ports standard device usb ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.123 2009/07/08 16:26:43 trasz Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.125 2009/10/27 10:55:34 kib Exp */ const char *freebsd32_syscallnames[] = { @@ -521,6 +521,15 @@ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ "lpathconf", /* 513 = lpathconf */ - "auditon", /* 514 = auditon */ - "auditctl_slice", /* 515 = auditctl_slice */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ + "freebsd32_pselect", /* 522 = freebsd32_pselect */ + "auditon", /* 523 = auditon */ + "auditctl_slice", /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.123 2009/07/08 16:26:43 trasz Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.125 2009/10/27 10:55:34 kib Exp */ #include "opt_compat.h" @@ -558,6 +558,15 @@ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon */ - { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 515 = auditctl_slice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, 0 }, /* 522 = freebsd32_pselect */ + { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 523 = auditon */ + { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/hwpmc/hwpmc_x86.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.12 2009/08/14 21:05:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.13 2009/12/01 21:54:53 emaste Exp $"); #include #include @@ -101,7 +101,7 @@ if (copyin((void *) sp, &pc, sizeof(pc)) != 0) return (n); } else if (copyin((void *) r, &pc, sizeof(pc)) != 0 || - copyin((void *) fp, &fp, sizeof(fp) != 0)) + copyin((void *) fp, &fp, sizeof(fp)) != 0) return (n); for (; n < nframes;) { ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/init_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.255 2009/10/27 11:01:15 kib Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 198508 2009-10-27 10:55:34Z kib */ #include "opt_compat.h" @@ -548,6 +548,13 @@ { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 511 = msgctl */ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 512 = shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { AS(auditon_slice_args), (sy_call_t *)auditon_slice, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon_slice */ - { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 515 = auditctl_slice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(pselect_args), (sy_call_t *)pselect, AUE_SELECT, NULL, 0, 0, 0 }, /* 522 = pselect */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/syscalls.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ const char *syscallnames[] = { @@ -521,6 +521,15 @@ "msgctl", /* 511 = msgctl */ "shmctl", /* 512 = shmctl */ "lpathconf", /* 513 = lpathconf */ - "auditon_slice", /* 514 = auditon_slice */ - "auditctl_slice", /* 515 = auditctl_slice */ + "#514", /* 514 = cap_new */ + "#515", /* 515 = cap_getrights */ + "#516", /* 516 = cap_enter */ + "#517", /* 517 = cap_getmode */ + "#518", /* 518 = pdfork */ + "#519", /* 519 = pdkill */ + "#520", /* 520 = pdgetpid */ + "#521", /* 521 = pdwait */ + "pselect", /* 522 = pselect */ + "auditon_slice", /* 523 = auditon_slice */ + "auditctl_slice", /* 524 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/kern/systrace_args.c#5 (text+ko) ==== @@ -3072,8 +3072,20 @@ *n_args = 2; break; } + /* pselect */ + case 522: { + struct pselect_args *p = params; + iarg[0] = p->nd; /* int */ + uarg[1] = (intptr_t) p->in; /* fd_set * */ + uarg[2] = (intptr_t) p->ou; /* fd_set * */ + uarg[3] = (intptr_t) p->ex; /* fd_set * */ + uarg[4] = (intptr_t) p->ts; /* const struct timespec * */ + uarg[5] = (intptr_t) p->sm; /* const sigset_t * */ + *n_args = 6; + break; + } /* auditon_slice */ - case 514: { + case 523: { struct auditon_slice_args *p = params; iarg[0] = p->cmd; /* int */ uarg[1] = (intptr_t) p->name; /* char * */ @@ -3083,7 +3095,7 @@ break; } /* auditctl_slice */ - case 515: { + case 524: { struct auditctl_slice_args *p = params; uarg[0] = (intptr_t) p->as_name; /* char * */ uarg[1] = (intptr_t) p->path; /* char * */ @@ -8172,8 +8184,33 @@ break; }; break; + /* pselect */ + case 522: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "fd_set *"; + break; + case 2: + p = "fd_set *"; + break; + case 3: + p = "fd_set *"; + break; + case 4: + p = "const struct timespec *"; + break; + case 5: + p = "const sigset_t *"; + break; + default: + break; + }; + break; /* auditon_slice */ - case 514: + case 523: switch(ndx) { case 0: p = "int"; @@ -8192,7 +8229,7 @@ }; break; /* auditctl_slice */ - case 515: + case 524: switch(ndx) { case 0: p = "char *"; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.133 2009/08/21 11:20:10 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.134 2009/12/02 08:52:06 luigi Exp $ */ #ifndef _IPFW2_H @@ -237,7 +237,7 @@ * */ typedef struct _ipfw_insn { /* template for instructions */ - enum ipfw_opcodes opcode:8; + u_int8_t opcode; u_int8_t len; /* number of 32-bit words */ #define F_NOT 0x80 #define F_OR 0x40 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/powerpc/include/vmparam.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: vmparam.h,v 1.11 2000/02/11 19:25:16 thorpej Exp $ - * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.14 2009/04/21 17:08:02 marcel Exp $ + * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.15 2009/12/02 06:49:22 nwhitehorn Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -38,23 +38,23 @@ #define USRSTACK VM_MAXUSER_ADDRESS #ifndef MAXTSIZ -#define MAXTSIZ (16*1024*1024) /* max text size */ +#define MAXTSIZ (64*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ -#define DFLDSIZ (32*1024*1024) /* default data size */ +#define DFLDSIZ (128*1024*1024) /* default data size */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (512*1024*1024) /* max data size */ +#define MAXDSIZ (1*1024*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ -#define DFLSSIZ (1*1024*1024) /* default stack size */ +#define DFLSSIZ (8*1024*1024) /* default stack size */ #endif #ifndef MAXSSIZ -#define MAXSSIZ (32*1024*1024) /* max stack size */ +#define MAXSSIZ (64*1024*1024) /* max stack size */ #endif /* ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ #define SYS_syscall 0 @@ -428,6 +428,7 @@ #define SYS_msgctl 511 #define SYS_shmctl 512 #define SYS_lpathconf 513 -#define SYS_auditon_slice 514 -#define SYS_auditctl_slice 515 -#define SYS_MAXSYSCALL 516 +#define SYS_pselect 522 +#define SYS_auditon_slice 523 +#define SYS_auditctl_slice 524 +#define SYS_MAXSYSCALL 525 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/syscall.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp MIASM = \ syscall.o \ exit.o \ @@ -377,5 +377,6 @@ msgctl.o \ shmctl.o \ lpathconf.o \ + pselect.o \ auditon_slice.o \ auditctl_slice.o ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/sysproto.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.259 2009/07/08 15:23:18 trasz Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.261 2009/10/27 10:55:34 kib Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1641,6 +1641,14 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; }; +struct pselect_args { + char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; + char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)]; + char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)]; + char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)]; + char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)]; + char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)]; +}; struct auditon_slice_args { char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; @@ -2009,6 +2017,7 @@ int msgctl(struct thread *, struct msgctl_args *); int shmctl(struct thread *, struct shmctl_args *); int lpathconf(struct thread *, struct lpathconf_args *); +int pselect(struct thread *, struct pselect_args *); int auditon_slice(struct thread *, struct auditon_slice_args *); int auditctl_slice(struct thread *, struct auditctl_slice_args *); @@ -2683,6 +2692,7 @@ #define SYS_AUE_msgctl AUE_MSGCTL #define SYS_AUE_shmctl AUE_SHMCTL #define SYS_AUE_lpathconf AUE_LPATHCONF +#define SYS_AUE_pselect AUE_SELECT #define SYS_AUE_auditon_slice AUE_AUDITON #define SYS_AUE_auditctl_slice AUE_AUDITCTL From owner-p4-projects@FreeBSD.ORG Wed Dec 2 13:41:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B73C1065676; Wed, 2 Dec 2009 13:41:38 +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 56DD0106566B for ; Wed, 2 Dec 2009 13:41:35 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 444E88FC17 for ; Wed, 2 Dec 2009 13:41:35 +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 nB2DfZdn047300 for ; Wed, 2 Dec 2009 13:41:35 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2DfZhe047298 for perforce@freebsd.org; Wed, 2 Dec 2009 13:41:35 GMT (envelope-from jona@FreeBSD.org) Date: Wed, 2 Dec 2009 13:41:35 GMT Message-Id: <200912021341.nB2DfZhe047298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 13:41:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=171267 Change 171267 by jona@jona-capsicum-belle64-ufs on 2009/12/02 13:41:19 Enable faccessat(2) in capability mode Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#16 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#43 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#19 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#16 (text+ko) ==== @@ -28,7 +28,7 @@ Low-level TODO list: - Add support for capability-mode *at() system calls: - faccessat INPROGRESS JA + faccessat DONE 2 Dec 2009 JA fchmodat ---- fchownat ---- fstatat ---- ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#23 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#22 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#23 $ ## ## @@ -453,9 +453,10 @@ olio_listio ## -## Allow openat(2), which we have constrained to prevent accessing files -## which are not "under" the directory FD given to the syscall. +## Allow faccessat(2) and openat(2), which we have constrained to prevent accessing +## files which are not "under" the directory FD given to the syscall. ## +faccessat openat ## ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#43 (text+ko) ==== @@ -523,7 +523,7 @@ { AS(cpuset_getid_args), (sy_call_t *)cpuset_getid, AUE_NULL, NULL, 0, 0, 0 }, /* 486 = cpuset_getid */ { AS(cpuset_getaffinity_args), (sy_call_t *)cpuset_getaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 487 = cpuset_getaffinity */ { AS(cpuset_setaffinity_args), (sy_call_t *)cpuset_setaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 488 = cpuset_setaffinity */ - { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 }, /* 489 = faccessat */ + { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, SYF_CAPENABLED }, /* 489 = faccessat */ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#19 (text+ko) ==== @@ -2219,7 +2219,7 @@ int flags, int mode) { struct ucred *cred, *tmpcred; - struct vnode *vp; + struct vnode *vp, *base = 0; struct nameidata nd; int vfslocked; int error; @@ -2238,8 +2238,25 @@ } else cred = tmpcred = td->td_ucred; AUDIT_ARG_VALUE(mode); - NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | - AUDITVNODE1, pathseg, path, fd, td); + + /* + * if a relative base was specified and we're in capability mode, find + * the vnode of the base so that namei() can restrict itself accordingly + */ + if ((cred->cr_flags & CRED_FLAG_CAPMODE) && (fd >= 0)) { + + if ((error = fgetvp(td, fd, CAP_LOOKUP | CAP_ATBASE, &base))) + /* XXX: more CAP_FOO? */ + return (error); + + if ((error = vn_lock(base, LK_SHARED))) { + vrele (base); + return (error); + } + } + + NDINIT_ATBASE(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | + AUDITVNODE1, pathseg, path, fd, base, td); if ((error = namei(&nd)) != 0) goto out1; vfslocked = NDHASGIANT(&nd); @@ -2254,6 +2271,7 @@ td->td_ucred = cred; crfree(tmpcred); } + if (base) vput(base); return (error); } From owner-p4-projects@FreeBSD.ORG Wed Dec 2 14:48:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D2A01065679; Wed, 2 Dec 2009 14:48:43 +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 20AE71065672 for ; Wed, 2 Dec 2009 14:48:43 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E5C68FC13 for ; Wed, 2 Dec 2009 14:48:43 +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 nB2Emg6c056852 for ; Wed, 2 Dec 2009 14:48:42 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2EmguA056850 for perforce@freebsd.org; Wed, 2 Dec 2009 14:48:42 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 14:48:42 GMT Message-Id: <200912021448.nB2EmguA056850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 14:48:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=171270 Change 171270 by raj@raj_fdt on 2009/12/02 14:47:55 Fix build errors when using 'buildenv' target to build dtc. Affected files ... .. //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#2 edit Differences ... ==== //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#2 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS= dtc.c checks.c fstree.c livetree.c treesource.c data.c \ flattree.c srcpos.c util.c \ fdt.c fdt_ro.c fdt_rw.c fdt_strerror.c \ - fdt_sw.c fdt_wip.c + fdt_sw.c fdt_wip.c $(DTCDIR)/version_gen.h CFLAGS = -Wall -g -Os -fPIC -Wpointer-arith -Wcast-qual CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${DTCDIR}/libfdt @@ -18,21 +18,20 @@ VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile VERSIONEXTRA!= $(DTCDIR)/scripts/setlocalversion -DTCVERSION= ${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA} -DTCVERSIONFILE= version_gen.h +DTCVERSION:= ${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA} +DTCVERSIONFILE:= $(DTCDIR)/version_gen.h MAN= BISON= yacc LEX= lex -OBJS+= $(DTCVERSIONFILE) dtc-parser.tab.o dtc-lexer.lex.o +OBJS+= dtc-parser.tab.o dtc-lexer.lex.o CLEANFILES+= dtc-parser.tab.o dtc-lexer.lex.o dtc-parser.tab.c \ dtc-parser.tab.h dtc-lexer.lex.c ${DTCVERSIONFILE} $(DTCVERSIONFILE): - @echo ${DTCVERSION} @echo '#define DTC_VERSION "DTC ${DTCVERSION}"' > ${DTCVERSIONFILE} dtc-parser.tab.o: dtc-parser.tab.c dtc-parser.tab.h From owner-p4-projects@FreeBSD.ORG Wed Dec 2 15:38:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45B7210656AA; Wed, 2 Dec 2009 15:38:33 +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 0A0611065693 for ; Wed, 2 Dec 2009 15:38:33 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1EE78FC0C for ; Wed, 2 Dec 2009 15:38:32 +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 nB2FcWOr064615 for ; Wed, 2 Dec 2009 15:38:32 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2FcWMJ064613 for perforce@freebsd.org; Wed, 2 Dec 2009 15:38:32 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 15:38:32 GMT Message-Id: <200912021538.nB2FcWMJ064613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 15:38:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=171273 Change 171273 by raj@raj_fdt on 2009/12/02 15:38:30 Initial support for FDT blob handling in loader(8). The following operations are supported: - load blob as a KLD data module - retrieve and validate blob header - list device tree - inspect node properties - run-time manipulate the blob: - modify existing props - add, delete props - add, delete nodes - prapare device tree blob as part of metadata, pass it to the kernel for booting Usage examples can be found here: http://wiki.freebsd.org/FlattenedDeviceTree/loader Affected files ... .. //depot/projects/fdt/sys/boot/fdt/Makefile#1 add .. //depot/projects/fdt/sys/boot/powerpc/uboot/Makefile#2 edit .. //depot/projects/fdt/sys/boot/uboot/common/main.c#2 edit .. //depot/projects/fdt/sys/boot/uboot/common/metadata.c#3 edit .. //depot/projects/fdt/sys/boot/uboot/lib/Makefile#2 edit .. //depot/projects/fdt/sys/boot/uboot/lib/fdt.c#1 add Differences ... ==== //depot/projects/fdt/sys/boot/powerpc/uboot/Makefile#2 (text+ko) ==== @@ -19,6 +19,8 @@ LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no +LOADER_FDT_SUPPORT?= yes + .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT .endif @@ -46,6 +48,9 @@ .if ${LOADER_TFTP_SUPPORT} == "yes" CFLAGS+= -DLOADER_TFTP_SUPPORT .endif +.if ${LOADER_FDT_SUPPORT} == "yes" +CFLAGS+= -DLOADER_FDT_SUPPORT +.endif .if !defined(NO_FORTH) # Enable BootForth @@ -71,6 +76,11 @@ .include "${.CURDIR}/../../uboot/common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../uboot/common +# FDT support library +LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +CFLAGS+= -I${.CURDIR}/../../fdt +CFLAGS+= -I${.OBJDIR}/../../fdt + # U-Boot standalone support library LIBUBOOT= ${.OBJDIR}/../../uboot/lib/libuboot.a CFLAGS+= -I${.CURDIR}/../../uboot/lib @@ -79,8 +89,8 @@ # where to get libstand from CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBUBOOT} -lstand +DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ==== //depot/projects/fdt/sys/boot/uboot/common/main.c#2 (text+ko) ==== @@ -258,3 +258,5 @@ ub_dump_si(si); return (CMD_OK); } + +COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt); ==== //depot/projects/fdt/sys/boot/uboot/common/metadata.c#3 (text+ko) ==== @@ -42,6 +42,8 @@ #include "bootstrap.h" #include "glue.h" +extern int fdt_fixup(void); + /* * Return a 'boothowto' value corresponding to the kernel arguments in * (kargs) and any relevant environment variables. @@ -262,15 +264,15 @@ { #define TMP_MAX_ETH 8 #define TMP_MAX_MR 8 - struct bootinfo *bi; - struct bi_mem_region tmp_mr[TMP_MAX_MR]; - struct bi_eth_addr tmp_eth[TMP_MAX_ETH]; - struct sys_info *si; - char *str, *end; - const char *env; - void *ptr; - u_int8_t tmp_addr[6]; - int i, n, mr_no, eth_no, size; + struct bootinfo *bi; + struct bi_mem_region tmp_mr[TMP_MAX_MR]; + struct bi_eth_addr tmp_eth[TMP_MAX_ETH]; + struct sys_info *si; + char *str, *end; + const char *env; + void *ptr; + uint8_t tmp_addr[6]; + int i, n, mr_no, eth_no, size; if ((si = ub_get_sys_info()) == NULL) panic("can't retrieve U-Boot sysinfo"); @@ -370,7 +372,7 @@ int md_load(char *args, vm_offset_t *modulep) { - struct preloaded_file *kfp; + struct preloaded_file *kfp, *bfp; struct preloaded_file *xp; struct file_metadata *md; struct bootinfo *bip; @@ -379,6 +381,7 @@ vm_offset_t envp; vm_offset_t size; vm_offset_t vaddr; + vm_offset_t dtbp; char *rootdevname; int howto; int bisize; @@ -389,7 +392,8 @@ * relocation. */ uint32_t mdt[] = { - MODINFOMD_SSYM, MODINFOMD_ESYM, MODINFOMD_KERNEND, MODINFOMD_ENVP + MODINFOMD_SSYM, MODINFOMD_ESYM, MODINFOMD_KERNEND, + MODINFOMD_ENVP, MODINFOMD_DTBP }; howto = md_getboothowto(args); @@ -405,23 +409,23 @@ /* Try reading the /etc/fstab file to select the root device */ getrootmount(rootdevname); - /* find the last module in the chain */ + /* Find the last module in the chain */ addr = 0; for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { if (addr < (xp->f_addr + xp->f_size)) addr = xp->f_addr + xp->f_size; } - /* pad to a page boundary */ + /* Pad to a page boundary */ addr = roundup(addr, PAGE_SIZE); - /* copy our environment */ + /* Copy our environment */ envp = addr; addr = md_copyenv(addr); - /* pad to a page boundary */ + /* Pad to a page boundary */ addr = roundup(addr, PAGE_SIZE); - /* prepare bootinfo */ + /* Prepare bootinfo */ bisize = md_bootinfo(&bip); kernend = 0; @@ -433,12 +437,21 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_BOOTINFO, bisize, bip); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); + + /* XXX This should be conditional: whether FDT support is enabled */ + /* Handle device tree blob */ + fdt_fixup(); + bfp = file_findfile(NULL, "dtb"); + dtbp = bfp == NULL ? 0 : bfp->f_addr; + file_addmetadata(kfp, MODINFOMD_DTBP, sizeof dtbp, &dtbp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); + /* Figure out the size and location of the metadata */ *modulep = addr; size = md_copymodules(0); kernend = roundup(addr + size, PAGE_SIZE); + /* Provide MODINFOMD_KERNEND */ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); @@ -453,7 +466,9 @@ bcopy(&vaddr, md->md_data, sizeof vaddr); } } + + /* Only now copy actual modules and metadata */ (void)md_copymodules(addr); - return(0); + return (0); } ==== //depot/projects/fdt/sys/boot/uboot/lib/Makefile#2 (text+ko) ==== @@ -7,9 +7,15 @@ SRCS= devicename.c elf_freebsd.c console.c copy.c disk.c \ module.c net.c reboot.c time.c glue.c +SRCS+= fdt.c + CFLAGS+= -ffreestanding -msoft-float CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ + +# Pick up FDT includes +CFLAGS+= -I${.CURDIR}/../../../../sys/contrib/dtc/libfdt/ + # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. From owner-p4-projects@FreeBSD.ORG Wed Dec 2 17:46:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C7261065692; Wed, 2 Dec 2009 17:46:44 +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 58FC91065672 for ; Wed, 2 Dec 2009 17:46:44 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C72A8FC1C for ; Wed, 2 Dec 2009 17:46:44 +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 nB2HkiEr096740 for ; Wed, 2 Dec 2009 17:46:44 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2HkipX096738 for perforce@freebsd.org; Wed, 2 Dec 2009 17:46:44 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 17:46:44 GMT Message-Id: <200912021746.nB2HkipX096738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 17:46:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=171284 Change 171284 by raj@raj_fdt on 2009/12/02 17:46:39 Provide missing metadata type for device tree blob. Affected files ... .. //depot/projects/fdt/sys/powerpc/include/metadata.h#2 edit Differences ... ==== //depot/projects/fdt/sys/powerpc/include/metadata.h#2 (text+ko) ==== @@ -33,5 +33,6 @@ #define MODINFOMD_HOWTO 0x1002 #define MODINFOMD_KERNEND 0x1003 #define MODINFOMD_BOOTINFO 0x1004 +#define MODINFOMD_DTBP 0x1005 #endif /* !_MACHINE_METADATA_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Dec 2 17:47:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAF021065694; Wed, 2 Dec 2009 17:47:45 +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 7F8D11065672 for ; Wed, 2 Dec 2009 17:47:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 533A68FC18 for ; Wed, 2 Dec 2009 17:47:45 +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 nB2HljSO096925 for ; Wed, 2 Dec 2009 17:47:45 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2Hlj50096923 for perforce@freebsd.org; Wed, 2 Dec 2009 17:47:45 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 17:47:45 GMT Message-Id: <200912021747.nB2Hlj50096923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 17:47:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=171285 Change 171285 by raj@raj_fdt on 2009/12/02 17:47:24 Fix build of libfdt for loader(8). Affected files ... .. //depot/projects/fdt/sys/boot/Makefile#3 edit Differences ... ==== //depot/projects/fdt/sys/boot/Makefile#3 (text+ko) ==== @@ -26,6 +26,8 @@ SUBDIR+= zfs .endif +SUBDIR+= fdt + # Pick the machine-dependent subdir based on the target architecture. ADIR= ${MACHINE:S/amd64/i386/:S/sun4v/sparc64/} .if exists(${.CURDIR}/${ADIR}/.) From owner-p4-projects@FreeBSD.ORG Wed Dec 2 18:59:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 534981065679; Wed, 2 Dec 2009 18:59:58 +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 17E2C1065670 for ; Wed, 2 Dec 2009 18:59:58 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05A478FC16 for ; Wed, 2 Dec 2009 18:59:58 +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 nB2Ixvsh011470 for ; Wed, 2 Dec 2009 18:59:57 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2IxvB0011468 for perforce@freebsd.org; Wed, 2 Dec 2009 18:59:57 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 18:59:57 GMT Message-Id: <200912021859.nB2IxvB0011468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 18:59:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=171289 Change 171289 by raj@raj_fdt on 2009/12/02 18:59:18 Bring memchr() from libc for libkern use. This will be required by libfdt when built as part of the kernel code. Affected files ... .. //depot/projects/fdt/sys/libkern/memchr.c#1 add .. //depot/projects/fdt/sys/sys/libkern.h#2 edit Differences ... ==== //depot/projects/fdt/sys/sys/libkern.h#2 (text+ko) ==== @@ -92,6 +92,7 @@ int fnmatch(const char *, const char *, int); void gets(char *, size_t, int); int locc(int, char *, u_int); +void *memchr(const void *s, int c, size_t n); int memcmp(const void *b1, const void *b2, size_t len); void qsort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)); From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:03:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF081065679; Wed, 2 Dec 2009 19:03:01 +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 5121F1065672 for ; Wed, 2 Dec 2009 19:03:01 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C2E58FC0C for ; Wed, 2 Dec 2009 19:03:01 +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 nB2J31sV012214 for ; Wed, 2 Dec 2009 19:03:01 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2J31Xj012197 for perforce@freebsd.org; Wed, 2 Dec 2009 19:03:01 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:03:01 GMT Message-Id: <200912021903.nB2J31Xj012197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:03:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=171290 Change 171290 by raj@raj_fdt on 2009/12/02 19:02:55 Introduce a new kernel build option, FDT, for creating FDT-enabled kernels. Only PowerPC initially. Affected files ... .. //depot/projects/fdt/sys/conf/options.powerpc#2 edit Differences ... ==== //depot/projects/fdt/sys/conf/options.powerpc#2 (text+ko) ==== @@ -10,8 +10,9 @@ GFB_NO_FONT_LOADING opt_gfb.h GFB_NO_MODE_CHANGE opt_gfb.h +FDT opt_platform.h +MPC85XX opt_platform.h POWERMAC opt_platform.h -MPC85XX opt_platform.h PSIM SC_OFWFB opt_ofwfb.h From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:05:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD1B9106568F; Wed, 2 Dec 2009 19:05:03 +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 80EAE1065698 for ; Wed, 2 Dec 2009 19:05:03 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DEE18FC0A for ; Wed, 2 Dec 2009 19:05:03 +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 nB2J53Ft013422 for ; Wed, 2 Dec 2009 19:05:03 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2J53Qx013420 for perforce@freebsd.org; Wed, 2 Dec 2009 19:05:03 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:05:03 GMT Message-Id: <200912021905.nB2J53Qx013420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:05:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=171291 Change 171291 by raj@raj_fdt on 2009/12/02 19:04:07 Integrate libfdt code into kernel image. Enable FDT support code for MPC85XX kernel. Affected files ... .. //depot/projects/fdt/sys/conf/Makefile.powerpc#2 edit .. //depot/projects/fdt/sys/conf/files.powerpc#2 edit .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#2 edit .. //depot/projects/fdt/sys/powerpc/conf/MPC85XX#2 edit Differences ... ==== //depot/projects/fdt/sys/conf/Makefile.powerpc#2 (text+ko) ==== @@ -32,6 +32,8 @@ CFLAGS+= -msoft-float +INCLUDES+= -I$S/contrib/dtc/libfdt + DDB_ENABLED!= grep DDB opt_ddb.h || true .if !empty(DDB_ENABLED) CFLAGS+= -fno-omit-frame-pointer ==== //depot/projects/fdt/sys/conf/files.powerpc#2 (text+ko) ==== @@ -15,6 +15,12 @@ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # +contrib/dtc/libfdt/fdt.c optional fdt +contrib/dtc/libfdt/fdt_ro.c optional fdt +contrib/dtc/libfdt/fdt_rw.c optional fdt +contrib/dtc/libfdt/fdt_strerror.c optional fdt +contrib/dtc/libfdt/fdt_sw.c optional fdt +contrib/dtc/libfdt/fdt_wip.c optional fdt crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac @@ -63,6 +69,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memchr.c optional fdt libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard ==== //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#2 (text+ko) ==== @@ -1,9 +1,17 @@ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H +#ifdef _KERNEL +#include +#include +#include +#include +#include +#else #include #include #include +#endif #define _B(n) ((unsigned long long)((uint8_t *)&x)[n]) static inline uint32_t fdt32_to_cpu(uint32_t x) ==== //depot/projects/fdt/sys/powerpc/conf/MPC85XX#2 (text+ko) ==== @@ -25,6 +25,7 @@ options DEVICE_POLLING options HZ=1000 #options DIAGNOSTIC +options FDT options FFS options GDB options GEOM_PART_GPT From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:32:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86E201065676; Wed, 2 Dec 2009 19:32:31 +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 31C161065670 for ; Wed, 2 Dec 2009 19:32:31 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F4818FC15 for ; Wed, 2 Dec 2009 19:32:31 +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 nB2JWUkm019142 for ; Wed, 2 Dec 2009 19:32:31 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2JWUHi019140 for perforce@freebsd.org; Wed, 2 Dec 2009 19:32:30 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:32:30 GMT Message-Id: <200912021932.nB2JWUHi019140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:32:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=171292 Change 171292 by raj@raj_fdt on 2009/12/02 19:31:45 Extend the ofw I/F so that ofw_init() can return a value. This will allow for better handling during initialization the flattened device ofw I/F back-end. Affected files ... .. //depot/projects/fdt/sys/dev/ofw/ofw_if.m#2 edit .. //depot/projects/fdt/sys/dev/ofw/ofw_standard.c#2 edit .. //depot/projects/fdt/sys/dev/ofw/openfirm.c#2 edit .. //depot/projects/fdt/sys/dev/ofw/openfirm.h#2 edit .. //depot/projects/fdt/sys/powerpc/ofw/ofw_real.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/ofw/ofw_if.m#2 (text+ko) ==== @@ -43,7 +43,7 @@ * @param _cookie A handle to the client interface, generally the OF * callback routine. */ -METHOD void init { +METHOD int init { ofw_t _ofw; void *_cookie; }; ==== //depot/projects/fdt/sys/dev/ofw/ofw_standard.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ #include "ofw_if.h" -static void ofw_std_init(ofw_t ofw, void *openfirm); +static int ofw_std_init(ofw_t ofw, void *openfirm); static int ofw_std_test(ofw_t ofw, const char *name); static int ofw_std_interpret(ofw_t ofw, const char *cmd, int nreturns, unsigned long *returns); @@ -150,11 +150,12 @@ /* Initializer */ -static void +static int ofw_std_init(ofw_t ofw, void *openfirm) { openfirmware = (int (*)(void *))openfirm; + return (0); } /* ==== //depot/projects/fdt/sys/dev/ofw/openfirm.c#2 (text+ko) ==== @@ -58,6 +58,8 @@ #include __FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.25 2009/06/14 00:05:38 marius Exp $"); +#include "opt_platform.h" + #include #include #include @@ -110,10 +112,10 @@ } /* Initializer */ -void +int OF_init(void *cookie) { - phandle_t chosen; + int rv; ofw_obj = &ofw_kernel_obj; /* @@ -123,12 +125,24 @@ kobj_class_compile_static(ofw_def_impl, &ofw_kernel_kops); kobj_init((kobj_t)ofw_obj, ofw_def_impl); - OFW_INIT(ofw_obj, cookie); + if (rv = OFW_INIT(ofw_obj, cookie)) + return (rv); + +#ifndef FDT + /* + * XXX The #ifndef is a temporary workaround until we handle /chosen + * properly for the FDT blob. + */ + + phandle_t chosen; if ((chosen = OF_finddevice("/chosen")) == -1) OF_exit(); if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1) stdout = -1; +#endif + + return (rv); } void @@ -228,7 +242,7 @@ } /* - * Resursively search the node and its parent for the given property, working + * Recursively search the node and its parent for the given property, working * downward from the node to the device tree root. Returns the value of the * first match. */ ==== //depot/projects/fdt/sys/dev/ofw/openfirm.h#2 (text+ko) ==== @@ -83,7 +83,7 @@ */ boolean_t OF_install(char *name, int prio); -void OF_init(void *cookie); +int OF_init(void *cookie); /* * Known Open Firmware interface names ==== //depot/projects/fdt/sys/powerpc/ofw/ofw_real.c#2 (text+ko) ==== @@ -76,7 +76,7 @@ #include #include "ofw_if.h" -static void ofw_real_init(ofw_t, void *openfirm); +static int ofw_real_init(ofw_t, void *openfirm); static int ofw_real_test(ofw_t, const char *name); static phandle_t ofw_real_peer(ofw_t, phandle_t node); static phandle_t ofw_real_child(ofw_t, phandle_t node); @@ -256,13 +256,14 @@ /* Initialiser */ -static void +static int ofw_real_init(ofw_t ofw, void *openfirm) { openfirmware = (int (*)(void *))openfirm; mtx_init(&of_bounce_mtx, "OF Bounce Page", MTX_DEF, 0); of_bounce_virt = NULL; + return (0); } /* From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:34:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B831065670; Wed, 2 Dec 2009 19:34:33 +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 B5F9B106566C for ; Wed, 2 Dec 2009 19:34:33 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A6B48FC08 for ; Wed, 2 Dec 2009 19:34:33 +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 nB2JYX5a019590 for ; Wed, 2 Dec 2009 19:34:33 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2JYXYU019588 for perforce@freebsd.org; Wed, 2 Dec 2009 19:34:33 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:34:33 GMT Message-Id: <200912021934.nB2JYXYU019588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:34:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=171293 Change 171293 by raj@raj_fdt on 2009/12/02 19:34:08 Initial implementation of the ofw I/F back-end routines for FDT. Affected files ... .. //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:44:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E4F21065679; Wed, 2 Dec 2009 19:44:45 +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 097681065670 for ; Wed, 2 Dec 2009 19:44:45 +0000 (UTC) (envelope-from josh@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6FD58FC1D for ; Wed, 2 Dec 2009 19:44:44 +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 nB2Jiij7021765 for ; Wed, 2 Dec 2009 19:44:44 GMT (envelope-from josh@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2Jihhq021756 for perforce@freebsd.org; Wed, 2 Dec 2009 19:44:43 GMT (envelope-from josh@freebsd.org) Date: Wed, 2 Dec 2009 19:44:43 GMT Message-Id: <200912021944.nB2Jihhq021756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to josh@freebsd.org using -f From: Josh Carter To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:44:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=171294 Change 171294 by josh@josh-freebsd on 2009/12/02 19:44:34 Integration from vendor/freebsd p4 revision 171288, svn revision 200042. Affected files ... .. //depot/projects/zfs/ObsoleteFiles.inc#2 integrate .. //depot/projects/zfs/UPDATING#2 integrate .. //depot/projects/zfs/bin/Makefile#2 integrate .. //depot/projects/zfs/bin/ps/keyword.c#2 integrate .. //depot/projects/zfs/bin/pwait/Makefile#1 branch .. //depot/projects/zfs/bin/pwait/pwait.1#1 branch .. //depot/projects/zfs/bin/pwait/pwait.c#1 branch .. //depot/projects/zfs/bin/sh/cd.c#2 integrate .. //depot/projects/zfs/bin/sh/error.c#2 integrate .. //depot/projects/zfs/bin/sh/error.h#2 integrate .. //depot/projects/zfs/bin/sh/eval.c#2 integrate .. //depot/projects/zfs/bin/sh/histedit.c#2 integrate .. //depot/projects/zfs/bin/sh/input.c#2 integrate .. //depot/projects/zfs/bin/sh/input.h#2 integrate .. //depot/projects/zfs/bin/sh/jobs.c#2 integrate .. //depot/projects/zfs/bin/sh/main.c#2 integrate .. //depot/projects/zfs/bin/sh/output.c#2 integrate .. //depot/projects/zfs/bin/sh/output.h#2 integrate .. //depot/projects/zfs/bin/sh/parser.c#2 integrate .. //depot/projects/zfs/bin/sh/redir.c#2 integrate .. //depot/projects/zfs/bin/sh/trap.c#2 integrate .. //depot/projects/zfs/bin/sh/var.c#2 integrate .. //depot/projects/zfs/cddl/usr.bin/ztest/Makefile#2 edit .. //depot/projects/zfs/contrib/bind9/CHANGES#2 integrate .. //depot/projects/zfs/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/zfs/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/zfs/contrib/bind9/version#2 integrate .. //depot/projects/zfs/contrib/file/magic2mime#1 branch .. //depot/projects/zfs/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/zfs/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/zfs/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/zfs/crypto/openssh/sshd.c#2 integrate .. //depot/projects/zfs/etc/Makefile#2 integrate .. //depot/projects/zfs/etc/defaults/rc.conf#2 integrate .. //depot/projects/zfs/etc/rc.d/Makefile#2 integrate .. //depot/projects/zfs/etc/rc.d/ip6fw#2 delete .. //depot/projects/zfs/etc/rc.d/ipfw#2 integrate .. //depot/projects/zfs/etc/rc.firewall#2 integrate .. //depot/projects/zfs/etc/rc.firewall6#2 delete .. //depot/projects/zfs/games/factor/factor.c#2 integrate .. //depot/projects/zfs/include/Makefile#2 integrate .. //depot/projects/zfs/include/signal.h#2 integrate .. //depot/projects/zfs/include/termios.h#1 branch .. //depot/projects/zfs/lib/bind/config.h#2 integrate .. //depot/projects/zfs/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/arm/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/i386-elf/crt1.c#2 delete .. //depot/projects/zfs/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/zfs/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/zfs/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/mips/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/zfs/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/zfs/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/zfs/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/zfs/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/zfs/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/zfs/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/zfs/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/zfs/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/exec.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/fts.3#2 integrate .. //depot/projects/zfs/lib/libc/gen/fts.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/zfs/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/zfs/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/zfs/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/zfs/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/zfs/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/zfs/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/zfs/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/zfs/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/zfs/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/zfs/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/zfs/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/zfs/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/zfs/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/zfs/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/zfs/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/zfs/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/zfs/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/zfs/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/zfs/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/zfs/lib/libc/string/strcat.3#2 integrate .. //depot/projects/zfs/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/zfs/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/zfs/lib/libfetch/ftp.c#2 integrate .. //depot/projects/zfs/lib/librt/Makefile#2 integrate .. //depot/projects/zfs/lib/librt/mq.c#2 integrate .. //depot/projects/zfs/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/zfs/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/zfs/lib/libthr/Makefile#2 integrate .. //depot/projects/zfs/lib/libusb/libusb10.c#2 integrate .. //depot/projects/zfs/lib/libusb/libusb10.h#2 integrate .. //depot/projects/zfs/lib/libusb/libusb20.3#2 integrate .. //depot/projects/zfs/lib/libusb/libusb20.c#2 integrate .. //depot/projects/zfs/lib/libusb/libusb20.h#2 integrate .. //depot/projects/zfs/lib/libutil/libutil.h#2 integrate .. //depot/projects/zfs/lib/libutil/pw_util.c#2 integrate .. //depot/projects/zfs/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/zfs/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/zfs/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/zfs/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/zfs/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/zfs/sbin/fsck/fsck.c#2 integrate .. //depot/projects/zfs/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/zfs/sbin/ipfw/dummynet.c#2 integrate .. //depot/projects/zfs/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/zfs/share/man/man3/queue.3#2 integrate .. //depot/projects/zfs/share/man/man4/Makefile#2 integrate .. //depot/projects/zfs/share/man/man4/ada.4#1 branch .. //depot/projects/zfs/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/zfs/share/man/man4/ata.4#2 integrate .. //depot/projects/zfs/share/man/man4/ipsec.4#2 integrate .. //depot/projects/zfs/share/man/man4/mfi.4#2 integrate .. //depot/projects/zfs/share/man/man4/sctp.4#2 integrate .. //depot/projects/zfs/share/man/man4/wi.4#2 integrate .. //depot/projects/zfs/share/man/man8/Makefile#2 integrate .. //depot/projects/zfs/share/man/man8/rc.8#2 integrate .. //depot/projects/zfs/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/zfs/share/man/man9/ifnet.9#2 integrate .. //depot/projects/zfs/share/misc/bsd-family-tree#2 integrate .. //depot/projects/zfs/share/misc/committers-ports.dot#2 integrate .. //depot/projects/zfs/share/zoneinfo/antarctica#2 integrate .. //depot/projects/zfs/share/zoneinfo/australasia#2 integrate .. //depot/projects/zfs/share/zoneinfo/etcetera#2 integrate .. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/zfs/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/zfs/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/zfs/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/zfs/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/zfs/sys/amd64/include/mca.h#2 integrate .. //depot/projects/zfs/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/zfs/sys/arm/arm/trap.c#2 integrate .. //depot/projects/zfs/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/zfs/sys/arm/conf/AVILA#2 integrate .. //depot/projects/zfs/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/zfs/sys/boot/Makefile#2 integrate .. //depot/projects/zfs/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/zfs/sys/boot/i386/Makefile#2 integrate .. //depot/projects/zfs/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/zfs/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/zfs/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/zfs/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/zfs/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/zfs/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/zfs/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/zfs/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/zfs/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/zfs/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/zfs/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/zfs/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/zfs/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/zfs/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/zfs/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/zfs/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/zfs/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/zfs/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/zfs/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/zfs/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/zfs/sys/conf/files#2 integrate .. //depot/projects/zfs/sys/conf/files.amd64#2 integrate .. //depot/projects/zfs/sys/conf/files.i386#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/zfs/sys/ddb/db_command.c#2 integrate .. //depot/projects/zfs/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/zfs/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/zfs/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/zfs/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/zfs/sys/dev/adb/adb.h#2 integrate .. //depot/projects/zfs/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/zfs/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/zfs/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/zfs/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/zfs/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/zfs/sys/dev/an/if_an.c#2 integrate .. //depot/projects/zfs/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/zfs/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/zfs/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/zfs/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/zfs/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/zfs/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/zfs/sys/dev/ata/ata-usb.c#2 delete .. //depot/projects/zfs/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/zfs/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/zfs/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/zfs/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/zfs/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/zfs/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/zfs/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/zfs/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/zfs/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/zfs/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/zfs/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/zfs/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/zfs/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/zfs/sys/dev/de/if_de.c#2 integrate .. //depot/projects/zfs/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/zfs/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/zfs/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/zfs/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/zfs/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/zfs/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/zfs/sys/dev/et/if_et.c#2 integrate .. //depot/projects/zfs/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/zfs/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/zfs/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/zfs/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/zfs/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/zfs/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/zfs/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/zfs/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/zfs/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/zfs/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/zfs/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/zfs/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/zfs/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/zfs/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/zfs/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/zfs/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/zfs/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/zfs/sys/dev/mwl/if_mwlvar.h#2 integrate .. //depot/projects/zfs/sys/dev/my/if_my.c#2 integrate .. //depot/projects/zfs/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/zfs/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/zfs/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/zfs/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/zfs/sys/dev/pci/pci.c#2 integrate .. //depot/projects/zfs/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/zfs/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/zfs/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/zfs/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/zfs/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/zfs/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/zfs/sys/dev/re/if_re.c#2 integrate .. //depot/projects/zfs/sys/dev/siis/siis.c#2 integrate .. //depot/projects/zfs/sys/dev/siis/siis.h#2 integrate .. //depot/projects/zfs/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/zfs/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/zfs/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/zfs/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/zfs/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/zfs/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/zfs/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/zfs/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/zfs/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/zfs/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/zfs/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/zfs/sys/dev/tl/if_tl.c#2 integrate .. //depot/projects/zfs/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/zfs/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/zfs/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/zfs/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uhcireg.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/zfs/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usbdi_util.h#1 branch .. //depot/projects/zfs/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/zfs/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/zfs/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/zfs/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/zfs/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/zfs/sys/dev/wb/if_wb.c#2 integrate .. //depot/projects/zfs/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/zfs/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/zfs/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/zfs/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/zfs/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/zfs/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/zfs/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/zfs/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/zfs/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/zfs/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label.h#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_ext2fs.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_gpt.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/zfs/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/zfs/sys/i386/conf/NOTES#2 integrate .. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/zfs/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/zfs/sys/i386/i386/mca.c#2 integrate .. //depot/projects/zfs/sys/i386/i386/trap.c#2 integrate .. //depot/projects/zfs/sys/i386/include/mca.h#2 integrate .. //depot/projects/zfs/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/zfs/sys/i386/xen/exception.s#2 integrate .. //depot/projects/zfs/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/zfs/sys/ia64/include/param.h#2 integrate .. //depot/projects/zfs/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/zfs/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/zfs/sys/kern/kern_linker.c#2 integrate .. //depot/projects/zfs/sys/kern/kern_sig.c#2 integrate .. //depot/projects/zfs/sys/kern/sched_ule.c#2 integrate .. //depot/projects/zfs/sys/kern/sys_process.c#2 integrate .. //depot/projects/zfs/sys/kern/tty.c#2 integrate .. //depot/projects/zfs/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/zfs/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/zfs/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/zfs/sys/mips/mips/trap.c#2 integrate .. //depot/projects/zfs/sys/modules/Makefile#2 integrate .. //depot/projects/zfs/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/zfs/sys/modules/amdsbwd/Makefile#1 branch .. //depot/projects/zfs/sys/modules/ata/atausb/Makefile#2 delete .. //depot/projects/zfs/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/zfs/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/zfs/sys/net/if.c#2 integrate .. //depot/projects/zfs/sys/net/if_dead.c#2 integrate .. //depot/projects/zfs/sys/net/if_var.h#2 integrate .. //depot/projects/zfs/sys/net/route.c#2 integrate .. //depot/projects/zfs/sys/netinet/in.h#2 integrate .. //depot/projects/zfs/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/zfs/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/zfs/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/zfs/sys/netinet/ipfw/ip_dummynet.c#2 integrate .. //depot/projects/zfs/sys/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/zfs/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/zfs/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/zfs/sys/netinet/sctputil.c#2 integrate .. //depot/projects/zfs/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/zfs/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/zfs/sys/netipsec/ipcomp_var.h#2 integrate .. //depot/projects/zfs/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/zfs/sys/netipsec/key.c#2 integrate .. //depot/projects/zfs/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/zfs/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/zfs/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/zfs/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/zfs/sys/opencrypto/deflate.h#2 integrate .. //depot/projects/zfs/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/zfs/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/zfs/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/zfs/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/zfs/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/zfs/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/zfs/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/zfs/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/zfs/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/zfs/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/zfs/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/zfs/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/zfs/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/zfs/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/zfs/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/zfs/sys/sys/_termios.h#1 branch .. //depot/projects/zfs/sys/sys/ata.h#2 integrate .. //depot/projects/zfs/sys/sys/elf_common.h#2 integrate .. //depot/projects/zfs/sys/sys/param.h#2 integrate .. //depot/projects/zfs/sys/sys/sdt.h#2 integrate .. //depot/projects/zfs/sys/sys/signal.h#2 integrate .. //depot/projects/zfs/sys/sys/signalvar.h#2 integrate .. //depot/projects/zfs/sys/sys/termios.h#2 integrate .. //depot/projects/zfs/sys/sys/tty.h#2 integrate .. //depot/projects/zfs/sys/vm/vm.h#2 integrate .. //depot/projects/zfs/sys/vm/vm_extern.h#2 integrate .. //depot/projects/zfs/sys/vm/vm_fault.c#2 integrate .. //depot/projects/zfs/sys/vm/vm_map.c#2 integrate .. //depot/projects/zfs/sys/vm/vm_map.h#2 integrate .. //depot/projects/zfs/tools/build/options/WITH_BIND_LIBS#1 branch .. //depot/projects/zfs/tools/regression/bin/sh/builtins/cd1.0#2 integrate .. //depot/projects/zfs/tools/regression/bin/sh/builtins/cd2.0#1 branch .. //depot/projects/zfs/tools/regression/bin/sh/builtins/fc1.0#1 branch .. //depot/projects/zfs/tools/regression/bin/sh/builtins/trap3.0#1 branch .. //depot/projects/zfs/tools/regression/bin/sh/errors/backquote-error1.0#2 integrate .. //depot/projects/zfs/tools/regression/bin/sh/execution/redir1.0#1 branch .. //depot/projects/zfs/tools/regression/bin/sh/execution/redir2.0#1 branch .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0080.h#2 integrate .. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch .. //depot/projects/zfs/tools/regression/environ/Makefile.envctl#2 integrate .. //depot/projects/zfs/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/zfs/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/ALIX_DSK#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/ALIX_NFS#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/etc/rc.conf#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/etc/ttys#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.cshrc#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.k5login#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.login#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/change_password#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/save_cfg#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/save_sshkeys#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/updatep1#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/updatep2#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/usr/ports/.keepme#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/alix_dsk.conf#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/alix_nfs.conf#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/build.sh#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/common.conf#1 branch .. //depot/projects/zfs/tools/tools/nanobsd/pcengines/test.sh#1 branch .. //depot/projects/zfs/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/zfs/usr.bin/gcore/Makefile#2 integrate .. //depot/projects/zfs/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/zfs/usr.bin/gcore/gcore.1#2 integrate .. //depot/projects/zfs/usr.bin/gcore/gcore.c#2 integrate .. //depot/projects/zfs/usr.bin/gzip/unbzip2.c#2 integrate .. //depot/projects/zfs/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/zfs/usr.bin/make/arch.c#2 integrate .. //depot/projects/zfs/usr.bin/make/dir.c#2 integrate .. //depot/projects/zfs/usr.bin/make/job.c#2 integrate .. //depot/projects/zfs/usr.bin/netstat/if.c#2 integrate .. //depot/projects/zfs/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/zfs/usr.bin/netstat/main.c#2 integrate .. //depot/projects/zfs/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/zfs/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/zfs/usr.bin/perror/perror.c#2 integrate .. //depot/projects/zfs/usr.bin/unifdef/unifdef.1#2 integrate .. //depot/projects/zfs/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/zfs/usr.bin/unifdef/unifdefall.sh#2 integrate .. //depot/projects/zfs/usr.bin/w/w.c#2 integrate .. //depot/projects/zfs/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/zfs/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/zfs/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate .. //depot/projects/zfs/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/zfs/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/zfs/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/zfs/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.214 2009/12/02 15:05:26 ume 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,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 +# 20091117: removal of rc.early(8) link +OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed ==== //depot/projects/zfs/UPDATING#2 (text+ko) ==== @@ -42,6 +42,10 @@ Applications that require wireless scan results (e.g. ifconfig(8)) from net80211 need to be recompiled. + Applications such as wpa_supplicant(8) may require a full world + build without using NO_CLEAN in order to get synchronized with the + new structure. + 20091025: The iwn(4) driver has been updated to support the 5000 and 5150 series. There's one kernel module for each firmware. Adding "device iwnfw" @@ -1072,4 +1076,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $ +$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ ==== //depot/projects/zfs/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ +# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $ .include @@ -27,6 +27,7 @@ pax \ pkill \ ps \ + pwait \ pwd \ ${_rcp} \ realpath \ ==== //depot/projects/zfs/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $"); #include #include @@ -330,6 +330,7 @@ errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); + free(realfmt); } return ((VAR *)NULL); } ==== //depot/projects/zfs/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); #include #include @@ -70,7 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); -STATIC char *getpwd2(char *, size_t); +STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -263,10 +263,8 @@ * any more because we traversed a symbolic link or something * we couldn't stat(). */ - if (dir == NULL || curdir == NULL) { - p = stalloc(PATH_MAX); - return getpwd2(p, PATH_MAX); - } + if (dir == NULL || curdir == NULL) + return getpwd2(); cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); STARTSTACKSTR(new); @@ -313,7 +311,7 @@ int pwdcmd(int argc, char **argv) { - char buf[PATH_MAX]; + char *p; int ch, phys; optreset = 1; optind = 1; opterr = 0; /* initialize getopt */ @@ -341,9 +339,9 @@ out1str(curdir); out1c('\n'); } else { - if (getcwd(buf, sizeof(buf)) == NULL) + if ((p = getpwd2()) == NULL) error(".: %s", strerror(errno)); - out1str(buf); + out1str(p); out1c('\n'); } @@ -356,36 +354,45 @@ char * getpwd(void) { - char buf[PATH_MAX]; char *p; if (curdir) return curdir; - p = getpwd2(buf, sizeof(buf)); + p = getpwd2(); if (p != NULL) curdir = savestr(p); return curdir; } +#define MAXPWD 256 + /* * Return the current directory. */ STATIC char * -getpwd2(char *buf, size_t size) +getpwd2(void) { - if (getcwd(buf, size) == NULL) { - char *pwd = getenv("PWD"); - struct stat stdot, stpwd; + struct stat stdot, stpwd; + char *pwd; + int i; - if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && - stat(pwd, &stpwd) != -1 && - stdot.st_dev == stpwd.st_dev && - stdot.st_ino == stpwd.st_ino) { + for (i = MAXPWD;; i *= 2) { + pwd = stalloc(i); + if (getcwd(pwd, i) != NULL) return pwd; - } - return NULL; + stunalloc(pwd); + if (errno != ERANGE) + break; + } + + pwd = getenv("PWD"); + if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && + stat(pwd, &stpwd) != -1 && + stdot.st_dev == stpwd.st_dev && + stdot.st_ino == stpwd.st_ino) { + return pwd; } - return buf; + return NULL; } ==== //depot/projects/zfs/bin/sh/error.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); /* * Errors and exceptions. @@ -73,11 +73,15 @@ * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) ==== //depot/projects/zfs/bin/sh/error.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ */ /* @@ -72,6 +72,8 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending ==== //depot/projects/zfs/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $"); #include #include @@ -593,6 +593,7 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; @@ -781,7 +782,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -797,6 +797,7 @@ longjmp(handler->loc, 1); } handler = &jmploc; + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); funcnest++; @@ -833,6 +834,7 @@ mode |= REDIR_BACKQ; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -867,6 +869,7 @@ if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); + popfilesupto(savetopfile); FORCEINTON; } if (cmdentry.u.index != EXECCMD) @@ -880,7 +883,6 @@ #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); ==== //depot/projects/zfs/bin/sh/histedit.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.31 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); #include #include @@ -92,7 +92,7 @@ if (hist != NULL) sethistsize(histsizeval()); else - out2str("sh: can't initialize history\n"); + out2fmt_flush("sh: can't initialize history\n"); } if (editing && !el && isatty(0)) { /* && isatty(2) ??? */ /* @@ -114,7 +114,7 @@ el_set(el, EL_PROMPT, getprompt); } else { bad: - out2str("sh: can't initialize editing\n"); + out2fmt_flush("sh: can't initialize editing\n"); } INTON; } else if (!editing && el) { @@ -336,6 +336,7 @@ if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { ==== //depot/projects/zfs/bin/sh/input.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.25 2009/06/17 21:58:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $"); #include /* defines BUFSIZ */ #include @@ -215,7 +215,7 @@ if (flags >= 0 && flags & O_NONBLOCK) { flags &=~ O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { - out2str("sh: turning off NDELAY mode\n"); + out2fmt_flush("sh: turning off NDELAY mode\n"); goto retry; } } @@ -359,7 +359,7 @@ struct strpush *sp; INTOFF; -/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/ +/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/ if (parsefile->strpush) { sp = ckmalloc(sizeof (struct strpush)); sp->prev = parsefile->strpush; @@ -386,7 +386,7 @@ parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; -/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/ +/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ if (sp->ap) sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; @@ -509,6 +509,32 @@ /* + * Return current file (to go back to it later using popfilesupto()). + */ + +struct parsefile * +getcurrentfile(void) +{ + return parsefile; +} + + +/* + * Pop files until the given file is on top again. Useful for regular + * builtins that read shell commands from files or strings. + * If the given file is not an active file, an error is raised. + */ + +void +popfilesupto(struct parsefile *file) +{ + while (parsefile != file && parsefile != &basepf) + popfile(); + if (parsefile != file) + error("popfilesupto() misused"); +} + +/* * Return to top level. */ ==== //depot/projects/zfs/bin/sh/input.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/input.h,v 1.10 2009/06/13 21:17:45 jilles Exp $ + * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ @@ -45,6 +45,8 @@ extern char *parsenextc; /* next character in input buffer */ extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct parsefile; + char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); @@ -56,6 +58,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:45:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8820B106568D; Wed, 2 Dec 2009 19:45:46 +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 4CE9C10656B9 for ; Wed, 2 Dec 2009 19:45:46 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 213438FC16 for ; Wed, 2 Dec 2009 19:45:46 +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 nB2JjjF5022020 for ; Wed, 2 Dec 2009 19:45:45 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2JjjwZ022017 for perforce@freebsd.org; Wed, 2 Dec 2009 19:45:45 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:45:45 GMT Message-Id: <200912021945.nB2JjjwZ022017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:45:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=171295 Change 171295 by raj@raj_fdt on 2009/12/02 19:45:10 Fix build error. Affected files ... .. //depot/projects/fdt/sys/dev/ofw/openfirm.c#3 edit Differences ... ==== //depot/projects/fdt/sys/dev/ofw/openfirm.c#3 (text+ko) ==== @@ -125,7 +125,7 @@ kobj_class_compile_static(ofw_def_impl, &ofw_kernel_kops); kobj_init((kobj_t)ofw_obj, ofw_def_impl); - if (rv = OFW_INIT(ofw_obj, cookie)) + if ((rv = OFW_INIT(ofw_obj, cookie)) != 0) return (rv); #ifndef FDT From owner-p4-projects@FreeBSD.ORG Wed Dec 2 19:48:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAF071065704; Wed, 2 Dec 2009 19:48:49 +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 9F7DA1065701 for ; Wed, 2 Dec 2009 19:48:49 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 739A08FC15 for ; Wed, 2 Dec 2009 19:48:49 +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 nB2JmnWv022625 for ; Wed, 2 Dec 2009 19:48:49 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2JmnOc022623 for perforce@freebsd.org; Wed, 2 Dec 2009 19:48:49 GMT (envelope-from raj@freebsd.org) Date: Wed, 2 Dec 2009 19:48:49 GMT Message-Id: <200912021948.nB2JmnOc022623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 19:48:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=171297 Change 171297 by raj@raj_fdt on 2009/12/02 19:48:47 Connect FDT ofw I/F back-end to the build. This gives us an FDT-enabled MPC85XX kernel featuring /dev/openfirm charcter device, accessible from user space. For more details and examples see http://wiki.freebsd.org/FlattenedDeviceTree/kernel Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#3 edit .. //depot/projects/fdt/sys/powerpc/booke/machdep.c#2 edit Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#3 (text+ko) ==== @@ -33,13 +33,14 @@ dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc -dev/ofw/openfirm.c optional aim -dev/ofw/openfirmio.c optional aim -dev/ofw/ofw_bus_if.m optional aim -dev/ofw/ofw_if.m optional aim -dev/ofw/ofw_bus_subr.c optional aim +dev/ofw/openfirm.c optional aim | fdt +dev/ofw/openfirmio.c optional aim | fdt +dev/ofw/ofw_bus_if.m optional aim | fdt +dev/ofw/ofw_if.m optional aim | fdt +dev/ofw/ofw_bus_subr.c optional aim | fdt dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim +dev/ofw/ofw_fdt.c optional fdt dev/ofw/ofw_iicbus.c optional iicbus aim dev/ofw/ofw_standard.c optional aim dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac ==== //depot/projects/fdt/sys/powerpc/booke/machdep.c#2 (text+ko) ==== @@ -135,6 +135,8 @@ #include #include +#include + #include #include @@ -334,12 +336,13 @@ { struct pcpu *pc; void *kmdp; - vm_offset_t end; + vm_offset_t end, dtbp; uint32_t csr; kmdp = NULL; end = endkernel; + dtbp = (vm_offset_t)NULL; /* * Parse metadata and fetch parameters. This must be done as the first @@ -354,6 +357,7 @@ boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); + dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); end = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); @@ -372,9 +376,15 @@ * restore everything as the TLB have all been reprogrammed * in the locore etc...) */ - while(1); + while (1); } + if (OF_install(OFW_FDT, 0) == FALSE) + while (1); + + if (OF_init((void *)dtbp) != 0) + while (1); + /* Initialize TLB1 handling */ tlb1_init(bootinfo->bi_bar_base); @@ -417,6 +427,8 @@ csr = ccsr_read4(OCP85XX_L2CTL); debugf(" L2CTL = 0x%08x\n", csr); + printf(" dtbp = 0x%08x\n", (uint32_t)dtbp); + print_bootinfo(); print_kernel_section_addr(); print_kenv(); From owner-p4-projects@FreeBSD.ORG Wed Dec 2 20:14:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4BF81065672; Wed, 2 Dec 2009 20:14:15 +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 A9249106566C for ; Wed, 2 Dec 2009 20:14:15 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E04C8FC12 for ; Wed, 2 Dec 2009 20:14:15 +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 nB2KEFkp029328 for ; Wed, 2 Dec 2009 20:14:15 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB2KEFr9029326 for perforce@freebsd.org; Wed, 2 Dec 2009 20:14:15 GMT (envelope-from truncs@FreeBSD.org) Date: Wed, 2 Dec 2009 20:14:15 GMT Message-Id: <200912022014.nB2KEFr9029326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2009 20:14:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=171300 Change 171300 by truncs@aditya on 2009/12/02 20:13:46 Get rid of the unwanted #ifdef ugliness. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#9 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#9 (text+ko) ==== @@ -167,24 +167,9 @@ --num; nb = ip->i_ib[indirs[0].in_off]; if (nb == 0) { -#if 0 - pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); -#else - /* see the comment by ext2_blkpref. What we do here is - to pretend that it'd be good for a block holding indirect - pointers to be allocated near its predecessor in terms - of indirection, or the last direct block. - We shamelessly exploit the fact that i_ib immediately - follows i_db. - Godmar thinks it make sense to allocate i_ib[0] immediately - after i_db[11], but it's not utterly clear whether this also - applies to i_ib[1] and i_ib[0] - */ - EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); -#endif if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb))) return (error); @@ -222,22 +207,13 @@ bqrelse(bp); continue; } - if (pref == 0) -#if 1 - /* see the comment above and by ext2_blkpref - * I think this implements Linux policy, but - * does it really make sense to allocate to - * block containing pointers together ? - * Also, will it ever succeed ? - */ - pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, - bp->b_lblkno); -#else + if (pref == 0) { EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); -#endif - if ((error = - ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { + } else + EXT2_LOCK(ump); + error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); + if(error) { brelse(bp); return (error); } From owner-p4-projects@FreeBSD.ORG Thu Dec 3 07:46:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE50106568F; Thu, 3 Dec 2009 07:46:50 +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 53D67106566B for ; Thu, 3 Dec 2009 07:46:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 409B58FC19 for ; Thu, 3 Dec 2009 07:46:50 +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 nB37ko5p049507 for ; Thu, 3 Dec 2009 07:46:50 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB37koaB049505 for perforce@freebsd.org; Thu, 3 Dec 2009 07:46:50 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 3 Dec 2009 07:46:50 GMT Message-Id: <200912030746.nB37koaB049505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 07:46:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=171309 Change 171309 by pgj@beehive on 2009/12/03 07:46:00 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#23 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#25 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#15 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#39 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#26 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#35 integrate .. //depot/projects/docproj_hu/www/en/gnome/contact.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#4 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq228.sgml#1 branch .. //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/gnome/index.xsl#6 integrate .. //depot/projects/docproj_hu/www/en/gnome/news.xml#5 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#33 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#26 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#67 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#28 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#20 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#12 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -626,7 +626,7 @@ - + ==== //depot/projects/docproj_hu/www/en/gnome/contact.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -44,6 +44,16 @@ + + avl + + + Alexander Loginov + (avl@FreeBSD.org) + + + Jeremy Messenger (mezz@FreeBSD.org)
    ==== //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/docs/Makefile,v 1.28 2009/04/11 03:10:05 marcus Exp $ +# $FreeBSD: www/en/gnome/docs/Makefile,v 1.29 2009/11/29 20:28:43 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -18,6 +18,7 @@ DOCS+= faq222.sgml DOCS+= faq224.sgml DOCS+= faq226.sgml +DOCS+= faq228.sgml DOCS+= gnome_porting.sgml DOCS+= gnome1_porting.sgml DOCS+= gnome2_porting.sgml ==== //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,8 +158,9 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME &gnomedevelver; is underway. We have ported - &gnomedevelver;.2 to FreeBSD. Start testing now!

    +

    We have just cleared out the MarcusCom ports tree after + merging &gnomever; into the FreeBSD ports tree. Stay tuned + for the start of &gnomedevelver; work.

    • &footer; ==== //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -78,14 +78,14 @@ gnomecontrolcenter2 sysutils/gnome-control-center - metacity nautilus2 gnomemenus - desktopfileutils libgnomekbd gnomepanel + metacity gnomemenus desktopfileutils + libgnomekbd gnomedesktop librsvg2 gnomedesktop x11/gnome-desktop - libgnomeui gnomedocutils + gconf2 gnomedocutils pygtk2 @@ -110,7 +110,7 @@ gnomepanel x11/gnome-panel gnomedesktop libwnck gnomemenus - gnomedocutils librsvg2 + gnomedocutils librsvg2 libgnomeui @@ -243,7 +243,7 @@ libgnomekbd x11/libgnomekbd - libgnomeui + gconf2 ==== //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -118,11 +118,6 @@ This is especially true for CD devices and floppy disk devices.

    -

    CAVEAT: If you are - using glabel (GEOM labels), volume labels MUST NOT - contain spaces. This will break hal's volume parsing - code, and could lead to crashes.

    -

    If you are a GNOME user be aware that prior to GNOME 2.22, gnome-volume-manager was responsible for asking hal to mount volumes. Since this responsibility @@ -318,10 +313,6 @@

    Additionally, if you are a GDM user, please provide the output of ck-list-sessions.

    - -

    Finally, remember that if you are using glabel, and the - label has a space in the name that will break hal. Labels - must NOT contain spaces.

    ==== //depot/projects/docproj_hu/www/en/gnome/index.xsl#6 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + devel/gnome2-hacker-tools (development tools) -

    Upgrading to GNOME 2.26?

    +

    Upgrading to GNOME 2.28?

    -

    If you are upgrading from GNOME 2.22 to GNOME 2.26, read the +

    If you are upgrading from GNOME 2.26 to GNOME 2.28, read the Upgrade FAQ for upgrade instructions.

    State of the port

    GNOME for FreeBSD is currently supported on - 6.4, 6-STABLE, 7.1, 7-STABLE, and 8-CURRENT. + 6-STABLE, 7.1, 7.2, 7-STABLE, 8.0, 8-STABLE, and 9-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_hu/www/en/gnome/news.xml#5 (text+ko) ==== @@ -19,13 +19,98 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.149 2009/04/13 21:34:50 jkois Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.151 2009/11/29 21:03:51 marcus Exp $ 2009 + November + + + 28 + + + Announcing GNOME 2.28.1. for FreeBSD! + +

    Presenting GNOME 2.28.1 for FreeBSD. The official release + notes for this release can be found at + + http://library.gnome.org/misc/release-notes/2.28/ + + . Officially, this is mostly a polishing release in preparation + for GNOME 3.0 due in about a year.

    + +

    On the FreeBSD front, though, a lot went into this release. + Major thanks goes to kwm and avl who did a lot of the porting + work for this release. In particular, kwm brought in Evolution + MAPI support for better Microsoft Exchange integration. Avl + made sure that the new gobject introspection repository ports + were nicely compartmentalized so that large dependencies aren't + brought in wholesale.

    + +

    But, every GNOME team member (ahze, avl, bland, kwm, mezz, + and myself) contributed to this release.

    + +

    Other major improvements include an updated HAL with better + volume probing code, ufsid integration, and support for volume + names containing spaces (big thanks to J.R. Oldroyd); a new + WebKit; updated AbiWord; an updated Gimp; and a preview of the + new GNOME Shell project (thanks to Pawel Worach).

    + +

    The FreeBSD GNOME Team would like to that the following + additional contributors to this release whose patches and + testing really helped make it a success:

    + +

    + Andrius Morkunas +
    + + Dominique Goncalves +
    + + Eric L. Chen +
    + + J.R. Oldroyd +
    + + Joseph S. Atkinson +
    + + Li +
    + + Pawel Worach +
    + + Romain Tarti?re +
    + + Thomas Vogt +
    + + Yasuda Keisuke +
    + + Rui Paulo +
    + + Martin Wilke +
    + + (and an extra shout out to miwi and pav for the pointyhat runs) +
    +

    + +

    We would like to send this release out to Alexander Loginov + (avl) in hopes that he feels better soon.

    +     +     +     + + April @@ -38,8 +123,9 @@ GNOME 2.26.0 for FreeBSD. The official release notes can be found at - http://library.gnome.org/misc/release-notes/2.26/. - On the FreeBSD front, we introduced a port of libxul 1.9 as + http://library.gnome.org/misc/release-notes/2.26/ + + . On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers can make use of this provider by setting: ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#33 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -94,6 +94,13 @@ + RELENG_8_0 + Frozen + &contact.so; + FreeBSD 8.0 supported errata fix branch. + + + RELENG_7 Open committers ==== //depot/projects/docproj_hu/www/hu/administration.sgml#26 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#67 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.28 2009/11/20 13:20:08 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.29 2009/11/29 02:42:48 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#28 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/press.xml,v 1.12 2009/11/15 21:45:34 pgj Exp $ + $FreeBSD: www/hu/share/sgml/press.xml,v 1.13 2009/11/29 04:18:52 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/navibar.ent#8 (text+ko) ==== @@ -1,4 +1,4 @@ - + FreeBSD/GNOME '> ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#20 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -237,7 +237,6 @@
  • &a.kib; <kib@FreeBSD.org>
  • &a.blackend; <blackend@FreeBSD.org>
  • &a.mux; <mux@FreeBSD.org>
    • -
  • &a.bmah; <bmah@FreeBSD.org>
  • &a.gnn; <gnn@FreeBSD.org>
  • &a.hrs; <hrs@FreeBSD.org>
  • &a.kensmith; <kensmith@FreeBSD.org> ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#28 (text+ko) ==== @@ -4,7 +4,7 @@ @@ -127,7 +127,7 @@
  • FreeBSD/GNOME '> From owner-p4-projects@FreeBSD.ORG Thu Dec 3 11:22:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DBF510656AB; Thu, 3 Dec 2009 11:22:29 +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 E1F4010656A4 for ; Thu, 3 Dec 2009 11:22:28 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B56AE8FC1D for ; Thu, 3 Dec 2009 11:22: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 nB3BMSKF001185 for ; Thu, 3 Dec 2009 11:22:28 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3BMSha001183 for perforce@freebsd.org; Thu, 3 Dec 2009 11:22:28 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 3 Dec 2009 11:22:28 GMT Message-Id: <200912031122.nB3BMSha001183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 11:22:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=171321 Change 171321 by jona@jona-capsicum-kent64 on 2009/12/03 11:22:12 Started working on fchmodat(2) Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#17 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#17 (text+ko) ==== @@ -29,7 +29,7 @@ - Add support for capability-mode *at() system calls: faccessat DONE 2 Dec 2009 JA - fchmodat ---- + fchmodat INPROGRESS JA fchownat ---- fstatat ---- futimesat ---- From owner-p4-projects@FreeBSD.ORG Thu Dec 3 12:54:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D1541065672; Thu, 3 Dec 2009 12:54:01 +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 B07C11065757 for ; Thu, 3 Dec 2009 12:54:00 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CDFF8FC1B for ; Thu, 3 Dec 2009 12:54:00 +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 nB3Cs01c031412 for ; Thu, 3 Dec 2009 12:54:00 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3Cs0Ev031410 for perforce@freebsd.org; Thu, 3 Dec 2009 12:54:00 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 3 Dec 2009 12:54:00 GMT Message-Id: <200912031254.nB3Cs0Ev031410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 12:54:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=171323 Change 171323 by jona@jona-capsicum-kent64 on 2009/12/03 12:53:02 Refactored out fgetbase(), which will be used for other syscalls besides faccessat() Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#20 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#27 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/filedesc.h#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#20 (text+ko) ==== @@ -160,6 +160,40 @@ } /* + * Get the "base" vnode defined by a user file descriptor. + * + * Several *at() system calls are now supported in capability mode. This function + * finds out what their "*at base" vnode, which is needed by namei(), should be: + * + * 1. In non-capability (and thus unconstrained) mode, base = 0. + * 2. In capability mode, base is the vnode given by the fd parameter, subject to + * the condition that the supplied 'rights' parameter (OR'ed with CAP_LOOKUP + * and CAP_ATBASE) is satisfied. The vnode is returned with a shared lock. + */ +int +fgetbase(struct thread *td, int fd, cap_rights_t rights, struct vnode **base) +{ + if (!(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) + base = 0; + + else { + int error; + + error = fgetvp(td, fd, rights | CAP_LOOKUP | CAP_ATBASE, base); + if (error) + return (error); + + if ((error = vn_lock(*base, LK_SHARED))) { + vrele(*base); + return (error); + } + } + + return 0; +} + + +/* * Sync each mounted filesystem. */ #ifndef _SYS_SYSPROTO_H_ @@ -2239,21 +2273,9 @@ cred = tmpcred = td->td_ucred; AUDIT_ARG_VALUE(mode); - /* - * if a relative base was specified and we're in capability mode, find - * the vnode of the base so that namei() can restrict itself accordingly - */ - if ((cred->cr_flags & CRED_FLAG_CAPMODE) && (fd >= 0)) { - - if ((error = fgetvp(td, fd, CAP_LOOKUP | CAP_ATBASE, &base))) - /* XXX: more CAP_FOO? */ - return (error); - - if ((error = vn_lock(base, LK_SHARED))) { - vrele (base); - return (error); - } - } + /* get *at base vnode for namei() */ + if ((error = fgetbase(td, fd, CAP_FSTAT, &base))) + return (error); NDINIT_ATBASE(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, fd, base, td); ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#27 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#26 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#27 $ */ /* @@ -52,7 +52,7 @@ #define CAP_GETSOCKNAME 0x0000000000000010ULL /* getsockname */ #define CAP_FCHFLAGS 0x0000000000000020ULL /* fchflags */ #define CAP_IOCTL 0x0000000000000040ULL /* ioctl */ -#define CAP_FSTAT 0x0000000000000080ULL /* fstat */ +#define CAP_FSTAT 0x0000000000000080ULL /* fstat, faccessat */ #define CAP_MMAP 0x0000000000000100ULL /* mmap */ #define CAP_FCNTL 0x0000000000000200ULL /* fcntl */ #define CAP_EVENT 0x0000000000000400ULL /* select/poll */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/filedesc.h#5 (text+ko) ==== @@ -130,6 +130,8 @@ int getvnode(struct filedesc *fdp, int fd, struct file **fpp); int getvnode_cap(struct filedesc *fdp, int fd, cap_rights_t rights, struct file **fpp); +int fgetbase(struct thread *td, int fd, cap_rights_t rights, + struct vnode **base); void mountcheckdirs(struct vnode *olddp, struct vnode *newdp); void setugidsafety(struct thread *td); From owner-p4-projects@FreeBSD.ORG Thu Dec 3 12:55:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD3B1065679; Thu, 3 Dec 2009 12:55:02 +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 DD1EF10656C0 for ; Thu, 3 Dec 2009 12:55:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C577B8FC19 for ; Thu, 3 Dec 2009 12:55:01 +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 nB3Ct1Ws031481 for ; Thu, 3 Dec 2009 12:55:01 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3Ct1QG031479 for perforce@freebsd.org; Thu, 3 Dec 2009 12:55:01 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 3 Dec 2009 12:55:01 GMT Message-Id: <200912031255.nB3Ct1QG031479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 12:55:02 -0000 http://p4web.freebsd.org/chv.cgi?CH=171324 Change 171324 by rene@rene_self on 2009/12/03 12:54:01 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#56 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#37 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#26 integrate .. //depot/projects/docproj_nl/www/en/gnome/contact.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/faq228.sgml#1 branch .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/gnome/index.xsl#5 integrate .. //depot/projects/docproj_nl/www/en/gnome/news.xml#5 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#29 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#20 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#5 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -18,10 +18,6 @@ - &a.mjacob; (1997 - 2007) - - - &a.kbyanc; (2000 - 2007) @@ -712,6 +708,10 @@ Andrew L. Moore (1993 - 1995) + + + Bruce A. Mah ( - 2009) + - Obtaining FreeBSD + Obtaining &os; CDROM and DVD Publishers @@ -13,7 +13,7 @@ Retail Boxed Products - FreeBSD is available as a boxed product (FreeBSD CDs, + &os; is available as a boxed product (&os; CDs, additional software, and printed documentation) from several retailers: @@ -37,13 +37,13 @@ CD and DVD Sets - FreeBSD CD and DVD sets are available from many online + &os; CD and DVD sets are available from many online retailers:
    - FreeBSD Mall, Inc. + &os; Mall, Inc. 700 Harvest Park Ste F Brentwood, CA 94513 USA @@ -142,7 +142,7 @@ Distributors - If you are a reseller and want to carry FreeBSD CDROM products, + If you are a reseller and want to carry &os; CDROM products, please contact a distributor: @@ -224,7 +224,7 @@ FTP Sites - The official sources for FreeBSD are available via anonymous FTP + The official sources for &os; are available via anonymous FTP from a worldwide set of mirror sites. The site is well connected and allows a large number of connections to it, but @@ -233,20 +233,20 @@ mirror site). The FreeBSD mirror + url="http://mirrorlist.FreeBSD.org/">&os; mirror sites database is more accurate than the mirror listing in the Handbook, as it gets its information from the DNS rather than relying on static lists of hosts. - Additionally, FreeBSD is available via anonymous FTP from the - following mirror sites. If you choose to obtain FreeBSD via anonymous + Additionally, &os; is available via anonymous FTP from the + following mirror sites. If you choose to obtain &os; via anonymous FTP, please try to use a site near you. The mirror sites listed as - Primary Mirror Sites typically have the entire FreeBSD archive (all + Primary Mirror Sites typically have the entire &os; archive (all the currently available versions for each of the architectures) but you will probably have faster download times from a site that is in your country or region. The regional sites carry the most recent versions for the most popular architecture(s) but might not carry - the entire FreeBSD archive. All sites provide access via anonymous + the entire &os; archive. All sites provide access via anonymous FTP but some sites also provide access via other methods. The access methods available for each site are provided in parentheses after the hostname. @@ -288,10 +288,10 @@ Anonymous CVS (or, as it is otherwise known, anoncvs) is a feature provided by the CVS - utilities bundled with FreeBSD for synchronizing with a remote - CVS repository. Among other things, it allows users of FreeBSD + utilities bundled with &os; for synchronizing with a remote + CVS repository. Among other things, it allows users of &os; to perform, with no special privileges, read-only CVS operations - against one of the FreeBSD project's official anoncvs servers. + against one of the &os; project's official anoncvs servers. To use it, one simply sets the CVSROOT environment variable to point at the appropriate anoncvs server, provides the well-known password anoncvs with the @@ -330,7 +330,7 @@ anoncvs is also only good for read-only operations on the CVS repository, so if it is your intention to support local development in one repository shared - with the FreeBSD project bits then + with the &os; project bits then CVSup is really your only option. @@ -340,7 +340,7 @@ Configuring &man.cvs.1; to use an Anonymous CVS repository is a simple matter of setting the CVSROOT - environment variable to point to one of the FreeBSD project's + environment variable to point to one of the &os; project's anoncvs servers. At the time of this writing, the following servers are available: @@ -386,11 +386,11 @@ Since CVS allows one to check out virtually - any version of the FreeBSD sources that ever existed (or, in + any version of the &os; sources that ever existed (or, in some cases, will exist), you need to be familiar with the revision () flag to &man.cvs.1; and what some of the permissible values for it in - the FreeBSD Project repository are. + the &os; Project repository are. There are two kinds of tags, revision tags and branch tags. A revision tag refers to a specific revision. Its meaning stays @@ -495,7 +495,7 @@ CVSweb is - the FreeBSD Project web interface for CVS. + the &os; Project web interface for CVS. @@ -511,7 +511,7 @@ CTM is a method for keeping a remote directory tree in sync with a central one. It has been - developed for usage with FreeBSD's source trees, though other + developed for usage with &os;'s source trees, though other people may find it useful for other purposes as time goes by. Little, if any, documentation currently exists at this time on the process of creating deltas, so contact the &a.ctm-users.name; mailing list for more @@ -522,11 +522,11 @@ Why Should I Use <application>CTM</application>? CTM will give you a local copy of - the FreeBSD source trees. There are a number of + the &os; source trees. There are a number of flavors of the tree available. Whether you wish to track the entire CVS tree or just one of the branches, CTM can provide you the information. - If you are an active developer on FreeBSD, but have lousy or + If you are an active developer on &os;, but have lousy or non-existent TCP/IP connectivity, or simply wish to have the changes automatically sent to you, CTM was made for you. You will need @@ -542,7 +542,7 @@ rather than a pre-packaged release. This is particularly true if you choose the current sources. It is recommended that you read Staying - current with FreeBSD. + current with &os;. @@ -554,7 +554,7 @@ current levels). The CTM program has been part of - FreeBSD ever since version 2.0 was released, and lives in + &os; ever since version 2.0 was released, and lives in /usr/src/usr.sbin/ctm if you have a copy of the source available. @@ -783,7 +783,7 @@ CTM Mirrors - CTM/FreeBSD is available via anonymous + CTM/&os; is available via anonymous FTP from the following mirror sites. If you choose to obtain CTM via anonymous FTP, please try to use a site near you. @@ -849,9 +849,9 @@ CVSup is a software package for distributing and updating source trees from a master CVS - repository on a remote server host. The FreeBSD sources are + repository on a remote server host. The &os; sources are maintained in a CVS repository on a central development machine - in California. With CVSup, FreeBSD + in California. With CVSup, &os; users can easily keep their own source trees up to date. CVSup uses the so-called @@ -868,16 +868,16 @@ so, refers to the entire software package. Its main components are the client cvsup which runs on each user's machine, and the server cvsupd which - runs at each of the FreeBSD mirror sites. + runs at each of the &os; mirror sites. - As you read the FreeBSD documentation and mailing lists, you + As you read the &os; documentation and mailing lists, you may see references to sup. Sup was the predecessor of CVSup, and it served a similar purpose. CVSup is used much in the same way as sup and, in fact, uses configuration files which are backward-compatible with sup's. - Sup is no longer used in the FreeBSD + Sup is no longer used in the &os; project, because CVSup is both faster and more flexible. @@ -908,7 +908,7 @@ The easiest way to install CVSup is to use the precompiled net/cvsup package - from the FreeBSD packages collection. + from the &os; packages collection. If you prefer to build CVSup from source, you can use the net/cvsup port instead. But be forewarned: the @@ -926,9 +926,9 @@ If you want to install csup on - FreeBSD 6.1 or earlier, you can use the precompiled + &os; 6.1 or earlier, you can use the precompiled net/csup package - from the FreeBSD packages collection. + from the &os; packages collection. If you prefer to build csup from source, you can use the net/csup port instead. @@ -1017,7 +1017,7 @@ With this background, we will now proceed to construct a supfile for receiving and updating the main source tree of FreeBSD-CURRENT. + linkend="current">&os;-CURRENT. @@ -1030,7 +1030,7 @@ available are described in the following section. In this example, we - wish to receive the entire main source tree for the FreeBSD + wish to receive the entire main source tree for the &os; system. There is a single large collection src-all which will give us all of that. As a first step toward constructing our @@ -1101,7 +1101,7 @@ field. The &man.cvsup.1; manual page explains how to do that. - For our example, we wish to receive FreeBSD-CURRENT. We + For our example, we wish to receive &os;-CURRENT. We add this line at the beginning of our supfile: @@ -1129,7 +1129,7 @@ of the CVSup mirror sites will do, though you should try to select one that is close to you in cyberspace. In this example we will - use a fictional FreeBSD distribution site, + use a fictional &os; distribution site, cvsup99.FreeBSD.org: *default host=cvsup99.FreeBSD.org @@ -1188,7 +1188,7 @@ *default release=cvs delete use-rel-suffix compress release=cvs indicates that the server - should get its information out of the main FreeBSD CVS + should get its information out of the main &os; CVS repository. This is virtually always the case, but there are other possibilities which are beyond the scope of this discussion. @@ -1295,7 +1295,7 @@ and so forth for the other languages (you can find the full list by browsing the FreeBSD + url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os; CVS repository). With this very useful feature, those users who are on @@ -1401,7 +1401,7 @@ cvs-all release=cvs - The main FreeBSD CVS repository, including the + The main &os; CVS repository, including the cryptography code. @@ -1410,16 +1410,16 @@ Files related to the distribution and mirroring - of FreeBSD. + of &os;. doc-all release=cvs - Sources for the FreeBSD Handbook and other + Sources for the &os; Handbook and other documentation. This does not include files for - the FreeBSD web site. + the &os; web site. @@ -1427,7 +1427,7 @@ ports-all release=cvs - The FreeBSD Ports Collection. + The &os; Ports Collection. If you do not want to update the whole of @@ -1523,7 +1523,7 @@ warning above: you should always update this subcollection, whenever you update any part of - the FreeBSD Ports Collection! + the &os; Ports Collection! @@ -2053,7 +2053,7 @@ projects-all release=cvs - Sources for the FreeBSD projects repository. + Sources for the &os; projects repository. @@ -2061,7 +2061,7 @@ src-all release=cvs - The main FreeBSD sources, including the + The main &os; sources, including the cryptography code. @@ -2103,7 +2103,7 @@ Utilities and libraries from outside the - FreeBSD project, used relatively unmodified + &os; project, used relatively unmodified (/usr/src/contrib). @@ -2113,7 +2113,7 @@ Cryptography utilities and libraries from - outside the FreeBSD project, used relatively + outside the &os; project, used relatively unmodified (/usr/src/crypto). @@ -2125,7 +2125,7 @@ Kerberos and DES (/usr/src/eBones). Not - used in current releases of FreeBSD. + used in current releases of &os;. @@ -2215,7 +2215,7 @@ release=cvs - Files required to produce a FreeBSD + Files required to produce a &os; release (/usr/src/release). @@ -2288,7 +2288,7 @@ Various tools for the maintenance of - FreeBSD + &os; (/usr/src/tools). @@ -2320,7 +2320,7 @@ www release=cvs - The sources for the FreeBSD WWW site. + The sources for the &os; WWW site. @@ -2349,7 +2349,7 @@ mail-archive release=current - FreeBSD mailing list archive. + &os; mailing list archive. @@ -2357,7 +2357,7 @@ www release=current - The pre-processed FreeBSD WWW site files (not the + The pre-processed &os; WWW site files (not the source files). Used by WWW mirror sites. @@ -2372,7 +2372,7 @@ The CVSup Home Page. - Most FreeBSD-related discussion of + Most &os;-related discussion of CVSup takes place on the &a.hackers;. New versions of the software are announced there, as well as on the &a.announce;. @@ -2386,7 +2386,7 @@ CVSup Sites - CVSup servers for FreeBSD are running + CVSup servers for &os; are running at the following sites: &chap.mirrors.cvsup.inc; @@ -2417,7 +2417,7 @@ HEAD - Symbolic name for the main line, or FreeBSD-CURRENT. + Symbolic name for the main line, or &os;-CURRENT. Also the default when no revision is specified. In CVSup, this tag is represented @@ -2437,8 +2437,8 @@ RELENG_8 - The line of development for FreeBSD-8.X, also known - as FreeBSD 8-STABLE + The line of development for &os;-8.X, also known + as &os; 8-STABLE @@ -2446,7 +2446,7 @@ RELENG_8_0 - The release branch for FreeBSD-8.0, used only for + The release branch for &os;-8.0, used only for security advisories and other critical fixes. @@ -2455,8 +2455,8 @@ RELENG_7 - The line of development for FreeBSD-7.X, also known - as FreeBSD 7-STABLE + The line of development for &os;-7.X, also known + as &os; 7-STABLE @@ -2464,7 +2464,7 @@ RELENG_7_2 - The release branch for FreeBSD-7.2, used only for + The release branch for &os;-7.2, used only for security advisories and other critical fixes. @@ -2473,7 +2473,7 @@ RELENG_7_1 - The release branch for FreeBSD-7.1, used only for + The release branch for &os;-7.1, used only for security advisories and other critical fixes. @@ -2482,7 +2482,7 @@ RELENG_7_0 - The release branch for FreeBSD-7.0, used only for + The release branch for &os;-7.0, used only for security advisories and other critical fixes. @@ -2491,8 +2491,8 @@ RELENG_6 - The line of development for FreeBSD-6.X, also known - as FreeBSD 6-STABLE + The line of development for &os;-6.X, also known + as &os; 6-STABLE @@ -2500,7 +2500,7 @@ RELENG_6_4 - The release branch for FreeBSD-6.4, used only for + The release branch for &os;-6.4, used only for security advisories and other critical fixes. @@ -2509,7 +2509,7 @@ RELENG_6_3 - The release branch for FreeBSD-6.3, used only for + The release branch for &os;-6.3, used only for security advisories and other critical fixes. @@ -2518,7 +2518,7 @@ RELENG_6_2 - The release branch for FreeBSD-6.2, used only for + The release branch for &os;-6.2, used only for security advisories and other critical fixes. @@ -2527,7 +2527,7 @@ RELENG_6_1 - The release branch for FreeBSD-6.1, used only for + The release branch for &os;-6.1, used only for security advisories and other critical fixes. @@ -2536,7 +2536,7 @@ RELENG_6_0 - The release branch for FreeBSD-6.0, used only for + The release branch for &os;-6.0, used only for security advisories and other critical fixes. @@ -2545,8 +2545,8 @@ RELENG_5 - The line of development for FreeBSD-5.X, also known - as FreeBSD 5-STABLE. + The line of development for &os;-5.X, also known + as &os; 5-STABLE. @@ -2554,7 +2554,7 @@ RELENG_5_5 - The release branch for FreeBSD-5.5, used only + The release branch for &os;-5.5, used only for security advisories and other critical fixes. @@ -2563,7 +2563,7 @@ RELENG_5_4 - The release branch for FreeBSD-5.4, used only + The release branch for &os;-5.4, used only for security advisories and other critical fixes. @@ -2572,7 +2572,7 @@ RELENG_5_3 - The release branch for FreeBSD-5.3, used only + The release branch for &os;-5.3, used only for security advisories and other critical fixes. @@ -2581,7 +2581,7 @@ RELENG_5_2 - The release branch for FreeBSD-5.2 and FreeBSD-5.2.1, used only + The release branch for &os;-5.2 and &os;-5.2.1, used only for security advisories and other critical fixes. @@ -2590,7 +2590,7 @@ RELENG_5_1 - The release branch for FreeBSD-5.1, used only + The release branch for &os;-5.1, used only for security advisories and other critical fixes. @@ -2599,7 +2599,7 @@ RELENG_5_0 - The release branch for FreeBSD-5.0, used only + The release branch for &os;-5.0, used only for security advisories and other critical fixes. @@ -2608,8 +2608,8 @@ RELENG_4 - The line of development for FreeBSD-4.X, also known - as FreeBSD 4-STABLE. + The line of development for &os;-4.X, also known + as &os; 4-STABLE. @@ -2617,7 +2617,7 @@ RELENG_4_11 - The release branch for FreeBSD-4.11, used only + The release branch for &os;-4.11, used only for security advisories and other critical fixes. @@ -2626,7 +2626,7 @@ RELENG_4_10 - The release branch for FreeBSD-4.10, used only + The release branch for &os;-4.10, used only for security advisories and other critical fixes. @@ -2635,7 +2635,7 @@ RELENG_4_9 - The release branch for FreeBSD-4.9, used only + The release branch for &os;-4.9, used only for security advisories and other critical fixes. @@ -2644,7 +2644,7 @@ RELENG_4_8 - The release branch for FreeBSD-4.8, used only + The release branch for &os;-4.8, used only for security advisories and other critical fixes. @@ -2653,7 +2653,7 @@ RELENG_4_7 - The release branch for FreeBSD-4.7, used only + The release branch for &os;-4.7, used only for security advisories and other critical fixes. @@ -2662,7 +2662,7 @@ RELENG_4_6 - The release branch for FreeBSD-4.6 and FreeBSD-4.6.2, + The release branch for &os;-4.6 and &os;-4.6.2, used only for security advisories and other critical fixes. @@ -2672,7 +2672,7 @@ RELENG_4_5 - The release branch for FreeBSD-4.5, used only + The release branch for &os;-4.5, used only for security advisories and other critical fixes. @@ -2681,7 +2681,7 @@ RELENG_4_4 - The release branch for FreeBSD-4.4, used only + The release branch for &os;-4.4, used only for security advisories and other critical fixes. @@ -2690,7 +2690,7 @@ RELENG_4_3 - The release branch for FreeBSD-4.3, used only + The release branch for &os;-4.3, used only for security advisories and other critical fixes. @@ -2699,7 +2699,7 @@ RELENG_3 - The line of development for FreeBSD-3.X, also known + The line of development for &os;-3.X, also known as 3.X-STABLE. @@ -2708,7 +2708,7 @@ RELENG_2_2 - The line of development for FreeBSD-2.2.X, also known + The line of development for &os;-2.2.X, also known as 2.2-STABLE. This branch is mostly obsolete. @@ -2738,7 +2738,7 @@ RELENG_8_0_0_RELEASE - FreeBSD 8.0 + &os; 8.0 @@ -2746,7 +2746,7 @@ RELENG_7_2_0_RELEASE - FreeBSD 7.2 + &os; 7.2 @@ -2754,7 +2754,7 @@ RELENG_7_1_0_RELEASE - FreeBSD 7.1 + &os; 7.1 @@ -2762,7 +2762,7 @@ RELENG_7_0_0_RELEASE - FreeBSD 7.0 + &os; 7.0 @@ -2770,7 +2770,7 @@ RELENG_6_4_0_RELEASE - FreeBSD 6.4 + &os; 6.4 @@ -2778,7 +2778,7 @@ RELENG_6_3_0_RELEASE - FreeBSD 6.3 + &os; 6.3 @@ -2786,7 +2786,7 @@ RELENG_6_2_0_RELEASE - FreeBSD 6.2 + &os; 6.2 @@ -2794,7 +2794,7 @@ RELENG_6_1_0_RELEASE - FreeBSD 6.1 + &os; 6.1 @@ -2802,7 +2802,7 @@ RELENG_6_0_0_RELEASE - FreeBSD 6.0 + &os; 6.0 @@ -2810,7 +2810,7 @@ RELENG_5_5_0_RELEASE - FreeBSD 5.5 + &os; 5.5 @@ -2818,7 +2818,7 @@ RELENG_5_4_0_RELEASE - FreeBSD 5.4 + &os; 5.4 @@ -2826,7 +2826,7 @@ RELENG_4_11_0_RELEASE - FreeBSD 4.11 + &os; 4.11 @@ -2834,7 +2834,7 @@ RELENG_5_3_0_RELEASE - FreeBSD 5.3 + &os; 5.3 @@ -2842,7 +2842,7 @@ RELENG_4_10_0_RELEASE - FreeBSD 4.10 + &os; 4.10 @@ -2850,7 +2850,7 @@ RELENG_5_2_1_RELEASE - FreeBSD 5.2.1 + &os; 5.2.1 @@ -2858,7 +2858,7 @@ RELENG_5_2_0_RELEASE - FreeBSD 5.2 + &os; 5.2 @@ -2866,7 +2866,7 @@ RELENG_4_9_0_RELEASE - FreeBSD 4.9 + &os; 4.9 @@ -2874,7 +2874,7 @@ RELENG_5_1_0_RELEASE - FreeBSD 5.1 + &os; 5.1 @@ -2882,7 +2882,7 @@ RELENG_4_8_0_RELEASE - FreeBSD 4.8 + &os; 4.8 @@ -2890,7 +2890,7 @@ RELENG_5_0_0_RELEASE - FreeBSD 5.0 + &os; 5.0 @@ -2898,7 +2898,7 @@ RELENG_4_7_0_RELEASE - FreeBSD 4.7 + &os; 4.7 @@ -2906,7 +2906,7 @@ RELENG_4_6_2_RELEASE >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 3 14:03:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E7181065694; Thu, 3 Dec 2009 14:03:10 +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 427781065670 for ; Thu, 3 Dec 2009 14:03:10 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15C348FC12 for ; Thu, 3 Dec 2009 14:03:10 +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 nB3E39jf038539 for ; Thu, 3 Dec 2009 14:03:09 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3E39I5038537 for perforce@freebsd.org; Thu, 3 Dec 2009 14:03:09 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 3 Dec 2009 14:03:09 GMT Message-Id: <200912031403.nB3E39I5038537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 14:03:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=171326 Change 171326 by jona@jona-capsicum-kent64 on 2009/12/03 14:03:05 Enable fchmodat(2) Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#24 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#44 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#21 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#24 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#23 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#24 $ ## ## @@ -453,10 +453,11 @@ olio_listio ## -## Allow faccessat(2) and openat(2), which we have constrained to prevent accessing +## Allow some of the *at(2) calls, which we have constrained to prevent accessing ## files which are not "under" the directory FD given to the syscall. ## faccessat +fchmodat openat ## ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#44 (text+ko) ==== @@ -524,7 +524,7 @@ { AS(cpuset_getaffinity_args), (sy_call_t *)cpuset_getaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 487 = cpuset_getaffinity */ { AS(cpuset_setaffinity_args), (sy_call_t *)cpuset_setaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 488 = cpuset_setaffinity */ { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, SYF_CAPENABLED }, /* 489 = faccessat */ - { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 490 = fchmodat */ + { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, SYF_CAPENABLED }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 493 = fstatat */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#21 (text+ko) ==== @@ -3042,13 +3042,20 @@ struct nameidata nd; int vfslocked; int follow; + struct vnode *base; AUDIT_ARG_MODE(mode); follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW; - NDINIT_AT(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, path, - fd, td); - if ((error = namei(&nd)) != 0) + if ((error = fgetbase(td, fd, CAP_FCHMOD, &base))) + return (error); + + NDINIT_ATBASE(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, path, + fd, base, td); + error = namei(&nd); + if (base) vput(base); + if (error) return (error); + vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); error = setfmode(td, nd.ni_vp, mode); From owner-p4-projects@FreeBSD.ORG Thu Dec 3 14:04:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A1101065698; Thu, 3 Dec 2009 14:04:11 +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 4EDCB106568B for ; Thu, 3 Dec 2009 14:04:11 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C5CC8FC15 for ; Thu, 3 Dec 2009 14:04:11 +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 nB3E4B3b038600 for ; Thu, 3 Dec 2009 14:04:11 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3E4Bon038598 for perforce@freebsd.org; Thu, 3 Dec 2009 14:04:11 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 3 Dec 2009 14:04:11 GMT Message-Id: <200912031404.nB3E4Bon038598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 14:04:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=171327 Change 171327 by jona@jona-capsicum-kent64 on 2009/12/03 14:03:56 We should, of course, be setting *base to 0, not the local variable base Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#22 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#22 (text+ko) ==== @@ -165,7 +165,7 @@ * Several *at() system calls are now supported in capability mode. This function * finds out what their "*at base" vnode, which is needed by namei(), should be: * - * 1. In non-capability (and thus unconstrained) mode, base = 0. + * 1. In non-capability (and thus unconstrained) mode, *base = 0. * 2. In capability mode, base is the vnode given by the fd parameter, subject to * the condition that the supplied 'rights' parameter (OR'ed with CAP_LOOKUP * and CAP_ATBASE) is satisfied. The vnode is returned with a shared lock. @@ -174,7 +174,7 @@ fgetbase(struct thread *td, int fd, cap_rights_t rights, struct vnode **base) { if (!(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) - base = 0; + *base = 0; else { int error; From owner-p4-projects@FreeBSD.ORG Thu Dec 3 14:47:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADB8A106568F; Thu, 3 Dec 2009 14:47:55 +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 7165D106568B for ; Thu, 3 Dec 2009 14:47:55 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EC8E8FC19 for ; Thu, 3 Dec 2009 14:47:55 +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 nB3EltsD041843 for ; Thu, 3 Dec 2009 14:47:55 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3EltWk041841 for perforce@freebsd.org; Thu, 3 Dec 2009 14:47:55 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 3 Dec 2009 14:47:55 GMT Message-Id: <200912031447.nB3EltWk041841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 14:47:56 -0000 http://p4web.freebsd.org/chv.cgi?CH=171331 Change 171331 by truncs@aditya on 2009/12/03 14:47:06 Bring back what the earlier code felt right. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#10 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#10 (text+ko) ==== @@ -207,10 +207,12 @@ bqrelse(bp); continue; } - if (pref == 0) { + if (pref == 0) { EXT2_LOCK(ump); - pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); - } else + pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, + bp->b_lblkno); + + } else EXT2_LOCK(ump); error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); if(error) { From owner-p4-projects@FreeBSD.ORG Thu Dec 3 15:46:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17E681065692; Thu, 3 Dec 2009 15:46:55 +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 D065C106568D for ; Thu, 3 Dec 2009 15:46:54 +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 BDE628FC14 for ; Thu, 3 Dec 2009 15:46:54 +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 nB3FksPf047236 for ; Thu, 3 Dec 2009 15:46:54 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3Fksxc047234 for perforce@freebsd.org; Thu, 3 Dec 2009 15:46:54 GMT (envelope-from mav@freebsd.org) Date: Thu, 3 Dec 2009 15:46:54 GMT Message-Id: <200912031546.nB3Fksxc047234@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 Precedence: bulk Cc: Subject: PERFORCE change 171334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 15:46:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=171334 Change 171334 by mav@mav_mavbook on 2009/12/03 15:46:47 Migrate powerpc ATA controllers to the new world order. Submitted by: nwitehorn@ Affected files ... .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#2 edit .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#7 edit .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#6 edit .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#2 (text+ko) ==== @@ -204,7 +204,6 @@ ata_dbdma_load(struct ata_request *request, void *addr, int *entries) { struct ata_channel *ch = device_get_softc(request->parent); - struct ata_device *atadev = device_get_softc(request->dev); struct ata_dbdma_dmaload_args args; int error; @@ -230,7 +229,7 @@ return EIO; } - request->dma = &ch->dma.slot[atadev->unit]; + request->dma = &ch->dma.slot[0]; if ((error = bus_dmamap_load(request->dma->data_tag, request->dma->data_map, request->data, request->bytecount, ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#7 (text+ko) ==== @@ -85,7 +85,7 @@ */ static int ata_kauai_probe(device_t dev); static int ata_kauai_attach(device_t dev); -static void ata_kauai_setmode(device_t parent, device_t dev); +static int ata_kauai_setmode(device_t dev, int target, int mode); static int ata_kauai_begin_transaction(struct ata_request *request); static device_method_t ata_kauai_methods[] = { @@ -307,34 +307,26 @@ return ata_attach(dev); } -static void -ata_kauai_setmode(device_t parent, device_t dev) +static int +ata_kauai_setmode(device_t dev, int target, int mode) { - struct ata_device *atadev = device_get_softc(dev); - struct ata_kauai_softc *sc = device_get_softc(parent); - uint32_t mode; + struct ata_kauai_softc *sc = device_get_softc(dev); - mode = ata_limit_mode(dev,atadev->mode, - (sc->shasta) ? ATA_UDMA6 : ATA_UDMA5); - - if (ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) - return; + mode = min(mode,sc->shasta ? ATA_UDMA6 : ATA_UDMA5); - atadev->mode = mode; - if (sc->shasta) { switch (mode & ATA_DMA_MASK) { case ATA_UDMA0: - sc->udmaconf[atadev->unit] + sc->udmaconf[target] = udma_timing_shasta[mode & ATA_MODE_MASK]; break; case ATA_WDMA0: - sc->udmaconf[atadev->unit] = 0; - sc->wdmaconf[atadev->unit] + sc->udmaconf[target] = 0; + sc->wdmaconf[target] = dma_timing_shasta[mode & ATA_MODE_MASK]; break; default: - sc->pioconf[atadev->unit] + sc->pioconf[target] = pio_timing_shasta[(mode & ATA_MODE_MASK) - ATA_PIO0]; break; @@ -342,32 +334,33 @@ } else { switch (mode & ATA_DMA_MASK) { case ATA_UDMA0: - sc->udmaconf[atadev->unit] + sc->udmaconf[target] = udma_timing_kauai[mode & ATA_MODE_MASK]; break; case ATA_WDMA0: - sc->udmaconf[atadev->unit] = 0; - sc->wdmaconf[atadev->unit] + sc->udmaconf[target] = 0; + sc->wdmaconf[target] = dma_timing_kauai[mode & ATA_MODE_MASK]; break; default: - sc->pioconf[atadev->unit] + sc->pioconf[target] = pio_timing_kauai[(mode & ATA_MODE_MASK) - ATA_PIO0]; break; } } + + return (mode); } static int ata_kauai_begin_transaction(struct ata_request *request) { - struct ata_device *atadev = device_get_softc(request->dev); struct ata_kauai_softc *sc = device_get_softc(request->parent); - bus_write_4(sc->sc_memr, UDMA_CONFIG_REG, sc->udmaconf[atadev->unit]); + bus_write_4(sc->sc_memr, UDMA_CONFIG_REG, sc->udmaconf[request->unit]); bus_write_4(sc->sc_memr, PIO_CONFIG_REG, - sc->wdmaconf[atadev->unit] | sc->pioconf[atadev->unit]); + sc->wdmaconf[request->unit] | sc->pioconf[request->unit]); return ata_begin_transaction(request); } ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#6 (text+ko) ==== @@ -111,7 +111,7 @@ * Define the macio ata bus attachment. */ static int ata_macio_probe(device_t dev); -static void ata_macio_setmode(device_t parent, device_t dev); +static int ata_macio_setmode(device_t dev, int target, int mode); static int ata_macio_attach(device_t dev); static int ata_macio_begin_transaction(struct ata_request *request); @@ -193,7 +193,7 @@ ata_default_registers(dev); ch->unit = 0; - ch->flags |= ATA_USE_16BIT; + ch->flags |= ATA_USE_16BIT | ATA_NO_ATAPI_DMA; ata_generic_hw(dev); return (ata_probe(dev)); @@ -247,26 +247,15 @@ return ata_attach(dev); } -static void -ata_macio_setmode(device_t parent, device_t dev) +static int +ata_macio_setmode(device_t dev, int target, int mode) { - struct ata_device *atadev = device_get_softc(dev); - struct ata_macio_softc *sc = device_get_softc(parent); - int mode = atadev->mode; + struct ata_macio_softc *sc = device_get_softc(dev); int min_cycle = 0, min_active = 0; int cycle_tick = 0, act_tick = 0, inact_tick = 0, half_tick; - mode = ata_limit_mode(dev, mode, sc->max_mode); - - /* XXX Some controllers don't work correctly with ATAPI DMA */ - if (atadev->param.config & ATA_PROTO_ATAPI) - mode = ata_limit_mode(dev, mode, ATA_PIO_MAX); - - if (ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) - return; - - atadev->mode = mode; + mode = min(mode, sc->max_mode); if ((mode & ATA_DMA_MASK) == ATA_UDMA0) { min_cycle = udma_timings[mode & ATA_MODE_MASK].cycle; @@ -276,7 +265,7 @@ act_tick = ATA_TIME_TO_TICK(sc->rev,min_active); /* mask: 0x1ff00000 */ - sc->udmaconf[atadev->unit] = + sc->udmaconf[target] = (cycle_tick << 21) | (act_tick << 25) | 0x100000; } else if ((mode & ATA_DMA_MASK) == ATA_WDMA0) { min_cycle = dma_timings[mode & ATA_MODE_MASK].cycle; @@ -288,7 +277,7 @@ if (sc->rev == 4) { inact_tick = cycle_tick - act_tick; /* mask: 0x001ffc00 */ - sc->wdmaconf[atadev->unit] = + sc->wdmaconf[target] = (act_tick << 10) | (inact_tick << 15); } else { inact_tick = cycle_tick - act_tick - DMA_REC_OFFSET; @@ -297,7 +286,7 @@ half_tick = 0; /* XXX */ /* mask: 0xfffff800 */ - sc->wdmaconf[atadev->unit] = (half_tick << 21) + sc->wdmaconf[target] = (half_tick << 21) | (inact_tick << 16) | (act_tick << 11); } } else { @@ -313,7 +302,7 @@ inact_tick = cycle_tick - act_tick; /* mask: 0x000003ff */ - sc->pioconf[atadev->unit] = + sc->pioconf[target] = (inact_tick << 5) | act_tick; } else { if (act_tick < PIO_ACT_MIN) @@ -324,21 +313,22 @@ inact_tick = PIO_REC_MIN; /* mask: 0x000007ff */ - sc->pioconf[atadev->unit] = + sc->pioconf[target] = (inact_tick << 5) | act_tick; } } + + return (mode); } static int ata_macio_begin_transaction(struct ata_request *request) { - struct ata_device *atadev = device_get_softc(request->dev); struct ata_macio_softc *sc = device_get_softc(request->parent); bus_write_4(sc->sc_mem, ATA_MACIO_TIMINGREG, - sc->udmaconf[atadev->unit] | sc->wdmaconf[atadev->unit] - | sc->pioconf[atadev->unit]); + sc->udmaconf[request->unit] | sc->wdmaconf[request->unit] + | sc->pioconf[request->unit]); return ata_begin_transaction(request); } ==== //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#6 (text+ko) ==== @@ -210,7 +210,7 @@ */ static int ata_iobus_sub_probe(device_t dev); -static void ata_iobus_sub_setmode(device_t parent, device_t dev); +static int ata_iobus_sub_setmode(device_t dev, int target, int mode); static device_method_t ata_iobus_sub_methods[] = { /* Device interface */ @@ -245,11 +245,9 @@ return ata_probe(dev); } -static void -ata_iobus_sub_setmode(device_t parent, device_t dev) +static int +ata_iobus_sub_setmode(device_t parent, int target, int mode); { - struct ata_device *atadev = device_get_softc(dev); - /* Only ever PIO mode here... */ - atadev->mode = ATA_PIO; + return (ATA_PIO); } From owner-p4-projects@FreeBSD.ORG Thu Dec 3 15:57:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EBEF1065676; Thu, 3 Dec 2009 15:57:27 +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 D6B68106566C; Thu, 3 Dec 2009 15:57:26 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from mail.icecube.wisc.edu (trout.icecube.wisc.edu [128.104.255.119]) by mx1.freebsd.org (Postfix) with ESMTP id 6A1728FC08; Thu, 3 Dec 2009 15:57:26 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.icecube.wisc.edu (Postfix) with ESMTP id D5F24582A7; Thu, 3 Dec 2009 09:57:25 -0600 (CST) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from mail.icecube.wisc.edu ([127.0.0.1]) by localhost (trout.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id Jvs9oJO3zpNf; Thu, 3 Dec 2009 09:57:25 -0600 (CST) Received: from elpis.tachypleus.net (i3-dhcp-172-16-223-177.icecube.wisc.edu [172.16.223.177]) by mail.icecube.wisc.edu (Postfix) with ESMTP id 15C84582A4; Thu, 3 Dec 2009 09:57:25 -0600 (CST) Message-ID: <4B17DFEA.1020704@freebsd.org> Date: Thu, 03 Dec 2009 09:57:30 -0600 From: Nathan Whitehorn User-Agent: Thunderbird 2.0.0.23 (X11/20091130) MIME-Version: 1.0 To: Alexander Motin References: <200912031546.nB3Fksxc047234@repoman.freebsd.org> In-Reply-To: <200912031546.nB3Fksxc047234@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 171334 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: Thu, 03 Dec 2009 15:57:27 -0000 Alexander Motin wrote: > http://p4web.freebsd.org/chv.cgi?CH=171334 > > Change 171334 by mav@mav_mavbook on 2009/12/03 15:46:47 > > Migrate powerpc ATA controllers to the new world order. > Submitted by: nwitehorn@ > > Affected files ... > > .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#2 edit > .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#7 edit > .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#6 edit > .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#6 edit > > Differences ... > > ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#2 (text+ko) ==== > > @@ -230,7 +229,7 @@ > return EIO; > } > > - request->dma = &ch->dma.slot[atadev->unit]; > + request->dma = &ch->dma.slot[0]; > > if ((error = bus_dmamap_load(request->dma->data_tag, > request->dma->data_map, request->data, request->bytecount, > I made an error in this part of the patch -- it should be request->unit, not 0, here. Thanks for your work! -Nathan From owner-p4-projects@FreeBSD.ORG Thu Dec 3 16:55:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F03AE1065679; Thu, 3 Dec 2009 16:55:47 +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 B48C51065672 for ; Thu, 3 Dec 2009 16:55:47 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-bw0-f213.google.com (mail-bw0-f213.google.com [209.85.218.213]) by mx1.freebsd.org (Postfix) with ESMTP id 3F5028FC17 for ; Thu, 3 Dec 2009 16:55:47 +0000 (UTC) Received: by bwz5 with SMTP id 5so1256758bwz.3 for ; Thu, 03 Dec 2009 08:55:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type:content-transfer-encoding; bh=woAQLGyR/IhWd3XtPQJ1seHlTwvNO6HITYQzoJBQ6no=; b=TOPFpwylcTJ8DGJ0v9ZilKZhU4tMw5QzXOJtuLJgTVC7Cxq+hJnYIFWzD8b/AAmCO7 iQF8/haWUNbWtOO2ocPo8y8LbDQK4M22/XjNOJpKyHbUhBDKd6Pgy5Ky1JHeaOm1jPpa N9Wp+cUlHNj80Jxknho9PeBEeaqf6OaDJWhgM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=SOMKpsO/pbYtYzYhgRKz6XsSwV1mSJkZt7BLiDCURdmvk2r7HoNSAhoudZS9cy0QQw 8KKq5inHeBJNHYZiNK/LznllcdMgQ4wT1QHJInIuhXadsq2zR5Ay5YVfnSKohSHLmHUQ Igl3XPkGD5NVpGUqi9ldlCjk3biPwLyVmSuaY= Received: by 10.204.7.197 with SMTP id e5mr1850175bke.184.1259857713803; Thu, 03 Dec 2009 08:28:33 -0800 (PST) Received: from mavbook.mavhome.dp.ua (pc.mavhome.dp.ua [212.86.226.226]) by mx.google.com with ESMTPS id 15sm812135fxm.2.2009.12.03.08.28.32 (version=SSLv3 cipher=RC4-MD5); Thu, 03 Dec 2009 08:28:33 -0800 (PST) Sender: Alexander Motin Message-ID: <4B17E72E.5010304@FreeBSD.org> Date: Thu, 03 Dec 2009 18:28:30 +0200 From: Alexander Motin User-Agent: Thunderbird 2.0.0.23 (X11/20090901) MIME-Version: 1.0 To: Nathan Whitehorn References: <200912031546.nB3Fksxc047234@repoman.freebsd.org> <4B17DFEA.1020704@freebsd.org> In-Reply-To: <4B17DFEA.1020704@freebsd.org> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 171334 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: Thu, 03 Dec 2009 16:55:48 -0000 Nathan Whitehorn wrote: > Alexander Motin wrote: >> @@ -230,7 +229,7 @@ >> return EIO; >> } >> >> - request->dma = &ch->dma.slot[atadev->unit]; >> + request->dma = &ch->dma.slot[0]; >> >> if ((error = bus_dmamap_load(request->dma->data_tag, >> request->dma->data_map, request->data, request->bytecount, >> > I made an error in this part of the patch -- it should be request->unit, > not 0, here. Thanks for your work! It's not your fault, it's my change. It shouldn't be request->unit there, as only one DMA slot per channel allocated now. It is useless to allocate more, as rest of ata(4) infrastructure supports only one request at a time per channel. -- Alexander Motin From owner-p4-projects@FreeBSD.ORG Thu Dec 3 16:58:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A9731065692; Thu, 3 Dec 2009 16:58:07 +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 D36F6106568D for ; Thu, 3 Dec 2009 16:58:06 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C18C68FC08 for ; Thu, 3 Dec 2009 16:58:06 +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 nB3Gw6P5063999 for ; Thu, 3 Dec 2009 16:58:06 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3Gw60w063997 for perforce@freebsd.org; Thu, 3 Dec 2009 16:58:06 GMT (envelope-from raj@freebsd.org) Date: Thu, 3 Dec 2009 16:58:06 GMT Message-Id: <200912031658.nB3Gw60w063997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 16:58:07 -0000 http://p4web.freebsd.org/chv.cgi?CH=171338 Change 171338 by raj@raj_fdt on 2009/12/03 16:57:28 Initial version of the fdtbus driver. It handles IRQ and MEM resources. Based on the device tree top-level entities are instantiated as newbus children on the fdtbus. The mpc85xx directory is temporary, it will be something generic once we are done with FDT bringup for PowerPC and move on to ARM. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#4 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdtbus.c#1 add Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#4 (text+ko) ==== @@ -119,6 +119,7 @@ powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 powerpc/mpc85xx/ds1553_core.c optional ds1553 +powerpc/mpc85xx/fdtbus.c optional fdt powerpc/mpc85xx/i2c.c optional iicbus mpc85xx powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx From owner-p4-projects@FreeBSD.ORG Thu Dec 3 17:00:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFAE910656D0; Thu, 3 Dec 2009 17:00: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 68A4010656CD for ; Thu, 3 Dec 2009 17:00:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from mail.icecube.wisc.edu (trout.icecube.wisc.edu [128.104.255.119]) by mx1.freebsd.org (Postfix) with ESMTP id 2F8F68FC27 for ; Thu, 3 Dec 2009 17:00:28 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.icecube.wisc.edu (Postfix) with ESMTP id AB471582AD; Thu, 3 Dec 2009 11:00:27 -0600 (CST) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from mail.icecube.wisc.edu ([127.0.0.1]) by localhost (trout.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id 8j7ygV22GRaS; Thu, 3 Dec 2009 11:00:27 -0600 (CST) Received: from elpis.tachypleus.net (unknown [128.104.255.214]) by mail.icecube.wisc.edu (Postfix) with ESMTP id 8DD3E582AB; Thu, 3 Dec 2009 11:00:27 -0600 (CST) Message-ID: <4B17EEA7.5040502@freebsd.org> Date: Thu, 03 Dec 2009 11:00:23 -0600 From: Nathan Whitehorn User-Agent: Thunderbird 2.0.0.23 (X11/20091130) MIME-Version: 1.0 To: Rafal Jaworowski References: <200912031658.nB3Gw60w063997@repoman.freebsd.org> In-Reply-To: <200912031658.nB3Gw60w063997@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 171338 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: Thu, 03 Dec 2009 17:00:29 -0000 Since this is the same as the OFW interface, or is supposed to be, would it make sense to make this be MI in /sys/dev/ofw, attaching with a low priority to any device with a phandle and OF children? -Nathan Rafal Jaworowski wrote: > http://p4web.freebsd.org/chv.cgi?CH=171338 > > Change 171338 by raj@raj_fdt on 2009/12/03 16:57:28 > > Initial version of the fdtbus driver. > > It handles IRQ and MEM resources. Based on the device tree top-level > entities are instantiated as newbus children on the fdtbus. > > The mpc85xx directory is temporary, it will be something generic once > we are done with FDT bringup for PowerPC and move on to ARM. > > Affected files ... > > .. //depot/projects/fdt/sys/conf/files.powerpc#4 edit > .. //depot/projects/fdt/sys/powerpc/mpc85xx/fdtbus.c#1 add > > Differences ... > > ==== //depot/projects/fdt/sys/conf/files.powerpc#4 (text+ko) ==== > > @@ -119,6 +119,7 @@ > powerpc/mpc85xx/atpic.c optional mpc85xx isa > powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 > powerpc/mpc85xx/ds1553_core.c optional ds1553 > +powerpc/mpc85xx/fdtbus.c optional fdt > powerpc/mpc85xx/i2c.c optional iicbus mpc85xx > powerpc/mpc85xx/isa.c optional mpc85xx isa > powerpc/mpc85xx/lbc.c optional mpc85xx > From owner-p4-projects@FreeBSD.ORG Thu Dec 3 17:21:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE6010656A7; Thu, 3 Dec 2009 17:21:32 +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 439B710656A4 for ; Thu, 3 Dec 2009 17:21:32 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from smtp.semihalf.com (smtp.semihalf.com [213.17.239.109]) by mx1.freebsd.org (Postfix) with ESMTP id E89FA8FC19 for ; Thu, 3 Dec 2009 17:21:31 +0000 (UTC) Received: from localhost (unknown [213.17.239.109]) by smtp.semihalf.com (Postfix) with ESMTP id 3C129C42CA; Thu, 3 Dec 2009 18:04:25 +0100 (CET) X-Virus-Scanned: by amavisd-new at semihalf.com Received: from smtp.semihalf.com ([213.17.239.109]) by localhost (smtp.semihalf.com [213.17.239.109]) (amavisd-new, port 10024) with ESMTP id 9IHhmpsfJkNT; Thu, 3 Dec 2009 18:04:24 +0100 (CET) Received: from [10.0.0.34] (cardhu.semihalf.com [213.17.239.108]) by smtp.semihalf.com (Postfix) with ESMTPSA id 82682C4275; Thu, 3 Dec 2009 18:04:24 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: text/plain; charset=us-ascii From: Rafal Jaworowski In-Reply-To: <4B17EEA7.5040502@freebsd.org> Date: Thu, 3 Dec 2009 18:04:45 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <901E1717-96CA-4067-928D-06DA5B5D1190@semihalf.com> References: <200912031658.nB3Gw60w063997@repoman.freebsd.org> <4B17EEA7.5040502@freebsd.org> To: Nathan Whitehorn X-Mailer: Apple Mail (2.1077) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 171338 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: Thu, 03 Dec 2009 17:21:32 -0000 On 2009-12-03, at 18:00, Nathan Whitehorn wrote: > Since this is the same as the OFW interface, or is supposed to be, = would it make sense to make this be MI in /sys/dev/ofw, attaching with a = low priority to any device with a phandle and OF children? The end goal is something like this, yes -- I want to get it initially = working with FDT and in the next round we can optimize/merge it into = something generic that suits all OF cases. If you have any particular = comments or insight let me know, comments are greatly welcome. Rafal From owner-p4-projects@FreeBSD.ORG Thu Dec 3 17:30:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A64111065695; Thu, 3 Dec 2009 17:30:39 +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 6B090106568F for ; Thu, 3 Dec 2009 17:30:39 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5928A8FC08 for ; Thu, 3 Dec 2009 17:30:39 +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 nB3HUdcp067374 for ; Thu, 3 Dec 2009 17:30:39 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3HUdaj067372 for perforce@freebsd.org; Thu, 3 Dec 2009 17:30:39 GMT (envelope-from raj@freebsd.org) Date: Thu, 3 Dec 2009 17:30:39 GMT Message-Id: <200912031730.nB3HUdaj067372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 17:30:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=171340 Change 171340 by raj@raj_fdt on 2009/12/03 17:30:39 Initial skeleton of the simplebus driver. This represents ePAPR 'simple-bus' node and hiererachy of subordinate peripheral devices integrated on the SOC, typically accessible through an internal memory-mapped regiters block. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#5 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/simplebus.c#1 add Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#5 (text+ko) ==== @@ -128,6 +128,7 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx +powerpc/mpc85xx/simplebus.c optional fdt powerpc/ofw/ofw_cpu.c optional aim powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim From owner-p4-projects@FreeBSD.ORG Thu Dec 3 20:41:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7D511065672; Thu, 3 Dec 2009 20:41:00 +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 64790106566C for ; Thu, 3 Dec 2009 20:41:00 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 503468FC12 for ; Thu, 3 Dec 2009 20:41:00 +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 nB3Kf0Fs084513 for ; Thu, 3 Dec 2009 20:41:00 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3KexFh084511 for perforce@freebsd.org; Thu, 3 Dec 2009 20:40:59 GMT (envelope-from raj@freebsd.org) Date: Thu, 3 Dec 2009 20:40:59 GMT Message-Id: <200912032040.nB3KexFh084511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 20:41:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=171355 Change 171355 by raj@raj_fdt on 2009/12/03 20:40:52 IFC @171341 Affected files ... .. //depot/projects/fdt/ObsoleteFiles.inc#3 integrate .. //depot/projects/fdt/bin/sh/eval.c#3 integrate .. //depot/projects/fdt/bin/sh/redir.c#3 integrate .. //depot/projects/fdt/contrib/bind9/CHANGES#2 integrate .. //depot/projects/fdt/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/fdt/contrib/bind9/version#2 integrate .. //depot/projects/fdt/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/fdt/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/fdt/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/fdt/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/fdt/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/fdt/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/fdt/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/fdt/etc/Makefile#3 integrate .. //depot/projects/fdt/etc/defaults/rc.conf#2 integrate .. //depot/projects/fdt/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/fdt/etc/rc.d/Makefile#2 integrate .. //depot/projects/fdt/etc/rc.d/ip6fw#2 delete .. //depot/projects/fdt/etc/rc.d/ipfw#2 integrate .. //depot/projects/fdt/etc/rc.firewall#2 integrate .. //depot/projects/fdt/etc/rc.firewall6#2 delete .. //depot/projects/fdt/include/Makefile#2 integrate .. //depot/projects/fdt/include/termios.h#1 branch .. //depot/projects/fdt/lib/Makefile#2 integrate .. //depot/projects/fdt/lib/bind/config.h#2 integrate .. //depot/projects/fdt/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/arm/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/i386-elf/crt1.c#2 delete .. //depot/projects/fdt/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/fdt/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/fdt/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/mips/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/fdt/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/fdt/lib/libc/gen/exec.c#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/fdt/lib/libc/rpc/svc.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/fdt/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/fdt/lib/libc/string/strcat.3#2 integrate .. //depot/projects/fdt/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/fdt/lib/libthr/Makefile#3 integrate .. //depot/projects/fdt/lib/libulog/Makefile#1 branch .. //depot/projects/fdt/lib/libulog/Symbol.map#1 branch .. //depot/projects/fdt/lib/libulog/ulog.h#1 branch .. //depot/projects/fdt/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/fdt/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/fdt/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/fdt/lib/libulog/ulog_login.3#1 branch .. //depot/projects/fdt/lib/libulog/ulog_login.c#1 branch .. //depot/projects/fdt/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/fdt/lib/libutil/libutil.h#2 integrate .. //depot/projects/fdt/libexec/Makefile#2 integrate .. //depot/projects/fdt/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/fdt/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/fdt/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/fdt/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/fdt/sbin/ipfw/dummynet.c#3 integrate .. //depot/projects/fdt/share/man/man4/Makefile#4 integrate .. //depot/projects/fdt/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/fdt/share/man/man4/ipsec.4#2 integrate .. //depot/projects/fdt/share/man/man4/sctp.4#2 integrate .. //depot/projects/fdt/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/fdt/share/man/man9/ifnet.9#2 integrate .. //depot/projects/fdt/share/misc/bsd-family-tree#2 integrate .. //depot/projects/fdt/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/fdt/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/amd64/include/mca.h#2 integrate .. //depot/projects/fdt/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/fdt/sys/arm/arm/trap.c#3 integrate .. //depot/projects/fdt/sys/arm/conf/AVILA#2 integrate .. //depot/projects/fdt/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/fdt/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/fdt/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/fdt/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/fdt/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/fdt/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.c#4 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.h#4 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/fdt/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/fdt/sys/conf/files#6 integrate .. //depot/projects/fdt/sys/conf/files.amd64#2 integrate .. //depot/projects/fdt/sys/conf/files.i386#2 integrate .. //depot/projects/fdt/sys/dev/adb/adb.h#2 integrate .. //depot/projects/fdt/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/fdt/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/fdt/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/fdt/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/fdt/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/fdt/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/fdt/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/atp.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/fdt/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/fdt/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/fdt/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/fdt/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label.h#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_ext2fs.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_gpt.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/fdt/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/fdt/sys/i386/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/fdt/sys/i386/i386/mca.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/trap.c#3 integrate .. //depot/projects/fdt/sys/i386/include/mca.h#2 integrate .. //depot/projects/fdt/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/fdt/sys/i386/xen/exception.s#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/fdt/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/fdt/sys/ia64/include/bus.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/fdt/sys/kern/tty.c#3 integrate .. //depot/projects/fdt/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/trap.c#3 integrate .. //depot/projects/fdt/sys/modules/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/amdsbwd/Makefile#1 branch .. //depot/projects/fdt/sys/net/if.c#4 integrate .. //depot/projects/fdt/sys/net/if_dead.c#2 integrate .. //depot/projects/fdt/sys/net/if_var.h#4 integrate .. //depot/projects/fdt/sys/netinet/in.h#3 integrate .. //depot/projects/fdt/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/fdt/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/fdt/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/fdt/sys/netipsec/ipcomp_var.h#2 integrate .. //depot/projects/fdt/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/fdt/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/fdt/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/fdt/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/fdt/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/fdt/sys/opencrypto/deflate.h#2 integrate .. //depot/projects/fdt/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/fdt/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/fdt/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/fdt/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/fdt/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/fdt/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/fdt/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/fdt/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/fdt/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/fdt/sys/sys/_termios.h#1 branch .. //depot/projects/fdt/sys/sys/ata.h#4 integrate .. //depot/projects/fdt/sys/sys/param.h#5 integrate .. //depot/projects/fdt/sys/sys/sdt.h#2 integrate .. //depot/projects/fdt/sys/sys/termios.h#2 integrate .. //depot/projects/fdt/sys/sys/tty.h#2 integrate .. //depot/projects/fdt/sys/vm/vm_fault.c#5 integrate .. //depot/projects/fdt/sys/vm/vm_map.h#3 integrate .. //depot/projects/fdt/tools/regression/bin/sh/builtins/fc1.0#2 integrate .. //depot/projects/fdt/tools/regression/bin/sh/errors/backquote-error1.0#2 integrate .. //depot/projects/fdt/tools/regression/bin/sh/execution/redir1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/execution/redir2.0#1 branch .. //depot/projects/fdt/tools/regression/environ/Makefile.envctl#2 integrate .. //depot/projects/fdt/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/fdt/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/fdt/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/fdt/usr.bin/netstat/if.c#3 integrate .. //depot/projects/fdt/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/fdt/usr.bin/netstat/main.c#2 integrate .. //depot/projects/fdt/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/fdt/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdef.c#3 integrate .. //depot/projects/fdt/usr.bin/users/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/users/users.c#2 integrate .. //depot/projects/fdt/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate Differences ... ==== //depot/projects/fdt/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.214 2009/12/02 15:05:26 ume 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,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall ==== //depot/projects/fdt/bin/sh/eval.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.69 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $"); #include #include @@ -883,7 +883,6 @@ #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); ==== //depot/projects/fdt/bin/sh/redir.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.28 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.29 2009/11/29 22:33:59 jilles Exp $"); #include #include @@ -63,6 +63,7 @@ #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; ==== //depot/projects/fdt/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,3 +1,9 @@ + --- 9.6.1-P2 released --- + +2772. [security] When validating, track whether pending data was from + the additional section or not and only return it if + validates as secure. [RT #20438] + --- 9.6.1-P1 released --- 2640. [security] A specially crafted update packet will cause named ==== //depot/projects/fdt/contrib/bind9/bin/named/query.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.313.20.7 2009/03/13 01:38:51 marka Exp $ */ +/* $Id: query.c,v 1.313.20.7.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -116,6 +116,8 @@ #define DNS_GETDB_NOLOG 0x02U #define DNS_GETDB_PARTIAL 0x04U +#define PENDINGOK(x) (((x) & DNS_DBFIND_PENDINGOK) != 0) + typedef struct client_additionalctx { ns_client_t *client; dns_rdataset_t *rdataset; @@ -1761,8 +1763,8 @@ */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -1801,8 +1803,8 @@ */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -2601,14 +2603,14 @@ /* * Attempt to validate RRsets that are pending or that are glue. */ - if ((rdataset->trust == dns_trust_pending || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_pending)) + if ((DNS_TRUST_PENDING(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_PENDING(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && - (client->query.dboptions & DNS_DBFIND_PENDINGOK) == 0) + !PENDINGOK(client->query.dboptions)) goto cleanup; - if ((rdataset->trust == dns_trust_glue || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_glue)) && + if ((DNS_TRUST_GLUE(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_GLUE(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && SECURE(client) && WANTDNSSEC(client)) goto cleanup; @@ -3716,6 +3718,8 @@ dns_rdataset_t *noqname; isc_boolean_t resuming; int line = -1; + dns_rdataset_t tmprdataset; + unsigned int dboptions; CTRACE("query_find"); @@ -3933,9 +3937,49 @@ /* * Now look for an answer in the database. */ + dboptions = client->query.dboptions; + if (sigrdataset == NULL && client->view->enablednssec) { + /* + * If the client doesn't want DNSSEC we still want to + * look for any data pending validation to save a remote + * lookup if possible. + */ + dns_rdataset_init(&tmprdataset); + sigrdataset = &tmprdataset; + dboptions |= DNS_DBFIND_PENDINGOK; + } + refind: result = dns_db_find(db, client->query.qname, version, type, - client->query.dboptions, client->now, - &node, fname, rdataset, sigrdataset); + dboptions, client->now, &node, fname, + rdataset, sigrdataset); + /* + * If we have found pending data try to validate it. + * If the data does not validate as secure and we can't + * use the unvalidated data requery the database with + * pending disabled to prevent infinite looping. + */ + if (result != ISC_R_SUCCESS || !DNS_TRUST_PENDING(rdataset->trust)) + goto validation_done; + if (validate(client, db, fname, rdataset, sigrdataset)) + goto validation_done; + if (rdataset->trust != dns_trust_pending_answer || + !PENDINGOK(client->query.dboptions)) { + dns_rdataset_disassociate(rdataset); + if (sigrdataset != NULL && + dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + if (sigrdataset == &tmprdataset) + sigrdataset = NULL; + dns_db_detachnode(db, &node); + dboptions &= ~DNS_DBFIND_PENDINGOK; + goto refind; + } + validation_done: + if (sigrdataset == &tmprdataset) { + if (dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + sigrdataset = NULL; + } resume: CTRACE("query_find: resume"); ==== //depot/projects/fdt/contrib/bind9/lib/dns/api#2 (text+ko) ==== @@ -1,3 +1,3 @@ -LIBINTERFACE = 52 +LIBINTERFACE = 53 LIBREVISION = 0 -LIBAGE = 2 +LIBAGE = 0 ==== //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/types.h#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.130.50.3 2009/01/29 22:40:35 jinmei Exp $ */ +/* $Id: types.h,v 1.130.50.3.12.1 2009/11/18 23:58:04 marka Exp $ */ #ifndef DNS_TYPES_H #define DNS_TYPES_H 1 @@ -258,40 +258,52 @@ dns_trust_none = 0, #define dns_trust_none ((dns_trust_t)dns_trust_none) - /*% Subject to DNSSEC validation but has not yet been validated */ - dns_trust_pending = 1, -#define dns_trust_pending ((dns_trust_t)dns_trust_pending) + /*% + * Subject to DNSSEC validation but has not yet been validated + * dns_trust_pending_additional (from the additional section). + */ + dns_trust_pending_additional = 1, +#define dns_trust_pending_additional \ + ((dns_trust_t)dns_trust_pending_additional) + + dns_trust_pending_answer = 2, +#define dns_trust_pending_answer ((dns_trust_t)dns_trust_pending_answer) /*% Received in the additional section of a response. */ - dns_trust_additional = 2, + dns_trust_additional = 3, #define dns_trust_additional ((dns_trust_t)dns_trust_additional) /* Received in a referral response. */ - dns_trust_glue = 3, + dns_trust_glue = 4, #define dns_trust_glue ((dns_trust_t)dns_trust_glue) /* Answer from a non-authoritative server */ - dns_trust_answer = 4, + dns_trust_answer = 5, #define dns_trust_answer ((dns_trust_t)dns_trust_answer) /* Received in the authority section as part of an authoritative response */ - dns_trust_authauthority = 5, + dns_trust_authauthority = 6, #define dns_trust_authauthority ((dns_trust_t)dns_trust_authauthority) /* Answer from an authoritative server */ - dns_trust_authanswer = 6, + dns_trust_authanswer = 7, #define dns_trust_authanswer ((dns_trust_t)dns_trust_authanswer) /* Successfully DNSSEC validated */ - dns_trust_secure = 7, + dns_trust_secure = 8, #define dns_trust_secure ((dns_trust_t)dns_trust_secure) /* This server is authoritative */ - dns_trust_ultimate = 8 + dns_trust_ultimate = 9 #define dns_trust_ultimate ((dns_trust_t)dns_trust_ultimate) }; +#define DNS_TRUST_PENDING(x) ((x) == dns_trust_pending_answer || \ + (x) == dns_trust_pending_additional) +#define DNS_TRUST_GLUE(x) ((x) == dns_trust_glue) + + /*% * Name checking severities. */ ==== //depot/projects/fdt/contrib/bind9/lib/dns/masterdump.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.94.50.2 2009/01/18 23:47:40 tbox Exp $ */ +/* $Id: masterdump.c,v 1.94.50.2.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -775,7 +775,8 @@ static const char *trustnames[] = { "none", - "pending", + "pending-additional", + "pending-answer", "additional", "glue", "answer", ==== //depot/projects/fdt/contrib/bind9/lib/dns/rbtdb.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.270.12.6 2009/05/06 23:34:30 jinmei Exp $ */ +/* $Id: rbtdb.c,v 1.270.12.6.10.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4005,7 +4005,7 @@ } if (dname_header != NULL && - (dname_header->trust != dns_trust_pending || + (!DNS_TRUST_PENDING(dname_header->trust) || (search->options & DNS_DBFIND_PENDINGOK) != 0)) { /* * We increment the reference count on node to ensure that @@ -4548,7 +4548,7 @@ if (found == NULL || (found->trust == dns_trust_glue && ((options & DNS_DBFIND_GLUEOK) == 0)) || - (found->trust == dns_trust_pending && + (DNS_TRUST_PENDING(found->trust) && ((options & DNS_DBFIND_PENDINGOK) == 0))) { /* * If there is an NS rdataset at this node, then this is the ==== //depot/projects/fdt/contrib/bind9/lib/dns/resolver.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.384.14.14 2009/06/02 23:47:13 tbox Exp $ */ +/* $Id: resolver.c,v 1.384.14.14.8.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4293,6 +4293,7 @@ * for it, unless it is glue. */ if (secure_domain && rdataset->trust != dns_trust_glue) { + dns_trust_t trust; /* * RRSIGs are validated as part of validating the * type they cover. @@ -4329,12 +4330,34 @@ } /* + * Reject out of bailiwick additional records + * without RRSIGs as they can't possibly validate + * as "secure" and as we will never never want to + * store these as "answers" after validation. + */ + if (rdataset->trust == dns_trust_additional && + sigrdataset == NULL && EXTERNAL(rdataset)) + continue; + + /* + * XXXMPA: If we store as "answer" after validating + * then we need to do bailiwick processing and + * also need to track whether RRsets are in or + * out of bailiwick. This will require a another + * pending trust level. + * * Cache this rdataset/sigrdataset pair as - * pending data. + * pending data. Track whether it was additional + * or not. */ - rdataset->trust = dns_trust_pending; + if (rdataset->trust == dns_trust_additional) + trust = dns_trust_pending_additional; + else + trust = dns_trust_pending_answer; + + rdataset->trust = trust; if (sigrdataset != NULL) - sigrdataset->trust = dns_trust_pending; + sigrdataset->trust = trust; if (!need_validation || !ANSWER(rdataset)) { addedrdataset = ardataset; result = dns_db_addrdataset(fctx->cache, node, @@ -4682,7 +4705,7 @@ for (trdataset = ISC_LIST_HEAD(tname->list); trdataset != NULL; trdataset = ISC_LIST_NEXT(trdataset, link)) - trdataset->trust = dns_trust_pending; + trdataset->trust = dns_trust_pending_answer; result = dns_message_nextname(fctx->rmessage, DNS_SECTION_AUTHORITY); } ==== //depot/projects/fdt/contrib/bind9/lib/dns/validator.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.9 2009/05/07 23:47:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.9.8.1 2009/11/18 23:58:04 marka Exp $ */ #include @@ -1607,7 +1607,7 @@ * We have an rrset for the given keyname. */ val->keyset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { /* @@ -1622,7 +1622,7 @@ if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * Having a pending key with no signature means that * something is broken. @@ -2243,7 +2243,7 @@ * We have DS records. */ val->dsset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { result = create_validator(val, @@ -2256,7 +2256,7 @@ if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * There should never be an unsigned DS. */ @@ -3337,7 +3337,7 @@ * There is no DS. If this is a delegation, * we maybe done. */ - if (val->frdataset.trust == dns_trust_pending) { + if (DNS_TRUST_PENDING(val->frdataset.trust)) { result = create_fetch(val, tname, dns_rdatatype_ds, dsfetched2, ==== //depot/projects/fdt/contrib/bind9/version#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ +# $Id: version,v 1.43.12.5.8.2 2009/11/18 23:58:04 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=6 PATCHVER=1 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/fdt/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 (text) ==== @@ -39,7 +39,7 @@ FROM BEGEMOT-IP-MIB; begemotMib2 MODULE-IDENTITY - LAST-UPDATED "200602130000Z" + LAST-UPDATED "200908030000Z" ORGANIZATION "German Aerospace Center" CONTACT-INFO " Hartmut Brandt @@ -54,6 +54,12 @@ E-mail: harti@freebsd.org" DESCRIPTION "The MIB for private mib2 stuff." + REVISION "200908030000Z" + DESCRIPTION + "Second edition adds begemotIfDataPoll object." + REVISION "200602130000Z" + DESCRIPTION + "Initial revision." ::= { begemotIp 1 } begemotIfMaxspeed OBJECT-TYPE @@ -87,4 +93,14 @@ bit rate in its MIB." ::= { begemotMib2 3 } +begemotIfDataPoll OBJECT-TYPE + SYNTAX TimeTicks + UNITS "deciseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The rate at which the mib2 module will poll interface data." + DEFVAL { 100 } + ::= { begemotMib2 4 } + END ==== //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -117,6 +117,15 @@ /* HC update timer handle */ static void *hc_update_timer; +/* Idle poll timer */ +static void *mibII_poll_timer; + +/* interfaces' data poll interval */ +u_int mibII_poll_ticks; + +/* Idle poll hook */ +static void mibII_idle(void *arg __unused); + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -410,6 +419,20 @@ mibif_hc_update_interval = ticks; } +/** + * Restart the idle poll timer. + */ +void +mibif_restart_mibII_poll_timer(void) +{ + if (mibII_poll_timer != NULL) + timer_stop(mibII_poll_timer); + + if ((mibII_poll_timer = timer_start_repeat(mibII_poll_ticks * 10, + mibII_poll_ticks * 10, mibII_idle, NULL, module)) == NULL) + syslog(LOG_ERR, "timer_start(%u): %m", mibII_poll_ticks); +} + /* * Fetch new MIB data. */ @@ -1553,7 +1576,7 @@ * Idle function */ static void -mibII_idle(void) +mibII_idle(void *arg __unused) { struct mibifa *ifa; @@ -1608,6 +1631,10 @@ ipForward_reg = or_register(&oid_ipForward, "The MIB module for the display of CIDR multipath IP Routes.", module); + + mibII_poll_timer = NULL; + mibII_poll_ticks = MIBII_POLL_TICKS; + mibif_restart_mibII_poll_timer(); } /* @@ -1651,6 +1678,11 @@ static int mibII_fini(void) { + if (mibII_poll_timer != NULL ) { + timer_stop(mibII_poll_timer); + mibII_poll_timer = NULL; + } + if (route_fd != NULL) fd_deselect(route_fd); if (route != -1) @@ -1690,7 +1722,7 @@ "This module implements the interface and ip groups.", mibII_init, mibII_fini, - mibII_idle, /* idle */ + NULL, /* idle */ NULL, /* dump */ NULL, /* config */ mibII_start, ==== //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII.h#2 (text+ko) ==== @@ -211,6 +211,14 @@ /* re-compute update interval */ void mibif_reset_hc_timer(void); +/* interfaces' data poll interval */ +extern u_int mibII_poll_ticks; + +/* restart the data poll timer */ +void mibif_restart_mibII_poll_timer(void); + +#define MIBII_POLL_TICKS 100 + /* get interfaces and interface addresses. */ void mib_fetch_interfaces(void); ==== //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 (text) ==== @@ -59,6 +59,11 @@ ctx->scratch->int1 = mibif_force_hc_update_interval; mibif_force_hc_update_interval = value->v.uint32; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + ctx->scratch->int1 = mibII_poll_ticks; + mibII_poll_ticks = value->v.uint32; + return (SNMP_ERR_NOERROR); } abort(); @@ -68,6 +73,10 @@ case LEAF_begemotIfForcePoll: mibif_force_hc_update_interval = ctx->scratch->int1; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibII_poll_ticks = ctx->scratch->int1; + return (SNMP_ERR_NOERROR); } abort(); @@ -78,6 +87,10 @@ mibif_force_hc_update_interval = ctx->scratch->int1; mibif_reset_hc_timer(); return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibif_restart_mibII_poll_timer(); + return (SNMP_ERR_NOERROR); } abort(); } @@ -98,6 +111,10 @@ case LEAF_begemotIfForcePoll: value->v.uint32 = mibif_force_hc_update_interval; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + value->v.uint32 = mibII_poll_ticks; + return (SNMP_ERR_NOERROR); } abort(); } ==== //depot/projects/fdt/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 (text+ko) ==== @@ -240,6 +240,7 @@ (1 begemotIfMaxspeed COUNTER64 op_begemot_mibII GET) (2 begemotIfPoll TIMETICKS op_begemot_mibII GET) (3 begemotIfForcePoll TIMETICKS op_begemot_mibII GET SET) + (4 begemotIfDataPoll TIMETICKS op_begemot_mibII GET SET) ) ) ) ==== //depot/projects/fdt/contrib/gcc/config/freebsd-spec.h#2 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.26 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.27 2009/12/02 16:34:20 kib Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -103,9 +103,10 @@ %{p:gcrt1.o%s} \ %{!p: \ %{profile:gcrt1.o%s} \ - %{!profile:crt1.o%s}}}} \ + %{!profile: \ + %{pie: Scrt1.o%s;:crt1.o%s}}}}} \ crti.o%s \ - %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}" + %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our own magical crtend.o file (see crtstuff.c) which provides part of @@ -113,8 +114,7 @@ entering `main', followed by the normal "finalizer" file, `crtn.o'. */ #define FBSD_ENDFILE_SPEC "\ - %{!shared:crtend.o%s} \ - %{shared:crtendS.o%s} \ + %{shared|pie:crtendS.o%s;:crtend.o%s} \ crtn.o%s " /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as ==== //depot/projects/fdt/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -777,6 +777,7 @@ .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) +.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) ==== //depot/projects/fdt/contrib/ntp/ntpd/ntp_io.c#2 (text+ko) ==== @@ -65,6 +65,12 @@ #endif /* IPV6 Multicast Support */ #endif /* IPv6 Support */ +#ifdef INCLUDE_IPV6_SUPPORT +#include +#include +#include +#endif /* !INCLUDE_IPV6_SUPPORT */ + extern int listen_to_virtual_ips; extern const char *specific_interface; @@ -1137,6 +1143,36 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 4 10:12:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F1571065679; Fri, 4 Dec 2009 10:12:14 +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 AE55E106566C for ; Fri, 4 Dec 2009 10:12:13 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99A4E8FC17 for ; Fri, 4 Dec 2009 10:12:13 +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 nB4ACDra002590 for ; Fri, 4 Dec 2009 10:12:13 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4ACD4Z002588 for perforce@freebsd.org; Fri, 4 Dec 2009 10:12:13 GMT (envelope-from marinosi@FreeBSD.org) Date: Fri, 4 Dec 2009 10:12:13 GMT Message-Id: <200912041012.nB4ACD4Z002588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 10:12:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=171374 Change 171374 by marinosi@revolver on 2009/12/04 10:11:14 Integrate and some debugging code. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/Makefile#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ip6fw#3 delete .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ipfw#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.firewall#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.firewall6#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/lib/libutil/libutil.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/syscalls.master#6 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/mca.c#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/in.h#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.c#27 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_worker.c#14 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/sys/param.h#5 integrate Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.214 2009/12/02 15:05:26 ume 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,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall ==== //depot/projects/soc2009/marinosi_appaudit/src/etc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ +# $FreeBSD: src/etc/Makefile,v 1.378 2009/12/02 15:05:26 ume Exp $ .include @@ -15,7 +15,7 @@ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ phones profile protocols \ - rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ + rc rc.bsdextended rc.firewall rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ sysctl.conf syslog.conf ==== //depot/projects/soc2009/marinosi_appaudit/src/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.363 2009/10/21 09:43:22 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.364 2009/12/02 15:05:26 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -118,7 +118,10 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file -firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" + # firewall. +#firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for + # "client" firewall. firewall_simple_iif="ed1" # Inside network interface for "simple" # firewall. firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" @@ -127,12 +130,22 @@ # firewall. firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" # firewall. +#firewall_simple_iif_ipv6="ed1" # Inside IPv6 network interface for "simple" + # firewall. +#firewall_simple_inet_ipv6="2001:db8:2:800::/56" # Inside IPv6 network prefix + # for "simple" firewall. +#firewall_simple_oif_ipv6="ed0" # Outside IPv6 network interface for "simple" + # firewall. +#firewall_simple_onet_ipv6="2001:db8:2:0::/56" # Outside IPv6 network prefix + # for "simple" firewall. firewall_myservices="" # List of TCP ports on which this host # offers services for "workstation" firewall. firewall_allowservices="" # List of IPs which have access to # $firewall_myservices for "workstation" # firewall. -firewall_trusted="" # List of IPs which have full access to this +firewall_trusted="" # List of IPv4s which have full access to this + # host for "workstation" firewall. +firewall_trusted_ipv6="" # List of IPv6s which have full access to this # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming # packets for "workstation" firewall. @@ -472,13 +485,6 @@ # faithd(8) setup. ipv6_ipv4mapping="NO" # Set to "YES" to enable IPv4 mapped IPv6 addr # communication. (like ::ffff:a.b.c.d) -ipv6_firewall_enable="NO" # Set to YES to enable IPv6 firewall - # functionality -ipv6_firewall_script="/etc/rc.firewall6" # Which script to run to set up the IPv6 firewall -ipv6_firewall_type="UNKNOWN" # IPv6 Firewall type (see /etc/rc.firewall6) -ipv6_firewall_quiet="NO" # Set to YES to suppress rule display -ipv6_firewall_logging="NO" # Set to YES to enable events logging -ipv6_firewall_flags="" # Flags passed to ip6fw when type is a file ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples ==== //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.101 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.102 2009/12/02 15:05:26 ume Exp $ .include @@ -15,7 +15,7 @@ hcsecd \ hostapd hostid hostid_save hostname \ inetd initrandom \ - ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ + ip6addrctl ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ ==== //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.d/ipfw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.21 2009/06/26 01:04:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.22 2009/12/02 15:05:26 ume Exp $ # # PROVIDE: ipfw @@ -17,6 +17,8 @@ stop_cmd="ipfw_stop" required_modules="ipfw" +set_rcvar_obsolete ipv6_firewall_enable + ipfw_prestart() { if checkyesno dummynet_enable; then @@ -61,7 +63,13 @@ # Enable the firewall # if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then - warn "failed to enable firewall" + warn "failed to enable IPv4 firewall" + fi + if afexists inet6; then + if ! ${SYSCTL_W} net.inet6.ip6.fw.enable=1 1>/dev/null 2>&1 + then + warn "failed to enable IPv6 firewall" + fi fi } @@ -70,6 +78,9 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 + if afexists inet6; then + ${SYSCTL_W} net.inet6.ip6.fw.enable=0 + fi if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd quietstop fi ==== //depot/projects/soc2009/marinosi_appaudit/src/etc/rc.firewall#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.firewall,v 1.60 2008/08/15 19:20:59 jhb Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.61 2009/12/02 15:05:26 ume Exp $ # # @@ -85,12 +85,42 @@ ${fwcmd} add 100 pass all from any to any via lo0 ${fwcmd} add 200 deny all from any to 127.0.0.0/8 ${fwcmd} add 300 deny ip from 127.0.0.0/8 to any + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add 400 deny all from any to ::1 + ${fwcmd} add 500 deny all from ::1 to any + fi +} + +setup_ipv6_mandatory () { + [ $ipv6_available -eq 0 ] || return 0 + + ############ + # Only in rare cases do you want to change these rules + # + # ND + # + # DAD + ${fwcmd} add pass ipv6-icmp from :: to ff02::/16 + # RS, RA, NS, NA, redirect... + ${fwcmd} add pass ipv6-icmp from fe80::/10 to fe80::/10 + ${fwcmd} add pass ipv6-icmp from fe80::/10 to ff02::/16 + + # Allow ICMPv6 destination unreach + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 1 + + # Allow NS/NA/toobig (don't filter it out) + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136 } if [ -n "${1}" ]; then firewall_type="${1}" fi +. /etc/rc.subr +. /etc/network.subr +afexists inet6 +ipv6_available=$? + ############ # Set quiet mode if requested # @@ -109,6 +139,7 @@ ${fwcmd} -f flush setup_loopback +setup_ipv6_mandatory ############ # Network Address Translation. All packets are passed to natd(8) @@ -166,11 +197,13 @@ # against people from outside your own network. # # Configuration: - # firewall_client_net: Network address of local network. + # firewall_client_net: Network address of local IPv4 network. + # firewall_client_net_ipv6: Network address of local IPv6 network. ############ # set this to your local network net="$firewall_client_net" + net6="$firewall_client_net_ipv6" # Allow limited broadcast traffic from my own net. ${fwcmd} add pass all from ${net} to 255.255.255.255 @@ -178,6 +211,16 @@ # Allow any traffic to or from my own net. ${fwcmd} add pass all from me to ${net} ${fwcmd} add pass all from ${net} to me + if [ -n "$net6" ]; then + ${fwcmd} add pass all from me6 to ${net6} + ${fwcmd} add pass all from ${net6} to me6 + fi + + if [ -n "$net6" ]; then + # Allow any link-local multicast traffic + ${fwcmd} add pass all from fe80::/10 to ff02::/16 + ${fwcmd} add pass all from ${net6} to ff02::/16 + fi # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -212,23 +255,38 @@ # on the inside at this machine for those services. # # Configuration: - # firewall_simple_iif: Inside network interface. - # firewall_simple_inet: Inside network address. - # firewall_simple_oif: Outside network interface. - # firewall_simple_onet: Outside network address. + # firewall_simple_iif: Inside IPv4 network interface. + # firewall_simple_inet: Inside IPv4 network address. + # firewall_simple_oif: Outside IPv4 network interface. + # firewall_simple_onet: Outside IPv4 network address. + # firewall_simple_iif_ipv6: Inside IPv6 network interface. + # firewall_simple_inet_ipv6: Inside IPv6 network prefix. + # firewall_simple_oif_ipv6: Outside IPv6 network interface. + # firewall_simple_onet_ipv6: Outside IPv6 network prefix. ############ # set these to your outside interface network oif="$firewall_simple_oif" onet="$firewall_simple_onet" + oif6="${firewall_simple_oif_ipv6:-$firewall_simple_oif}" + onet6="$firewall_simple_onet_ipv6" # set these to your inside interface network iif="$firewall_simple_iif" inet="$firewall_simple_inet" + iif6="${firewall_simple_iif_ipv6:-$firewall_simple_iif}" + inet6="$firewall_simple_inet_ipv6" # Stop spoofing ${fwcmd} add deny all from ${inet} to any in via ${oif} ${fwcmd} add deny all from ${onet} to any in via ${iif} + if [ -n "$inet6" ]; then + ${fwcmd} add deny all from ${inet6} to any in via ${oif6} + if [ -n "$onet6" ]; then + ${fwcmd} add deny all from ${onet6} to any in \ + via ${iif6} + fi + fi # Stop RFC1918 nets on the outside interface ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} @@ -254,7 +312,7 @@ case ${natd_enable} in [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd all from any to any via ${natd_interface} + ${fwcmd} add divert natd ip4 from any to any via ${natd_interface} fi ;; esac @@ -273,6 +331,55 @@ ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} + if [ -n "$inet6" ]; then + # Stop unique local unicast address on the outside interface + ${fwcmd} add deny all from fc00::/7 to any via ${oif6} + ${fwcmd} add deny all from any to fc00::/7 via ${oif6} + + # Stop site-local on the outside interface + ${fwcmd} add deny all from fec0::/10 to any via ${oif6} + ${fwcmd} add deny all from any to fec0::/10 via ${oif6} + + # Disallow "internal" addresses to appear on the wire. + ${fwcmd} add deny all from ::ffff:0.0.0.0/96 to any \ + via ${oif6} + ${fwcmd} add deny all from any to ::ffff:0.0.0.0/96 \ + via ${oif6} + + # Disallow packets to malicious IPv4 compatible prefix. + ${fwcmd} add deny all from ::224.0.0.0/100 to any via ${oif6} + ${fwcmd} add deny all from any to ::224.0.0.0/100 via ${oif6} + ${fwcmd} add deny all from ::127.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::127.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::0.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::255.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::255.0.0.0/104 via ${oif6} + + ${fwcmd} add deny all from ::0.0.0.0/96 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/96 via ${oif6} + + # Disallow packets to malicious 6to4 prefix. + ${fwcmd} add deny all from 2002:e000::/20 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:e000::/20 via ${oif6} + ${fwcmd} add deny all from 2002:7f00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:7f00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:0000::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0000::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ff00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ff00::/24 via ${oif6} + + ${fwcmd} add deny all from 2002:0a00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0a00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ac10::/28 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ac10::/28 via ${oif6} + ${fwcmd} add deny all from 2002:c0a8::/32 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:c0a8::/32 via ${oif6} + + ${fwcmd} add deny all from ff05::/16 to any via ${oif6} + ${fwcmd} add deny all from any to ff05::/16 via ${oif6} + fi + # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -291,7 +398,11 @@ ${fwcmd} add pass tcp from any to me 80 setup # Reject&Log all setup of incoming connections from the outside - ${fwcmd} add deny log tcp from any to any in via ${oif} setup + ${fwcmd} add deny log ip4 from any to any in via ${oif} setup proto tcp + if [ -n "$inet6" ]; then + ${fwcmd} add deny log ip6 from any to any in via ${oif6} \ + setup proto tcp + fi # Allow setup of any other TCP connection ${fwcmd} add pass tcp from any to any setup @@ -313,7 +424,7 @@ # offers services. # firewall_allowservices: List of IPs which has access to # $firewall_myservices. - # firewall_trusted: List of IPs which has full access + # firewall_trusted: List of IPv4s which has full access # to this host. Be very carefull # when setting this. This option can # seriously degrade the level of @@ -324,25 +435,44 @@ # firewall_nologports: List of TCP/UDP ports for which # denied incomming packets are not # logged. - + # firewall_trusted_ipv6: List of IPv6s which has full access + # to this host. Be very carefull + # when setting this. This option can + # seriously degrade the level of + # protection provided by the firewall. + # Allow packets for which a state has been built. ${fwcmd} add check-state # For services permitted below. ${fwcmd} add pass tcp from me to any established + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any established + fi # Allow any connection out, adding state for each. ${fwcmd} add pass tcp from me to any setup keep-state ${fwcmd} add pass udp from me to any keep-state ${fwcmd} add pass icmp from me to any keep-state + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any setup keep-state + ${fwcmd} add pass udp from me6 to any keep-state + ${fwcmd} add pass ipv6-icmp from me6 to any keep-state + fi # Allow DHCP. ${fwcmd} add pass udp from 0.0.0.0 68 to 255.255.255.255 67 out ${fwcmd} add pass udp from any 67 to me 68 in ${fwcmd} add pass udp from any 67 to 255.255.255.255 68 in + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass udp from fe80::/10 to me6 546 in + fi # Some servers will ping the IP while trying to decide if it's # still in use. ${fwcmd} add pass icmp from any to any icmptype 8 + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass ipv6-icmp from any to any icmp6type 128,129 + fi # Allow "mandatory" ICMP in. ${fwcmd} add pass icmp from any to any icmptype 3,4,11 @@ -361,6 +491,9 @@ for i in ${firewall_allowservices} ; do for j in ${firewall_myservices} ; do ${fwcmd} add pass tcp from $i to me $j + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from $i to me6 $j + fi done done @@ -370,7 +503,10 @@ for i in ${firewall_trusted} ; do ${fwcmd} add pass ip from $i to me done - + for i in ${firewall_trusted_ipv6} ; do + ${fwcmd} add pass all from $i to me6 + done + ${fwcmd} add 65000 count ip from any to any # Drop packets to ports where we don't want logging ==== //depot/projects/soc2009/marinosi_appaudit/src/lib/libutil/libutil.h#2 (text+ko) ==== @@ -33,12 +33,40 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libutil/libutil.h,v 1.49 2008/12/02 06:50:26 peter Exp $ + * $FreeBSD: src/lib/libutil/libutil.h,v 1.50 2009/12/02 15:56:18 ed Exp $ */ #ifndef _LIBUTIL_H_ #define _LIBUTIL_H_ +#include +#include + +#ifndef _GID_T_DECLARED +typedef __gid_t gid_t; +#define _GID_T_DECLARED +#endif + +#ifndef _INT64_T_DECLARED +typedef __int64_t int64_t; +#define _INT64_T_DECLARED +#endif + +#ifndef _PID_T_DECLARED +typedef __pid_t pid_t; +#define _PID_T_DECLARED +#endif + +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED +#endif + +#ifndef _UID_T_DECLARED +typedef __uid_t uid_t; +#define _UID_T_DECLARED +#endif + #define PROPERTY_MAX_NAME 64 #define PROPERTY_MAX_VALUE 512 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/amd64/mca.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.3 2009/05/20 16:11:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.4 2009/12/02 15:45:55 avg Exp $"); #include #include @@ -117,48 +117,6 @@ return (SYSCTL_OUT(req, &record, sizeof(record))); } -static struct mca_record * -mca_record_entry(int bank) -{ - struct mca_internal *rec; - uint64_t status; - u_int p[4]; - - status = rdmsr(MSR_MC_STATUS(bank)); - if (!(status & MC_STATUS_VAL)) - return (NULL); - - rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT | M_ZERO); - if (rec == NULL) { - printf("MCA: Unable to allocate space for an event.\n"); - return (NULL); - } - - /* Save exception information. */ - rec->rec.mr_status = status; - if (status & MC_STATUS_ADDRV) - rec->rec.mr_addr = rdmsr(MSR_MC_ADDR(bank)); - if (status & MC_STATUS_MISCV) - rec->rec.mr_misc = rdmsr(MSR_MC_MISC(bank)); - rec->rec.mr_tsc = rdtsc(); - rec->rec.mr_apic_id = PCPU_GET(apic_id); - - /* - * Clear machine check. Don't do this for uncorrectable - * errors so that the BIOS can see them. - */ - if (!(rec->rec.mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { - wrmsr(MSR_MC_STATUS(bank), 0); - do_cpuid(0, p); - } - - mtx_lock_spin(&mca_lock); - STAILQ_INSERT_TAIL(&mca_records, rec, link); - mca_count++; - mtx_unlock_spin(&mca_lock); - return (&rec->rec); -} - static const char * mca_error_ttype(uint16_t mca_error) { @@ -219,11 +177,13 @@ } /* Dump details about a single machine check. */ -static void -mca_log(struct mca_record *rec) +static void __nonnull(1) +mca_log(const struct mca_record *rec) { uint16_t mca_error; + printf("MCA: bank %d, status 0x%016llx\n", rec->mr_bank, + (long long)rec->mr_status); printf("MCA: CPU %d ", rec->mr_apic_id); if (rec->mr_status & MC_STATUS_UC) printf("UNCOR "); @@ -329,6 +289,59 @@ printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr); } +static int __nonnull(2) +mca_check_status(int bank, struct mca_record *rec) +{ + uint64_t status; + u_int p[4]; + + status = rdmsr(MSR_MC_STATUS(bank)); + if (!(status & MC_STATUS_VAL)) + return (0); + + /* Save exception information. */ + rec->mr_status = status; + rec->mr_bank = bank; + rec->mr_addr = 0; + if (status & MC_STATUS_ADDRV) + rec->mr_addr = rdmsr(MSR_MC_ADDR(bank)); + rec->mr_misc = 0; + if (status & MC_STATUS_MISCV) + rec->mr_misc = rdmsr(MSR_MC_MISC(bank)); + rec->mr_tsc = rdtsc(); + rec->mr_apic_id = PCPU_GET(apic_id); + + /* + * Clear machine check. Don't do this for uncorrectable + * errors so that the BIOS can see them. + */ + if (!(rec->mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { + wrmsr(MSR_MC_STATUS(bank), 0); + do_cpuid(0, p); + } + return (1); +} + +static void __nonnull(1) +mca_record_entry(const struct mca_record *record) +{ + struct mca_internal *rec; + + rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT); + if (rec == NULL) { + printf("MCA: Unable to allocate space for an event.\n"); + mca_log(record); + return; + } + + rec->rec = *record; + rec->logged = 0; + mtx_lock_spin(&mca_lock); + STAILQ_INSERT_TAIL(&mca_records, rec, link); + mca_count++; + mtx_unlock_spin(&mca_lock); +} + /* * This scans all the machine check banks of the current CPU to see if * there are any machine checks. Any non-recoverable errors are @@ -341,7 +354,7 @@ static int mca_scan(int mcip) { - struct mca_record *rec; + struct mca_record rec; uint64_t mcg_cap, ucmask; int count, i, recoverable; @@ -354,13 +367,13 @@ ucmask |= MC_STATUS_OVER; mcg_cap = rdmsr(MSR_MCG_CAP); for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) { - rec = mca_record_entry(i); - if (rec != NULL) { + if (mca_check_status(i, &rec)) { count++; - if (rec->mr_status & ucmask) { + if (rec.mr_status & ucmask) { recoverable = 0; - mca_log(rec); + mca_log(&rec); } + mca_record_entry(&rec); } } return (mcip ? recoverable : count); ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/amd64/include/mca.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mca.h,v 1.1 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/mca.h,v 1.2 2009/12/02 15:45:55 avg Exp $ */ #ifndef __MACHINE_MCA_H__ @@ -36,6 +36,7 @@ uint64_t mr_misc; uint64_t mr_tsc; int mr_apic_id; + int mr_bank; }; #ifdef _KERNEL ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/cam/scsi/scsi_cd.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.112 2009/11/14 20:13:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.113 2009/12/02 16:08:33 scottl Exp $"); #include "opt_cd.h" @@ -2673,12 +2673,10 @@ authinfo = (struct dvd_authinfo *)addr; - cam_periph_lock(periph); if (cmd == DVDIOCREPORTKEY) error = cdreportkey(periph, authinfo); else error = cdsendkey(periph, authinfo); - cam_periph_unlock(periph); break; } case DVDIOCREADSTRUCTURE: { @@ -2686,9 +2684,7 @@ dvdstruct = (struct dvd_struct *)addr; - cam_periph_lock(periph); error = cdreaddvdstructure(periph, dvdstruct); - cam_periph_unlock(periph); break; } @@ -3732,8 +3728,6 @@ databuf = NULL; lba = 0; - ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); - switch (authinfo->format) { case DVD_REPORT_AGID: length = sizeof(struct scsi_report_key_data_agid); @@ -3759,9 +3753,7 @@ length = 0; break; default: - error = EINVAL; - goto bailout; - break; /* NOTREACHED */ + return (EINVAL); } if (length != 0) { @@ -3769,6 +3761,8 @@ } else databuf = NULL; + cam_periph_lock(periph); + ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_report_key(&ccb->csio, /* retries */ 1, @@ -3869,12 +3863,14 @@ goto bailout; break; /* NOTREACHED */ } + bailout: + xpt_release_ccb(ccb); + cam_periph_unlock(periph); + if (databuf != NULL) free(databuf, M_DEVBUF); - xpt_release_ccb(ccb); - return(error); } @@ -3889,8 +3885,6 @@ error = 0; databuf = NULL; - ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); - switch(authinfo->format) { case DVD_SEND_CHALLENGE: { struct scsi_report_key_data_challenge *challenge_data; @@ -3942,11 +3936,12 @@ break; } default: - error = EINVAL; - goto bailout; - break; /* NOTREACHED */ + return (EINVAL); } + cam_periph_lock(periph); + ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); + scsi_send_key(&ccb->csio, /* retries */ 1, /* cbfcnp */ cddone, @@ -3961,13 +3956,12 @@ error = cdrunccb(ccb, cderror, /*cam_flags*/CAM_RETRY_SELTO, /*sense_flags*/SF_RETRY_UA); -bailout: + xpt_release_ccb(ccb); + cam_periph_unlock(periph); if (databuf != NULL) free(databuf, M_DEVBUF); - xpt_release_ccb(ccb); - return(error); } @@ -3985,8 +3979,6 @@ /* The address is reserved for many of the formats */ address = 0; - ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); - switch(dvdstruct->format) { case DVD_STRUCT_PHYSICAL: length = sizeof(struct scsi_read_dvd_struct_data_physical); @@ -4004,13 +3996,7 @@ length = sizeof(struct scsi_read_dvd_struct_data_manufacturer); break; case DVD_STRUCT_CMI: - error = ENODEV; - goto bailout; -#ifdef notyet - length = sizeof(struct scsi_read_dvd_struct_data_copy_manage); - address = dvdstruct->address; -#endif - break; /* NOTREACHED */ + return (ENODEV); case DVD_STRUCT_PROTDISCID: length = sizeof(struct scsi_read_dvd_struct_data_prot_discid); break; @@ -4027,21 +4013,9 @@ length = sizeof(struct scsi_read_dvd_struct_data_spare_area); break; case DVD_STRUCT_RMD_LAST: - error = ENODEV; - goto bailout; -#ifdef notyet - length = sizeof(struct scsi_read_dvd_struct_data_rmd_borderout); - address = dvdstruct->address; -#endif - break; /* NOTREACHED */ + return (ENODEV); case DVD_STRUCT_RMD_RMA: - error = ENODEV; - goto bailout; -#ifdef notyet - length = sizeof(struct scsi_read_dvd_struct_data_rmd); - address = dvdstruct->address; -#endif - break; /* NOTREACHED */ + return (ENODEV); case DVD_STRUCT_PRERECORDED: length = sizeof(struct scsi_read_dvd_struct_data_leadin); break; @@ -4049,13 +4023,7 @@ length = sizeof(struct scsi_read_dvd_struct_data_disc_id); break; case DVD_STRUCT_DCB: - error = ENODEV; - goto bailout; -#ifdef notyet - length = sizeof(struct scsi_read_dvd_struct_data_dcb); - address = dvdstruct->address; -#endif - break; /* NOTREACHED */ + return (ENODEV); case DVD_STRUCT_LIST: /* * This is the maximum allocation length for the READ DVD @@ -4067,9 +4035,7 @@ length = 65535; break; default: - error = EINVAL; - goto bailout; - break; /* NOTREACHED */ + return (EINVAL); } if (length != 0) { @@ -4077,6 +4043,9 @@ } else databuf = NULL; + cam_periph_lock(periph); + ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); + scsi_read_dvd_structure(&ccb->csio, /* retries */ 1, /* cbfcnp */ cddone, @@ -4164,13 +4133,14 @@ min(sizeof(dvdstruct->data), dvdstruct->length)); break; } + bailout: + xpt_release_ccb(ccb); + cam_periph_unlock(periph); if (databuf != NULL) free(databuf, M_DEVBUF); - xpt_release_ccb(ccb); - return(error); } ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -913,6 +913,6 @@ fd_set *ou, fd_set *ex, \ const struct timespec32 *ts, \ const sigset_t *sm); } -523 AUE_AUDITON NOPROTO { int auditon(int cmd, char *name, \ +523 AUE_AUDITON NOPROTO { int auditon_slice(int cmd, char *name, \ void *data, u_int length); } 524 AUE_AUDITCTL NOPROTO { int auditctl_slice(char *as_name, char *path); } ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/dev/if_ndis/if_ndis.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.171 2009/11/02 11:07:42 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.172 2009/12/02 16:26:18 jhb Exp $"); #include #include @@ -3222,14 +3222,8 @@ static void ndis_scan(void *arg) { - struct ndis_softc *sc = arg; - struct ieee80211com *ic; - struct ieee80211vap *vap; - - ic = sc->ifp->if_l2com; - vap = TAILQ_FIRST(&ic->ic_vaps); + struct ieee80211vap *vap = arg; - ndis_scan_results(sc); ieee80211_scan_done(vap); } @@ -3377,7 +3371,7 @@ return; } /* Set a timer to collect the results */ - callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, sc); + callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, vap); } static void @@ -3401,5 +3395,7 @@ static void ndis_scan_end(struct ieee80211com *ic) { - /* ignore */ + struct ndis_softc *sc = ic->ic_ifp->if_softc; + + ndis_scan_results(sc); } ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/i386/i386/mca.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 4 14:18:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771E01065695; Fri, 4 Dec 2009 14:18:20 +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 3A0DD1065693 for ; Fri, 4 Dec 2009 14:18:20 +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 281C98FC15 for ; Fri, 4 Dec 2009 14:18:20 +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 nB4EIKxN034948 for ; Fri, 4 Dec 2009 14:18:20 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4EIKOs034946 for perforce@freebsd.org; Fri, 4 Dec 2009 14:18:20 GMT (envelope-from mav@freebsd.org) Date: Fri, 4 Dec 2009 14:18:20 GMT Message-Id: <200912041418.nB4EIKOs034946@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 Precedence: bulk Cc: Subject: PERFORCE change 171379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 14:18:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=171379 Change 171379 by mav@mav_mavtest on 2009/12/04 14:17:55 Fix SATA revision reporting. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#14 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#14 (text+ko) ==== @@ -362,7 +362,7 @@ static int ata_intel_sata_getrev(device_t dev, int target) { - struct ata_channel *ch = device_get_softc(device_get_parent(dev)); + struct ata_channel *ch = device_get_softc(dev); int devno = (ch->unit << 1) + target; /* set ATA_SSTATUS register offset */ From owner-p4-projects@FreeBSD.ORG Fri Dec 4 15:43:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47E851065875; Fri, 4 Dec 2009 15:43:46 +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 0C7FD1065873 for ; Fri, 4 Dec 2009 15:43:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE1BC8FC0A for ; Fri, 4 Dec 2009 15:43:45 +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 nB4FhjYb042218 for ; Fri, 4 Dec 2009 15:43:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4FhjdA042216 for perforce@freebsd.org; Fri, 4 Dec 2009 15:43:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Dec 2009 15:43:45 GMT Message-Id: <200912041543.nB4FhjdA042216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 15:43:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=171383 Change 171383 by hselasky@hselasky_laptop001 on 2009/12/04 15:43:36 USB controller: - correct typo - patch by Mitya - s/82801IJ/82801JI/ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#21 (text+ko) ==== @@ -196,9 +196,9 @@ return "Intel 82801I (ICH9) USB 2.0 controller"; case 0x3a3a8086: - return "Intel 82801IJ (ICH10) USB 2.0 controller USB-A"; + return "Intel 82801JI (ICH10) USB 2.0 controller USB-A"; case 0x3a3c8086: - return "Intel 82801IJ (ICH10) USB 2.0 controller USB-B"; + return "Intel 82801JI (ICH10) USB 2.0 controller USB-B"; case 0x00e01033: return ("NEC uPD 720100 USB 2.0 controller"); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#16 (text+ko) ==== @@ -233,17 +233,17 @@ return ("Intel 82801I (ICH9) USB controller"); case 0x3a348086: - return ("Intel 82801IJ (ICH10) USB controller USB-A"); + return ("Intel 82801JI (ICH10) USB controller USB-A"); case 0x3a358086: - return ("Intel 82801IJ (ICH10) USB controller USB-B"); + return ("Intel 82801JI (ICH10) USB controller USB-B"); case 0x3a368086: - return ("Intel 82801IJ (ICH10) USB controller USB-C"); + return ("Intel 82801JI (ICH10) USB controller USB-C"); case 0x3a378086: - return ("Intel 82801IJ (ICH10) USB controller USB-D"); + return ("Intel 82801JI (ICH10) USB controller USB-D"); case 0x3a388086: - return ("Intel 82801IJ (ICH10) USB controller USB-E"); + return ("Intel 82801JI (ICH10) USB controller USB-E"); case 0x3a398086: - return ("Intel 82801IJ (ICH10) USB controller USB-F"); + return ("Intel 82801JI (ICH10) USB controller USB-F"); case 0x719a8086: return ("Intel 82443MX USB controller"); From owner-p4-projects@FreeBSD.ORG Fri Dec 4 17:27:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10DA61065672; Fri, 4 Dec 2009 17:27:30 +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 C9542106566B for ; Fri, 4 Dec 2009 17:27:29 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B70048FC15 for ; Fri, 4 Dec 2009 17:27:29 +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 nB4HRTgN061993 for ; Fri, 4 Dec 2009 17:27:29 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4HRTZG061990 for perforce@freebsd.org; Fri, 4 Dec 2009 17:27:29 GMT (envelope-from truncs@FreeBSD.org) Date: Fri, 4 Dec 2009 17:27:29 GMT Message-Id: <200912041727.nB4HRTZG061990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 17:27:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=171385 Change 171385 by truncs@aditya on 2009/12/04 17:27:18 Use EXT2_LOCK only once instead of using it twice. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#11 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#11 (text+ko) ==== @@ -207,13 +207,10 @@ bqrelse(bp); continue; } - if (pref == 0) { - EXT2_LOCK(ump); + EXT2_LOCK(ump); + if (pref == 0) pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); - - } else - EXT2_LOCK(ump); error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb); if(error) { brelse(bp); @@ -291,3 +288,4 @@ *bpp = nbp; return (0); } + From owner-p4-projects@FreeBSD.ORG Fri Dec 4 22:10:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 296FA1065679; Fri, 4 Dec 2009 22:10:13 +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 E40DB106566B for ; Fri, 4 Dec 2009 22:10:12 +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 D1E3D8FC1D for ; Fri, 4 Dec 2009 22:10:12 +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 nB4MACEf097864 for ; Fri, 4 Dec 2009 22:10:12 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4MACdB097862 for perforce@freebsd.org; Fri, 4 Dec 2009 22:10:12 GMT (envelope-from mav@freebsd.org) Date: Fri, 4 Dec 2009 22:10:12 GMT Message-Id: <200912042210.nB4MACdB097862@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 Precedence: bulk Cc: Subject: PERFORCE change 171393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2009 22:10:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=171393 Change 171393 by mav@mav_mavtest on 2009/12/04 22:09:22 Add comments that JMicron and Marvell PATA don't require explicit mode setting. They snoop mode setting command sent to drive. Add 40-wire cable detection to Marvell PATA. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#18 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#8 (text+ko) ==== @@ -153,6 +153,7 @@ ata_print_cable(dev, "controller"); mode = ATA_UDMA2; } + /* Nothing to do to setup mode, the controller snoop SET_FEATURE cmd. */ return (mode); } ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#18 (text+ko) ==== @@ -170,6 +170,7 @@ error = ata_pci_ch_attach(dev); /* dont use 32 bit PIO transfers */ ch->flags |= ATA_USE_16BIT; + ch->flags |= ATA_CHECKS_CABLE; return (error); } @@ -177,8 +178,15 @@ ata_marvell_setmode(device_t dev, int target, int mode) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + struct ata_channel *ch = device_get_softc(dev); mode = min(mode, ctlr->chip->max_dma); + /* Check for 80pin cable present. */ + if (mode > ATA_UDMA2 && ATA_IDX_INB(ch, ATA_BMDEVSPEC_0) & 0x01) { + ata_print_cable(dev, "controller"); + mode = ATA_UDMA2; + } + /* Nothing to do to setup mode, the controller snoop SET_FEATURE cmd. */ return (mode); } From owner-p4-projects@FreeBSD.ORG Sat Dec 5 01:09:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36BCE10656A3; Sat, 5 Dec 2009 01:09:12 +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 E8449106566C for ; Sat, 5 Dec 2009 01:09:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D53C58FC14 for ; Sat, 5 Dec 2009 01:09:11 +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 nB519Blm024712 for ; Sat, 5 Dec 2009 01:09:11 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB519Bwx024710 for perforce@freebsd.org; Sat, 5 Dec 2009 01:09:11 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 5 Dec 2009 01:09:11 GMT Message-Id: <200912050109.nB519Bwx024710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 01:09:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=171396 Change 171396 by rene@rene_self on 2009/12/05 01:09:08 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#57 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#59 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -475,6 +475,12 @@ America + Experts Exchange + + Experts + Exchange + + and many more. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#57 (text+ko) ==== @@ -1,7 +1,7 @@ USE_RC_SUBR variable. + + + Adding users and groups + + Some ports require a certain user to be on the installed + system. Choose a free UID from 50 to 999 and register it either in + ports/UIDs (for users) or in + ports/GIDs (for groups). Make sure you do not + use a UID already used by the system or other ports. + + Please include a patch against these two files when you + require a new user or group to be created for your + port. + + Then you can use USERS and GROUPS + variables in your Makefile, and the user + will be automatically created when installing the port. + + USERS= pulse +GROUPS= pulse pulse-access pulse-rt + + The current list of reserved UIDs and GIDs can be found + in ports/UIDs and + ports/GIDs. + + + @@ -13569,30 +13596,6 @@ - - UIDs and GIDs - - The current list of reserved UIDs and GIDs can be found - in ports/UIDs and - ports/GIDs. - - If your port requires a certain user to be on the installed - system, let the pkg-install script call - pw to create it automatically. Look at - sysutils/symon for an example. - Your port must use a fixed user/group ID number. You must - choose a free UID from 50 to 999 and register it either in - ports/UIDs (for users) or in - ports/GIDs (for groups). - - Make sure you do not use a UID already used by the system or - other ports. - - Please include a patch against these two files when you - require a new user or group to be created for your - port. - - Do things rationally ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#59 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.280 2009/11/27 14:04:49 rwatson Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.281 2009/12/03 18:25:12 danger Exp $ @@ -33,6 +33,31 @@ 2009 + 12 + + + 3 + + + Official support for NVIDIA graphics cards on amd64 + architecture + +

    The NVIDIA Corporation releases an initial BETA version of + NVIDIA 195.22 &os; graphics drivers for both i386 and amd64 + architectures. The drivers support recent versions of the + &os; operating system, i.e. 7.2-STABLE and 8.0-RELEASE and + provide support for features like SLI, improved + compatibility and performance, especially on systems with + 4GB or more of RAM. This marks the first driver release for + amd64, as it was previously available only for i386 + architecture. Please see the original announcement + for more information.

    +     +     +     + + 11 From owner-p4-projects@FreeBSD.ORG Sat Dec 5 16:12:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A31381065676; Sat, 5 Dec 2009 16:12:21 +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 5C0211065670 for ; Sat, 5 Dec 2009 16:12:21 +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 4A00E8FC25 for ; Sat, 5 Dec 2009 16:12:21 +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 nB5GCLHc039052 for ; Sat, 5 Dec 2009 16:12:21 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5GCL5k039050 for perforce@freebsd.org; Sat, 5 Dec 2009 16:12:21 GMT (envelope-from mav@freebsd.org) Date: Sat, 5 Dec 2009 16:12:21 GMT Message-Id: <200912051612.nB5GCL5k039050@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 Precedence: bulk Cc: Subject: PERFORCE change 171412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 16:12:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=171412 Change 171412 by mav@mav_mavtest on 2009/12/05 16:11:46 Use controller advertized maximum transaction size, same as for da. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#31 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#31 (text+ko) ==== @@ -726,6 +726,12 @@ softc->disk->d_name = "cd"; softc->disk->d_unit = periph->unit_number; softc->disk->d_drv1 = periph; + if (cpi.maxio == 0) + softc->disk->d_maxsize = DFLTPHYS; /* traditional default */ + else if (cpi.maxio > MAXPHYS) + softc->disk->d_maxsize = MAXPHYS; /* for safety */ + else + softc->disk->d_maxsize = cpi.maxio; softc->disk->d_flags = 0; disk_create(softc->disk, DISK_VERSION); cam_periph_lock(periph); @@ -2768,7 +2774,6 @@ softc = (struct cd_softc *)periph->softc; cdprevent(periph, PR_PREVENT); - softc->disk->d_maxsize = DFLTPHYS; softc->disk->d_sectorsize = 2048; softc->disk->d_mediasize = 0; @@ -2870,7 +2875,6 @@ } softc->flags |= CD_FLAG_VALID_TOC; - softc->disk->d_maxsize = DFLTPHYS; softc->disk->d_sectorsize = softc->params.blksize; softc->disk->d_mediasize = (off_t)softc->params.blksize * softc->params.disksize; From owner-p4-projects@FreeBSD.ORG Sat Dec 5 19:20:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81ABE1065672; Sat, 5 Dec 2009 19:20:30 +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 2DFAC106566C for ; Sat, 5 Dec 2009 19:20:30 +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 1B3B08FC13 for ; Sat, 5 Dec 2009 19:20:30 +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 nB5JKTf6066747 for ; Sat, 5 Dec 2009 19:20:29 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5JKT3X066745 for perforce@freebsd.org; Sat, 5 Dec 2009 19:20:29 GMT (envelope-from mav@freebsd.org) Date: Sat, 5 Dec 2009 19:20:29 GMT Message-Id: <200912051920.nB5JKT3X066745@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 Precedence: bulk Cc: Subject: PERFORCE change 171419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 19:20:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=171419 Change 171419 by mav@mav_mavtest on 2009/12/05 19:20:27 Improve PIO transaction size negotiation. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#63 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#63 (text+ko) ==== @@ -366,7 +366,7 @@ cts.xport_specific.sata.valid = CTS_SATA_VALID_MODE; } xpt_action((union ccb *)&cts); - /* Fetch user modes from SIM. */ + /* Fetch current modes from SIM. */ bzero(&cts, sizeof(cts)); xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; @@ -395,10 +395,25 @@ } case PROBE_SET_MULTI: { - u_int sectors; + u_int sectors, bytecount; - sectors = max(1, min(ident_buf->sectors_intr & 0xff, 16)); - + bytecount = 8192; /* SATA maximum */ + /* Fetch user bytecount from SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (path->device->transport == XPORT_ATA) { + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.ata.bytecount; + } else { + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.sata.bytecount; + } + /* Honor device capabilities. */ + sectors = max(1, min(ident_buf->sectors_intr & 0xff, + bytecount / ata_logical_sector_size(ident_buf))); /* Report bytecount to SIM. */ bzero(&cts, sizeof(cts)); xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); @@ -414,6 +429,20 @@ cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT; } xpt_action((union ccb *)&cts); + /* Fetch current bytecount from SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if (path->device->transport == XPORT_ATA) { + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.ata.bytecount; + } else { + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.sata.bytecount; + } + sectors = bytecount / ata_logical_sector_size(ident_buf); cam_fill_ataio(ataio, 1, @@ -427,6 +456,45 @@ break; } case PROBE_INQUIRY: + { + u_int bytecount; + + bytecount = 8192; /* SATA maximum */ + /* Fetch user bytecount from SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (path->device->transport == XPORT_ATA) { + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.ata.bytecount; + } else { + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT) + bytecount = cts.xport_specific.sata.bytecount; + } + /* Honor device capabilities. */ + bytecount &= ~1; + bytecount = max(2, min(65534, bytecount)); + if (ident_buf->satacapabilities != 0x0000 && + ident_buf->satacapabilities != 0xffff) { + bytecount = min(8192, bytecount); + } + /* Report bytecount to SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + if (path->device->transport == XPORT_ATA) { + cts.xport_specific.ata.bytecount = bytecount; + cts.xport_specific.ata.valid = CTS_ATA_VALID_BYTECOUNT; + } else { + cts.xport_specific.sata.bytecount = bytecount; + cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT; + } + xpt_action((union ccb *)&cts); + /* FALLTHROUGH */ + } case PROBE_FULL_INQUIRY: { u_int inquiry_len; From owner-p4-projects@FreeBSD.ORG Sat Dec 5 19:21:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F3B51065676; Sat, 5 Dec 2009 19:21:31 +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 53B09106566B for ; Sat, 5 Dec 2009 19:21:31 +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 4175B8FC17 for ; Sat, 5 Dec 2009 19:21:31 +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 nB5JLVD1066829 for ; Sat, 5 Dec 2009 19:21:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5JLVfW066827 for perforce@freebsd.org; Sat, 5 Dec 2009 19:21:31 GMT (envelope-from mav@freebsd.org) Date: Sat, 5 Dec 2009 19:21:31 GMT Message-Id: <200912051921.nB5JLVfW066827@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 Precedence: bulk Cc: Subject: PERFORCE change 171420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 19:21:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=171420 Change 171420 by mav@mav_mavtest on 2009/12/05 19:20:44 Improve PIO transaction size negotiation. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#42 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#42 (text+ko) ==== @@ -153,7 +153,10 @@ #ifdef ATA_CAM for (i = 0; i < 16; i++) { ch->user[i].mode = 0; - ch->user[i].bytecount = 8192; + if (ch->flags & ATA_SATA) + ch->user[i].bytecount = 8192; + else + ch->user[i].bytecount = MAXPHYS; ch->curr[i] = ch->user[i]; } #endif @@ -1494,7 +1497,9 @@ d->mode = cts->xport_specific.ata.mode; } if (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT) - d->bytecount = min(8192, cts->xport_specific.ata.bytecount); + d->bytecount = cts->xport_specific.ata.bytecount; + if (ch->flags & ATA_SATA) + d->bytecount = min(8192, d->bytecount); } ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); From owner-p4-projects@FreeBSD.ORG Sat Dec 5 19:34:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10BBC1065679; Sat, 5 Dec 2009 19:34:45 +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 C93B41065670 for ; Sat, 5 Dec 2009 19:34:44 +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 B6D398FC0C for ; Sat, 5 Dec 2009 19:34:44 +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 nB5JYi6N067896 for ; Sat, 5 Dec 2009 19:34:44 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5JYiAo067894 for perforce@freebsd.org; Sat, 5 Dec 2009 19:34:44 GMT (envelope-from mav@freebsd.org) Date: Sat, 5 Dec 2009 19:34:44 GMT Message-Id: <200912051934.nB5JYiAo067894@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 Precedence: bulk Cc: Subject: PERFORCE change 171422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 19:34:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=171422 Change 171422 by mav@mav_mavtest on 2009/12/05 19:34:27 Allow all ata(4) supported controllers, except some specifically handled to use transfers up to MAXPHYS or 255 pages size. PCI ATA BM spec defines many restrictions on data, but there is no limit on total size. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#17 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#19 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#14 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#17 (text+ko) ==== @@ -76,7 +76,7 @@ ch->dma.alignment = 2; ch->dma.boundary = 65536; ch->dma.segsize = 65536; - ch->dma.max_iosize = 128 * DEV_BSIZE; + ch->dma.max_iosize = MIN((ATA_DMA_ENTRIES - 1) * PAGE_SIZE, MAXPHYS); ch->dma.max_address = BUS_SPACE_MAXADDR_32BIT; ch->dma.dma_slots = 1; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#19 (text+ko) ==== @@ -607,8 +607,6 @@ /* chip does not reliably do 64K DMA transfers */ if (ctlr->chip->cfg2 == MV_50XX || ctlr->chip->cfg2 == MV_60XX) ch->dma.max_iosize = 64 * DEV_BSIZE; - else - ch->dma.max_iosize = (ATA_DMA_ENTRIES - 1) * PAGE_SIZE; } ATA_DECLARE_DRIVER(ata_marvell); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#14 (text+ko) ==== @@ -321,7 +321,6 @@ ATA_OUTL(ctlr->r_res2, 0x148 + (unit01 << 7) + (unit10 << 8),(1 << 16)); } - ch->dma.max_iosize = (ATA_DMA_ENTRIES - 1) * PAGE_SIZE; if (ctlr->chip->cfg2 & SII_BUG) { /* work around errata in early chips */ ch->dma.boundary = 8192; From owner-p4-projects@FreeBSD.ORG Sat Dec 5 20:15:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB89F1065679; Sat, 5 Dec 2009 20:15:25 +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 9017E106566B for ; Sat, 5 Dec 2009 20:15:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D9C78FC0C for ; Sat, 5 Dec 2009 20:15:25 +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 nB5KFP0H072062 for ; Sat, 5 Dec 2009 20:15:25 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5KFPEV072060 for perforce@freebsd.org; Sat, 5 Dec 2009 20:15:25 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 5 Dec 2009 20:15:25 GMT Message-Id: <200912052015.nB5KFPEV072060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 20:15:26 -0000 http://p4web.freebsd.org/chv.cgi?CH=171424 Change 171424 by rene@rene_self on 2009/12/05 20:14:40 MFen handbook: * introduction 1.136 -> 1.137 * mirrors 1.472 -> 1.473 (SRCID bump only) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#23 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#38 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#23 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.18 2009/11/29 17:46:16 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.136 + %SRCID% 1.137 --> @@ -580,6 +580,13 @@ TELEHOUSE America + + Experts Exchange + + + Experts + Exchange + en nog veel meer sites. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#38 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.472 + %SRCID% 1.473 --> From owner-p4-projects@FreeBSD.ORG Sat Dec 5 22:07:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27771065672; Sat, 5 Dec 2009 22:07:18 +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 9637E106566B for ; Sat, 5 Dec 2009 22:07:18 +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 81E748FC15 for ; Sat, 5 Dec 2009 22:07:18 +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 nB5M7Ikt093153 for ; Sat, 5 Dec 2009 22:07:18 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5M7HVX093151 for perforce@freebsd.org; Sat, 5 Dec 2009 22:07:17 GMT (envelope-from mav@freebsd.org) Date: Sat, 5 Dec 2009 22:07:17 GMT Message-Id: <200912052207.nB5M7HVX093151@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 Precedence: bulk Cc: Subject: PERFORCE change 171432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2009 22:07:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=171432 Change 171432 by mav@mav_mavbook on 2009/12/05 22:06:39 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#20 integrate .. //depot/projects/scottl-camlock/src/bin/date/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/scottl-camlock/src/etc/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#11 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6fw#4 delete .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall6#3 delete .. //depot/projects/scottl-camlock/src/lib/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/csu/amd64/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/csu/arm/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1.c#2 delete .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/scottl-camlock/src/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/mips/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/exec.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fdevname.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/termios.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/es_ES.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strcmp.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/Symbol.map#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_pututxline.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_setutxfile.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_util.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libutil/libutil.h#3 integrate .. //depot/projects/scottl-camlock/src/libexec/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/scottl-camlock/src/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/init/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/dummynet.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/pmu.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_ctrl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/bus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/ia64_cpu.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#35 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_int.h#7 integrate .. //depot/projects/scottl-camlock/src/tools/tools/sysbuild/sysbuild.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/proc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/users.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/wall.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/write.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mountd/exports.5#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsv4.4#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/stablerestart.5#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_server.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.215 2009/12/05 17:46:51 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 +OLD_FILES+=usr/share/examples/etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz +# 20091117: usr/share/zoneinfo/GMT link removed +OLD_FILES+=usr/share/zoneinfo/GMT # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed ==== //depot/projects/scottl-camlock/src/bin/date/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBULOG} +LDADD= -lulog .include ==== //depot/projects/scottl-camlock/src/bin/date/date.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.48 2008/02/07 16:04:24 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); #include #include @@ -48,11 +48,12 @@ #include #include #include -#include #include #include #include #include +#define _ULOG_POSIX_NAMES +#include #include #include "extern.h" @@ -181,6 +182,7 @@ static void setthetime(const char *fmt, const char *p, int jflag, int nflag) { + struct utmpx utx; struct tm *lt; struct timeval tv; const char *dot, *t; @@ -271,12 +273,16 @@ if (!jflag) { /* set the time */ if (nflag || netsettime(tval)) { - logwtmp("|", "date", ""); + utx.ut_type = OLD_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); tv.tv_sec = tval; tv.tv_usec = 0; if (settimeofday(&tv, (struct timezone *)NULL)) err(1, "settimeofday (timeval)"); - logwtmp("{", "date", ""); + utx.ut_type = NEW_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); } if ((p = getlogin()) == NULL) ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 (text) ==== @@ -39,7 +39,7 @@ FROM BEGEMOT-IP-MIB; begemotMib2 MODULE-IDENTITY - LAST-UPDATED "200602130000Z" + LAST-UPDATED "200908030000Z" ORGANIZATION "German Aerospace Center" CONTACT-INFO " Hartmut Brandt @@ -54,6 +54,12 @@ E-mail: harti@freebsd.org" DESCRIPTION "The MIB for private mib2 stuff." + REVISION "200908030000Z" + DESCRIPTION + "Second edition adds begemotIfDataPoll object." + REVISION "200602130000Z" + DESCRIPTION + "Initial revision." ::= { begemotIp 1 } begemotIfMaxspeed OBJECT-TYPE @@ -87,4 +93,14 @@ bit rate in its MIB." ::= { begemotMib2 3 } +begemotIfDataPoll OBJECT-TYPE + SYNTAX TimeTicks + UNITS "deciseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The rate at which the mib2 module will poll interface data." + DEFVAL { 100 } + ::= { begemotMib2 4 } + END ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.c#3 (text+ko) ==== @@ -117,6 +117,15 @@ /* HC update timer handle */ static void *hc_update_timer; +/* Idle poll timer */ +static void *mibII_poll_timer; + +/* interfaces' data poll interval */ +u_int mibII_poll_ticks; + +/* Idle poll hook */ +static void mibII_idle(void *arg __unused); + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -410,6 +419,20 @@ mibif_hc_update_interval = ticks; } +/** + * Restart the idle poll timer. + */ +void +mibif_restart_mibII_poll_timer(void) +{ + if (mibII_poll_timer != NULL) + timer_stop(mibII_poll_timer); + + if ((mibII_poll_timer = timer_start_repeat(mibII_poll_ticks * 10, + mibII_poll_ticks * 10, mibII_idle, NULL, module)) == NULL) + syslog(LOG_ERR, "timer_start(%u): %m", mibII_poll_ticks); +} + /* * Fetch new MIB data. */ @@ -1553,7 +1576,7 @@ * Idle function */ static void -mibII_idle(void) +mibII_idle(void *arg __unused) { struct mibifa *ifa; @@ -1608,6 +1631,10 @@ ipForward_reg = or_register(&oid_ipForward, "The MIB module for the display of CIDR multipath IP Routes.", module); + + mibII_poll_timer = NULL; + mibII_poll_ticks = MIBII_POLL_TICKS; + mibif_restart_mibII_poll_timer(); } /* @@ -1651,6 +1678,11 @@ static int mibII_fini(void) { + if (mibII_poll_timer != NULL ) { + timer_stop(mibII_poll_timer); + mibII_poll_timer = NULL; + } + if (route_fd != NULL) fd_deselect(route_fd); if (route != -1) @@ -1690,7 +1722,7 @@ "This module implements the interface and ip groups.", mibII_init, mibII_fini, - mibII_idle, /* idle */ + NULL, /* idle */ NULL, /* dump */ NULL, /* config */ mibII_start, ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.h#2 (text+ko) ==== @@ -211,6 +211,14 @@ /* re-compute update interval */ void mibif_reset_hc_timer(void); +/* interfaces' data poll interval */ +extern u_int mibII_poll_ticks; + +/* restart the data poll timer */ +void mibif_restart_mibII_poll_timer(void); + +#define MIBII_POLL_TICKS 100 + /* get interfaces and interface addresses. */ void mib_fetch_interfaces(void); ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 (text) ==== @@ -59,6 +59,11 @@ ctx->scratch->int1 = mibif_force_hc_update_interval; mibif_force_hc_update_interval = value->v.uint32; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + ctx->scratch->int1 = mibII_poll_ticks; + mibII_poll_ticks = value->v.uint32; + return (SNMP_ERR_NOERROR); } abort(); @@ -68,6 +73,10 @@ case LEAF_begemotIfForcePoll: mibif_force_hc_update_interval = ctx->scratch->int1; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibII_poll_ticks = ctx->scratch->int1; + return (SNMP_ERR_NOERROR); } abort(); @@ -78,6 +87,10 @@ mibif_force_hc_update_interval = ctx->scratch->int1; mibif_reset_hc_timer(); return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibif_restart_mibII_poll_timer(); + return (SNMP_ERR_NOERROR); } abort(); } @@ -98,6 +111,10 @@ case LEAF_begemotIfForcePoll: value->v.uint32 = mibif_force_hc_update_interval; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + value->v.uint32 = mibII_poll_ticks; + return (SNMP_ERR_NOERROR); } abort(); } ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 (text+ko) ==== @@ -240,6 +240,7 @@ (1 begemotIfMaxspeed COUNTER64 op_begemot_mibII GET) (2 begemotIfPoll TIMETICKS op_begemot_mibII GET) (3 begemotIfForcePoll TIMETICKS op_begemot_mibII GET SET) + (4 begemotIfDataPoll TIMETICKS op_begemot_mibII GET SET) ) ) ) ==== //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.26 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.27 2009/12/02 16:34:20 kib Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -103,9 +103,10 @@ %{p:gcrt1.o%s} \ %{!p: \ %{profile:gcrt1.o%s} \ - %{!profile:crt1.o%s}}}} \ + %{!profile: \ + %{pie: Scrt1.o%s;:crt1.o%s}}}}} \ crti.o%s \ - %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}" + %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our own magical crtend.o file (see crtstuff.c) which provides part of @@ -113,8 +114,7 @@ entering `main', followed by the normal "finalizer" file, `crtn.o'. */ #define FBSD_ENDFILE_SPEC "\ - %{!shared:crtend.o%s} \ - %{shared:crtendS.o%s} \ + %{shared|pie:crtendS.o%s;:crtend.o%s} \ crtn.o%s " /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#3 (text+ko) ==== @@ -777,6 +777,7 @@ .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) +.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_lib.c#3 (text+ko) ==== @@ -2592,6 +2592,9 @@ if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) return(0); + if (1) + return(0); + s->s3->renegotiate=1; return(1); } ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#3 (text+ko) ==== @@ -983,9 +983,7 @@ if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg); - if (SSL_is_init_finished(s) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && - !s->s3->renegotiate) + if (0) { ssl3_renegotiate(s); if (ssl3_renegotiate_check(s)) @@ -1116,8 +1114,7 @@ /* Unexpected handshake message (Client Hello, or protocol violation) */ if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { - if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + if (0) { #if 0 /* worked only because C operator preferences are not as expected (and * because this is not really needed for clients except for detecting ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_srvr.c#4 (text+ko) ==== @@ -718,6 +718,13 @@ #endif STACK_OF(SSL_CIPHER) *ciphers=NULL; + if (s->new_session) + { + al=SSL_AD_HANDSHAKE_FAILURE; + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); + goto f_err; + } + /* We do this so that we will respond with our native type. * If we are TLSv1 and we get SSLv3, we will respond with TLSv1, * This down switching should be handled by a different method. ==== //depot/projects/scottl-camlock/src/etc/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ +# $FreeBSD: src/etc/Makefile,v 1.378 2009/12/02 15:05:26 ume Exp $ .include @@ -15,7 +15,7 @@ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ phones profile protocols \ - rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ + rc rc.bsdextended rc.firewall rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ sysctl.conf syslog.conf ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#11 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.363 2009/10/21 09:43:22 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.364 2009/12/02 15:05:26 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -118,7 +118,10 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file -firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" + # firewall. +#firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for + # "client" firewall. firewall_simple_iif="ed1" # Inside network interface for "simple" # firewall. firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" @@ -127,12 +130,22 @@ # firewall. firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" # firewall. +#firewall_simple_iif_ipv6="ed1" # Inside IPv6 network interface for "simple" + # firewall. +#firewall_simple_inet_ipv6="2001:db8:2:800::/56" # Inside IPv6 network prefix + # for "simple" firewall. +#firewall_simple_oif_ipv6="ed0" # Outside IPv6 network interface for "simple" + # firewall. +#firewall_simple_onet_ipv6="2001:db8:2:0::/56" # Outside IPv6 network prefix + # for "simple" firewall. firewall_myservices="" # List of TCP ports on which this host # offers services for "workstation" firewall. firewall_allowservices="" # List of IPs which have access to # $firewall_myservices for "workstation" # firewall. -firewall_trusted="" # List of IPs which have full access to this +firewall_trusted="" # List of IPv4s which have full access to this + # host for "workstation" firewall. +firewall_trusted_ipv6="" # List of IPv6s which have full access to this # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming # packets for "workstation" firewall. @@ -472,13 +485,6 @@ # faithd(8) setup. ipv6_ipv4mapping="NO" # Set to "YES" to enable IPv4 mapped IPv6 addr # communication. (like ::ffff:a.b.c.d) -ipv6_firewall_enable="NO" # Set to YES to enable IPv6 firewall - # functionality -ipv6_firewall_script="/etc/rc.firewall6" # Which script to run to set up the IPv6 firewall -ipv6_firewall_type="UNKNOWN" # IPv6 Firewall type (see /etc/rc.firewall6) -ipv6_firewall_quiet="NO" # Set to YES to suppress rule display -ipv6_firewall_logging="NO" # Set to YES to enable events logging -ipv6_firewall_flags="" # Flags passed to ip6fw when type is a file ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.var.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.75 2006/08/31 09:51:33 cperciva Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.76 2009/12/03 09:18:40 cperciva Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -32,7 +32,7 @@ db entropy uname=operator gname=operator mode=0700 .. - freebsd-update + freebsd-update mode=0700 .. ipf mode=0700 .. ==== //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.101 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.102 2009/12/02 15:05:26 ume Exp $ .include @@ -15,7 +15,7 @@ hcsecd \ hostapd hostid hostid_save hostname \ inetd initrandom \ - ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ + ip6addrctl ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ ==== //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.21 2009/06/26 01:04:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.22 2009/12/02 15:05:26 ume Exp $ # # PROVIDE: ipfw @@ -17,6 +17,8 @@ stop_cmd="ipfw_stop" required_modules="ipfw" +set_rcvar_obsolete ipv6_firewall_enable + ipfw_prestart() { if checkyesno dummynet_enable; then @@ -61,7 +63,13 @@ # Enable the firewall # if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then - warn "failed to enable firewall" + warn "failed to enable IPv4 firewall" + fi + if afexists inet6; then + if ! ${SYSCTL_W} net.inet6.ip6.fw.enable=1 1>/dev/null 2>&1 + then + warn "failed to enable IPv6 firewall" + fi fi } @@ -70,6 +78,9 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 + if afexists inet6; then + ${SYSCTL_W} net.inet6.ip6.fw.enable=0 + fi if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd quietstop fi ==== //depot/projects/scottl-camlock/src/etc/rc.firewall#4 (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.firewall,v 1.60 2008/08/15 19:20:59 jhb Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.61 2009/12/02 15:05:26 ume Exp $ # # @@ -85,12 +85,42 @@ ${fwcmd} add 100 pass all from any to any via lo0 ${fwcmd} add 200 deny all from any to 127.0.0.0/8 ${fwcmd} add 300 deny ip from 127.0.0.0/8 to any + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add 400 deny all from any to ::1 + ${fwcmd} add 500 deny all from ::1 to any + fi +} + +setup_ipv6_mandatory () { + [ $ipv6_available -eq 0 ] || return 0 + + ############ + # Only in rare cases do you want to change these rules + # + # ND + # + # DAD + ${fwcmd} add pass ipv6-icmp from :: to ff02::/16 + # RS, RA, NS, NA, redirect... + ${fwcmd} add pass ipv6-icmp from fe80::/10 to fe80::/10 + ${fwcmd} add pass ipv6-icmp from fe80::/10 to ff02::/16 + + # Allow ICMPv6 destination unreach + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 1 + + # Allow NS/NA/toobig (don't filter it out) + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136 } if [ -n "${1}" ]; then firewall_type="${1}" fi +. /etc/rc.subr +. /etc/network.subr +afexists inet6 +ipv6_available=$? + ############ # Set quiet mode if requested # @@ -109,6 +139,7 @@ ${fwcmd} -f flush setup_loopback +setup_ipv6_mandatory ############ # Network Address Translation. All packets are passed to natd(8) @@ -166,11 +197,13 @@ # against people from outside your own network. # # Configuration: - # firewall_client_net: Network address of local network. + # firewall_client_net: Network address of local IPv4 network. + # firewall_client_net_ipv6: Network address of local IPv6 network. ############ # set this to your local network net="$firewall_client_net" + net6="$firewall_client_net_ipv6" # Allow limited broadcast traffic from my own net. ${fwcmd} add pass all from ${net} to 255.255.255.255 @@ -178,6 +211,16 @@ # Allow any traffic to or from my own net. ${fwcmd} add pass all from me to ${net} ${fwcmd} add pass all from ${net} to me + if [ -n "$net6" ]; then + ${fwcmd} add pass all from me6 to ${net6} + ${fwcmd} add pass all from ${net6} to me6 + fi + + if [ -n "$net6" ]; then + # Allow any link-local multicast traffic + ${fwcmd} add pass all from fe80::/10 to ff02::/16 + ${fwcmd} add pass all from ${net6} to ff02::/16 + fi # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -212,23 +255,38 @@ # on the inside at this machine for those services. # # Configuration: - # firewall_simple_iif: Inside network interface. - # firewall_simple_inet: Inside network address. - # firewall_simple_oif: Outside network interface. - # firewall_simple_onet: Outside network address. + # firewall_simple_iif: Inside IPv4 network interface. + # firewall_simple_inet: Inside IPv4 network address. + # firewall_simple_oif: Outside IPv4 network interface. + # firewall_simple_onet: Outside IPv4 network address. + # firewall_simple_iif_ipv6: Inside IPv6 network interface. + # firewall_simple_inet_ipv6: Inside IPv6 network prefix. + # firewall_simple_oif_ipv6: Outside IPv6 network interface. + # firewall_simple_onet_ipv6: Outside IPv6 network prefix. ############ # set these to your outside interface network oif="$firewall_simple_oif" onet="$firewall_simple_onet" + oif6="${firewall_simple_oif_ipv6:-$firewall_simple_oif}" + onet6="$firewall_simple_onet_ipv6" # set these to your inside interface network iif="$firewall_simple_iif" inet="$firewall_simple_inet" + iif6="${firewall_simple_iif_ipv6:-$firewall_simple_iif}" + inet6="$firewall_simple_inet_ipv6" # Stop spoofing ${fwcmd} add deny all from ${inet} to any in via ${oif} ${fwcmd} add deny all from ${onet} to any in via ${iif} + if [ -n "$inet6" ]; then + ${fwcmd} add deny all from ${inet6} to any in via ${oif6} + if [ -n "$onet6" ]; then + ${fwcmd} add deny all from ${onet6} to any in \ + via ${iif6} + fi + fi # Stop RFC1918 nets on the outside interface ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} @@ -254,7 +312,7 @@ case ${natd_enable} in [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd all from any to any via ${natd_interface} + ${fwcmd} add divert natd ip4 from any to any via ${natd_interface} fi ;; esac @@ -273,6 +331,55 @@ ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} + if [ -n "$inet6" ]; then + # Stop unique local unicast address on the outside interface + ${fwcmd} add deny all from fc00::/7 to any via ${oif6} + ${fwcmd} add deny all from any to fc00::/7 via ${oif6} + + # Stop site-local on the outside interface + ${fwcmd} add deny all from fec0::/10 to any via ${oif6} + ${fwcmd} add deny all from any to fec0::/10 via ${oif6} + + # Disallow "internal" addresses to appear on the wire. + ${fwcmd} add deny all from ::ffff:0.0.0.0/96 to any \ + via ${oif6} + ${fwcmd} add deny all from any to ::ffff:0.0.0.0/96 \ + via ${oif6} + + # Disallow packets to malicious IPv4 compatible prefix. + ${fwcmd} add deny all from ::224.0.0.0/100 to any via ${oif6} + ${fwcmd} add deny all from any to ::224.0.0.0/100 via ${oif6} + ${fwcmd} add deny all from ::127.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::127.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::0.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::255.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::255.0.0.0/104 via ${oif6} + + ${fwcmd} add deny all from ::0.0.0.0/96 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/96 via ${oif6} + + # Disallow packets to malicious 6to4 prefix. + ${fwcmd} add deny all from 2002:e000::/20 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:e000::/20 via ${oif6} + ${fwcmd} add deny all from 2002:7f00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:7f00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:0000::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0000::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ff00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ff00::/24 via ${oif6} + + ${fwcmd} add deny all from 2002:0a00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0a00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ac10::/28 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ac10::/28 via ${oif6} + ${fwcmd} add deny all from 2002:c0a8::/32 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:c0a8::/32 via ${oif6} + + ${fwcmd} add deny all from ff05::/16 to any via ${oif6} + ${fwcmd} add deny all from any to ff05::/16 via ${oif6} + fi + # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -291,7 +398,11 @@ ${fwcmd} add pass tcp from any to me 80 setup # Reject&Log all setup of incoming connections from the outside - ${fwcmd} add deny log tcp from any to any in via ${oif} setup + ${fwcmd} add deny log ip4 from any to any in via ${oif} setup proto tcp + if [ -n "$inet6" ]; then + ${fwcmd} add deny log ip6 from any to any in via ${oif6} \ + setup proto tcp + fi # Allow setup of any other TCP connection ${fwcmd} add pass tcp from any to any setup @@ -313,7 +424,7 @@ # offers services. # firewall_allowservices: List of IPs which has access to # $firewall_myservices. - # firewall_trusted: List of IPs which has full access + # firewall_trusted: List of IPv4s which has full access # to this host. Be very carefull # when setting this. This option can # seriously degrade the level of @@ -324,25 +435,44 @@ # firewall_nologports: List of TCP/UDP ports for which # denied incomming packets are not # logged. - + # firewall_trusted_ipv6: List of IPv6s which has full access + # to this host. Be very carefull + # when setting this. This option can + # seriously degrade the level of + # protection provided by the firewall. + # Allow packets for which a state has been built. ${fwcmd} add check-state # For services permitted below. ${fwcmd} add pass tcp from me to any established + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any established + fi # Allow any connection out, adding state for each. ${fwcmd} add pass tcp from me to any setup keep-state ${fwcmd} add pass udp from me to any keep-state ${fwcmd} add pass icmp from me to any keep-state + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any setup keep-state + ${fwcmd} add pass udp from me6 to any keep-state + ${fwcmd} add pass ipv6-icmp from me6 to any keep-state + fi # Allow DHCP. ${fwcmd} add pass udp from 0.0.0.0 68 to 255.255.255.255 67 out ${fwcmd} add pass udp from any 67 to me 68 in ${fwcmd} add pass udp from any 67 to 255.255.255.255 68 in + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass udp from fe80::/10 to me6 546 in + fi # Some servers will ping the IP while trying to decide if it's # still in use. ${fwcmd} add pass icmp from any to any icmptype 8 + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass ipv6-icmp from any to any icmp6type 128,129 + fi # Allow "mandatory" ICMP in. ${fwcmd} add pass icmp from any to any icmptype 3,4,11 @@ -361,6 +491,9 @@ for i in ${firewall_allowservices} ; do for j in ${firewall_myservices} ; do ${fwcmd} add pass tcp from $i to me $j + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from $i to me6 $j + fi done done >>> TRUNCATED FOR MAIL (1000 lines) <<<