From owner-svn-src-projects@FreeBSD.ORG Thu Dec 9 22:01:17 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BA0C1065740; Thu, 9 Dec 2010 22:01:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E95188FC14; Thu, 9 Dec 2010 22:01:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB9M1Gc9052076; Thu, 9 Dec 2010 22:01:16 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB9M1Gue052062; Thu, 9 Dec 2010 22:01:16 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201012092201.oB9M1Gue052062@svn.freebsd.org> From: Dimitry Andric Date: Thu, 9 Dec 2010 22:01:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216339 - in projects/binutils-2.17: . bin/csh/USD.doc bin/sh cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9 contrib/bind9/bin/check contrib/bind9/bin/dig contrib/bind9/bin/na... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2010 22:01:17 -0000 Author: dim Date: Thu Dec 9 22:01:15 2010 New Revision: 216339 URL: http://svn.freebsd.org/changeset/base/216339 Log: Sync: merge r216133 through r216338 from ^/head. Added: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt - copied unchanged from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt projects/binutils-2.17/contrib/bind9/release-notes.css - copied unchanged from r216338, head/contrib/bind9/release-notes.css projects/binutils-2.17/contrib/bsnmp/lib/snmpcrypto.c - copied unchanged from r216338, head/contrib/bsnmp/lib/snmpcrypto.c projects/binutils-2.17/contrib/bsnmp/snmp_usm/ - copied from r216338, head/contrib/bsnmp/snmp_usm/ projects/binutils-2.17/contrib/bsnmp/snmp_vacm/ - copied from r216338, head/contrib/bsnmp/snmp_vacm/ projects/binutils-2.17/crypto/openssl/ACKNOWLEDGMENTS - copied unchanged from r216338, head/crypto/openssl/ACKNOWLEDGMENTS projects/binutils-2.17/lib/msun/src/e_log2.c - copied unchanged from r216338, head/lib/msun/src/e_log2.c projects/binutils-2.17/lib/msun/src/e_log2f.c - copied unchanged from r216338, head/lib/msun/src/e_log2f.c projects/binutils-2.17/lib/msun/src/k_log.h - copied unchanged from r216338, head/lib/msun/src/k_log.h projects/binutils-2.17/lib/msun/src/k_logf.h - copied unchanged from r216338, head/lib/msun/src/k_logf.h projects/binutils-2.17/share/doc/psd/12.make/stubs - copied unchanged from r216338, head/share/doc/psd/12.make/stubs projects/binutils-2.17/share/doc/psd/12.make/tutorial.ms - copied unchanged from r216338, head/share/doc/psd/12.make/tutorial.ms projects/binutils-2.17/share/doc/psd/18.gprof/abstract.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/abstract.me projects/binutils-2.17/share/doc/psd/18.gprof/gathering.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/gathering.me projects/binutils-2.17/share/doc/psd/18.gprof/header.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/header.me projects/binutils-2.17/share/doc/psd/18.gprof/intro.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/intro.me projects/binutils-2.17/share/doc/psd/18.gprof/postp.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp.me projects/binutils-2.17/share/doc/psd/18.gprof/postp1.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp1.pic projects/binutils-2.17/share/doc/psd/18.gprof/postp2.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp2.pic projects/binutils-2.17/share/doc/psd/18.gprof/postp3.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/postp3.pic projects/binutils-2.17/share/doc/psd/18.gprof/pres1.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/pres1.pic projects/binutils-2.17/share/doc/psd/18.gprof/pres2.pic - copied unchanged from r216338, head/share/doc/psd/18.gprof/pres2.pic projects/binutils-2.17/share/doc/psd/18.gprof/present.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/present.me projects/binutils-2.17/share/doc/psd/18.gprof/profiling.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/profiling.me projects/binutils-2.17/share/doc/psd/18.gprof/refs.me - copied unchanged from r216338, head/share/doc/psd/18.gprof/refs.me projects/binutils-2.17/share/doc/psd/22.rpcgen/rpcgen.ms - copied unchanged from r216338, head/share/doc/psd/22.rpcgen/rpcgen.ms projects/binutils-2.17/share/doc/psd/22.rpcgen/stubs - copied unchanged from r216338, head/share/doc/psd/22.rpcgen/stubs projects/binutils-2.17/share/doc/psd/23.rpc/rpc.prog.ms - copied unchanged from r216338, head/share/doc/psd/23.rpc/rpc.prog.ms projects/binutils-2.17/share/doc/psd/23.rpc/stubs - copied unchanged from r216338, head/share/doc/psd/23.rpc/stubs projects/binutils-2.17/share/doc/psd/24.xdr/stubs - copied unchanged from r216338, head/share/doc/psd/24.xdr/stubs projects/binutils-2.17/share/doc/psd/24.xdr/xdr.nts.ms - copied unchanged from r216338, head/share/doc/psd/24.xdr/xdr.nts.ms projects/binutils-2.17/share/doc/psd/25.xdrrfc/stubs - copied unchanged from r216338, head/share/doc/psd/25.xdrrfc/stubs projects/binutils-2.17/share/doc/psd/25.xdrrfc/xdr.rfc.ms - copied unchanged from r216338, head/share/doc/psd/25.xdrrfc/xdr.rfc.ms projects/binutils-2.17/share/doc/psd/26.rpcrfc/rpc.rfc.ms - copied unchanged from r216338, head/share/doc/psd/26.rpcrfc/rpc.rfc.ms projects/binutils-2.17/share/doc/psd/26.rpcrfc/stubs - copied unchanged from r216338, head/share/doc/psd/26.rpcrfc/stubs projects/binutils-2.17/share/doc/psd/27.nfsrpc/nfs.rfc.ms - copied unchanged from r216338, head/share/doc/psd/27.nfsrpc/nfs.rfc.ms projects/binutils-2.17/share/doc/psd/27.nfsrpc/stubs - copied unchanged from r216338, head/share/doc/psd/27.nfsrpc/stubs projects/binutils-2.17/share/doc/smm/02.config/0.t - copied unchanged from r216338, head/share/doc/smm/02.config/0.t projects/binutils-2.17/share/doc/smm/02.config/1.t - copied unchanged from r216338, head/share/doc/smm/02.config/1.t projects/binutils-2.17/share/doc/smm/02.config/2.t - copied unchanged from r216338, head/share/doc/smm/02.config/2.t projects/binutils-2.17/share/doc/smm/02.config/3.t - copied unchanged from r216338, head/share/doc/smm/02.config/3.t projects/binutils-2.17/share/doc/smm/02.config/4.t - copied unchanged from r216338, head/share/doc/smm/02.config/4.t projects/binutils-2.17/share/doc/smm/02.config/5.t - copied unchanged from r216338, head/share/doc/smm/02.config/5.t projects/binutils-2.17/share/doc/smm/02.config/6.t - copied unchanged from r216338, head/share/doc/smm/02.config/6.t projects/binutils-2.17/share/doc/smm/02.config/a.t - copied unchanged from r216338, head/share/doc/smm/02.config/a.t projects/binutils-2.17/share/doc/smm/02.config/b.t - copied unchanged from r216338, head/share/doc/smm/02.config/b.t projects/binutils-2.17/share/doc/smm/02.config/c.t - copied unchanged from r216338, head/share/doc/smm/02.config/c.t projects/binutils-2.17/share/doc/smm/02.config/d.t - copied unchanged from r216338, head/share/doc/smm/02.config/d.t projects/binutils-2.17/share/doc/smm/02.config/e.t - copied unchanged from r216338, head/share/doc/smm/02.config/e.t projects/binutils-2.17/share/doc/smm/02.config/spell.ok - copied unchanged from r216338, head/share/doc/smm/02.config/spell.ok projects/binutils-2.17/share/doc/smm/03.fsck/0.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/0.t projects/binutils-2.17/share/doc/smm/03.fsck/1.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/1.t projects/binutils-2.17/share/doc/smm/03.fsck/2.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/2.t projects/binutils-2.17/share/doc/smm/03.fsck/3.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/3.t projects/binutils-2.17/share/doc/smm/03.fsck/4.t - copied unchanged from r216338, head/share/doc/smm/03.fsck/4.t projects/binutils-2.17/share/doc/smm/07.lpr/ - copied from r216338, head/share/doc/smm/07.lpr/ projects/binutils-2.17/share/doc/smm/11.timedop/timed.ms - copied unchanged from r216338, head/share/doc/smm/11.timedop/timed.ms projects/binutils-2.17/share/doc/smm/12.timed/date - copied unchanged from r216338, head/share/doc/smm/12.timed/date projects/binutils-2.17/share/doc/smm/12.timed/loop - copied unchanged from r216338, head/share/doc/smm/12.timed/loop projects/binutils-2.17/share/doc/smm/12.timed/spell.ok - copied unchanged from r216338, head/share/doc/smm/12.timed/spell.ok projects/binutils-2.17/share/doc/smm/12.timed/time - copied unchanged from r216338, head/share/doc/smm/12.timed/time projects/binutils-2.17/share/doc/smm/12.timed/timed.ms - copied unchanged from r216338, head/share/doc/smm/12.timed/timed.ms projects/binutils-2.17/share/doc/smm/12.timed/unused - copied unchanged from r216338, head/share/doc/smm/12.timed/unused projects/binutils-2.17/share/doc/usd/04.csh/csh.1 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.1 projects/binutils-2.17/share/doc/usd/04.csh/csh.2 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.2 projects/binutils-2.17/share/doc/usd/04.csh/csh.3 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.3 projects/binutils-2.17/share/doc/usd/04.csh/csh.4 - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.4 projects/binutils-2.17/share/doc/usd/04.csh/csh.a - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.a projects/binutils-2.17/share/doc/usd/04.csh/csh.g - copied unchanged from r216338, head/share/doc/usd/04.csh/csh.g projects/binutils-2.17/share/doc/usd/04.csh/tabs - copied unchanged from r216338, head/share/doc/usd/04.csh/tabs projects/binutils-2.17/share/doc/usd/05.dc/dc - copied unchanged from r216338, head/share/doc/usd/05.dc/dc projects/binutils-2.17/share/doc/usd/06.bc/bc - copied unchanged from r216338, head/share/doc/usd/06.bc/bc projects/binutils-2.17/share/doc/usd/07.mail/mail0.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail0.nr projects/binutils-2.17/share/doc/usd/07.mail/mail1.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail1.nr projects/binutils-2.17/share/doc/usd/07.mail/mail2.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail2.nr projects/binutils-2.17/share/doc/usd/07.mail/mail3.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail3.nr projects/binutils-2.17/share/doc/usd/07.mail/mail4.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail4.nr projects/binutils-2.17/share/doc/usd/07.mail/mail5.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail5.nr projects/binutils-2.17/share/doc/usd/07.mail/mail6.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail6.nr projects/binutils-2.17/share/doc/usd/07.mail/mail7.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail7.nr projects/binutils-2.17/share/doc/usd/07.mail/mail8.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail8.nr projects/binutils-2.17/share/doc/usd/07.mail/mail9.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/mail9.nr projects/binutils-2.17/share/doc/usd/07.mail/maila.nr - copied unchanged from r216338, head/share/doc/usd/07.mail/maila.nr projects/binutils-2.17/share/man/man9/SYSINIT.9 - copied unchanged from r216338, head/share/man/man9/SYSINIT.9 projects/binutils-2.17/sys/mips/mips/uma_machdep.c - copied unchanged from r216338, head/sys/mips/mips/uma_machdep.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.h - copied unchanged from r216338, head/sys/powerpc/aim/mmu_oea64.h projects/binutils-2.17/sys/powerpc/aim/moea64_if.m - copied unchanged from r216338, head/sys/powerpc/aim/moea64_if.m projects/binutils-2.17/sys/powerpc/aim/moea64_native.c - copied unchanged from r216338, head/sys/powerpc/aim/moea64_native.c projects/binutils-2.17/sys/powerpc/powerpc/iommu_if.m - copied unchanged from r216338, head/sys/powerpc/powerpc/iommu_if.m projects/binutils-2.17/sys/x86/x86/busdma_machdep.c - copied unchanged from r216338, head/sys/x86/x86/busdma_machdep.c projects/binutils-2.17/sys/x86/x86/tsc.c - copied unchanged from r216338, head/sys/x86/x86/tsc.c projects/binutils-2.17/tools/regression/lib/msun/test-logarithm.c - copied unchanged from r216338, head/tools/regression/lib/msun/test-logarithm.c projects/binutils-2.17/tools/regression/lib/msun/test-logarithm.t - copied unchanged from r216338, head/tools/regression/lib/msun/test-logarithm.t projects/binutils-2.17/tools/regression/lib/msun/test-nearbyint.c - copied unchanged from r216338, head/tools/regression/lib/msun/test-nearbyint.c projects/binutils-2.17/tools/regression/lib/msun/test-nearbyint.t - copied unchanged from r216338, head/tools/regression/lib/msun/test-nearbyint.t projects/binutils-2.17/tools/regression/usr.bin/printf/regress.m5.out - copied unchanged from r216338, head/tools/regression/usr.bin/printf/regress.m5.out projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_usm/ - copied from r216338, head/usr.sbin/bsnmpd/modules/snmp_usm/ projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_vacm/ - copied from r216338, head/usr.sbin/bsnmpd/modules/snmp_vacm/ projects/binutils-2.17/usr.sbin/bsnmpd/tools/ - copied from r216338, head/usr.sbin/bsnmpd/tools/ Deleted: projects/binutils-2.17/bin/csh/USD.doc/ projects/binutils-2.17/lib/libc/rpc/PSD.doc/ projects/binutils-2.17/sbin/fsck_ffs/SMM.doc/ projects/binutils-2.17/sys/amd64/amd64/busdma_machdep.c projects/binutils-2.17/sys/amd64/amd64/tsc.c projects/binutils-2.17/sys/i386/i386/busdma_machdep.c projects/binutils-2.17/sys/i386/i386/tsc.c projects/binutils-2.17/usr.bin/bc/USD.doc/ projects/binutils-2.17/usr.bin/dc/USD.doc/ projects/binutils-2.17/usr.bin/gprof/PSD.doc/ projects/binutils-2.17/usr.bin/mail/USD.doc/ projects/binutils-2.17/usr.bin/make/PSD.doc/ projects/binutils-2.17/usr.sbin/config/SMM.doc/ projects/binutils-2.17/usr.sbin/lpr/SMM.doc/ projects/binutils-2.17/usr.sbin/timed/SMM.doc/ projects/binutils-2.17/usr.sbin/usbdevs/ Modified: projects/binutils-2.17/ObsoleteFiles.inc projects/binutils-2.17/bin/sh/jobs.c projects/binutils-2.17/bin/sh/sh.1 projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/binutils-2.17/contrib/bind9/CHANGES projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c projects/binutils-2.17/contrib/bind9/bin/dig/host.c projects/binutils-2.17/contrib/bind9/bin/named/client.c projects/binutils-2.17/contrib/bind9/bin/named/include/named/query.h projects/binutils-2.17/contrib/bind9/bin/named/query.c projects/binutils-2.17/contrib/bind9/bin/named/server.c projects/binutils-2.17/contrib/bind9/lib/dns/api projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/view.h projects/binutils-2.17/contrib/bind9/lib/dns/journal.c projects/binutils-2.17/contrib/bind9/lib/dns/rbtdb.c projects/binutils-2.17/contrib/bind9/lib/dns/validator.c projects/binutils-2.17/contrib/bind9/lib/dns/view.c projects/binutils-2.17/contrib/bind9/lib/isc/api projects/binutils-2.17/contrib/bind9/lib/isc/print.c projects/binutils-2.17/contrib/bind9/version projects/binutils-2.17/contrib/bsnmp/lib/asn1.c projects/binutils-2.17/contrib/bsnmp/lib/asn1.h projects/binutils-2.17/contrib/bsnmp/lib/bsnmpclient.3 projects/binutils-2.17/contrib/bsnmp/lib/bsnmplib.3 projects/binutils-2.17/contrib/bsnmp/lib/snmp.c projects/binutils-2.17/contrib/bsnmp/lib/snmp.h projects/binutils-2.17/contrib/bsnmp/lib/snmpagent.c projects/binutils-2.17/contrib/bsnmp/lib/snmpclient.c projects/binutils-2.17/contrib/bsnmp/lib/snmpclient.h projects/binutils-2.17/contrib/bsnmp/lib/snmppriv.h projects/binutils-2.17/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt projects/binutils-2.17/contrib/bsnmp/snmpd/action.c projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 projects/binutils-2.17/contrib/bsnmp/snmpd/config.c projects/binutils-2.17/contrib/bsnmp/snmpd/export.c projects/binutils-2.17/contrib/bsnmp/snmpd/main.c projects/binutils-2.17/contrib/bsnmp/snmpd/snmpd.h projects/binutils-2.17/contrib/bsnmp/snmpd/snmpmod.3 projects/binutils-2.17/contrib/bsnmp/snmpd/snmpmod.h projects/binutils-2.17/contrib/bsnmp/snmpd/trans_lsock.c projects/binutils-2.17/contrib/bsnmp/snmpd/trans_udp.c projects/binutils-2.17/contrib/bsnmp/snmpd/trap.c projects/binutils-2.17/contrib/bsnmp/snmpd/tree.def projects/binutils-2.17/contrib/traceroute/as.c projects/binutils-2.17/contrib/traceroute/as.h projects/binutils-2.17/contrib/traceroute/ifaddrlist.c projects/binutils-2.17/contrib/traceroute/traceroute.c projects/binutils-2.17/crypto/openssl/CHANGES projects/binutils-2.17/crypto/openssl/FAQ projects/binutils-2.17/crypto/openssl/Makefile projects/binutils-2.17/crypto/openssl/NEWS projects/binutils-2.17/crypto/openssl/README projects/binutils-2.17/crypto/openssl/crypto/evp/p_sign.c projects/binutils-2.17/crypto/openssl/crypto/evp/p_verify.c projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake.c projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake.h projects/binutils-2.17/crypto/openssl/crypto/jpake/jpake_err.c projects/binutils-2.17/crypto/openssl/crypto/opensslv.h projects/binutils-2.17/crypto/openssl/crypto/stack/safestack.h projects/binutils-2.17/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/binutils-2.17/crypto/openssl/openssl.spec projects/binutils-2.17/crypto/openssl/ssl/s3_clnt.c projects/binutils-2.17/crypto/openssl/ssl/s3_srvr.c projects/binutils-2.17/etc/snmpd.config projects/binutils-2.17/games/bcd/bcd.6 projects/binutils-2.17/games/caesar/caesar.6 projects/binutils-2.17/games/caesar/rot13.sh projects/binutils-2.17/games/factor/factor.6 projects/binutils-2.17/games/morse/morse.6 projects/binutils-2.17/games/number/number.6 projects/binutils-2.17/games/pom/pom.6 projects/binutils-2.17/games/random/random.6 projects/binutils-2.17/lib/csu/amd64/crt1.c projects/binutils-2.17/lib/csu/amd64/crti.S projects/binutils-2.17/lib/csu/amd64/crtn.S projects/binutils-2.17/lib/csu/arm/crt1.c projects/binutils-2.17/lib/csu/arm/crtn.S projects/binutils-2.17/lib/csu/i386-elf/crt1_c.c projects/binutils-2.17/lib/csu/i386-elf/crt1_s.S projects/binutils-2.17/lib/csu/i386-elf/crti.S projects/binutils-2.17/lib/csu/i386-elf/crtn.S projects/binutils-2.17/lib/csu/ia64/crt1.S projects/binutils-2.17/lib/csu/ia64/crti.S projects/binutils-2.17/lib/csu/ia64/crtn.S projects/binutils-2.17/lib/csu/powerpc/crt1.c projects/binutils-2.17/lib/csu/powerpc/crti.S projects/binutils-2.17/lib/csu/powerpc/crtn.S projects/binutils-2.17/lib/csu/powerpc64/crt1.c projects/binutils-2.17/lib/csu/powerpc64/crti.S projects/binutils-2.17/lib/csu/powerpc64/crtn.S projects/binutils-2.17/lib/csu/sparc64/crt1.c projects/binutils-2.17/lib/csu/sparc64/crti.S projects/binutils-2.17/lib/csu/sparc64/crtn.S projects/binutils-2.17/lib/libarchive/archive_read_extract.c projects/binutils-2.17/lib/libarchive/test/Makefile projects/binutils-2.17/lib/libarchive/test/test_acl_freebsd.c projects/binutils-2.17/lib/libbsnmp/libbsnmp/Makefile projects/binutils-2.17/lib/libc/stdio/freopen.c projects/binutils-2.17/lib/libgeom/libgeom.3 projects/binutils-2.17/lib/msun/Makefile projects/binutils-2.17/lib/msun/Symbol.map projects/binutils-2.17/lib/msun/man/log.3 projects/binutils-2.17/lib/msun/man/math.3 projects/binutils-2.17/lib/msun/src/math.h projects/binutils-2.17/lib/msun/src/math_private.h projects/binutils-2.17/libexec/bootpd/rtmsg.c projects/binutils-2.17/libexec/mknetid/parse_group.c projects/binutils-2.17/sbin/geom/class/eli/geli.8 projects/binutils-2.17/sbin/ifconfig/ifconfig.c projects/binutils-2.17/sbin/route/route.c projects/binutils-2.17/secure/lib/libcrypto/Makefile.inc projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_ctrl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_base64.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_md.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_find_type.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_push.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_read.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_accept.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_connect.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_fd.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_mem.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_socket.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_set_callback.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_should_retry.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_start.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add_word.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_bn2bin.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_cmp.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_copy.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_generate_prime.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_num_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_set_bit.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_swap.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_zero.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_free.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_do_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_clear_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_error_string.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_get_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_print_errors.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_put_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_remove_state.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_set_mark.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SealInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SignInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_config.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/binutils-2.17/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_create.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_parse.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_verify.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_cleanup.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_egd.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_check_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_print.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/blowfish.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn_internal.3 projects/binutils-2.17/secure/lib/libcrypto/man/buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/crypto.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DHparams.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/binutils-2.17/secure/lib/libcrypto/man/des.3 projects/binutils-2.17/secure/lib/libcrypto/man/dh.3 projects/binutils-2.17/secure/lib/libcrypto/man/dsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/ecdsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/engine.3 projects/binutils-2.17/secure/lib/libcrypto/man/err.3 projects/binutils-2.17/secure/lib/libcrypto/man/evp.3 projects/binutils-2.17/secure/lib/libcrypto/man/hmac.3 projects/binutils-2.17/secure/lib/libcrypto/man/lh_stats.3 projects/binutils-2.17/secure/lib/libcrypto/man/lhash.3 projects/binutils-2.17/secure/lib/libcrypto/man/md5.3 projects/binutils-2.17/secure/lib/libcrypto/man/mdc2.3 projects/binutils-2.17/secure/lib/libcrypto/man/pem.3 projects/binutils-2.17/secure/lib/libcrypto/man/rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/rc4.3 projects/binutils-2.17/secure/lib/libcrypto/man/ripemd.3 projects/binutils-2.17/secure/lib/libcrypto/man/rsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/sha.3 projects/binutils-2.17/secure/lib/libcrypto/man/threads.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui_compat.3 projects/binutils-2.17/secure/lib/libcrypto/man/x509.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_accept.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_alert_type_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_clear.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_connect.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_do_handshake.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ciphers.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_error.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_rbio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_library_init.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_pending.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_read.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_rstate_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_session_reused.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_bio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_connect_state.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_state_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_want.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_write.3 projects/binutils-2.17/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/binutils-2.17/secure/lib/libssl/man/ssl.3 projects/binutils-2.17/secure/usr.bin/openssl/man/CA.pl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/asn1parse.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ca.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ciphers.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dgst.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dhparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsaparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ec.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ecparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/enc.1 projects/binutils-2.17/secure/usr.bin/openssl/man/errstr.1 projects/binutils-2.17/secure/usr.bin/openssl/man/gendsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/genrsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/nseq.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ocsp.1 projects/binutils-2.17/secure/usr.bin/openssl/man/openssl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/passwd.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs12.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs8.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rand.1 projects/binutils-2.17/secure/usr.bin/openssl/man/req.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsautl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_client.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_server.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_time.1 projects/binutils-2.17/secure/usr.bin/openssl/man/sess_id.1 projects/binutils-2.17/secure/usr.bin/openssl/man/smime.1 projects/binutils-2.17/secure/usr.bin/openssl/man/speed.1 projects/binutils-2.17/secure/usr.bin/openssl/man/spkac.1 projects/binutils-2.17/secure/usr.bin/openssl/man/verify.1 projects/binutils-2.17/secure/usr.bin/openssl/man/version.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509v3_config.1 projects/binutils-2.17/share/doc/psd/12.make/Makefile projects/binutils-2.17/share/doc/psd/18.gprof/Makefile projects/binutils-2.17/share/doc/psd/22.rpcgen/Makefile projects/binutils-2.17/share/doc/psd/23.rpc/Makefile projects/binutils-2.17/share/doc/psd/24.xdr/Makefile projects/binutils-2.17/share/doc/psd/25.xdrrfc/Makefile projects/binutils-2.17/share/doc/psd/26.rpcrfc/Makefile projects/binutils-2.17/share/doc/psd/27.nfsrpc/Makefile projects/binutils-2.17/share/doc/smm/02.config/Makefile projects/binutils-2.17/share/doc/smm/03.fsck/Makefile projects/binutils-2.17/share/doc/smm/11.timedop/Makefile projects/binutils-2.17/share/doc/smm/12.timed/Makefile projects/binutils-2.17/share/doc/usd/04.csh/Makefile projects/binutils-2.17/share/doc/usd/05.dc/Makefile projects/binutils-2.17/share/doc/usd/06.bc/Makefile projects/binutils-2.17/share/doc/usd/07.mail/Makefile projects/binutils-2.17/share/man/man3/fpgetround.3 projects/binutils-2.17/share/man/man5/rc.conf.5 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/bus_space.9 projects/binutils-2.17/share/misc/committers-ports.dot projects/binutils-2.17/sys/amd64/amd64/exception.S projects/binutils-2.17/sys/amd64/amd64/genassym.c projects/binutils-2.17/sys/amd64/amd64/identcpu.c projects/binutils-2.17/sys/amd64/amd64/machdep.c projects/binutils-2.17/sys/amd64/amd64/vm_machdep.c projects/binutils-2.17/sys/amd64/ia32/ia32_signal.c projects/binutils-2.17/sys/amd64/include/cpu.h projects/binutils-2.17/sys/amd64/include/pcb.h projects/binutils-2.17/sys/amd64/linux32/linux32_sysvec.c projects/binutils-2.17/sys/arm/at91/at91_pmc.c projects/binutils-2.17/sys/cddl/compat/opensolaris/sys/cyclic_impl.h projects/binutils-2.17/sys/cddl/dev/cyclic/cyclic.c projects/binutils-2.17/sys/cddl/dev/cyclic/i386/cyclic_machdep.c projects/binutils-2.17/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/binutils-2.17/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/binutils-2.17/sys/compat/ndis/kern_ndis.c projects/binutils-2.17/sys/compat/ndis/ndis_var.h projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h projects/binutils-2.17/sys/compat/ndis/subr_ndis.c projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/conf/files.amd64 projects/binutils-2.17/sys/conf/files.i386 projects/binutils-2.17/sys/conf/files.mips projects/binutils-2.17/sys/conf/files.pc98 projects/binutils-2.17/sys/conf/files.powerpc projects/binutils-2.17/sys/dev/aac/aac_cam.c projects/binutils-2.17/sys/dev/acpica/acpi_hpet.c projects/binutils-2.17/sys/dev/ahci/ahci.c projects/binutils-2.17/sys/dev/bwn/if_bwn.c projects/binutils-2.17/sys/dev/e1000/if_em.c projects/binutils-2.17/sys/dev/e1000/if_igb.c projects/binutils-2.17/sys/dev/ichwd/ichwd.c projects/binutils-2.17/sys/dev/ichwd/ichwd.h projects/binutils-2.17/sys/dev/iwn/if_iwn.c projects/binutils-2.17/sys/dev/iwn/if_iwnvar.h projects/binutils-2.17/sys/dev/ixgbe/ixgbe.c projects/binutils-2.17/sys/dev/mfi/mfi_cam.c projects/binutils-2.17/sys/dev/mps/mps.c projects/binutils-2.17/sys/dev/siba/siba_bwn.c projects/binutils-2.17/sys/dev/sis/if_sisreg.h projects/binutils-2.17/sys/dev/usb/net/if_axe.c projects/binutils-2.17/sys/dev/usb/usb_pf.c projects/binutils-2.17/sys/dev/usb/usb_request.c projects/binutils-2.17/sys/dev/wpi/if_wpi.c projects/binutils-2.17/sys/dev/xen/blkfront/blkfront.c projects/binutils-2.17/sys/fs/nfsserver/nfs_nfsdstate.c projects/binutils-2.17/sys/geom/part/g_part_mbr.c projects/binutils-2.17/sys/i386/i386/identcpu.c projects/binutils-2.17/sys/i386/i386/machdep.c projects/binutils-2.17/sys/i386/i386/pmap.c projects/binutils-2.17/sys/i386/include/cpu.h projects/binutils-2.17/sys/kern/init_main.c projects/binutils-2.17/sys/kern/kern_fork.c projects/binutils-2.17/sys/kern/kern_thread.c projects/binutils-2.17/sys/kern/kern_umtx.c projects/binutils-2.17/sys/kern/sched_4bsd.c projects/binutils-2.17/sys/kern/sched_ule.c projects/binutils-2.17/sys/kern/uipc_usrreq.c projects/binutils-2.17/sys/mips/adm5120/adm5120_machdep.c projects/binutils-2.17/sys/mips/alchemy/alchemy_machdep.c projects/binutils-2.17/sys/mips/atheros/ar71xx_machdep.c projects/binutils-2.17/sys/mips/cavium/octeon_machdep.c projects/binutils-2.17/sys/mips/idt/idt_machdep.c projects/binutils-2.17/sys/mips/include/md_var.h projects/binutils-2.17/sys/mips/include/pmap.h projects/binutils-2.17/sys/mips/include/vmparam.h projects/binutils-2.17/sys/mips/malta/malta_machdep.c projects/binutils-2.17/sys/mips/mips/minidump_machdep.c projects/binutils-2.17/sys/mips/mips/mp_machdep.c projects/binutils-2.17/sys/mips/mips/pmap.c projects/binutils-2.17/sys/mips/mips/vm_machdep.c projects/binutils-2.17/sys/mips/rmi/dev/nlge/if_nlge.c projects/binutils-2.17/sys/mips/rmi/xlr_machdep.c projects/binutils-2.17/sys/mips/rmi/xlr_pci.c projects/binutils-2.17/sys/mips/sentry5/s5_machdep.c projects/binutils-2.17/sys/mips/sibyte/sb_machdep.c projects/binutils-2.17/sys/net/if.h projects/binutils-2.17/sys/netinet/ip_fastfwd.c projects/binutils-2.17/sys/netinet/sctp_indata.c projects/binutils-2.17/sys/netinet/sctp_input.c projects/binutils-2.17/sys/netinet/sctp_structs.h projects/binutils-2.17/sys/netinet6/nd6.c projects/binutils-2.17/sys/pc98/pc98/machdep.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.c projects/binutils-2.17/sys/powerpc/include/bus_dma.h projects/binutils-2.17/sys/powerpc/include/pmap.h projects/binutils-2.17/sys/powerpc/include/pte.h projects/binutils-2.17/sys/powerpc/powerpc/busdma_machdep.c projects/binutils-2.17/sys/sys/param.h projects/binutils-2.17/sys/sys/proc.h projects/binutils-2.17/sys/sys/queue.h projects/binutils-2.17/sys/teken/teken_subr.h projects/binutils-2.17/sys/vm/vm_map.c projects/binutils-2.17/sys/vm/vm_map.h projects/binutils-2.17/sys/vm/vm_mmap.c projects/binutils-2.17/sys/vm/vm_page.c projects/binutils-2.17/sys/xen/evtchn/evtchn.c projects/binutils-2.17/tools/build/mk/OptionalObsoleteFiles.inc projects/binutils-2.17/tools/regression/lib/msun/Makefile projects/binutils-2.17/tools/regression/lib/msun/test-exponential.c projects/binutils-2.17/tools/regression/lib/msun/test-fma.c projects/binutils-2.17/tools/regression/lib/msun/test-fmaxmin.c projects/binutils-2.17/tools/regression/lib/msun/test-invtrig.c projects/binutils-2.17/tools/regression/lib/msun/test-lrint.c projects/binutils-2.17/tools/regression/lib/msun/test-trig.c projects/binutils-2.17/tools/regression/sockets/unix_gc/unix_gc.c projects/binutils-2.17/tools/regression/usr.bin/printf/regress.sh projects/binutils-2.17/tools/tools/nanobsd/nanobsd.sh projects/binutils-2.17/usr.bin/calendar/calendars/calendar.freebsd projects/binutils-2.17/usr.bin/man/man.sh projects/binutils-2.17/usr.bin/printf/printf.c projects/binutils-2.17/usr.bin/stat/Makefile projects/binutils-2.17/usr.bin/stat/stat.1 projects/binutils-2.17/usr.bin/stat/stat.c projects/binutils-2.17/usr.bin/truss/syscalls.c projects/binutils-2.17/usr.sbin/Makefile.amd64 projects/binutils-2.17/usr.sbin/ac/ac.c projects/binutils-2.17/usr.sbin/boot0cfg/boot0cfg.c projects/binutils-2.17/usr.sbin/bsnmpd/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/bsnmpd/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/modules/Makefile projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c projects/binutils-2.17/usr.sbin/cxgbtool/cxgbtool.c projects/binutils-2.17/usr.sbin/extattrctl/extattrctl.c projects/binutils-2.17/usr.sbin/fifolog/lib/fifolog_write.h projects/binutils-2.17/usr.sbin/fifolog/lib/fifolog_write_poll.c projects/binutils-2.17/usr.sbin/fwcontrol/fwcontrol.c projects/binutils-2.17/usr.sbin/lpr/Makefile projects/binutils-2.17/usr.sbin/rarpd/rarpd.c projects/binutils-2.17/usr.sbin/sysinstall/dist.c projects/binutils-2.17/usr.sbin/sysinstall/install.c projects/binutils-2.17/usr.sbin/traceroute/Makefile projects/binutils-2.17/usr.sbin/traceroute6/Makefile projects/binutils-2.17/usr.sbin/traceroute6/traceroute6.c projects/binutils-2.17/usr.sbin/usbdump/usbdump.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/octeon-sdk/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/ObsoleteFiles.inc ============================================================================== --- projects/binutils-2.17/ObsoleteFiles.inc Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/ObsoleteFiles.inc Thu Dec 9 22:01:15 2010 (r216339) @@ -22,16 +22,33 @@ # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ # sort | uniq -d # +# To find regular duplicates not dependant on optional components, you can +# also use something that will not give you false positives, e.g.: +# for t in `make -V TARGETS universe`; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# +# For optional components, you can use the following to see if some entries +# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc +# for o in tools/build/options/WITH*; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \ +# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# 20101114: Remove long-obsolete MAKEDEV.8 +OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101112: removed gasp.info OLD_FILES+=usr/share/info/gasp.info.gz -# 20101109: headers moved to machine/ to x86/ +# 20101109: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/mptable.h .endif -# 20101101: headers moved to machine/ to x86/ +# 20101101: headers moved from machine/ to x86/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/apicreg.h OLD_FILES+=usr/include/machine/mca.h Modified: projects/binutils-2.17/bin/sh/jobs.c ============================================================================== --- projects/binutils-2.17/bin/sh/jobs.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/bin/sh/jobs.c Thu Dec 9 22:01:15 2010 (r216339) @@ -100,7 +100,8 @@ static void setcurjob(struct job *); static void deljob(struct job *); static struct job *getcurjob(struct job *); #endif -static void showjob(struct job *, pid_t, int); +static void printjobcmd(struct job *); +static void showjob(struct job *, int); /* @@ -205,8 +206,7 @@ fgcmd(int argc __unused, char **argv) jp = getjob(argv[1]); if (jp->jobctl == 0) error("job not created under job control"); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); flushout(&output); pgrp = jp->ps[0].pid; tcsetpgrp(ttyfd, pgrp); @@ -235,8 +235,7 @@ bgcmd(int argc, char **argv) jp->foreground = 0; fmtstr(s, 64, "[%td] ", jp - jobtab + 1); out1str(s); - out1str(jp->ps[0].cmd); - out1c('\n'); + printjobcmd(jp); } while (--argc > 1); return 0; } @@ -296,19 +295,33 @@ jobscmd(int argc, char *argv[]) showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, mode); + showjob(getjob(id), mode); return (0); } static void -showjob(struct job *jp, pid_t pid, int mode) +printjobcmd(struct job *jp) +{ + struct procstat *ps; + int i; + + for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) { + out1str(ps->cmd); + if (i > 0) + out1str(" | "); + } + out1c('\n'); +} + +static void +showjob(struct job *jp, int mode) { char s[64]; + char statestr[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; - pid_t ppid; char c; procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; @@ -321,16 +334,44 @@ showjob(struct job *jp, pid_t pid, int m prev = j - jobtab + 1; } #endif + ps = jp->ps + jp->nprocs - 1; + if (jp->state == 0) { + strcpy(statestr, "Running"); +#if JOBS + } else if (jp->state == JOBSTOPPED) { + while (!WIFSTOPPED(ps->status) && ps > jp->ps) + ps--; + if (WIFSTOPPED(ps->status)) + i = WSTOPSIG(ps->status); + else + i = -1; + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + strcpy(statestr, "Suspended"); +#endif + } else if (WIFEXITED(ps->status)) { + if (WEXITSTATUS(ps->status) == 0) + strcpy(statestr, "Done"); + else + fmtstr(statestr, 64, "Done(%d)", + WEXITSTATUS(ps->status)); + } else { + i = WTERMSIG(ps->status); + if (i > 0 && i < sys_nsig && sys_siglist[i]) + strcpy(statestr, sys_siglist[i]); + else + fmtstr(statestr, 64, "Signal %d", i); + if (WCOREDUMP(ps->status)) + strcat(statestr, " (core dumped)"); + } + for (ps = jp->ps ; ; ps++) { /* for each process */ if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { - ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : - getpgid(ps->pid); - out1fmt("%d\n", (int)ppid); + out1fmt("%d\n", (int)ps->pid); goto skip; } - if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) - goto skip; - if (pid != 0 && pid != ps->pid) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps) goto skip; if (jobno == curr && ps == jp->ps) c = '+'; @@ -349,39 +390,19 @@ showjob(struct job *jp, pid_t pid, int m out1str(s); col += strlen(s); } - s[0] = '\0'; - if (ps != jp->ps) { - *s = '\0'; - } else if (ps->status == -1) { - strcpy(s, "Running"); - } else if (WIFEXITED(ps->status)) { - if (WEXITSTATUS(ps->status) == 0) - strcpy(s, "Done"); - else - fmtstr(s, 64, "Done (%d)", - WEXITSTATUS(ps->status)); - } else { -#if JOBS - if (WIFSTOPPED(ps->status)) - i = WSTOPSIG(ps->status); - else -#endif - i = WTERMSIG(ps->status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - scopy(sys_siglist[i & 0x7F], s); - else - fmtstr(s, 64, "Signal %d", i & 0x7F); - if (WCOREDUMP(ps->status)) - strcat(s, " (core dumped)"); + if (ps == jp->ps) { + out1str(statestr); + col += strlen(statestr); } - out1str(s); - col += strlen(s); do { out1c(' '); col++; } while (col < 30); - out1str(ps->cmd); - out1c('\n'); + if (mode == SHOWJOBS_VERBOSE) { + out1str(ps->cmd); + out1c('\n'); + } else + printjobcmd(jp); skip: if (--procno <= 0) break; } @@ -413,7 +434,7 @@ showjobs(int change, int mode) } if (change && ! jp->changed) continue; - showjob(jp, 0, mode); + showjob(jp, mode); jp->changed = 0; /* Hack: discard jobs for which $! has not been referenced * in interactive mode when they terminate. @@ -769,7 +790,7 @@ forkshell(struct job *jp, union node *n, TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; - if (mode == FORK_BG) + if (mode == FORK_BG && (jp == NULL || jp->nprocs == 0)) checkzombies(); flushall(); pid = fork(); @@ -961,7 +982,7 @@ dowait(int block, struct job *job) int done; int stopped; int sig; - int i; + int coredump; in_dowait++; TRACE(("dowait(%d) called\n", block)); @@ -983,7 +1004,7 @@ dowait(int block, struct job *job) INTOFF; thisjob = NULL; for (jp = jobtab ; jp < jobtab + njobs ; jp++) { - if (jp->used) { + if (jp->used && jp->nprocs > 0) { done = 1; stopped = 1; for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) { @@ -1020,36 +1041,29 @@ dowait(int block, struct job *job) } } INTON; - if (! rootshell || ! iflag || (job && thisjob == job)) { -#if JOBS - if (WIFSTOPPED(status)) - sig = WSTOPSIG(status); - else -#endif - { - if (WIFEXITED(status)) - sig = 0; + if (!thisjob || thisjob->state == 0) + ; + else if ((!rootshell || !iflag || thisjob == job) && + thisjob->foreground && thisjob->state != JOBSTOPPED) { + sig = 0; + coredump = 0; + for (sp = thisjob->ps; sp < thisjob->ps + thisjob->nprocs; sp++) + if (WIFSIGNALED(sp->status)) { + sig = WTERMSIG(sp->status); + coredump = WCOREDUMP(sp->status); + } + if (sig > 0 && sig != SIGINT && sig != SIGPIPE) { + if (sig < sys_nsig && sys_siglist[sig]) + out1str(sys_siglist[sig]); else - sig = WTERMSIG(status); - } - if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { - if (!mflag || - (thisjob->foreground && !WIFSTOPPED(status))) { - i = WTERMSIG(status); - if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) - out1str(sys_siglist[i & 0x7F]); - else - out1fmt("Signal %d", i & 0x7F); - if (WCOREDUMP(status)) - out1str(" (core dumped)"); - out1c('\n'); - } else - showjob(thisjob, pid, SHOWJOBS_DEFAULT); + out1fmt("Signal %d", sig); + if (coredump) + out1str(" (core dumped)"); + out1c('\n'); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); - if (thisjob) - thisjob->changed = 1; + thisjob->changed = 1; } return pid; } @@ -1300,13 +1314,46 @@ cmdputs(const char *s) if (--cmdnleft > 0) *q++ = '{'; subtype = *p++; + if ((subtype & VSTYPE) == VSLENGTH && --cmdnleft > 0) + *q++ = '#'; } else if (c == '=' && subtype != 0) { - *q++ = "}-+?="[(subtype & VSTYPE) - VSNORMAL]; + *q = "}-+?=##%%\0X"[(subtype & VSTYPE) - VSNORMAL]; + if (*q) + q++; + else + cmdnleft++; + if (((subtype & VSTYPE) == VSTRIMLEFTMAX || + (subtype & VSTYPE) == VSTRIMRIGHTMAX) && + --cmdnleft > 0) + *q = q[-1], q++; subtype = 0; } else if (c == CTLENDVAR) { *q++ = '}'; - } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) - cmdnleft++; /* ignore it */ + } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE) { + cmdnleft -= 5; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '.'; + *q++ = '.'; + *q++ = '.'; + *q++ = ')'; + } + } else if (c == CTLARI) { + cmdnleft -= 2; + if (cmdnleft > 0) { + *q++ = '$'; + *q++ = '('; + *q++ = '('; + } + p++; + } else if (c == CTLENDARI) { + if (--cmdnleft > 0) { + *q++ = ')'; + *q++ = ')'; + } + } else if (c == CTLQUOTEMARK || c == CTLQUOTEEND) + cmdnleft++; /* ignore */ else *q++ = c; if (--cmdnleft <= 0) { Modified: projects/binutils-2.17/bin/sh/sh.1 ============================================================================== --- projects/binutils-2.17/bin/sh/sh.1 Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/bin/sh/sh.1 Thu Dec 9 22:01:15 2010 (r216339) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd December 1, 2010 +.Dd December 3, 2010 .Dt SH 1 .Os .Sh NAME @@ -1593,12 +1593,7 @@ To include a .Ql - , make it the first or last character listed. .Ss Built-in Commands -This section lists the commands which -are built-in because they need to perform some operation -that cannot be performed by a separate process. -In addition to -these, built-in versions of essential utilities -are provided for efficiency. +This section lists the built-in commands. .Bl -tag -width indent .It Ic \&: A null command that returns a 0 (true) exit value. @@ -1649,15 +1644,19 @@ subsection. Continue the specified jobs (or the current job if no jobs are given) in the background. +.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc +List or alter key bindings for the line editor. +This command is documented in +.Xr editrc 5 . +.It Ic break Op Ar num +See the +.Sx Flow-Control Constructs +subsection. .It Ic builtin Ar cmd Op Ar arg ... Execute the specified built-in command, .Ar cmd . This is useful when the user wishes to override a shell function with the same name as a built-in command. -.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc -List or alter key bindings for the line editor. -This command is documented in -.Xr editrc 5 . .It Ic cd Oo Fl L | P Oc Op Ar directory Switch to the specified .Ar directory , @@ -1759,6 +1758,10 @@ a shell keyword or an alias for .Ar value . +.It Ic continue Op Ar num +See the +.Sx Flow-Control Constructs +subsection. .It Ic echo Oo Fl e | n Oc Op Ar string ... Print a space-separated list of the arguments to the standard output and append a newline character. Modified: projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 9 22:01:15 2010 (r216339) @@ -48,11 +48,13 @@ static int read_efi_label(nvlist_t *config, diskaddr_t *sb); +#ifdef sun #if defined(__i386) || defined(__amd64) #define BOOTCMD "installgrub(1M)" #else #define BOOTCMD "installboot(1M)" #endif +#endif /* sun */ /* * ==================================================================== @@ -1889,14 +1891,15 @@ zpool_vdev_attach(zpool_handle_t *zhp, if (ret == 0) { if (rootpool) { - /* - * XXX - This should be removed once we can - * automatically install the bootblocks on the - * newly attached disk. - */ - (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Please " - "be sure to invoke %s to make '%s' bootable.\n"), - BOOTCMD, new_disk); + (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If " + "you boot from pool '%s', you may need to update\n" + "boot code on newly attached disk '%s'.\n\n" + "Assuming you use GPT partitioning and 'da0' is " + "your new boot disk\n" + "you may use the following command:\n\n" + "\tgpart bootcode -b /boot/pmbr -p " + "/boot/gptzfsboot -i 1 da0\n\n"), + zhp->zpool_name, new_disk); } return (0); } Modified: projects/binutils-2.17/contrib/bind9/CHANGES ============================================================================== --- projects/binutils-2.17/contrib/bind9/CHANGES Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/CHANGES Thu Dec 9 22:01:15 2010 (r216339) @@ -1,3 +1,55 @@ + + --- 9.6-ESV-R3 released --- + +2972. [bug] win32: address windows socket errors. [RT #21906] + +2971. [bug] Fixed a bug that caused journal files not to be + compacted on Windows systems as a result of + non-POSIX-compliant rename() semantics. [RT #22434] + +2970. [security] Adding a NO DATA negative cache entry failed to clear + any matching RRSIG records. A subsequent lookup of + of NO DATA cache entry could trigger a INSIST when the + unexpected RRSIG was also returned with the NO DATA + cache entry. + + CVE-2010-3613, VU#706148. [RT #22288] + +2969. [security] Fix acl type processing so that allow-query works + in options and view statements. Also add a new + set of tests to verify proper functioning. + + CVE-2010-3615, VU#510208. [RT #22418] + +2968. [security] Named could fail to prove a data set was insecure + before marking it as insecure. One set of conditions + that can trigger this occurs naturally when rolling + DNSKEY algorithms. + + CVE-2010-3614, VU#837744. [RT #22309] + +2967. [bug] 'host -D' now turns on debugging messages earlier. + [RT #22361] + +2966. [bug] isc_print_vsnprintf() failed to check if there was + space available in the buffer when adding a left + justified character with a non zero width, + (e.g. "%-1c"). [RT #22270] + +2964. [bug] view->queryacl was being overloaded. Seperate the + usage into view->queryacl, view->cacheacl and + view->queryonacl. [RT #22114] + +2962. [port] win32: add more dependencies to BINDBuild.dsw. + [RT #22062] + +2952. [port] win32: named-checkzone and named-checkconf failed + to initialise winsock. [RT #21932] + +2951. [bug] named failed to generate a correct signed response + in a optout, delegation only zone with no secure + delegations. [RT #22007] + --- 9.6-ESV-R2 released --- 2939. [func] Check that named successfully skips NSEC3 records Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html Thu Dec 9 22:01:15 2010 (r216339, copy of r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html) @@ -0,0 +1,225 @@ + + + + + + +

