Date: Thu, 12 Oct 2006 06:56:57 GMT From: Michael Bushkov <bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107744 for review Message-ID: <200610120656.k9C6uvMu022906@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107744 Change 107744 by bushman@bushman_nss_ldap_cached on 2006/10/12 06:56:43 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/libalias.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mixer#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/elf.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#9 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.info.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/sys.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.c#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.conf.5#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/mkmakefile.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ipfwpcap/ipfwpcap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/mailwrapper.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/LICENSE#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/RELEASE#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/VERSION#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/callout.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/cfparse.y#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/common/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/config.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/defs.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/dvmrp.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/icmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/igmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/igmpv2.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/inet.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/ipip.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/kern.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/main.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/map-mbone.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/map-mbone/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mapper.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted.conf#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/pathnames.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/prune.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/prune.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/route.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/route.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr_var.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/testrsrr/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/testrsrr/testrsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/vif.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/vif.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/nvram.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdog.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wpa/hostapd/hostapd.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#8 (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.296 2006/09/20 19:48:31 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -297,7 +297,11 @@ router_enable="NO" # Set to YES to enable a routing daemon. router="/sbin/routed" # Name of routing daemon to use if enabled. router_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do multicast routing (see /etc/mrouted.conf). +mrouted_enable="NO" # Do IPv4 multicast routing. +mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast + # routing daemon. You need to + # install it from package or + # port. mrouted_flags="" # Flags for multicast routing daemon. ipxgateway_enable="NO" # Set to YES to enable IPX routing. ipxrouted_enable="NO" # Set to YES to run the IPX routing daemon. @@ -531,6 +535,7 @@ # ruleset file. newsyslog_enable="YES" # Run newsyslog at startup. newsyslog_flags="-CN" # Newsyslog flags to create marked files +mixer_enable="YES" # Run the sound mixer. ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/libalias.conf#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ -/usr/lib/libalias_cuseeme.so -/usr/lib/libalias_ftp.so -/usr/lib/libalias_irc.so -/usr/lib/libalias_nbt.so -/usr/lib/libalias_pptp.so -/usr/lib/libalias_skinny.so -/usr/lib/libalias_smedia.so +# $FreeBSD: src/etc/libalias.conf,v 1.2 2006/10/08 14:01:58 piso Exp $ +/lib/libalias_cuseeme.so +/lib/libalias_ftp.so +/lib/libalias_irc.so +/lib/libalias_nbt.so +/lib/libalias_pptp.so +/lib/libalias_skinny.so +/lib/libalias_smedia.so ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -100,6 +100,8 @@ .. .. geom + cache + .. concat .. eli ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#3 (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/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel 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 @@ -677,6 +679,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -712,6 +716,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -786,6 +792,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -1007,6 +1015,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#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/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ # # ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ ==== //depot/projects/soc2006/nss_ldap_cached/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/soc2006/nss_ldap_cached/src/etc/rc.d/mixer#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/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $ # # PROVIDE: mixer @@ -34,6 +34,7 @@ . /etc/rc.subr name="mixer" +rcvar="mixer_enable" stop_cmd="mixer_stop" start_cmd="mixer_start" reload_cmd="mixer_start" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.9 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ # # PROVIDE: mrouted @@ -12,7 +12,7 @@ name="mrouted" rcvar=`set_rcvar` -command="/usr/sbin/${name}" +command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" extra_commands="reload" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#7 (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/soc2006/nss_ldap_cached/src/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ - geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ + geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/soc2006/nss_ldap_cached/src/include/elf.h#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/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $ + * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ */ /* @@ -38,4 +38,8 @@ #include <sys/elf32.h> #include <sys/elf64.h> +#ifdef _SOLARIS_C_SOURCE +#include <sys/_elf_solaris.h> +#endif + #endif /* !_ELF_H_ */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.217 2006/08/22 07:51:06 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.218 2006/09/30 11:32:46 ru Exp $ .include <bsd.own.mk> @@ -31,7 +31,7 @@ libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_nis}\ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ - libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + libbegemot ${_libbluetooth} libbsnmp libbz2 libc \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi libipsec \ @@ -80,11 +80,6 @@ _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no" -_libc_r= -.endif - .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.13 2006/10/10 11:37:41 maxim Exp $ .\" -.Dd June 2, 1993 +.Dd October 10, 2006 .Dt KILLPG 2 .Os .Sh NAME @@ -66,7 +66,7 @@ have the same effective user ID, or the sender must be the super-user. As a single special case the continue signal SIGCONT may be sent -to any process that is a descendant of the current process. +to any process with the same session ID as the caller. .Sh RETURN VALUES .Rv -std killpg .Sh ERRORS ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.11 2006/10/04 01:17:23 ache Exp $"); #include "namespace.h" #include <sys/types.h> @@ -61,6 +61,7 @@ static struct arc4_stream rs; static int rs_initialized; static int rs_stired; +static int arc4_count; static inline u_int8_t arc4_getbyte(struct arc4_stream *); static void arc4_stir(struct arc4_stream *); @@ -127,7 +128,8 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - arc4_getbyte(as); + (void) arc4_getbyte(as); + arc4_count = 400000; } static inline u_int8_t @@ -172,7 +174,7 @@ static void arc4_check_stir(void) { - if (!rs_stired) { + if (!rs_stired || --arc4_count == 0) { arc4_stir(&rs); rs_stired = 1; } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.21 2006/09/29 22:57:22 ru Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -98,7 +98,7 @@ If the .Fa fmt argument is not NULL, the -.Xr printf 3 +.Xr printf 3 Ns -like formatted error message is output. The output is terminated by a newline character. .Pp ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.10 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.11 2006/10/07 21:27:20 trhodes Exp $ .\" .Dd September 7, 1998 .Dt GETOBJFORMAT 3 @@ -116,7 +116,8 @@ If the environment variable .Ev OBJFORMAT is set, it overrides the default object file format. -.Ev OBJFORMAT takes precedence over +.Ev OBJFORMAT +takes precedence over .Pa /etc/objformat . .El .Sh FILES ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#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/lib/libc/gen/tls.c,v 1.12 2006/09/01 17:35:48 marcel Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ */ /* @@ -58,6 +58,15 @@ void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign); void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign); +#if defined(__ia64__) || defined(__amd64__) +#define TLS_TCB_ALIGN 16 +#elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \ + defined(__sparc64__) +#define TLS_TCB_ALIGN sizeof(void *) +#else +#error TLS_TCB_ALIGN undefined for target architecture +#endif + #if defined(__ia64__) || defined(__powerpc__) #define TLS_VARIANT_I #endif @@ -299,7 +308,7 @@ } } - tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, 1); + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _set_tp(tls); #endif ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present.3#2 (text+ko) ==== @@ -28,10 +28,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.8 2006/07/07 14:02:17 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.9 2006/09/30 10:29:43 ru Exp $ .\" -.Dd January 9, 2002 -.Dt MAC_IS_PRESENT_NP 3 +.Dd July 7, 2006 +.Dt MAC_IS_PRESENT 3 .Os .Sh NAME .Nm mac_is_present @@ -50,7 +50,7 @@ If .Fa policyname is -.No non- Ns Dv NULL , +.Pf non- Dv NULL , the presence of the named policy (e.g.\& .Dq Li biba , ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/_set_tp.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $ + * $FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.2 2006/10/08 02:50:33 kmacy Exp $ */ void _set_tp(void *tpval) { - register void* tp __asm__("%g7"); - tp = tpval; + __asm __volatile("mov %0, %%g7" : : "r" (tpval)); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/a64l.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.2 2006/02/26 23:01:11 wkoszek Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.3 2006/09/30 10:29:43 ru Exp $ .\" .Dd November 20, 2005 .Dt A64L 3 @@ -67,32 +67,26 @@ are .Ql .\& for 0, -.Ql /\& +.Ql / for 1, -.Ql 0\& -.Fl -.Ql 9\& -for 2 -.Fl -11, -.Ql A\& -.Fl -.Ql Z\& -for 12 -.Fl -37, and -.Ql a\& -.Fl -.Ql z\& -for 38 -.Fl -63. +.Ql 0 +- +.Ql 9 +for 2 - 11, +.Ql A +- +.Ql Z +for 12 - 37, and +.Ql a +- +.Ql z +for 38 - 63. .Pp The .Fn a64l function takes a pointer to a radix-64 representation, in which the first digit is the least significant, and returns a corresponding -.Ft long +.Vt long value. If the string pointed to by .Fa s @@ -120,7 +114,9 @@ .Pp The .Fn l64a -function takes a long argument and returns a pointer to the corresponding +function takes a +.Vt long +argument and returns a pointer to the corresponding radix-64 representation. The behavior of .Fn l64a @@ -141,19 +137,23 @@ .Fa buffer , consuming at most .Fa buflen -characters including the terminating NUL character. +characters including the terminating +.Dv NUL +character. .Sh RETURN VALUES On successful completion, .Fn a64l returns the -.Ft long +.Vt long value resulting from conversion of the input string. -If a string pointed to by s is an empty string, +If a string pointed to by +.Fa s +is an empty string, .Fn a64l returns 0. .Pp The -l64a +.Fn l64a function returns a pointer to the radix-64 representation. If value is 0, .Fn l64a @@ -169,7 +169,7 @@ functions are derived from .Nx with modifications. -They were added to +They appeared in .Fx 6.1 . .Sh AUTHORS The @@ -177,6 +177,7 @@ .Fn l64a , and .Fn l64a_r +functions were added to .Fx by ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.17 2005/01/20 09:17:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ .\" .Dd December 11, 1993 .Dt GETENV 3 @@ -90,8 +90,7 @@ .Fa overwrite is tested; if .Fa overwrite -is -zero, the +is zero, the variable is not reset, otherwise it is reset to the given .Fa value . ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/posix_memalign.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.1 2006/01/12 07:28:20 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.2 2006/09/30 10:29:43 ru Exp $ .\" .Dd January 11, 2006 .Dt POSIX_MEMALIGN 3 @@ -51,7 +51,8 @@ .Pp The requested .Fa alignment -must be a power of 2 at least as large as sizeof(void *). +must be a power of 2 at least as large as +.Fn sizeof "void *" . .Pp Memory that is allocated via .Fn posix_memalign @@ -72,16 +73,17 @@ .It Bq Er EINVAL The .Fa alignment -parameter is not a power of 2 at least as large as sizeof(void *). +parameter is not a power of 2 at least as large as +.Fn sizeof "void *" . .It Bq Er ENOMEM Memory allocation error. .El .Sh SEE ALSO +.Xr free 3 , .Xr malloc 3 , -.Xr valloc 3 , .Xr realloc 3 , .Xr reallocf 3 , -.Xr free 3 +.Xr valloc 3 .Sh STANDARDS The .Fn posix_memalign ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtonum.3#2 (text) ==== @@ -13,7 +13,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" $OpenBSD: strtonum.3,v 1.12 2005/10/26 11:37:58 jmc Exp $ -.\" $FreeBSD: src/lib/libc/stdlib/strtonum.3,v 1.4 2006/03/15 14:45:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/strtonum.3,v 1.5 2006/09/30 10:29:43 ru Exp $ .\" .Dd April 29, 2004 .Dt STRTONUM 3 @@ -22,8 +22,8 @@ .Nm strtonum .Nd "reliably convert string value to an integer" .Sh SYNOPSIS -.Fd #include <stdlib.h> -.Fd #include <limits.h> +.In stdlib.h +.In limits.h .Ft long long .Fo strtonum .Fa "const char *nptr" @@ -37,7 +37,7 @@ function converts the string in .Fa nptr to a -.Li long long +.Vt "long long" value. The .Fn strtonum @@ -58,7 +58,7 @@ sign. .Pp The remainder of the string is converted to a -.Li long long +.Vt "long long" value according to base 10. .Pp The value obtained is then checked against the provided @@ -83,10 +83,10 @@ is set, and .Fa errstr will point to an error message. +On success, .Fa *errstr will be set to -.Dv NULL -on success; +.Dv NULL ; this fact can be used to differentiate a successful return of 0 from an error. .Sh EXAMPLES @@ -111,21 +111,22 @@ .It Bq Er EINVAL The given string did not consist solely of digit characters. .It Bq Er EINVAL -.Ar minval >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610120656.k9C6uvMu022906>