From owner-p4-projects@FreeBSD.ORG Wed May 2 15:36:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD1B16A409; Wed, 2 May 2007 15:36:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C68BE16A407 for ; Wed, 2 May 2007 15:36:19 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B5AA513C469 for ; Wed, 2 May 2007 15:36:19 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l42FaJpr035586 for ; Wed, 2 May 2007 15:36:19 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l42FaEV8035583 for perforce@freebsd.org; Wed, 2 May 2007 15:36:14 GMT (envelope-from bushman@freebsd.org) Date: Wed, 2 May 2007 15:36:14 GMT Message-Id: <200705021536.l42FaEV8035583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 119163 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: Wed, 02 May 2007 15:36:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=119163 Change 119163 by bushman@bushman_sh on 2007/05/02 15:36:04 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devd.conf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bgfsck#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cleanvar#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/geli2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostname#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ip6fw#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfilter#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfw#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kldxref#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netif#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfslocking#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pflog#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pfsync#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/power_profile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ppp#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/random#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/syscons#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/var#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/zfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.firewall#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/services#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/dumprestore.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/types.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stdio.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stdlib.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/Versions.def#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gmon/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/addr2ascii.3#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/addr2ascii.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/ascii2addr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/inet.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sys_calls.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/nls/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/engine.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/rpc/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/rpc/clnt_dg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/softfloat/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getenv.3#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/posix_memalign.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/putenv.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/setenv.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdtime/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/send.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/xdr/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/yp/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_class.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.man.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.symver.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/version_gen.awk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getaddr.t#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getgr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getproto.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getpw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getrpc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getserv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getusershell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/nss/test-getusershell.t#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/brandelf/brandelf.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/bzip2/doc/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/c89/c89.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/c99/c99.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/calendar/calendars/calendar.usholiday#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/cut/cut.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/du/du.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/env/env.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/find/find.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/finger/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/finger/finger.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/finger/finger.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/finger/net.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/lastcomm/lastcomm.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/limits/limits.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/login/login.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/mail/mail.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/GNode.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/globals.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/job.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/job.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/make.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/make.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/make.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/make/targ.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/mkstr/mkstr.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/mkuzip/mkuzip.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/bpf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/if.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/mcast.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/nl/nl.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/quota/quota.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/rup/rup.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/POSIX#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/TEST/hanoi.sed#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/TEST/math.sed#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/TEST/sed.test#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sed/sed.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/stat/stat.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/su/su.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/config_freebsd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/getdate.y#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/matching.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/config.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-acl.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-basic.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-deep-dir.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-flags.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-nodump.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-overwrite.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/test/test-utf8.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/tree.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/util.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/write.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/top/machine.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/touch/touch.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/setup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/truss.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/truss/truss.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ul/ul.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidump/acpidump.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidump/acpidump.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cron/lib/entry.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/cxgbtool.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/reg_defs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/reg_defs_t3.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/reg_defs_t3b.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cxgbtool/version.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/daemon/daemon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/fdformat/fdformat.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ifmcstat/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/inetd/inetd.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/kbdmap/kbdmap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/lpr/lpd/recvjob.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.c#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/moused/moused.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mtest/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mtest/mtest.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mtest/mtest.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntpd.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/lib/exec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/pmcstat.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pstat/pstat.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/cpdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw_conf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.statd/procs.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.statd/statd.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpcbind/rpcbind.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sade/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sendmail/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/snapinfo/snapinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/biosmptable.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/config.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/termcap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/variable.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.566 2007/01/20 07:48:09 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -40,6 +40,9 @@ .if ${MK_GAMES} != "no" SUBDIR+=games .endif +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 @@ -235,36 +238,30 @@ .else LIB32CPUTYPE= ${TARGET_CPUTYPE} .endif -LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT -LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ +LIB32FLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT \ + -iprefix ${LIB32TMP}/usr/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 -LIB32CC= ${LIB32PREFLAGS} \ - ${LIB32POSTFLAGS} -LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ - ${LIB32POSTFLAGS} -LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ - ${LIB32POSTFLAGS} # Yes, the flags are redundant. -LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="${CC} ${LIB32CC}" \ - CXX="${CXX} ${LIB32CXX}" \ - OBJC="${OBJC} ${LIB32OBJC}" \ + CC="${CC} ${LIB32FLAGS}" \ + CXX="${CXX} ${LIB32FLAGS}" \ + OBJC="${OBJC} ${LIB32FLAGS}" \ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="${AS} --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ +LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ - -DWITHOUT_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS + -DWITHOUT_HTML DESTDIR=${LIB32TMP} +LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif # install stage @@ -364,7 +361,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .if ${TARGET_ARCH} == "amd64" - rm -rf ${OBJTREE}/lib32 + ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/} .endif .endif _obj: @@ -434,34 +431,31 @@ .endfor .endif .for _t in obj includes - cd ${.CURDIR}/include; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/gnu/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif + cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t} .endif .endfor .for _dir in usr.bin/lex/lib - cd ${.CURDIR}/${_dir}; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} obj + cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj .endfor -.for _dir in lib/ncurses/ncurses lib/libmagic +.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools .endfor cd ${.CURDIR}; \ - ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries + ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -869,7 +863,7 @@ _mklocale= usr.bin/mklocale .endif -.if ${BOOTSTRAPPING} < 700015 +.if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -933,6 +927,7 @@ bin/sh \ ${_rescue} \ lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ ${_share} \ ${_aicasm} \ usr.bin/awk \ @@ -1020,17 +1015,22 @@ lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ - lib/ncurses/ncurses lib/libnssutil lib/libopie lib/libpam \ + lib/ncurses/ncurses lib/ncurses/ncursesw lib/libnssutil \ + lib/libopie lib/libpam lib/libpthread \ 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 ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L lib/libutil__L: lib/libnssutil__L +.if ${MK_CDDL} != "no" +_cddl_lib= cddl/lib +.endif + .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/periodic.conf#3 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.41 2006/08/29 08:49:57 ru Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $ # # What files override these defaults ? @@ -88,6 +88,9 @@ daily_status_disks_enable="YES" # Check disk status daily_status_disks_df_flags="-l -h" # df(1) flags for check +# 404.status-zfs +daily_status_zfs_enable="NO" # Check ZFS + # 405.status-ata_raid daily_status_ata_raid_enable="NO" # Check ATA raid status ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#9 (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.304 2007/02/09 12:11:27 flz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.314 2007/04/10 16:42:13 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -24,7 +24,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown -early_late_divider="mountcritlocal" # Script that separates early/late +early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know # the ramifications if you change this. # See rc.conf(5) for more details. @@ -42,16 +42,19 @@ powerd_flags="" # Flags to powerd (if enabled). tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created -tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp +tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created -varmfs_flags="-S -M" # Extra mount options for the mfs /var +varmfs_flags="-S" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never cleanvar_enable="YES" # Clean the /var directory local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces rc_conf_files="/etc/rc.conf /etc/rc.conf.local" +# ZFS support +zfs_enable="NO" # Set to YES to automatically mount ZFS file systems + # Experimental - test before enabling gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab gbde_devices="NO" # Devices to automatically attach (list, or AUTO) @@ -90,12 +93,14 @@ ### Basic network and firewall/security options: ### hostname="" # Set this! +hostid_enable="YES" # Set host UUID. +hostid_file="/etc/hostid" # File with hostuuid. nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. dhclient_flags="" # Extra flags to pass to dhcp client. -dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only +#dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. -background_dhclient_fxp0="" # Start dhcp client on fxp0 in the background. +#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. firewall_enable="NO" # Set to YES to enable firewall functionality @@ -151,6 +156,7 @@ pflog_flags="" # additional flags for pflogd pfsync_enable="NO" # Expose pf state to other hosts for syncing pfsync_syncdev="" # Interface for pfsync to work through +pfsync_syncpeer="" # IP address of pfsync peer host pfsync_ifconfig="" # Additional options to ifconfig(8) for pfsync tcp_extensions="YES" # Set to NO to turn off RFC1323 extensions. log_in_vain="0" # >=1 to log connects to ports w/o listeners. @@ -264,7 +270,9 @@ nfs_reserved_port_only="NO" # Provide NFS only on secure port (or NO). nfs_bufpackets="" # bufspace (in packets) for client rpc_lockd_enable="NO" # Run NFS rpc.lockd needed for client/server. +rpc_lockd_flags="" # Flags to rpc.lockd (if enabled). rpc_statd_enable="NO" # Run NFS rpc.statd needed for client/server. +rpc_statd_flags="" # Flags to rpc.statd (if enabled). rpcbind_enable="NO" # Run the portmapper service (YES/NO). rpcbind_program="/usr/sbin/rpcbind" # path to rpcbind, if you want a different one. rpcbind_flags="" # Flags to rpcbind (if enabled). @@ -425,7 +433,7 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples -ip6addrctl_enable="NO" # Set to YES to enable default address selection +ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages ############################################################## ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -208,6 +208,37 @@ action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; }; +# Sample ZFS problem reports handling. +notify 10 { + match "system" "ZFS"; + match "type" "zpool"; + action "logger -p kern.err 'ZFS: failed to load zpool $pool'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "vdev"; + action "logger -p kern.err 'ZFS: vdev failure, zpool=$pool type=$type'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "data"; + action "logger -p kern.warn 'ZFS: zpool I/O failure, zpool=$pool error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "io"; + action "logger -p kern.warn 'ZFS: vdev I/O failure, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size error=$zio_err'"; +}; + +notify 10 { + match "system" "ZFS"; + match "type" "checksum"; + action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -114,6 +114,8 @@ .. mirror .. + multipath + .. nop .. raid3 @@ -207,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.root.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.77 2006/05/10 18:53:15 marcus Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.79 2007/04/08 23:59:39 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -16,6 +16,8 @@ .. modules .. + zfs + .. .. dev mode=0555 .. @@ -62,6 +64,8 @@ .. ssl .. + zfs + .. .. lib geom ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.usr.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.324 2006/12/05 16:57:10 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.326 2007/03/02 14:56:14 flz Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -75,6 +75,12 @@ misc .. .. + legal + intel_ipw + .. + intel_iwi + .. + .. ncurses .. ntp ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#7 (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.177 2007/02/09 12:11:26 flz Exp $ +# $FreeBSD: src/etc/network.subr,v 1.179 2007/03/29 21:42:19 ache Exp $ # # ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.14 2006/03/02 14:44:19 brueffer Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.15 2007/04/06 02:33:06 pjd Exp $ FILES= 100.clean-disks \ 110.clean-tmps \ @@ -12,6 +12,7 @@ 310.accounting \ 330.news \ 400.status-disks \ + 404.status-zfs \ 405.status-ata-raid \ 406.status-gmirror \ 407.status-graid3 \ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc#2 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.339 2006/02/20 21:54:30 dougb Exp $ +# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ # # System startup script run by init on autoboot @@ -75,7 +75,7 @@ skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" - if [ "$early_late_divider" = "mountcritlocal" ]; then + if [ "$early_late_divider" = "FILESYSTEMS" ]; then early_late_divider=NETWORKING fi fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.81 2007/04/09 19:21:27 pjd Exp $ .include -FILES= DAEMON LOGIN NETWORKING SERVERS \ +FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ @@ -14,7 +14,7 @@ fsck ftpd \ gbde geli geli2 \ hcsecd \ - hostapd hostname \ + hostapd hostid hostname \ idmapd inetd initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ @@ -40,7 +40,8 @@ var virecover \ watchdogd wpa_supplicant \ ypbind yppasswdd ypserv \ - ypset ypupdated ypxfrd + ypset ypupdated ypxfrd \ + zfs .if ${MK_OPENSSH} != "no" FILES+= sshd ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/NETWORKING#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.11 2005/12/03 01:33:06 brooks Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.12 2007/04/09 10:09:40 des Exp $ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: netif routing network_ipv6 isdnd ppp +# REQUIRE: netif netoptions routing network_ipv6 isdnd ppp # REQUIRE: routed mrouted route6d mroute6d # This is a dummy dependency, for services which require networking ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/addswap#2 (text+ko) ==== @@ -2,11 +2,11 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.6 2006/01/17 19:29:31 philip Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.7 2007/04/02 22:53:07 des Exp $ # # PROVIDE: addswap -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # BEFORE: sysctl # KEYWORD: nojail ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/adjkerntz#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: adjkerntz -# REQUIRE: mountcritlocal random +# REQUIRE: FILESYSTEMS random # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bgfsck#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.7 2005/07/22 00:57:37 obrien Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.8 2007/03/11 06:53:06 brooks Exp $ # # PROVIDE: bgfsck @@ -16,11 +16,23 @@ bgfsck_start () { + if [ -z "${rc_force}" ]; then + background_fsck_delay=${background_fsck_delay:=0} + else + background_fsck_delay=0 + fi + if [ ${background_fsck_delay} -lt 0 ]; then + echo "Background file system checks delayed indefinitly" + return 0 + fi + bgfsck_msg='Starting background file system checks' - if [ ${background_fsck_delay:=0} -gt 0 ]; then + if [ "${background_fsck_delay}" -gt 0 ]; then bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi - echo "${bgfsck_msg}." + if [ -z "${rc_force}" ]; then + echo "${bgfsck_msg}." + fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ logger -p daemon.notice -t fsck & ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bootconf.sh#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $ -# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.5 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: bootconf -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS bootconf_start() { ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cleanvar#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.11 2005/12/19 10:57:00 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.12 2007/04/02 22:53:07 des Exp $ # # PROVIDE: cleanvar -# REQUIRE: mountcritlocal var +# REQUIRE: FILESYSTEMS var . /etc/rc.subr ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#6 (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.26 2007/02/15 06:51:31 yar Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ # # PROVIDE: dhclient @@ -28,17 +28,13 @@ fi # Override for $ifn specific flags (see rc.subr for $flags setting) - eval specific=\$dhclient_flags_$ifn + specific=`get_if_var $ifn dhclient_flags_IF` if [ -z "$flags" -a -n "$specific" ]; then rc_flags=$specific fi - eval specific=\$background_dhclient_$ifn - if [ -n "$specific" ]; then - if checkyesno background_dhclient_$ifn; then - rc_flags="${rc_flags} -b" - fi - elif checkyesno background_dhclient; then + background_dhclient=`get_if_var $ifn background_dhclient_IF $background_dhclient` + if checkyesno background_dhclient; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/geli2#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<