+ +

Introduction

+ +

+ BIND 9.6-ESV-R3 is a maintenance release for BIND 9.6-ESV. +

+

+ This document summarizes changes from BIND 9.6-ESV-R1 to BIND 9.6-ESV-R3. + Please see the CHANGES file in the source code release for a + complete list of all changes. +

+
+ +

Download

+ +

+ The latest release of BIND 9 software can always be found + on our web site at + http://www.isc.org/software/bind. + There you will find additional information about each release, + source code, and some pre-compiled versions for certain operating + systems. +

+
+ +

Support

+ +

Product support information is available on + http://www.isc.org/services/support + for paid support options. Free support is provided by our user + community via a mailing list. Information on all public email + lists is available at + https://lists.isc.org/mailman/listinfo. +

+
+ +

New Features

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +

None.

+
+
+ +

Feature Changes

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +

None.

+
+
+ +

Security Fixes

+ +

9.6-ESV-R2

+ +

None.

+
+

9.6-ESV-R3

+ +
  • + Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup + of the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] +
  • + BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the RRSIG + in the DNSKEY RRset when resuming from validating the DNSKEY RRset. + This can happen when in the middle of a DNSKEY algorithm rollover, + when two different algorithms were used to sign a zone but only the + new set of keys are in the zone DNSKEY RRset. + [RT #22309] [CVE-2010-3614] [VU#837744] +
+
+
+ +

Bug Fixes

+ +

9.6-ESV-R2

+ +
  • + Check that named successfully skips NSEC3 records + that fail to match the NSEC3PARAM record currently + in use. + [RT #21868] +
  • + Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could + incorrectly stay in an over memory state, effectively refusing + further caching, which subsequently made a BIND 9 caching + server unworkable. + [RT #21818] +
  • + BIND did not properly handle non-cacheable negative responses + from insecure zones. This caused several non-protocol-compliant + zones to become unresolvable. BIND is now more accepting of + responses it receives from less strict servers. + [RT #21555] +
  • + The resolver could attempt to destroy a fetch context too + soon, resulting in a crash. + [RT #19878] +
  • + The placeholder negative caching element was not + properly constructed triggering a crash (INSIST) in + dns_ncache_towire(). + [RT #21346] +
  • + Handle the introduction of new trusted-keys and + DS, DLV RRsets better. + [RT #21097] +
  • + Fix arguments to dns_keytable_findnextkeynode() call. + [RT #20877] +
+
+

9.6-ESV-R3

+ +
  • + Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. + This resolves an issue where sockets would shut down on + Windows servers causing named to stop responding to queries. + [RT #21906] +
  • + Windows has non-POSIX compliant behavior in its rename() and unlink() + calls. This caused journal compaction to fail on Windows BIND servers + with the log error: "dns_journal_compact failed: failure". + [RT #22434] +
  • + 'host -D' now turns on debugging messages earlier. + [RT #22361] +
  • + isc_print_vsnprintf() failed to check if there was + space available in the buffer when adding a left + justified character with a non zero width, + (e.g. "%-1c"). + [RT #22270] +
  • + view->queryacl was being overloaded. Seperate the + usage into view->queryacl, view->cacheacl and + view->queryonacl. + [RT #22114] +
  • + win32: add more dependencies to BINDBuild.dsw. + [RT #22062] +
  • + win32: named-checkzone and named-checkconf failed + to initialise winsock. + [RT #21932] +
  • + named failed to generate a correct signed response + in a optout, delegation only zone with no secure + delegations. + [RT #22007] +
+
+
+ +

Known issues in this release

+ +
  • +

    + "make test" will fail on OSX and possibly other operating systems. + The failure occurs in a new test to check for allow-query ACLs. + The failure is caused because the source address is not specified on + the dig commands issued in the test. +

    +

    + If running "make test" is part of your usual acceptance process, + please edit the file bin/tests/system/allow_query/test.sh + and add +

    + -b 10.53.0.2 +

    + to the DIGOPTS line. +

    +
+
+ +

Thank You

+ +

+ Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to make + quality open source software, please visit our donations page at + http://www.isc.org/supportisc. +

+
+
Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf) ============================================================================== Binary file (source and/or target). No diff available. Copied: projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt (from r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt Thu Dec 9 22:01:15 2010 (r216339, copy of r216338, head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt) @@ -0,0 +1,133 @@ + __________________________________________________________________ + +Introduction + + BIND 9.6-ESV-R3 is a maintenance release for BIND 9.6-ESV. + + This document summarizes changes from BIND 9.6-ESV-R1 to BIND + 9.6-ESV-R3. Please see the CHANGES file in the source code release for + a complete list of all changes. + +Download + + The latest release of BIND 9 software can always be found on our web + site at http://www.isc.org/software/bind. There you will find + additional information about each release, source code, and some + pre-compiled versions for certain operating systems. + +Support + + Product support information is available on + http://www.isc.org/services/support for paid support options. Free + support is provided by our user community via a mailing list. + Information on all public email lists is available at + https://lists.isc.org/mailman/listinfo. + +New Features + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + None. + +Feature Changes + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + None. + +Security Fixes + +9.6-ESV-R2 + + None. + +9.6-ESV-R3 + + * Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup of + the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] + * BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the + RRSIG in the DNSKEY RRset when resuming from validating the DNSKEY + RRset. This can happen when in the middle of a DNSKEY algorithm + rollover, when two different algorithms were used to sign a zone + but only the new set of keys are in the zone DNSKEY RRset. [RT + #22309] [CVE-2010-3614] [VU#837744] + +Bug Fixes + +9.6-ESV-R2 + + * Check that named successfully skips NSEC3 records that fail to + match the NSEC3PARAM record currently in use. [RT #21868] + * Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could incorrectly + stay in an over memory state, effectively refusing further caching, + which subsequently made a BIND 9 caching server unworkable. [RT + #21818] + * BIND did not properly handle non-cacheable negative responses from + insecure zones. This caused several non-protocol-compliant zones to + become unresolvable. BIND is now more accepting of responses it + receives from less strict servers. [RT #21555] + * The resolver could attempt to destroy a fetch context too soon, + resulting in a crash. [RT #19878] + * The placeholder negative caching element was not properly + constructed triggering a crash (INSIST) in dns_ncache_towire(). [RT + #21346] + * Handle the introduction of new trusted-keys and DS, DLV RRsets + better. [RT #21097] + * Fix arguments to dns_keytable_findnextkeynode() call. [RT #20877] + +9.6-ESV-R3 + + * Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. This resolves an issue where sockets would shut down + on Windows servers causing named to stop responding to queries. [RT + #21906] + * Windows has non-POSIX compliant behavior in its rename() and + unlink() calls. This caused journal compaction to fail on Windows + BIND servers with the log error: "dns_journal_compact failed: + failure". [RT #22434] + * 'host -D' now turns on debugging messages earlier. [RT #22361] + * isc_print_vsnprintf() failed to check if there was space available + in the buffer when adding a left justified character with a non + zero width, (e.g. "%-1c"). [RT #22270] + * view->queryacl was being overloaded. Seperate the usage into + view->queryacl, view->cacheacl and view->queryonacl. [RT #22114] + * win32: add more dependencies to BINDBuild.dsw. [RT #22062] + * win32: named-checkzone and named-checkconf failed to initialise + winsock. [RT #21932] + * named failed to generate a correct signed response in a optout, + delegation only zone with no secure delegations. [RT #22007] + +Known issues in this release + + * "make test" will fail on OSX and possibly other operating systems. + The failure occurs in a new test to check for allow-query ACLs. The + failure is caused because the source address is not specified on + the dig commands issued in the test. + If running "make test" is part of your usual acceptance process, + please edit the file bin/tests/system/allow_query/test.sh and add + -b 10.53.0.2 + to the DIGOPTS line. + +Thank You + + Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to + make quality open source software, please visit our donations page at + http://www.isc.org/supportisc. Modified: projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/check-tool.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.c,v 1.35.36.3 2009/01/20 02:03:18 marka Exp $ */ +/* $Id: check-tool.c,v 1.35.36.3.24.2 2010/09/07 23:46:25 tbox Exp $ */ /*! \file */ @@ -23,6 +23,10 @@ #include +#ifdef _WIN32 +#include +#endif + #include "check-tool.h" #include #include @@ -662,3 +666,26 @@ dump_zone(const char *zonename, dns_zone return (result); } + +#ifdef _WIN32 +void +InitSockets(void) { + WORD wVersionRequested; + WSADATA wsaData; + int err; + + wVersionRequested = MAKEWORD(2, 0); + + err = WSAStartup( wVersionRequested, &wsaData ); + if (err != 0) { + fprintf(stderr, "WSAStartup() failed: %d\n", err); + exit(1); + } +} + +void +DestroySockets(void) { + WSACleanup(); +} +#endif + Modified: projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/check-tool.h Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.h,v 1.14 2007/06/18 23:47:17 tbox Exp $ */ +/* $Id: check-tool.h,v 1.14.628.2 2010/09/07 23:46:26 tbox Exp $ */ #ifndef CHECK_TOOL_H #define CHECK_TOOL_H @@ -43,6 +43,11 @@ isc_result_t dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, dns_masterformat_t fileformat, const dns_master_style_t *style); +#ifdef _WIN32 +void InitSockets(void); +void DestroySockets(void); +#endif + extern int debug; extern isc_boolean_t nomerge; extern isc_boolean_t docheckmx; Modified: projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/named-checkconf.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.46.222.2 2009/02/16 23:47:15 tbox Exp $ */ +/* $Id: named-checkconf.c,v 1.46.222.2.24.2 2010/09/07 23:46:26 tbox Exp $ */ /*! \file */ @@ -453,6 +453,10 @@ main(int argc, char **argv) { if (conffile == NULL || conffile[0] == '\0') conffile = NAMED_CONFFILE; +#ifdef _WIN32 + InitSockets(); +#endif + RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); RUNTIME_CHECK(setup_logging(mctx, stdout, &logc) == ISC_R_SUCCESS); @@ -494,5 +498,9 @@ main(int argc, char **argv) { isc_mem_destroy(&mctx); +#ifdef _WIN32 + DestroySockets(); +#endif + return (exit_status); } Modified: projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c ============================================================================== --- projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c Thu Dec 9 21:31:21 2010 (r216338) +++ projects/binutils-2.17/contrib/bind9/bin/check/named-checkzone.c Thu Dec 9 22:01:15 2010 (r216339) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***