Date: Tue, 3 Oct 2006 00:35:15 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107133 for review Message-ID: <200610030035.k930ZFqU033978@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107133 Change 107133 by jb@jb_freebsd7 on 2006/10/03 00:34:35 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#24 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#23 integrate .. //depot/projects/dtrace/ports/LEGAL#6 integrate .. //depot/projects/dtrace/ports/MOVED#16 integrate .. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/config.h#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/dtrace/src/etc/network.subr#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/dtrace/src/etc/rc.subr#9 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/dtrace/src/share/colldef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#7 integrate .. //depot/projects/dtrace/src/share/man/man9/zone.9#3 integrate .. //depot/projects/dtrace/src/share/mklocale/Makefile#3 integrate .. //depot/projects/dtrace/src/share/monetdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/monetdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/msgdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/msgdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/numericdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/numericdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/timedef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/timedef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/include/clock.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#30 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/include/clock.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/subr_clock.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rtc.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/buf.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/kernel.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#8 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#24 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.611 2006/09/30 11:26:46 bsam Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.612 2006/10/02 00:00:06 bsam Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -421,6 +421,11 @@ </listitem> <listitem> + <para>Alexey Illarionov + <email>littlesavage@rambler.ru</email></para> + </listitem> + + <listitem> <para>Alexey V. Antipovsky <email>kemm@in-line.ru</email></para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.20 2006/09/25 22:51:26 rwatson Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.22 2006/10/02 13:44:03 rwatson Exp $ --> <!-- Need more documentation on praudit, auditreduce, etc. Plus more info @@ -122,8 +122,8 @@ <para><emphasis>event</emphasis>: An auditable event is any event that can be logged using the audit subsystem. Examples of security-relevant events include the creation of - a file, the building of a network connection, or the logging - in of a user. Events are either <quote>attributable</quote>, + a file, the building of a network connection, or a user logging in. + Events are either <quote>attributable</quote>, meaning that they can be traced to an authenticated user, or <quote>non-attributable</quote> if they cannot be. Examples of non-attributable events are any events that occur @@ -163,9 +163,9 @@ <listitem> <para><emphasis>preselection</emphasis>: The process by which the - system identifies which events are of interest in order to avoid - generating audit records describing events that are not of - interest to the administrator. The preselection configuration + system identifies which events are of interest to the administrator + in order to avoid generating audit records describing events that + are not of interest. The preselection configuration uses a series of selection expressions to identify which classes of events to audit for which users, as well as global settings that apply to both authenticated and unauthenticated @@ -189,9 +189,9 @@ <title>Installing Audit Support</title> <para>User space support for Event Auditing is installed as part of the - base &os; operating as of 6.2-RELEASE. However, kernel support for - Event Auditing must also be configured, which is done by adding the - following lines to the local configuration file:</para> + base &os; operating system as of 6.2-RELEASE. However, Event Auditing + support must be explicitly compiled into the kernel by adding the + following lines to the kernel configuration file:</para> <programlisting>options AUDIT</programlisting> @@ -228,7 +228,7 @@ <para><filename>audit_control</filename> - Controls aspects of the audit subsystem, such as default audit classes, minimum disk space to leave on the audit log volume, - etc.</para> + maximum audit trail size, etc.</para> </listitem> <listitem> @@ -238,7 +238,7 @@ </listitem> <listitem> - <para><filename>audit_user</filename> - Any user-specific audit + <para><filename>audit_user</filename> - User-specific audit requirements, which are combined with the global defaults at login.</para> </listitem> @@ -297,7 +297,10 @@ <listitem> <para><option>ex</option> - <literal>exec</literal> - Audit - program or utility execution.</para> + program execution. Auditing of command line arguments and + environmental variables is controlled via &man.audit.control.5; + using the <literal>argv</literal> and <literal>envv</literal> + parameters to the <literal>policy</literal> setting.</para> </listitem> <listitem> @@ -450,7 +453,9 @@ <programlisting>dir:/var/audit flags:lo minfree:20 -naflags:lo</programlisting> +naflags:lo +policy:cnt +filesz:0</programlisting> <para>The <option>dir</option> option is used to set one or more directories where audit logs will be stored. If more than one @@ -474,6 +479,22 @@ <para>The <option>naflags</option> option specifies audit classes to be audited for non-attributed events, such as the login process and system daemons.</para> + + <para>The <option>policy</option> option specifies a comma-separated + list of policy flags controlling various aspects of audit + behavior. The default <literal>cnt</literal> flag indicates that + the system should continue running despite an auditing failure + (this flag is highly recommended). Another commonly used flag is + <literal>argv</literal>, which causes command line arguments to + the &man.execve.2; system call to audited as part of command + execution.</para> + + <para>The <option>filesz</option> option specifies the maximum size + in bytes to allow an audit trail file to grow to before + automatically terminating and rotating the trail file. The + default, 0, disables automatic log rotation. If the requested + file size is non-zero and below the minimum 512k, it will be + ignored and a log message will be generated.</para> </sect3> <sect3 id="audit-audituser"> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.755 2006/10/01 08:29:23 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.756 2006/10/02 06:15:59 dds Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -6576,7 +6576,7 @@ <para>Create an empty <filename>pkg-plist</filename> file:</para> - <screen>&prompt.root; <userinput>touch pkg-plist</userinput></screen> + <screen>&prompt.root; <userinput>:>pkg-plist</userinput></screen> <para>If your port honors <makevar>PREFIX</makevar> (which it should) you can then install the port and create the package list.</para> ==== //depot/projects/dtrace/ports/LEGAL#6 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.497 2006/09/17 10:00:57 rafan Exp $ +# $FreeBSD: ports/LEGAL,v 1.499 2006/10/02 12:38:31 vd Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -268,6 +268,7 @@ graphviz/* graphics/graphviz Needs license before fetching GTL-* misc/gtl Non-commercial use only, license forbids redistribution +hcfpcimodem*lnxtbeta*.tar.gz comms/hcfmdm No redistribution allowed himeno/* benchmarks/himenobench Uncertain to distribute sources and binaries hjb3_0-linux.sfx www/hotjava Licensed for individual non-commercial use only @@ -500,9 +501,6 @@ rkive3.1.tar.Z news/rkive Restrictive copyright rman-3.* textproc/rman Do not sell for profit linux-realplayer-*.rpm multimedia/linux-realplayer Redistribution not allowed -rpm/i386/8.0/* emulators/linux_base-8 Binaries under GNU GPL - without accompanying source -rtplib-* devel/rtplib Limited use license ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit savage/savage* games/linux-savage Savage is freeware, but i am ==== //depot/projects/dtrace/ports/MOVED#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1141 2006/09/30 14:08:35 skv Exp $ +# $FreeBSD: ports/MOVED,v 1.1145 2006/10/02 17:37:20 alepulver Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2471,3 +2471,13 @@ japanese/dvi2ps|japanese/dvipsk|2006-09-23|Removed because no longer supported and dvipsk has enough compatibility sysutils/xsearch|sysutils/searchmonkey|2006-09-30|The project has been renamed textproc/p5-XML-LibXML-XPathContext|textproc/p5-XML-LibXML|2006-09-30|merged +devel/rtplib||2006-10-02|Has expired: Upstream codebase appears to be unmaintained +emulators/linux_base||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-debian||2006-10-02|Has expired: unmaintained and does not comply to the linux_base invariants +emulators/linux_base-8||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-rh-9||2006-10-02|Has expired: unsupported by upstream, no security support anymore +misc/pointless||2006-10-02|Has expired: No longer actively maintained +www/mediawiki14||2006-10-02|Has expired: No longer supported, please upgrade your wiki installation +comms/pstngw||2006-10-02|Has expired +net/openh323-112||2006-10-02|Has expired +devel/pwlib152||2006-10-02|Has expired ==== //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.9 2006/07/30 22:34:30 sat Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.10 2006/10/02 14:00:45 vd Exp $ # # Variables: @@ -109,15 +109,9 @@ . if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes" _LINUX_BASE_SUFFIX= fc4 -. elif ${USE_LINUX} == "debian" -_LINUX_BASE_SUFFIX= debian -. elif ${USE_LINUX} == "fc3" -_LINUX_BASE_SUFFIX= fc3 -. elif ${USE_LINUX} == "8" -_LINUX_BASE_SUFFIX= 8 . else # other linux_base ports do not provide a pkg-plist file -IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"8\", \"debian\", \"fc3\" and \"fc4\" +IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\" and \"fc4\" . endif PLIST?= ${WRKDIR}/.PLIST.linux-rpm ==== //depot/projects/dtrace/src/crypto/openssh/FREEBSD-upgrade#3 (text+ko) ==== @@ -42,20 +42,28 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit + --with-pam --with-tcp-wrappers --with-libedit \ + --with-ssl-engine + + This will regenerate config.h, which must be committed along with + the rest. Note that we don't want to configure OpenSSH for Kerberos using configure since we have to be able to turn it on or off depending on the value of MK_KERBEROS. Our Makefiles take care of this. -8) Commit the resulting config.h. Make sure you don't accidentally - commit any other files created by autoconf, autoheader or - configure; they'll just clutter up the repo and cause trouble at - the next upgrade. +8) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +9) Build libssh. Follow the instructions in ssh_namespace.h to get a + list of new symbols. Update ssh_namespace.h, build everything, + install and test. -9) Build and test. +A) Build and test the pam_ssh PAM module. It gropes around libssh's + internals and will break if something significant changes or if + ssh_namespace.h is out of whack. -A) Re-commit everything on freefall (you *did* use a test repo for +B) Re-commit everything on repoman (you *did* use a test repo for this, didn't you?) @@ -126,4 +134,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.11 2006/03/17 18:54:20 ru Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $ ==== //depot/projects/dtrace/src/crypto/openssh/config.h#4 (text+ko) ==== @@ -458,7 +458,7 @@ #define HAVE_INT64_T 1 /* Define to 1 if you have the <inttypes.h> header file. */ -/* #undef HAVE_INTTYPES_H */ +#define HAVE_INTTYPES_H 1 /* define if you have intxx_t data type */ #define HAVE_INTXX_T 1 @@ -548,7 +548,7 @@ #define HAVE_MEMMOVE 1 /* Define to 1 if you have the <memory.h> header file. */ -/* #undef HAVE_MEMORY_H */ +#define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mkdtemp' function. */ #define HAVE_MKDTEMP 1 @@ -780,7 +780,7 @@ #define HAVE_STDINT_H 1 /* Define to 1 if you have the <stdlib.h> header file. */ -/* #undef HAVE_STDLIB_H */ +#define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -915,7 +915,7 @@ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ -/* #undef HAVE_SYS_TYPES_H */ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the <sys/un.h> header file. */ #define HAVE_SYS_UN_H 1 @@ -1243,7 +1243,7 @@ /* #undef SSH_TUN_PREPEND_AF */ /* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ +#define STDC_HEADERS 1 /* Define if you want a different $PATH for the superuser */ /* #undef SUPERUSER_PATH */ ==== //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.120 2006/10/02 00:23:13 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -725,6 +725,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.321 2006/09/30 09:02:38 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.322 2006/10/02 00:23:14 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -549,6 +549,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -1013,6 +1015,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/dtrace/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ # # @@ -41,6 +41,10 @@ { _cfg=1 + if checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 + fi + ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/dtrace/src/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ # # PROVIDE: dhclient @@ -53,6 +53,7 @@ ifn="$2" load_rc_config $name +load_rc_config network if ! dhcpif $ifn; then return 1 ==== //depot/projects/dtrace/src/etc/rc.subr#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.69 2006/10/02 08:20:37 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1008,7 +1008,7 @@ case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) if [ -x /usr/bin/logger ]; then - logger "$0: INFO: $*" + logger "$0: DEBUG: $*" fi echo 1>&2 "$0: DEBUG: $*" ;; ==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.121 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.122 2006/10/02 08:55:54 schweikh Exp $ .\" .Dd September 6, 2006 .Dt IFCONFIG 8 @@ -427,7 +427,7 @@ The routing metric is used by the routing protocol .Pq Xr routed 8 . Higher metrics have the effect of making a route -less favorable; metrics are counted as addition hops +less favorable; metrics are counted as additional hops to the destination network or host. .It Cm mtu Ar n Set the maximum transmission unit of the interface to @@ -615,7 +615,7 @@ or .Cm - for the address. -This option is useful when more than one access points have the same SSID. +This option is useful when more than one access point uses the same SSID. Another name for the .Cm bssid parameter is @@ -1525,5 +1525,5 @@ .Pp If you delete such an address using .Nm , -the kernel may act very oddly. +the kernel may act very odd. Do this at your own risk. ==== //depot/projects/dtrace/src/share/colldef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.69 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.70 2006/10/02 00:23:14 ache Exp $ LOCALES= bg_BG.CP1251 \ be_BY.CP1131 \ @@ -89,7 +89,8 @@ de_DE el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES \ et_EE eu_ES fi_FI fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ - ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ + ja_JP kk_KZ ko_KR lt_LT mn_MN \ + nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW US-ASCII_UTF-8= ${UTF8LINKS:C/^/la_LN:/} ==== //depot/projects/dtrace/src/share/man/man9/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.278 2006/09/25 20:12:13 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -110,6 +110,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hash.9 \ hashinit.9 \ hexdump.9 \ ieee80211.9 \ @@ -587,6 +588,12 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hash.9 hash32.9 \ + hash.9 hash32_buf.9 \ + hash.9 hash32_str.9 \ + hash.9 hash32_strn.9 \ + hash.9 hash32_stre.9 \ + hash.9 hash32_strne.9 MLINKS+=hashinit.9 hashdestroy.9 \ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ==== //depot/projects/dtrace/src/share/man/man9/zone.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.26 2004/01/25 11:39:41 des Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ .\" .Dd July 21, 2003 .Dt ZONE 9 @@ -65,27 +65,9 @@ are not, and provides functions for allocating items from the zone and for releasing them back (which makes them available for later use). .Pp -The zone allocator stores state information inside the items proper -while they are not allocated, -so structures that will be managed by the zone allocator -and wish to use the type stable property of zones by leaving some fields -pre-filled between allocations, must reserve -two pointers at the very beginning for internal use by the zone -allocator, as follows: -.Bd -literal -offset indent -struct my_item { - struct my_item *z_rsvd1; - struct my_item *z_rsvd2; - /* rest of structure */ -}; -.Ed -.Pp -Alternatively they should assume those entries corrupted -after each allocation. After the first allocation of an item, it will have been cleared to zeroes, however subsequent allocations -will retain the contents as of the last free, with the exception of the -fields mentioned above. +will retain the contents as of the last free. .Pp The .Fn uma_zcreate ==== //depot/projects/dtrace/src/share/mklocale/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.63 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.64 2006/10/02 00:23:14 ache Exp $ LOCALES= UTF-8 \ am_ET.UTF-8 \ @@ -77,7 +77,8 @@ en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \ fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ - ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ + ja_JP kk_KZ ko_KR lt_LT mn_MN \ + nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW UTF-8_UTF-8= ${UTF8LINKS:C/^/:/} ==== //depot/projects/dtrace/src/share/monetdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.62 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.63 2006/10/02 00:36:51 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -44,6 +44,7 @@ ko_KR.eucKR \ ko_KR.UTF-8 \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_BE.ISO8859-1 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ ==== //depot/projects/dtrace/src/share/msgdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/msgdef/Makefile,v 1.63 2005/09/28 07:40:03 ru Exp $ +# $FreeBSD: src/share/msgdef/Makefile,v 1.64 2006/10/02 00:36:52 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -39,6 +39,7 @@ kk_KZ.UTF-8 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ ==== //depot/projects/dtrace/src/share/numericdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/numericdef/Makefile,v 1.59 2005/03/04 14:24:30 ru Exp $ +# $FreeBSD: src/share/numericdef/Makefile,v 1.60 2006/10/02 00:36:52 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -26,6 +26,7 @@ kk_KZ.PT154 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ ==== //depot/projects/dtrace/src/share/timedef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/Makefile,v 1.48 2005/03/04 14:24:30 ru Exp $ +# $FreeBSD: src/share/timedef/Makefile,v 1.49 2006/10/02 00:36:52 ache Exp $ LOCALES= am_ET.UTF-8 \ be_BY.CP1131 \ @@ -53,6 +53,7 @@ lt_LT.ISO8859-4 \ lt_LT.ISO8859-13 \ lt_LT.UTF-8 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ no_NO.UTF-8 \ ==== //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include <sys/buf.h> #include <sys/bus.h> #include <sys/callout.h> +#include <sys/clock.h> #include <sys/cons.h> #include <sys/cpu.h> #include <sys/eventhandler.h> @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/dtrace/src/sys/amd64/include/clock.h#4 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/clock.h> #include <sys/lock.h> #include <sys/kdb.h> #include <sys/mutex.h> @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#6 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/clock.h> #include <sys/imgact.h> #include <sys/limits.h> #include <sys/lock.h> ==== //depot/projects/dtrace/src/sys/arm/include/clock.h#3 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $"); #include "opt_compat.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/clock.h> #include <sys/exec.h> #include <sys/fcntl.h> #include <sys/filedesc.h> ==== //depot/projects/dtrace/src/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1147 2006/10/01 11:34:54 ariff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1148 2006/10/02 15:42:01 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1384,7 +1384,7 @@ kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard -kern/subr_clock.c optional genclock +kern/subr_clock.c standard kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_eventhandler.c standard @@ -1404,6 +1404,7 @@ kern/subr_prf.c standard kern/subr_prof.c standard kern/subr_rman.c standard +kern/subr_rtc.c optional genclock kern/subr_sbuf.c standard kern/subr_scanf.c standard kern/subr_sleepqueue.c standard ==== //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -78,10 +78,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061001_0028" +#define HDA_DRV_TEST_REV "20061003_0029" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.1 2006/10/01 11:12:59 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.3 2006/10/02 16:30:04 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -102,13 +102,17 @@ } \ } while(0) -#if 0 +#if 1 #undef HDAC_INTR_EXTRA #define HDAC_INTR_EXTRA 1 #endif -#define hdac_lock(sc) snd_mtxlock((sc)->lock) -#define hdac_unlock(sc) snd_mtxunlock((sc)->lock) +#define hdac_lock(sc) snd_mtxlock((sc)->lock) +#define hdac_unlock(sc) snd_mtxunlock((sc)->lock) + +#define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) +#define HDA_MATCH_ALL 0xffffffff +#define HDAC_INVALID 0xffffffff #define HDA_MODEL_CONSTRUCT(vendor, model) \ (((uint32_t)(model) << 16) | ((vendor##_VENDORID) & 0xffff)) @@ -156,7 +160,12 @@ #define ACER_VENDORID 0x1025 #define ACER_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0xffff) +/* Asus */ +#define ASUS_VENDORID 0x1043 +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) + /* Misc constants.. */ #define HDA_AMP_MUTE_DEFAULT (0xffffffff) #define HDA_AMP_MUTE_NONE (0) @@ -346,7 +355,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610030035.k930ZFqU033978>