From owner-svn-src-projects@FreeBSD.ORG Sun Nov 7 15:41:41 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 ED1E8106564A; Sun, 7 Nov 2010 15:41:41 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DC62D8FC1E; Sun, 7 Nov 2010 15:41:41 +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 oA7FffdU055637; Sun, 7 Nov 2010 15:41:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA7Fff6o055634; Sun, 7 Nov 2010 15:41:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201011071541.oA7Fff6o055634@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 7 Nov 2010 15:41:41 +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: r214920 - projects/binutils-2.17/lib/libc/powerpc64/sys 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: Sun, 07 Nov 2010 15:41:42 -0000 Author: nwhitehorn Date: Sun Nov 7 15:41:41 2010 New Revision: 214920 URL: http://svn.freebsd.org/changeset/base/214920 Log: Make sure to specify the alignment of minbrk and curbrk. They were correctly aligned by accident with earlier binutils, but no longer are, causing link failures. Modified: projects/binutils-2.17/lib/libc/powerpc64/sys/brk.S projects/binutils-2.17/lib/libc/powerpc64/sys/sbrk.S Modified: projects/binutils-2.17/lib/libc/powerpc64/sys/brk.S ============================================================================== --- projects/binutils-2.17/lib/libc/powerpc64/sys/brk.S Sun Nov 7 15:36:07 2010 (r214919) +++ projects/binutils-2.17/lib/libc/powerpc64/sys/brk.S Sun Nov 7 15:41:41 2010 (r214920) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); .globl CNAME(_end) .data + .align 3 HIDENAME(minbrk): .llong CNAME(_end) Modified: projects/binutils-2.17/lib/libc/powerpc64/sys/sbrk.S ============================================================================== --- projects/binutils-2.17/lib/libc/powerpc64/sys/sbrk.S Sun Nov 7 15:36:07 2010 (r214919) +++ projects/binutils-2.17/lib/libc/powerpc64/sys/sbrk.S Sun Nov 7 15:41:41 2010 (r214920) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); .globl CNAME(_end) .data + .align 3 HIDENAME(curbrk): .llong CNAME(_end) From owner-svn-src-projects@FreeBSD.ORG Tue Nov 9 02:53:26 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 8255A106564A; Tue, 9 Nov 2010 02:53:26 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B5258FC15; Tue, 9 Nov 2010 02:53:26 +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 oA92rQAp075346; Tue, 9 Nov 2010 02:53:26 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA92rQIN075333; Tue, 9 Nov 2010 02:53:26 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201011090253.oA92rQIN075333@svn.freebsd.org> From: Attilio Rao Date: Tue, 9 Nov 2010 02:53:26 +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: r215028 - in projects/sv: . bin/rm bin/sh bin/stty bin/test cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzpool/common cddl/lib/drti contrib/bind9 contrib/bind9/bin... 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: Tue, 09 Nov 2010 02:53:26 -0000 Author: attilio Date: Tue Nov 9 02:53:24 2010 New Revision: 215028 URL: http://svn.freebsd.org/changeset/base/215028 Log: MFC @ r215025 Added: projects/sv/contrib/libpcap/opentest.c - copied unchanged from r215026, head/contrib/libpcap/opentest.c projects/sv/contrib/libpcap/pcap-can-linux.c - copied unchanged from r215026, head/contrib/libpcap/pcap-can-linux.c projects/sv/contrib/libpcap/pcap-can-linux.h - copied unchanged from r215026, head/contrib/libpcap/pcap-can-linux.h projects/sv/contrib/libpcap/pcap-common.c - copied unchanged from r215026, head/contrib/libpcap/pcap-common.c projects/sv/contrib/libpcap/pcap-common.h - copied unchanged from r215026, head/contrib/libpcap/pcap-common.h projects/sv/contrib/libpcap/pcap-snf.c - copied unchanged from r215026, head/contrib/libpcap/pcap-snf.c projects/sv/contrib/libpcap/pcap-snf.h - copied unchanged from r215026, head/contrib/libpcap/pcap-snf.h projects/sv/contrib/libpcap/pcap/ipnet.h - copied unchanged from r215026, head/contrib/libpcap/pcap/ipnet.h projects/sv/contrib/libpcap/selpolltest.c - copied unchanged from r215026, head/contrib/libpcap/selpolltest.c projects/sv/contrib/libpcap/sf-pcap-ng.c - copied unchanged from r215026, head/contrib/libpcap/sf-pcap-ng.c projects/sv/contrib/libpcap/sf-pcap-ng.h - copied unchanged from r215026, head/contrib/libpcap/sf-pcap-ng.h projects/sv/contrib/libpcap/sf-pcap.c - copied unchanged from r215026, head/contrib/libpcap/sf-pcap.c projects/sv/contrib/libpcap/sf-pcap.h - copied unchanged from r215026, head/contrib/libpcap/sf-pcap.h projects/sv/contrib/tcpdump/Makefile-devel-adds - copied unchanged from r215026, head/contrib/tcpdump/Makefile-devel-adds projects/sv/contrib/tcpdump/forces.h - copied unchanged from r215026, head/contrib/tcpdump/forces.h projects/sv/contrib/tcpdump/ipnet.h - copied unchanged from r215026, head/contrib/tcpdump/ipnet.h projects/sv/contrib/tcpdump/print-forces.c - copied unchanged from r215026, head/contrib/tcpdump/print-forces.c projects/sv/contrib/tcpdump/print-ipnet.c - copied unchanged from r215026, head/contrib/tcpdump/print-ipnet.c projects/sv/contrib/tcpdump/print-usb.c - copied unchanged from r215026, head/contrib/tcpdump/print-usb.c projects/sv/contrib/tcpdump/signature.c - copied unchanged from r215026, head/contrib/tcpdump/signature.c projects/sv/contrib/tcpdump/signature.h - copied unchanged from r215026, head/contrib/tcpdump/signature.h projects/sv/contrib/tcpdump/tcpdump.1.in - copied unchanged from r215026, head/contrib/tcpdump/tcpdump.1.in projects/sv/contrib/tcpdump/tests/ - copied from r215026, head/contrib/tcpdump/tests/ projects/sv/contrib/wpa/patches/ - copied from r215026, head/contrib/wpa/patches/ projects/sv/contrib/wpa/src/ap/ - copied from r215026, head/contrib/wpa/src/ap/ projects/sv/contrib/wpa/src/crypto/.gitignore - copied unchanged from r215026, head/contrib/wpa/src/crypto/.gitignore projects/sv/contrib/wpa/src/crypto/aes-cbc.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-cbc.c projects/sv/contrib/wpa/src/crypto/aes-ctr.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-ctr.c projects/sv/contrib/wpa/src/crypto/aes-eax.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-eax.c projects/sv/contrib/wpa/src/crypto/aes-encblock.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-encblock.c projects/sv/contrib/wpa/src/crypto/aes-internal-dec.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-internal-dec.c projects/sv/contrib/wpa/src/crypto/aes-internal-enc.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-internal-enc.c projects/sv/contrib/wpa/src/crypto/aes-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-internal.c projects/sv/contrib/wpa/src/crypto/aes-omac1.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-omac1.c projects/sv/contrib/wpa/src/crypto/aes-unwrap.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-unwrap.c projects/sv/contrib/wpa/src/crypto/aes-wrap.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes-wrap.c projects/sv/contrib/wpa/src/crypto/aes_i.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/aes_i.h projects/sv/contrib/wpa/src/crypto/crypto_internal-cipher.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/crypto_internal-cipher.c projects/sv/contrib/wpa/src/crypto/crypto_internal-modexp.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/crypto_internal-modexp.c projects/sv/contrib/wpa/src/crypto/crypto_internal-rsa.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/crypto_internal-rsa.c projects/sv/contrib/wpa/src/crypto/crypto_nss.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/crypto_nss.c projects/sv/contrib/wpa/src/crypto/des-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/des-internal.c projects/sv/contrib/wpa/src/crypto/des_i.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/des_i.h projects/sv/contrib/wpa/src/crypto/dh_group5.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/dh_group5.c projects/sv/contrib/wpa/src/crypto/dh_group5.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/dh_group5.h projects/sv/contrib/wpa/src/crypto/fips_prf_cryptoapi.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/fips_prf_cryptoapi.c projects/sv/contrib/wpa/src/crypto/fips_prf_gnutls.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/fips_prf_gnutls.c projects/sv/contrib/wpa/src/crypto/fips_prf_internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/fips_prf_internal.c projects/sv/contrib/wpa/src/crypto/fips_prf_nss.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/fips_prf_nss.c projects/sv/contrib/wpa/src/crypto/fips_prf_openssl.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/fips_prf_openssl.c projects/sv/contrib/wpa/src/crypto/md4-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/md4-internal.c projects/sv/contrib/wpa/src/crypto/md5-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/md5-internal.c projects/sv/contrib/wpa/src/crypto/md5-non-fips.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/md5-non-fips.c projects/sv/contrib/wpa/src/crypto/md5_i.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/md5_i.h projects/sv/contrib/wpa/src/crypto/milenage.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/milenage.c projects/sv/contrib/wpa/src/crypto/milenage.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/milenage.h projects/sv/contrib/wpa/src/crypto/sha1-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha1-internal.c projects/sv/contrib/wpa/src/crypto/sha1-pbkdf2.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha1-pbkdf2.c projects/sv/contrib/wpa/src/crypto/sha1-tlsprf.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha1-tlsprf.c projects/sv/contrib/wpa/src/crypto/sha1-tprf.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha1-tprf.c projects/sv/contrib/wpa/src/crypto/sha1_i.h - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha1_i.h projects/sv/contrib/wpa/src/crypto/sha256-internal.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/sha256-internal.c projects/sv/contrib/wpa/src/crypto/tls_nss.c - copied unchanged from r215026, head/contrib/wpa/src/crypto/tls_nss.c projects/sv/contrib/wpa/src/drivers/.gitignore - copied unchanged from r215026, head/contrib/wpa/src/drivers/.gitignore projects/sv/contrib/wpa/src/drivers/drivers.mak - copied unchanged from r215026, head/contrib/wpa/src/drivers/drivers.mak projects/sv/contrib/wpa/src/eap_server/eap_server.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server.c projects/sv/contrib/wpa/src/eap_server/eap_server_aka.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_aka.c projects/sv/contrib/wpa/src/eap_server/eap_server_fast.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_fast.c projects/sv/contrib/wpa/src/eap_server/eap_server_gpsk.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_gpsk.c projects/sv/contrib/wpa/src/eap_server/eap_server_gtc.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_gtc.c projects/sv/contrib/wpa/src/eap_server/eap_server_identity.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_identity.c projects/sv/contrib/wpa/src/eap_server/eap_server_ikev2.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_ikev2.c projects/sv/contrib/wpa/src/eap_server/eap_server_md5.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_md5.c projects/sv/contrib/wpa/src/eap_server/eap_server_methods.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_methods.c projects/sv/contrib/wpa/src/eap_server/eap_server_mschapv2.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_mschapv2.c projects/sv/contrib/wpa/src/eap_server/eap_server_pax.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_pax.c projects/sv/contrib/wpa/src/eap_server/eap_server_peap.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_peap.c projects/sv/contrib/wpa/src/eap_server/eap_server_psk.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_psk.c projects/sv/contrib/wpa/src/eap_server/eap_server_sake.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_sake.c projects/sv/contrib/wpa/src/eap_server/eap_server_sim.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_sim.c projects/sv/contrib/wpa/src/eap_server/eap_server_tls.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_tls.c projects/sv/contrib/wpa/src/eap_server/eap_server_tls_common.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_tls_common.c projects/sv/contrib/wpa/src/eap_server/eap_server_tnc.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_tnc.c projects/sv/contrib/wpa/src/eap_server/eap_server_ttls.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_ttls.c projects/sv/contrib/wpa/src/eap_server/eap_server_vendor_test.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_vendor_test.c projects/sv/contrib/wpa/src/eap_server/eap_server_wsc.c - copied unchanged from r215026, head/contrib/wpa/src/eap_server/eap_server_wsc.c projects/sv/contrib/wpa/src/eapol_auth/ - copied from r215026, head/contrib/wpa/src/eapol_auth/ projects/sv/contrib/wpa/src/lib.rules - copied unchanged from r215026, head/contrib/wpa/src/lib.rules projects/sv/contrib/wpa/src/radius/.gitignore - copied unchanged from r215026, head/contrib/wpa/src/radius/.gitignore projects/sv/contrib/wpa/src/tls/.gitignore - copied unchanged from r215026, head/contrib/wpa/src/tls/.gitignore projects/sv/contrib/wpa/src/tls/pkcs1.c - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs1.c projects/sv/contrib/wpa/src/tls/pkcs1.h - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs1.h projects/sv/contrib/wpa/src/tls/pkcs5.c - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs5.c projects/sv/contrib/wpa/src/tls/pkcs5.h - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs5.h projects/sv/contrib/wpa/src/tls/pkcs8.c - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs8.c projects/sv/contrib/wpa/src/tls/pkcs8.h - copied unchanged from r215026, head/contrib/wpa/src/tls/pkcs8.h projects/sv/contrib/wpa/src/utils/.gitignore - copied unchanged from r215026, head/contrib/wpa/src/utils/.gitignore projects/sv/contrib/wpa/src/utils/list.h - copied unchanged from r215026, head/contrib/wpa/src/utils/list.h projects/sv/contrib/wpa/src/utils/radiotap.c - copied unchanged from r215026, head/contrib/wpa/src/utils/radiotap.c projects/sv/contrib/wpa/src/utils/radiotap.h - copied unchanged from r215026, head/contrib/wpa/src/utils/radiotap.h projects/sv/contrib/wpa/src/utils/radiotap_iter.h - copied unchanged from r215026, head/contrib/wpa/src/utils/radiotap_iter.h projects/sv/contrib/wpa/src/utils/trace.c - copied unchanged from r215026, head/contrib/wpa/src/utils/trace.c projects/sv/contrib/wpa/src/utils/trace.h - copied unchanged from r215026, head/contrib/wpa/src/utils/trace.h projects/sv/contrib/wpa/src/wps/http.h - copied unchanged from r215026, head/contrib/wpa/src/wps/http.h projects/sv/contrib/wpa/src/wps/http_client.c - copied unchanged from r215026, head/contrib/wpa/src/wps/http_client.c projects/sv/contrib/wpa/src/wps/http_client.h - copied unchanged from r215026, head/contrib/wpa/src/wps/http_client.h projects/sv/contrib/wpa/src/wps/http_server.c - copied unchanged from r215026, head/contrib/wpa/src/wps/http_server.c projects/sv/contrib/wpa/src/wps/http_server.h - copied unchanged from r215026, head/contrib/wpa/src/wps/http_server.h projects/sv/contrib/wpa/src/wps/ndef.c - copied unchanged from r215026, head/contrib/wpa/src/wps/ndef.c projects/sv/contrib/wpa/src/wps/upnp_xml.c - copied unchanged from r215026, head/contrib/wpa/src/wps/upnp_xml.c projects/sv/contrib/wpa/src/wps/upnp_xml.h - copied unchanged from r215026, head/contrib/wpa/src/wps/upnp_xml.h projects/sv/contrib/wpa/src/wps/wps_er.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_er.c projects/sv/contrib/wpa/src/wps/wps_er.h - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_er.h projects/sv/contrib/wpa/src/wps/wps_er_ssdp.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_er_ssdp.c projects/sv/contrib/wpa/src/wps/wps_nfc.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_nfc.c projects/sv/contrib/wpa/src/wps/wps_nfc_pn531.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_nfc_pn531.c projects/sv/contrib/wpa/src/wps/wps_ufd.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_ufd.c projects/sv/contrib/wpa/src/wps/wps_upnp_ap.c - copied unchanged from r215026, head/contrib/wpa/src/wps/wps_upnp_ap.c projects/sv/contrib/wpa/wpa_supplicant/.gitignore - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/.gitignore projects/sv/contrib/wpa/wpa_supplicant/ap.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/ap.c projects/sv/contrib/wpa/wpa_supplicant/ap.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/ap.h projects/sv/contrib/wpa/wpa_supplicant/bgscan.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/bgscan.c projects/sv/contrib/wpa/wpa_supplicant/bgscan.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/bgscan.h projects/sv/contrib/wpa/wpa_supplicant/bgscan_simple.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/bgscan_simple.c projects/sv/contrib/wpa/wpa_supplicant/bss.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/bss.c projects/sv/contrib/wpa/wpa_supplicant/bss.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/bss.h projects/sv/contrib/wpa/wpa_supplicant/dbus/ - copied from r215026, head/contrib/wpa/wpa_supplicant/dbus/ projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore projects/sv/contrib/wpa/wpa_supplicant/driver_i.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/driver_i.h projects/sv/contrib/wpa/wpa_supplicant/eap_register.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/eap_register.c projects/sv/contrib/wpa/wpa_supplicant/examples/60_wpa_supplicant - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/examples/60_wpa_supplicant projects/sv/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py projects/sv/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py projects/sv/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py projects/sv/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py projects/sv/contrib/wpa/wpa_supplicant/ibss_rsn.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/ibss_rsn.c projects/sv/contrib/wpa/wpa_supplicant/ibss_rsn.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/ibss_rsn.h projects/sv/contrib/wpa/wpa_supplicant/notify.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/notify.c projects/sv/contrib/wpa/wpa_supplicant/notify.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/notify.h projects/sv/contrib/wpa/wpa_supplicant/scan.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/scan.h projects/sv/contrib/wpa/wpa_supplicant/sme.c - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/sme.c projects/sv/contrib/wpa/wpa_supplicant/sme.h - copied unchanged from r215026, head/contrib/wpa/wpa_supplicant/sme.h projects/sv/lib/libarchive/test/test_compat_zip_2.zip.uu - copied unchanged from r215026, head/lib/libarchive/test/test_compat_zip_2.zip.uu projects/sv/lib/libkvm/kvm_minidump_mips.c - copied unchanged from r215026, head/lib/libkvm/kvm_minidump_mips.c projects/sv/sys/arm/xscale/ixp425/avila_gpio.c - copied unchanged from r215026, head/sys/arm/xscale/ixp425/avila_gpio.c projects/sv/sys/dev/agp/agp_apple.c - copied unchanged from r215026, head/sys/dev/agp/agp_apple.c projects/sv/sys/mips/mips/minidump_machdep.c - copied unchanged from r215026, head/sys/mips/mips/minidump_machdep.c projects/sv/sys/x86/acpica/OsdEnvironment.c - copied unchanged from r215026, head/sys/x86/acpica/OsdEnvironment.c projects/sv/sys/x86/acpica/madt.c - copied unchanged from r215026, head/sys/x86/acpica/madt.c projects/sv/sys/x86/include/ - copied from r215026, head/sys/x86/include/ projects/sv/sys/x86/x86/mptable.c - copied unchanged from r215026, head/sys/x86/x86/mptable.c projects/sv/sys/x86/x86/mptable_pci.c - copied unchanged from r215026, head/sys/x86/x86/mptable_pci.c projects/sv/sys/x86/x86/nexus.c - copied unchanged from r215026, head/sys/x86/x86/nexus.c projects/sv/tools/regression/bin/sh/builtins/printf1.0 - copied unchanged from r215026, head/tools/regression/bin/sh/builtins/printf1.0 projects/sv/tools/regression/bin/sh/builtins/printf2.0 - copied unchanged from r215026, head/tools/regression/bin/sh/builtins/printf2.0 projects/sv/tools/regression/bin/sh/errors/bad-keyword1.0 - copied unchanged from r215026, head/tools/regression/bin/sh/errors/bad-keyword1.0 projects/sv/tools/regression/bin/sh/expansion/plus-minus5.0 - copied unchanged from r215026, head/tools/regression/bin/sh/expansion/plus-minus5.0 projects/sv/tools/regression/bin/sh/expansion/plus-minus6.0 - copied unchanged from r215026, head/tools/regression/bin/sh/expansion/plus-minus6.0 projects/sv/tools/regression/bin/sh/expansion/trim5.0 - copied unchanged from r215026, head/tools/regression/bin/sh/expansion/trim5.0 projects/sv/tools/regression/bin/sh/expansion/trim6.0 - copied unchanged from r215026, head/tools/regression/bin/sh/expansion/trim6.0 projects/sv/tools/regression/bin/sh/parser/alias3.0 - copied unchanged from r215026, head/tools/regression/bin/sh/parser/alias3.0 projects/sv/tools/regression/bin/test/ - copied from r215026, head/tools/regression/bin/test/ projects/sv/usr.sbin/makefs/cd9660/ - copied from r215026, head/usr.sbin/makefs/cd9660/ projects/sv/usr.sbin/makefs/cd9660.c - copied unchanged from r215026, head/usr.sbin/makefs/cd9660.c projects/sv/usr.sbin/makefs/cd9660.h - copied unchanged from r215026, head/usr.sbin/makefs/cd9660.h projects/sv/usr.sbin/makefs/compat/Makefile.inc - copied unchanged from r215026, head/usr.sbin/makefs/compat/Makefile.inc projects/sv/usr.sbin/makefs/ffs.h - copied unchanged from r215026, head/usr.sbin/makefs/ffs.h projects/sv/usr.sbin/makefs/ffs/Makefile.inc - copied unchanged from r215026, head/usr.sbin/makefs/ffs/Makefile.inc projects/sv/usr.sbin/tcpdump/tcpdump/tcpdump.1 - copied unchanged from r215026, head/usr.sbin/tcpdump/tcpdump/tcpdump.1 Replaced: projects/sv/contrib/wpa/hostapd/ - copied from r215026, head/contrib/wpa/hostapd/ projects/sv/contrib/wpa/hostapd/ChangeLog - copied unchanged from r215026, head/contrib/wpa/hostapd/ChangeLog projects/sv/contrib/wpa/hostapd/Makefile - copied unchanged from r215026, head/contrib/wpa/hostapd/Makefile projects/sv/contrib/wpa/hostapd/README - copied unchanged from r215026, head/contrib/wpa/hostapd/README projects/sv/contrib/wpa/hostapd/README-WPS - copied unchanged from r215026, head/contrib/wpa/hostapd/README-WPS projects/sv/contrib/wpa/hostapd/ctrl_iface.c - copied unchanged from r215026, head/contrib/wpa/hostapd/ctrl_iface.c projects/sv/contrib/wpa/hostapd/ctrl_iface.h - copied unchanged from r215026, head/contrib/wpa/hostapd/ctrl_iface.h projects/sv/contrib/wpa/hostapd/defconfig - copied unchanged from r215026, head/contrib/wpa/hostapd/defconfig projects/sv/contrib/wpa/hostapd/eap_testing.txt - copied unchanged from r215026, head/contrib/wpa/hostapd/eap_testing.txt projects/sv/contrib/wpa/hostapd/hostapd.8 - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.8 projects/sv/contrib/wpa/hostapd/hostapd.accept - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.accept projects/sv/contrib/wpa/hostapd/hostapd.conf - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.conf projects/sv/contrib/wpa/hostapd/hostapd.deny - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.deny projects/sv/contrib/wpa/hostapd/hostapd.eap_user - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.eap_user projects/sv/contrib/wpa/hostapd/hostapd.radius_clients - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.radius_clients projects/sv/contrib/wpa/hostapd/hostapd.sim_db - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.sim_db projects/sv/contrib/wpa/hostapd/hostapd.vlan - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.vlan projects/sv/contrib/wpa/hostapd/hostapd.wpa_psk - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd.wpa_psk projects/sv/contrib/wpa/hostapd/hostapd_cli.1 - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd_cli.1 projects/sv/contrib/wpa/hostapd/hostapd_cli.c - copied unchanged from r215026, head/contrib/wpa/hostapd/hostapd_cli.c projects/sv/contrib/wpa/hostapd/logwatch/ - copied from r215026, head/contrib/wpa/hostapd/logwatch/ projects/sv/contrib/wpa/hostapd/logwatch/README - copied unchanged from r215026, head/contrib/wpa/hostapd/logwatch/README projects/sv/contrib/wpa/hostapd/logwatch/hostapd - copied unchanged from r215026, head/contrib/wpa/hostapd/logwatch/hostapd projects/sv/contrib/wpa/hostapd/logwatch/hostapd.conf - copied unchanged from r215026, head/contrib/wpa/hostapd/logwatch/hostapd.conf projects/sv/contrib/wpa/hostapd/nt_password_hash.c - copied unchanged from r215026, head/contrib/wpa/hostapd/nt_password_hash.c projects/sv/contrib/wpa/hostapd/wired.conf - copied unchanged from r215026, head/contrib/wpa/hostapd/wired.conf Deleted: projects/sv/bin/test/TEST.README projects/sv/bin/test/TEST.csh projects/sv/bin/test/TEST.sh projects/sv/contrib/libpcap/FREEBSD-Xlist projects/sv/contrib/libpcap/FREEBSD-upgrade projects/sv/contrib/libpcap/net/bpf_filter.c projects/sv/contrib/tcpdump/FREEBSD-Xlist projects/sv/contrib/tcpdump/FREEBSD-upgrade projects/sv/contrib/tcpdump/missing/getaddrinfo.c projects/sv/contrib/tcpdump/tcpdump.1 projects/sv/contrib/wpa/src/common/nl80211_copy.h projects/sv/contrib/wpa/src/common/wireless_copy.h projects/sv/contrib/wpa/src/crypto/aes.c projects/sv/contrib/wpa/src/crypto/aes_wrap.c projects/sv/contrib/wpa/src/crypto/des.c projects/sv/contrib/wpa/src/crypto/md4.c projects/sv/contrib/wpa/src/crypto/rc4.h projects/sv/contrib/wpa/src/drivers/radiotap.c projects/sv/contrib/wpa/src/drivers/radiotap.h projects/sv/contrib/wpa/src/drivers/radiotap_iter.h projects/sv/contrib/wpa/src/drivers/scan_helpers.c projects/sv/contrib/wpa/src/eap_server/eap.c projects/sv/contrib/wpa/src/eap_server/eap_aka.c projects/sv/contrib/wpa/src/eap_server/eap_fast.c projects/sv/contrib/wpa/src/eap_server/eap_gpsk.c projects/sv/contrib/wpa/src/eap_server/eap_gtc.c projects/sv/contrib/wpa/src/eap_server/eap_identity.c projects/sv/contrib/wpa/src/eap_server/eap_ikev2.c projects/sv/contrib/wpa/src/eap_server/eap_md5.c projects/sv/contrib/wpa/src/eap_server/eap_methods.c projects/sv/contrib/wpa/src/eap_server/eap_mschapv2.c projects/sv/contrib/wpa/src/eap_server/eap_pax.c projects/sv/contrib/wpa/src/eap_server/eap_peap.c projects/sv/contrib/wpa/src/eap_server/eap_psk.c projects/sv/contrib/wpa/src/eap_server/eap_sake.c projects/sv/contrib/wpa/src/eap_server/eap_sim.c projects/sv/contrib/wpa/src/eap_server/eap_tls.c projects/sv/contrib/wpa/src/eap_server/eap_tls_common.c projects/sv/contrib/wpa/src/eap_server/eap_tnc.c projects/sv/contrib/wpa/src/eap_server/eap_ttls.c projects/sv/contrib/wpa/src/eap_server/eap_vendor_test.c projects/sv/contrib/wpa/src/eap_server/eap_wsc.c projects/sv/contrib/wpa/src/hlr_auc_gw/Makefile projects/sv/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c projects/sv/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db projects/sv/contrib/wpa/src/hlr_auc_gw/milenage.c projects/sv/contrib/wpa/src/hlr_auc_gw/milenage.h projects/sv/contrib/wpa/src/tls/asn1_test.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h projects/sv/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf projects/sv/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service projects/sv/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c projects/sv/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h projects/sv/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/doxygen.fast projects/sv/contrib/wpa/wpa_supplicant/doc/doxygen.full projects/sv/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/eap.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl projects/sv/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/porting.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen projects/sv/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig projects/sv/contrib/wpa/wpa_supplicant/tests/test_aes.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_md4.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_md5.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_sha1.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_sha256.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_x509v3.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh projects/sv/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh projects/sv/sys/amd64/acpica/OsdEnvironment.c projects/sv/sys/amd64/acpica/madt.c projects/sv/sys/amd64/amd64/mptable.c projects/sv/sys/amd64/amd64/mptable_pci.c projects/sv/sys/amd64/amd64/nexus.c projects/sv/sys/amd64/include/apicreg.h projects/sv/sys/amd64/include/mca.h projects/sv/sys/i386/acpica/OsdEnvironment.c projects/sv/sys/i386/acpica/madt.c projects/sv/sys/i386/i386/mptable.c projects/sv/sys/i386/i386/mptable_pci.c projects/sv/sys/i386/i386/nexus.c projects/sv/sys/i386/include/apicreg.h projects/sv/sys/i386/include/mca.h projects/sv/sys/pc98/include/apicreg.h projects/sv/sys/pc98/include/mca.h projects/sv/usr.bin/objformat/ Modified: projects/sv/ObsoleteFiles.inc projects/sv/bin/rm/rm.1 projects/sv/bin/sh/eval.c projects/sv/bin/sh/expand.c projects/sv/bin/sh/expand.h projects/sv/bin/sh/histedit.c projects/sv/bin/sh/mksyntax.c projects/sv/bin/sh/parser.c projects/sv/bin/sh/parser.h projects/sv/bin/sh/sh.1 projects/sv/bin/sh/var.c projects/sv/bin/stty/key.c projects/sv/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/sv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/sv/cddl/lib/drti/Makefile projects/sv/contrib/bind9/CHANGES projects/sv/contrib/bind9/README projects/sv/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html projects/sv/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html projects/sv/contrib/bind9/bin/dnssec/dnssec-keygen.html projects/sv/contrib/bind9/bin/dnssec/dnssec-signzone.html projects/sv/contrib/bind9/bin/named/include/named/globals.h projects/sv/contrib/bind9/bin/named/main.c projects/sv/contrib/bind9/bin/named/query.c projects/sv/contrib/bind9/bin/named/server.c projects/sv/contrib/bind9/bin/nsupdate/nsupdate.html projects/sv/contrib/bind9/doc/arm/Bv9ARM-book.xml projects/sv/contrib/bind9/doc/arm/Bv9ARM.ch06.html projects/sv/contrib/bind9/doc/arm/Bv9ARM.ch07.html projects/sv/contrib/bind9/doc/arm/Bv9ARM.ch08.html projects/sv/contrib/bind9/doc/arm/Bv9ARM.ch09.html projects/sv/contrib/bind9/doc/arm/Bv9ARM.html projects/sv/contrib/bind9/doc/arm/Bv9ARM.pdf projects/sv/contrib/bind9/doc/arm/isc-logo.eps projects/sv/contrib/bind9/doc/arm/isc-logo.pdf projects/sv/contrib/bind9/doc/arm/man.dig.html projects/sv/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html projects/sv/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html projects/sv/contrib/bind9/doc/arm/man.dnssec-keygen.html projects/sv/contrib/bind9/doc/arm/man.dnssec-signzone.html projects/sv/contrib/bind9/doc/arm/man.host.html projects/sv/contrib/bind9/doc/arm/man.named-checkconf.html projects/sv/contrib/bind9/doc/arm/man.named-checkzone.html projects/sv/contrib/bind9/doc/arm/man.named.html projects/sv/contrib/bind9/doc/arm/man.nsupdate.html projects/sv/contrib/bind9/doc/arm/man.rndc-confgen.html projects/sv/contrib/bind9/doc/arm/man.rndc.conf.html projects/sv/contrib/bind9/doc/arm/man.rndc.html projects/sv/contrib/bind9/lib/dns/adb.c projects/sv/contrib/bind9/lib/dns/api projects/sv/contrib/bind9/lib/dns/include/dns/diff.h projects/sv/contrib/bind9/lib/dns/include/dns/ncache.h projects/sv/contrib/bind9/lib/dns/include/dns/rdataset.h projects/sv/contrib/bind9/lib/dns/include/dns/resolver.h projects/sv/contrib/bind9/lib/dns/include/dns/result.h projects/sv/contrib/bind9/lib/dns/include/dns/types.h projects/sv/contrib/bind9/lib/dns/include/dns/validator.h projects/sv/contrib/bind9/lib/dns/ncache.c projects/sv/contrib/bind9/lib/dns/rbtdb.c projects/sv/contrib/bind9/lib/dns/rdatalist.c projects/sv/contrib/bind9/lib/dns/rdataset.c projects/sv/contrib/bind9/lib/dns/rdataslab.c projects/sv/contrib/bind9/lib/dns/resolver.c projects/sv/contrib/bind9/lib/dns/result.c projects/sv/contrib/bind9/lib/dns/sdb.c projects/sv/contrib/bind9/lib/dns/sdlz.c projects/sv/contrib/bind9/lib/dns/validator.c projects/sv/contrib/bind9/lib/dns/view.c projects/sv/contrib/bind9/lib/isc/api projects/sv/contrib/bind9/lib/isc/include/isc/mem.h projects/sv/contrib/bind9/lib/isc/mem.c projects/sv/contrib/bind9/lib/lwres/man/lwres.html projects/sv/contrib/bind9/lib/lwres/man/lwres_buffer.html projects/sv/contrib/bind9/lib/lwres/man/lwres_config.html projects/sv/contrib/bind9/lib/lwres/man/lwres_context.html projects/sv/contrib/bind9/lib/lwres/man/lwres_gabn.html projects/sv/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html projects/sv/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html projects/sv/contrib/bind9/lib/lwres/man/lwres_gethostent.html projects/sv/contrib/bind9/lib/lwres/man/lwres_getipnode.html projects/sv/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html projects/sv/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html projects/sv/contrib/bind9/lib/lwres/man/lwres_gnba.html projects/sv/contrib/bind9/lib/lwres/man/lwres_hstrerror.html projects/sv/contrib/bind9/lib/lwres/man/lwres_inetntop.html projects/sv/contrib/bind9/lib/lwres/man/lwres_noop.html projects/sv/contrib/bind9/lib/lwres/man/lwres_packet.html projects/sv/contrib/bind9/lib/lwres/man/lwres_resutil.html projects/sv/contrib/bind9/version projects/sv/contrib/binutils/bfd/elfxx-mips.c projects/sv/contrib/gdb/gdb/dwarf2read.c projects/sv/contrib/gdb/gdb/mips-tdep.c projects/sv/contrib/gdb/gdb/mips-tdep.h projects/sv/contrib/gdb/gdb/mipsfbsd-tdep.c projects/sv/contrib/gdb/gdb/mipsfbsd-tdep.h projects/sv/contrib/ipfilter/tools/ipf_y.y projects/sv/contrib/libpcap/CHANGES projects/sv/contrib/libpcap/CREDITS projects/sv/contrib/libpcap/INSTALL.txt projects/sv/contrib/libpcap/Makefile.in projects/sv/contrib/libpcap/README projects/sv/contrib/libpcap/TODO projects/sv/contrib/libpcap/VERSION projects/sv/contrib/libpcap/arcnet.h projects/sv/contrib/libpcap/atmuni31.h projects/sv/contrib/libpcap/bpf/net/bpf_filter.c projects/sv/contrib/libpcap/bpf_dump.c projects/sv/contrib/libpcap/bpf_image.c projects/sv/contrib/libpcap/config.guess projects/sv/contrib/libpcap/config.h.in projects/sv/contrib/libpcap/config.sub projects/sv/contrib/libpcap/configure projects/sv/contrib/libpcap/configure.in projects/sv/contrib/libpcap/dlpisubs.c projects/sv/contrib/libpcap/dlpisubs.h projects/sv/contrib/libpcap/etherent.c projects/sv/contrib/libpcap/ethertype.h projects/sv/contrib/libpcap/fad-getad.c projects/sv/contrib/libpcap/fad-gifc.c projects/sv/contrib/libpcap/fad-glifc.c projects/sv/contrib/libpcap/fad-null.c projects/sv/contrib/libpcap/fad-win32.c projects/sv/contrib/libpcap/filtertest.c projects/sv/contrib/libpcap/gencode.c projects/sv/contrib/libpcap/gencode.h projects/sv/contrib/libpcap/grammar.y projects/sv/contrib/libpcap/inet.c projects/sv/contrib/libpcap/lbl/os-aix4.h projects/sv/contrib/libpcap/lbl/os-hpux11.h projects/sv/contrib/libpcap/lbl/os-osf4.h projects/sv/contrib/libpcap/lbl/os-osf5.h projects/sv/contrib/libpcap/lbl/os-solaris2.h projects/sv/contrib/libpcap/lbl/os-sunos4.h projects/sv/contrib/libpcap/lbl/os-ultrix4.h projects/sv/contrib/libpcap/llc.h projects/sv/contrib/libpcap/missing/snprintf.c projects/sv/contrib/libpcap/nametoaddr.c projects/sv/contrib/libpcap/nlpid.h projects/sv/contrib/libpcap/optimize.c projects/sv/contrib/libpcap/pcap-bpf.c projects/sv/contrib/libpcap/pcap-bpf.h projects/sv/contrib/libpcap/pcap-bt-linux.c projects/sv/contrib/libpcap/pcap-bt-linux.h projects/sv/contrib/libpcap/pcap-config.1 projects/sv/contrib/libpcap/pcap-config.in projects/sv/contrib/libpcap/pcap-dag.c projects/sv/contrib/libpcap/pcap-dag.h projects/sv/contrib/libpcap/pcap-dlpi.c projects/sv/contrib/libpcap/pcap-dos.c projects/sv/contrib/libpcap/pcap-dos.h projects/sv/contrib/libpcap/pcap-enet.c projects/sv/contrib/libpcap/pcap-filter.manmisc.in projects/sv/contrib/libpcap/pcap-int.h projects/sv/contrib/libpcap/pcap-libdlpi.c projects/sv/contrib/libpcap/pcap-linktype.manmisc.in projects/sv/contrib/libpcap/pcap-linux.c projects/sv/contrib/libpcap/pcap-namedb.h projects/sv/contrib/libpcap/pcap-nit.c projects/sv/contrib/libpcap/pcap-null.c projects/sv/contrib/libpcap/pcap-pf.c projects/sv/contrib/libpcap/pcap-savefile.manfile.in projects/sv/contrib/libpcap/pcap-septel.c projects/sv/contrib/libpcap/pcap-septel.h projects/sv/contrib/libpcap/pcap-sita.html projects/sv/contrib/libpcap/pcap-snit.c projects/sv/contrib/libpcap/pcap-snoop.c projects/sv/contrib/libpcap/pcap-stdinc.h projects/sv/contrib/libpcap/pcap-usb-linux.c projects/sv/contrib/libpcap/pcap-usb-linux.h projects/sv/contrib/libpcap/pcap-win32.c projects/sv/contrib/libpcap/pcap.3pcap.in projects/sv/contrib/libpcap/pcap.c projects/sv/contrib/libpcap/pcap.h projects/sv/contrib/libpcap/pcap/bluetooth.h projects/sv/contrib/libpcap/pcap/bpf.h projects/sv/contrib/libpcap/pcap/namedb.h projects/sv/contrib/libpcap/pcap/pcap.h projects/sv/contrib/libpcap/pcap/sll.h projects/sv/contrib/libpcap/pcap/usb.h projects/sv/contrib/libpcap/pcap/vlan.h projects/sv/contrib/libpcap/pcap_activate.3pcap projects/sv/contrib/libpcap/pcap_breakloop.3pcap projects/sv/contrib/libpcap/pcap_can_set_rfmon.3pcap projects/sv/contrib/libpcap/pcap_close.3pcap projects/sv/contrib/libpcap/pcap_compile.3pcap.in projects/sv/contrib/libpcap/pcap_create.3pcap projects/sv/contrib/libpcap/pcap_datalink.3pcap.in projects/sv/contrib/libpcap/pcap_datalink_name_to_val.3pcap projects/sv/contrib/libpcap/pcap_datalink_val_to_name.3pcap projects/sv/contrib/libpcap/pcap_dump.3pcap projects/sv/contrib/libpcap/pcap_dump_close.3pcap projects/sv/contrib/libpcap/pcap_dump_file.3pcap projects/sv/contrib/libpcap/pcap_dump_flush.3pcap projects/sv/contrib/libpcap/pcap_dump_ftell.3pcap projects/sv/contrib/libpcap/pcap_dump_open.3pcap.in projects/sv/contrib/libpcap/pcap_file.3pcap projects/sv/contrib/libpcap/pcap_fileno.3pcap projects/sv/contrib/libpcap/pcap_findalldevs.3pcap projects/sv/contrib/libpcap/pcap_free_datalinks.3pcap projects/sv/contrib/libpcap/pcap_freealldevs.3pcap projects/sv/contrib/libpcap/pcap_freecode.3pcap projects/sv/contrib/libpcap/pcap_get_selectable_fd.3pcap projects/sv/contrib/libpcap/pcap_geterr.3pcap projects/sv/contrib/libpcap/pcap_inject.3pcap projects/sv/contrib/libpcap/pcap_is_swapped.3pcap projects/sv/contrib/libpcap/pcap_lib_version.3pcap projects/sv/contrib/libpcap/pcap_list_datalinks.3pcap.in projects/sv/contrib/libpcap/pcap_lookupdev.3pcap projects/sv/contrib/libpcap/pcap_lookupnet.3pcap projects/sv/contrib/libpcap/pcap_loop.3pcap projects/sv/contrib/libpcap/pcap_major_version.3pcap projects/sv/contrib/libpcap/pcap_next_ex.3pcap projects/sv/contrib/libpcap/pcap_offline_filter.3pcap projects/sv/contrib/libpcap/pcap_open_dead.3pcap.in projects/sv/contrib/libpcap/pcap_open_live.3pcap projects/sv/contrib/libpcap/pcap_open_offline.3pcap.in projects/sv/contrib/libpcap/pcap_set_buffer_size.3pcap projects/sv/contrib/libpcap/pcap_set_datalink.3pcap projects/sv/contrib/libpcap/pcap_set_promisc.3pcap projects/sv/contrib/libpcap/pcap_set_rfmon.3pcap projects/sv/contrib/libpcap/pcap_set_snaplen.3pcap projects/sv/contrib/libpcap/pcap_set_timeout.3pcap projects/sv/contrib/libpcap/pcap_setdirection.3pcap projects/sv/contrib/libpcap/pcap_setfilter.3pcap projects/sv/contrib/libpcap/pcap_setnonblock.3pcap projects/sv/contrib/libpcap/pcap_snapshot.3pcap projects/sv/contrib/libpcap/pcap_stats.3pcap projects/sv/contrib/libpcap/pcap_statustostr.3pcap projects/sv/contrib/libpcap/pcap_strerror.3pcap projects/sv/contrib/libpcap/ppp.h projects/sv/contrib/libpcap/runlex.sh projects/sv/contrib/libpcap/savefile.c projects/sv/contrib/libpcap/scanner.l projects/sv/contrib/libpcap/sunatmpos.h projects/sv/contrib/tcpdump/CHANGES projects/sv/contrib/tcpdump/CREDITS projects/sv/contrib/tcpdump/INSTALL.txt projects/sv/contrib/tcpdump/Makefile.in projects/sv/contrib/tcpdump/README projects/sv/contrib/tcpdump/VERSION projects/sv/contrib/tcpdump/acconfig.h projects/sv/contrib/tcpdump/addrtoname.c projects/sv/contrib/tcpdump/af.c projects/sv/contrib/tcpdump/af.h projects/sv/contrib/tcpdump/atmuni31.h projects/sv/contrib/tcpdump/bootp.h projects/sv/contrib/tcpdump/bpf_dump.c projects/sv/contrib/tcpdump/checksum.c projects/sv/contrib/tcpdump/config.guess projects/sv/contrib/tcpdump/config.h.in projects/sv/contrib/tcpdump/config.sub projects/sv/contrib/tcpdump/configure projects/sv/contrib/tcpdump/configure.in projects/sv/contrib/tcpdump/ethertype.h projects/sv/contrib/tcpdump/gmpls.c projects/sv/contrib/tcpdump/gmpls.h projects/sv/contrib/tcpdump/gmt2local.h projects/sv/contrib/tcpdump/icmp6.h projects/sv/contrib/tcpdump/ieee802_11.h projects/sv/contrib/tcpdump/ieee802_11_radio.h projects/sv/contrib/tcpdump/interface.h projects/sv/contrib/tcpdump/ip6.h projects/sv/contrib/tcpdump/ipproto.c projects/sv/contrib/tcpdump/ipproto.h projects/sv/contrib/tcpdump/isakmp.h projects/sv/contrib/tcpdump/l2vpn.c projects/sv/contrib/tcpdump/l2vpn.h projects/sv/contrib/tcpdump/lbl/os-sunos4.h projects/sv/contrib/tcpdump/lbl/os-ultrix4.h projects/sv/contrib/tcpdump/missing/addrinfo.h projects/sv/contrib/tcpdump/netdissect.h projects/sv/contrib/tcpdump/nfs.h projects/sv/contrib/tcpdump/nlpid.c projects/sv/contrib/tcpdump/nlpid.h projects/sv/contrib/tcpdump/oui.c projects/sv/contrib/tcpdump/oui.h projects/sv/contrib/tcpdump/print-802_11.c projects/sv/contrib/tcpdump/print-ap1394.c projects/sv/contrib/tcpdump/print-arcnet.c projects/sv/contrib/tcpdump/print-atm.c projects/sv/contrib/tcpdump/print-bfd.c projects/sv/contrib/tcpdump/print-bgp.c projects/sv/contrib/tcpdump/print-bootp.c projects/sv/contrib/tcpdump/print-bt.c projects/sv/contrib/tcpdump/print-cdp.c projects/sv/contrib/tcpdump/print-cfm.c projects/sv/contrib/tcpdump/print-dccp.c projects/sv/contrib/tcpdump/print-dhcp6.c projects/sv/contrib/tcpdump/print-domain.c projects/sv/contrib/tcpdump/print-enc.c projects/sv/contrib/tcpdump/print-esp.c projects/sv/contrib/tcpdump/print-ether.c projects/sv/contrib/tcpdump/print-fr.c projects/sv/contrib/tcpdump/print-gre.c projects/sv/contrib/tcpdump/print-icmp6.c projects/sv/contrib/tcpdump/print-ip.c projects/sv/contrib/tcpdump/print-ip6.c projects/sv/contrib/tcpdump/print-isakmp.c projects/sv/contrib/tcpdump/print-isoclns.c projects/sv/contrib/tcpdump/print-juniper.c projects/sv/contrib/tcpdump/print-l2tp.c projects/sv/contrib/tcpdump/print-lane.c projects/sv/contrib/tcpdump/print-llc.c projects/sv/contrib/tcpdump/print-lldp.c projects/sv/contrib/tcpdump/print-lspping.c projects/sv/contrib/tcpdump/print-nfs.c projects/sv/contrib/tcpdump/print-ntp.c projects/sv/contrib/tcpdump/print-olsr.c projects/sv/contrib/tcpdump/print-ospf.c projects/sv/contrib/tcpdump/print-pflog.c projects/sv/contrib/tcpdump/print-pim.c projects/sv/contrib/tcpdump/print-ppp.c projects/sv/contrib/tcpdump/print-rrcp.c projects/sv/contrib/tcpdump/print-rsvp.c projects/sv/contrib/tcpdump/print-rx.c projects/sv/contrib/tcpdump/print-sctp.c projects/sv/contrib/tcpdump/print-sip.c projects/sv/contrib/tcpdump/print-sll.c projects/sv/contrib/tcpdump/print-smb.c projects/sv/contrib/tcpdump/print-sunrpc.c projects/sv/contrib/tcpdump/print-symantec.c projects/sv/contrib/tcpdump/print-tcp.c projects/sv/contrib/tcpdump/print-tftp.c projects/sv/contrib/tcpdump/print-token.c projects/sv/contrib/tcpdump/print-udp.c projects/sv/contrib/tcpdump/setsignal.h projects/sv/contrib/tcpdump/sll.h projects/sv/contrib/tcpdump/smbutil.c projects/sv/contrib/tcpdump/strcasecmp.c projects/sv/contrib/tcpdump/tcp.h projects/sv/contrib/tcpdump/tcpdump-stdinc.h projects/sv/contrib/tcpdump/tcpdump.c projects/sv/contrib/tcpdump/tftp.h projects/sv/contrib/tcpdump/timed.h projects/sv/contrib/tcpdump/token.h projects/sv/contrib/tcpdump/util.c projects/sv/contrib/top/display.c projects/sv/contrib/top/top.h projects/sv/contrib/tzdata/australasia projects/sv/contrib/wpa/src/Makefile projects/sv/contrib/wpa/src/common/Makefile projects/sv/contrib/wpa/src/common/defs.h projects/sv/contrib/wpa/src/common/ieee802_11_common.c projects/sv/contrib/wpa/src/common/ieee802_11_common.h projects/sv/contrib/wpa/src/common/ieee802_11_defs.h projects/sv/contrib/wpa/src/common/privsep_commands.h projects/sv/contrib/wpa/src/common/version.h projects/sv/contrib/wpa/src/common/wpa_common.c projects/sv/contrib/wpa/src/common/wpa_common.h projects/sv/contrib/wpa/src/common/wpa_ctrl.h projects/sv/contrib/wpa/src/crypto/Makefile projects/sv/contrib/wpa/src/crypto/aes.h projects/sv/contrib/wpa/src/crypto/crypto.h projects/sv/contrib/wpa/src/crypto/crypto_cryptoapi.c projects/sv/contrib/wpa/src/crypto/crypto_gnutls.c projects/sv/contrib/wpa/src/crypto/crypto_internal.c projects/sv/contrib/wpa/src/crypto/crypto_libtomcrypt.c projects/sv/contrib/wpa/src/crypto/crypto_none.c projects/sv/contrib/wpa/src/crypto/crypto_openssl.c projects/sv/contrib/wpa/src/crypto/dh_groups.c projects/sv/contrib/wpa/src/crypto/md5.c projects/sv/contrib/wpa/src/crypto/md5.h projects/sv/contrib/wpa/src/crypto/ms_funcs.c projects/sv/contrib/wpa/src/crypto/ms_funcs.h projects/sv/contrib/wpa/src/crypto/rc4.c projects/sv/contrib/wpa/src/crypto/sha1.c projects/sv/contrib/wpa/src/crypto/sha1.h projects/sv/contrib/wpa/src/crypto/sha256.c projects/sv/contrib/wpa/src/crypto/tls.h projects/sv/contrib/wpa/src/crypto/tls_gnutls.c projects/sv/contrib/wpa/src/crypto/tls_internal.c projects/sv/contrib/wpa/src/crypto/tls_none.c projects/sv/contrib/wpa/src/crypto/tls_openssl.c projects/sv/contrib/wpa/src/crypto/tls_schannel.c projects/sv/contrib/wpa/src/drivers/Makefile projects/sv/contrib/wpa/src/drivers/driver.h projects/sv/contrib/wpa/src/drivers/driver_ndis.c projects/sv/contrib/wpa/src/drivers/driver_ndis.h projects/sv/contrib/wpa/src/drivers/driver_ndiswrapper.c projects/sv/contrib/wpa/src/drivers/driver_wired.c projects/sv/contrib/wpa/src/drivers/drivers.c projects/sv/contrib/wpa/src/eap_common/Makefile projects/sv/contrib/wpa/src/eap_common/chap.c projects/sv/contrib/wpa/src/eap_common/chap.h projects/sv/contrib/wpa/src/eap_common/eap_fast_common.c projects/sv/contrib/wpa/src/eap_common/eap_gpsk_common.c projects/sv/contrib/wpa/src/eap_common/eap_pax_common.c projects/sv/contrib/wpa/src/eap_common/eap_peap_common.c projects/sv/contrib/wpa/src/eap_common/eap_psk_common.c projects/sv/contrib/wpa/src/eap_common/eap_sake_common.c projects/sv/contrib/wpa/src/eap_common/eap_sim_common.c projects/sv/contrib/wpa/src/eap_common/eap_sim_common.h projects/sv/contrib/wpa/src/eap_common/ikev2_common.c projects/sv/contrib/wpa/src/eap_peer/Makefile projects/sv/contrib/wpa/src/eap_peer/eap.c projects/sv/contrib/wpa/src/eap_peer/eap.h projects/sv/contrib/wpa/src/eap_peer/eap_aka.c projects/sv/contrib/wpa/src/eap_peer/eap_config.h projects/sv/contrib/wpa/src/eap_peer/eap_fast.c projects/sv/contrib/wpa/src/eap_peer/eap_fast_pac.c projects/sv/contrib/wpa/src/eap_peer/eap_leap.c projects/sv/contrib/wpa/src/eap_peer/eap_md5.c projects/sv/contrib/wpa/src/eap_peer/eap_methods.c projects/sv/contrib/wpa/src/eap_peer/eap_methods.h projects/sv/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/sv/contrib/wpa/src/eap_peer/eap_pax.c projects/sv/contrib/wpa/src/eap_peer/eap_peap.c projects/sv/contrib/wpa/src/eap_peer/eap_psk.c projects/sv/contrib/wpa/src/eap_peer/eap_sim.c projects/sv/contrib/wpa/src/eap_peer/eap_tls.c projects/sv/contrib/wpa/src/eap_peer/eap_tls_common.c projects/sv/contrib/wpa/src/eap_peer/eap_tls_common.h projects/sv/contrib/wpa/src/eap_peer/eap_tnc.c projects/sv/contrib/wpa/src/eap_peer/eap_ttls.c projects/sv/contrib/wpa/src/eap_peer/eap_wsc.c projects/sv/contrib/wpa/src/eap_peer/ikev2.c projects/sv/contrib/wpa/src/eap_peer/mschapv2.c projects/sv/contrib/wpa/src/eap_peer/mschapv2.h projects/sv/contrib/wpa/src/eap_server/Makefile projects/sv/contrib/wpa/src/eap_server/eap.h projects/sv/contrib/wpa/src/eap_server/eap_i.h projects/sv/contrib/wpa/src/eap_server/eap_methods.h projects/sv/contrib/wpa/src/eap_server/eap_sim_db.c projects/sv/contrib/wpa/src/eap_server/eap_sim_db.h projects/sv/contrib/wpa/src/eap_server/eap_tls_common.h projects/sv/contrib/wpa/src/eap_server/ikev2.c projects/sv/contrib/wpa/src/eap_server/tncs.c projects/sv/contrib/wpa/src/eapol_supp/Makefile projects/sv/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/sv/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/sv/contrib/wpa/src/l2_packet/Makefile projects/sv/contrib/wpa/src/l2_packet/l2_packet_freebsd.c projects/sv/contrib/wpa/src/l2_packet/l2_packet_ndis.c projects/sv/contrib/wpa/src/radius/Makefile projects/sv/contrib/wpa/src/radius/radius.c projects/sv/contrib/wpa/src/radius/radius.h projects/sv/contrib/wpa/src/radius/radius_client.c projects/sv/contrib/wpa/src/radius/radius_client.h projects/sv/contrib/wpa/src/radius/radius_server.c projects/sv/contrib/wpa/src/radius/radius_server.h projects/sv/contrib/wpa/src/rsn_supp/Makefile projects/sv/contrib/wpa/src/rsn_supp/peerkey.c projects/sv/contrib/wpa/src/rsn_supp/pmksa_cache.c projects/sv/contrib/wpa/src/rsn_supp/pmksa_cache.h projects/sv/contrib/wpa/src/rsn_supp/preauth.c projects/sv/contrib/wpa/src/rsn_supp/preauth.h projects/sv/contrib/wpa/src/rsn_supp/wpa.c projects/sv/contrib/wpa/src/rsn_supp/wpa.h projects/sv/contrib/wpa/src/rsn_supp/wpa_ft.c projects/sv/contrib/wpa/src/rsn_supp/wpa_i.h projects/sv/contrib/wpa/src/rsn_supp/wpa_ie.c projects/sv/contrib/wpa/src/rsn_supp/wpa_ie.h projects/sv/contrib/wpa/src/tls/Makefile projects/sv/contrib/wpa/src/tls/asn1.c projects/sv/contrib/wpa/src/tls/asn1.h projects/sv/contrib/wpa/src/tls/rsa.c projects/sv/contrib/wpa/src/tls/tlsv1_client.c projects/sv/contrib/wpa/src/tls/tlsv1_client_read.c projects/sv/contrib/wpa/src/tls/tlsv1_client_write.c projects/sv/contrib/wpa/src/tls/tlsv1_common.h projects/sv/contrib/wpa/src/tls/tlsv1_cred.c projects/sv/contrib/wpa/src/tls/tlsv1_record.c projects/sv/contrib/wpa/src/tls/tlsv1_record.h projects/sv/contrib/wpa/src/tls/tlsv1_server.c projects/sv/contrib/wpa/src/tls/tlsv1_server_read.c projects/sv/contrib/wpa/src/tls/tlsv1_server_write.c projects/sv/contrib/wpa/src/tls/x509v3.c projects/sv/contrib/wpa/src/tls/x509v3.h projects/sv/contrib/wpa/src/utils/Makefile projects/sv/contrib/wpa/src/utils/base64.c projects/sv/contrib/wpa/src/utils/build_config.h projects/sv/contrib/wpa/src/utils/common.c projects/sv/contrib/wpa/src/utils/common.h projects/sv/contrib/wpa/src/utils/eloop.c projects/sv/contrib/wpa/src/utils/eloop.h projects/sv/contrib/wpa/src/utils/eloop_none.c projects/sv/contrib/wpa/src/utils/eloop_win.c projects/sv/contrib/wpa/src/utils/ip_addr.h projects/sv/contrib/wpa/src/utils/os.h projects/sv/contrib/wpa/src/utils/os_internal.c projects/sv/contrib/wpa/src/utils/os_unix.c projects/sv/contrib/wpa/src/utils/uuid.c projects/sv/contrib/wpa/src/utils/uuid.h projects/sv/contrib/wpa/src/utils/wpa_debug.c projects/sv/contrib/wpa/src/utils/wpa_debug.h projects/sv/contrib/wpa/src/utils/wpabuf.c projects/sv/contrib/wpa/src/utils/wpabuf.h projects/sv/contrib/wpa/src/wps/Makefile projects/sv/contrib/wpa/src/wps/httpread.c projects/sv/contrib/wpa/src/wps/httpread.h projects/sv/contrib/wpa/src/wps/wps.c projects/sv/contrib/wpa/src/wps/wps.h projects/sv/contrib/wpa/src/wps/wps_attr_build.c projects/sv/contrib/wpa/src/wps/wps_attr_parse.c projects/sv/contrib/wpa/src/wps/wps_attr_process.c projects/sv/contrib/wpa/src/wps/wps_common.c projects/sv/contrib/wpa/src/wps/wps_defs.h projects/sv/contrib/wpa/src/wps/wps_dev_attr.c projects/sv/contrib/wpa/src/wps/wps_enrollee.c projects/sv/contrib/wpa/src/wps/wps_i.h projects/sv/contrib/wpa/src/wps/wps_registrar.c projects/sv/contrib/wpa/src/wps/wps_upnp.c projects/sv/contrib/wpa/src/wps/wps_upnp.h projects/sv/contrib/wpa/src/wps/wps_upnp_event.c projects/sv/contrib/wpa/src/wps/wps_upnp_i.h projects/sv/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/sv/contrib/wpa/src/wps/wps_upnp_web.c projects/sv/contrib/wpa/wpa_supplicant/ChangeLog projects/sv/contrib/wpa/wpa_supplicant/Makefile projects/sv/contrib/wpa/wpa_supplicant/README projects/sv/contrib/wpa/wpa_supplicant/README-WPS projects/sv/contrib/wpa/wpa_supplicant/config.c projects/sv/contrib/wpa/wpa_supplicant/config.h projects/sv/contrib/wpa/wpa_supplicant/config_file.c projects/sv/contrib/wpa/wpa_supplicant/config_ssid.h projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/sv/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/sv/contrib/wpa/wpa_supplicant/defconfig projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 projects/sv/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml projects/sv/contrib/wpa/wpa_supplicant/eapol_test.c projects/sv/contrib/wpa/wpa_supplicant/events.c projects/sv/contrib/wpa/wpa_supplicant/main.c projects/sv/contrib/wpa/wpa_supplicant/mlme.c projects/sv/contrib/wpa/wpa_supplicant/mlme.h projects/sv/contrib/wpa/wpa_supplicant/nmake.mak projects/sv/contrib/wpa/wpa_supplicant/preauth_test.c projects/sv/contrib/wpa/wpa_supplicant/scan.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c projects/sv/contrib/wpa/wpa_supplicant/tests/test_wpa.c projects/sv/contrib/wpa/wpa_supplicant/todo.txt projects/sv/contrib/wpa/wpa_supplicant/wpa_cli.c projects/sv/contrib/wpa/wpa_supplicant/wpa_passphrase.c projects/sv/contrib/wpa/wpa_supplicant/wpa_priv.c projects/sv/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/sv/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/sv/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi projects/sv/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/sv/contrib/wpa/wpa_supplicant/wpas_glue.c projects/sv/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/sv/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/sv/gnu/usr.bin/gdb/arch/mips/Makefile projects/sv/gnu/usr.bin/gdb/arch/mips/init.c projects/sv/gnu/usr.bin/gdb/kgdb/trgt_mips.c projects/sv/include/Makefile projects/sv/include/termios.h projects/sv/include/unistd.h projects/sv/lib/bind/config.h projects/sv/lib/bind/isc/isc/platform.h projects/sv/lib/clang/Makefile projects/sv/lib/libarchive/archive.h projects/sv/lib/libarchive/archive_private.h projects/sv/lib/libarchive/archive_read.3 projects/sv/lib/libarchive/archive_read.c projects/sv/lib/libarchive/archive_read_disk.3 projects/sv/lib/libarchive/archive_read_disk.c projects/sv/lib/libarchive/archive_read_extract.c projects/sv/lib/libarchive/archive_read_support_format_zip.c projects/sv/lib/libarchive/archive_virtual.c projects/sv/lib/libarchive/archive_write.3 projects/sv/lib/libarchive/archive_write.c projects/sv/lib/libarchive/archive_write_disk.3 projects/sv/lib/libarchive/archive_write_disk.c projects/sv/lib/libarchive/libarchive.3 projects/sv/lib/libarchive/libarchive_internals.3 projects/sv/lib/libarchive/test/test_compat_zip.c projects/sv/lib/libc/gen/Makefile.inc projects/sv/lib/libc/gen/Symbol.map projects/sv/lib/libc/gen/sysconf.c projects/sv/lib/libc/gen/tcsetattr.3 projects/sv/lib/libc/gen/termios.c projects/sv/lib/libc/sys/chflags.2 projects/sv/lib/libjail/jail.c projects/sv/lib/libkvm/Makefile projects/sv/lib/libkvm/kvm_mips.c projects/sv/lib/libkvm/kvm_private.h projects/sv/lib/libpcap/Makefile projects/sv/lib/libpcap/config.h projects/sv/lib/libpmc/pmc.mips.3 projects/sv/lib/libpmc/pmc.xscale.3 projects/sv/lib/libthr/thread/thr_attr.c projects/sv/lib/libthr/thread/thr_sig.c projects/sv/libexec/getty/main.c projects/sv/libexec/rlogind/rlogind.c projects/sv/libexec/rtld-elf/rtld.c projects/sv/libexec/rtld-elf/rtld.h projects/sv/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/sv/release/fixit.profile projects/sv/release/sparc64/boot_crunch.conf projects/sv/sbin/camcontrol/camcontrol.c projects/sv/sbin/hastd/primary.c projects/sv/sbin/mount_nfs/mount_nfs.c projects/sv/sbin/pflogd/Makefile projects/sv/share/man/man3/pthread_attr_affinity_np.3 projects/sv/share/man/man4/aibs.4 projects/sv/share/man/man4/bge.4 projects/sv/share/man/man4/man4.sparc64/openfirm.4 projects/sv/share/man/man4/man4.sparc64/openprom.4 projects/sv/share/man/man4/re.4 projects/sv/share/man/man9/BUS_SETUP_INTR.9 projects/sv/share/man/man9/Makefile projects/sv/share/man/man9/locking.9 projects/sv/share/man/man9/sysctl_ctx_init.9 projects/sv/share/man/man9/taskqueue.9 projects/sv/share/misc/bsd-family-tree projects/sv/sys/amd64/acpica/acpi_wakeup.c projects/sv/sys/amd64/amd64/amd64_mem.c projects/sv/sys/amd64/amd64/apic_vector.S projects/sv/sys/amd64/amd64/genassym.c projects/sv/sys/amd64/amd64/intr_machdep.c projects/sv/sys/amd64/amd64/machdep.c projects/sv/sys/amd64/amd64/mp_machdep.c projects/sv/sys/amd64/amd64/mp_watchdog.c projects/sv/sys/amd64/amd64/pmap.c projects/sv/sys/amd64/amd64/trap.c projects/sv/sys/amd64/include/pmap.h projects/sv/sys/arm/arm/elf_trampoline.c projects/sv/sys/arm/arm/machdep.c projects/sv/sys/arm/conf/AVILA projects/sv/sys/arm/conf/AVILA.hints projects/sv/sys/arm/include/cpuconf.h projects/sv/sys/arm/xscale/ixp425/files.avila projects/sv/sys/arm/xscale/ixp425/ixp425reg.h projects/sv/sys/boot/common/loader.8 projects/sv/sys/boot/forth/beastie.4th projects/sv/sys/boot/i386/libi386/biosacpi.c projects/sv/sys/boot/i386/libi386/i386_module.c projects/sv/sys/boot/i386/loader/help.i386 projects/sv/sys/boot/ofw/common/main.c projects/sv/sys/boot/ofw/libofw/ofw_memory.c projects/sv/sys/boot/ofw/libofw/ofw_net.c projects/sv/sys/boot/ofw/libofw/openfirm.c projects/sv/sys/boot/sparc64/loader/main.c projects/sv/sys/cam/cam_periph.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/sv/sys/compat/linprocfs/linprocfs.c projects/sv/sys/compat/ndis/kern_ndis.c projects/sv/sys/compat/ndis/subr_ndis.c projects/sv/sys/compat/ndis/subr_ntoskrnl.c projects/sv/sys/conf/files projects/sv/sys/conf/files.amd64 projects/sv/sys/conf/files.i386 projects/sv/sys/conf/files.mips projects/sv/sys/conf/files.pc98 projects/sv/sys/conf/files.powerpc projects/sv/sys/conf/kern.post.mk projects/sv/sys/conf/kmod.mk projects/sv/sys/conf/options.amd64 projects/sv/sys/conf/options.powerpc projects/sv/sys/contrib/octeon-sdk/cvmx-app-init.h projects/sv/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper.c projects/sv/sys/dev/acpica/acpi.c projects/sv/sys/dev/acpica/acpi_pci_link.c projects/sv/sys/dev/agp/agp.c projects/sv/sys/dev/ahci/ahci.c projects/sv/sys/dev/alc/if_alc.c projects/sv/sys/dev/ata/ata-all.c projects/sv/sys/dev/ata/ata-lowlevel.c projects/sv/sys/dev/ata/chipsets/ata-intel.c projects/sv/sys/dev/bge/if_bge.c projects/sv/sys/dev/bge/if_bgereg.h projects/sv/sys/dev/bwi/if_bwi.c projects/sv/sys/dev/bwn/if_bwn.c projects/sv/sys/dev/e1000/e1000_82571.c projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_lem.c projects/sv/sys/dev/e1000/if_lem.h projects/sv/sys/dev/gpio/gpioled.c projects/sv/sys/dev/iicbus/iiconf.c projects/sv/sys/dev/iwn/if_iwn.c projects/sv/sys/dev/mii/brgphy.c projects/sv/sys/dev/mii/e1000phy.c projects/sv/sys/dev/mii/mii_physubr.c projects/sv/sys/dev/mii/miidevs projects/sv/sys/dev/mii/miivar.h projects/sv/sys/dev/ral/rt2560.c projects/sv/sys/dev/ral/rt2661.c projects/sv/sys/dev/re/if_re.c projects/sv/sys/dev/siis/siis.c projects/sv/sys/dev/sk/if_sk.c projects/sv/sys/dev/usb/net/uhso.c projects/sv/sys/dev/usb/quirk/usb_quirk.c projects/sv/sys/dev/usb/serial/u3g.c projects/sv/sys/dev/usb/serial/uark.c projects/sv/sys/dev/usb/serial/ubsa.c projects/sv/sys/dev/usb/serial/ubser.c projects/sv/sys/dev/usb/serial/uchcom.c projects/sv/sys/dev/usb/serial/ucycom.c projects/sv/sys/dev/usb/serial/ufoma.c projects/sv/sys/dev/usb/serial/uftdi.c projects/sv/sys/dev/usb/serial/ugensa.c projects/sv/sys/dev/usb/serial/uipaq.c projects/sv/sys/dev/usb/serial/umct.c projects/sv/sys/dev/usb/serial/umodem.c projects/sv/sys/dev/usb/serial/umoscom.c projects/sv/sys/dev/usb/serial/uplcom.c projects/sv/sys/dev/usb/serial/usb_serial.c projects/sv/sys/dev/usb/serial/usb_serial.h projects/sv/sys/dev/usb/serial/uslcom.c projects/sv/sys/dev/usb/serial/uvisor.c projects/sv/sys/dev/usb/serial/uvscom.c projects/sv/sys/dev/usb/usb_device.c projects/sv/sys/dev/usb/usb_hub.c projects/sv/sys/dev/usb/usb_request.c projects/sv/sys/dev/usb/usb_request.h projects/sv/sys/dev/usb/usbdevs projects/sv/sys/dev/usb/usbdi.h projects/sv/sys/dev/usb/wlan/if_rum.c projects/sv/sys/dev/usb/wlan/if_run.c projects/sv/sys/dev/usb/wlan/if_ural.c projects/sv/sys/dev/usb/wlan/if_zyd.c projects/sv/sys/dev/wb/if_wb.c projects/sv/sys/dev/wpi/if_wpi.c projects/sv/sys/dev/xen/blkback/blkback.c projects/sv/sys/dev/xl/if_xl.c projects/sv/sys/fs/nfsclient/nfs_clnode.c projects/sv/sys/fs/nfsclient/nfs_clvnops.c projects/sv/sys/geom/geom_event.c projects/sv/sys/i386/acpica/acpi_wakeup.c projects/sv/sys/i386/i386/apic_vector.s projects/sv/sys/i386/i386/genassym.c projects/sv/sys/i386/i386/intr_machdep.c projects/sv/sys/i386/i386/machdep.c projects/sv/sys/i386/i386/mp_machdep.c projects/sv/sys/i386/i386/mp_watchdog.c projects/sv/sys/i386/i386/mpboot.s projects/sv/sys/i386/i386/pmap.c projects/sv/sys/i386/i386/trap.c projects/sv/sys/i386/xen/mp_machdep.c projects/sv/sys/i386/xen/mptable.c projects/sv/sys/ia64/acpica/OsdEnvironment.c projects/sv/sys/ia64/ia64/machdep.c projects/sv/sys/kern/init_main.c projects/sv/sys/kern/kern_clock.c projects/sv/sys/kern/kern_clocksource.c projects/sv/sys/kern/kern_conf.c projects/sv/sys/kern/kern_cpuset.c projects/sv/sys/kern/kern_timeout.c projects/sv/sys/kern/link_elf.c projects/sv/sys/kern/sched_ule.c projects/sv/sys/kern/subr_acl_nfs4.c projects/sv/sys/kern/subr_taskqueue.c projects/sv/sys/kern/vfs_cache.c projects/sv/sys/mips/cavium/octeon_ebt3000_cf.c projects/sv/sys/mips/cavium/octopci.c projects/sv/sys/mips/include/cpuregs.h projects/sv/sys/mips/include/md_var.h projects/sv/sys/mips/include/pmap.h projects/sv/sys/mips/mips/dump_machdep.c projects/sv/sys/mips/mips/gdb_machdep.c projects/sv/sys/mips/mips/machdep.c projects/sv/sys/modules/Makefile projects/sv/sys/modules/acpi/Makefile projects/sv/sys/modules/acpi/acpi/Makefile projects/sv/sys/modules/agp/Makefile projects/sv/sys/net/bpf.h projects/sv/sys/net80211/ieee80211.c projects/sv/sys/net80211/ieee80211_node.c projects/sv/sys/net80211/ieee80211_ratectl.c projects/sv/sys/net80211/ieee80211_ratectl.h projects/sv/sys/net80211/ieee80211_sta.c projects/sv/sys/net80211/ieee80211_var.h projects/sv/sys/netinet/if_ether.c projects/sv/sys/netinet/libalias/alias.c projects/sv/sys/netinet/sctp_indata.c projects/sv/sys/netinet/sctp_input.c projects/sv/sys/netinet/sctp_output.c projects/sv/sys/netinet/sctp_timer.c projects/sv/sys/netinet/sctp_timer.h projects/sv/sys/netinet/sctp_usrreq.c projects/sv/sys/netinet/sctputil.c projects/sv/sys/netinet/sctputil.h projects/sv/sys/netipsec/ipsec.c projects/sv/sys/nfsclient/nfs_vfsops.c projects/sv/sys/nfsserver/nfs_serv.c projects/sv/sys/pc98/include/bus.h projects/sv/sys/pc98/pc98/busiosubr.c projects/sv/sys/pc98/pc98/machdep.c projects/sv/sys/pci/if_rlreg.h projects/sv/sys/powerpc/aim/copyinout.c projects/sv/sys/powerpc/aim/machdep.c projects/sv/sys/powerpc/aim/mmu_oea.c projects/sv/sys/powerpc/aim/mmu_oea64.c projects/sv/sys/powerpc/aim/slb.c projects/sv/sys/powerpc/aim/swtch32.S projects/sv/sys/powerpc/aim/swtch64.S projects/sv/sys/powerpc/aim/trap.c projects/sv/sys/powerpc/aim/trap_subr32.S projects/sv/sys/powerpc/aim/trap_subr64.S projects/sv/sys/powerpc/aim/vm_machdep.c projects/sv/sys/powerpc/booke/machdep.c projects/sv/sys/powerpc/conf/GENERIC projects/sv/sys/powerpc/conf/GENERIC64 projects/sv/sys/powerpc/conf/NOTES projects/sv/sys/powerpc/include/pcb.h projects/sv/sys/powerpc/include/slb.h projects/sv/sys/powerpc/include/sr.h projects/sv/sys/powerpc/powermac/cpcht.c projects/sv/sys/powerpc/powerpc/exec_machdep.c projects/sv/sys/powerpc/powerpc/genassym.c projects/sv/sys/sparc64/sparc64/machdep.c projects/sv/sys/sparc64/sparc64/pmap.c projects/sv/sys/sun4v/sun4v/machdep.c projects/sv/sys/sys/interrupt.h projects/sv/sys/sys/kerneldump.h projects/sv/sys/sys/taskqueue.h projects/sv/sys/teken/sequences projects/sv/sys/teken/teken_subr_compat.h projects/sv/sys/vm/uma_core.c projects/sv/sys/vm/vm_map.c projects/sv/sys/vm/vm_page.c projects/sv/sys/vm/vm_phys.c projects/sv/sys/vm/vm_reserv.c projects/sv/sys/x86/x86/io_apic.c projects/sv/sys/x86/x86/local_apic.c projects/sv/sys/x86/x86/mca.c projects/sv/sys/x86/x86/msi.c projects/sv/tools/regression/acltools/tools-nfs4.test projects/sv/tools/regression/bin/Makefile projects/sv/tools/tools/nanobsd/nanobsd.sh projects/sv/usr.bin/calendar/calendars/calendar.freebsd projects/sv/usr.bin/fold/fold.c projects/sv/usr.bin/kdump/kdump.1 projects/sv/usr.bin/locate/locate/locate.rc projects/sv/usr.bin/locate/locate/updatedb.sh projects/sv/usr.bin/setchannel/setchannel.1 projects/sv/usr.bin/setchannel/setchannel.c projects/sv/usr.bin/yacc/Makefile projects/sv/usr.bin/yacc/closure.c projects/sv/usr.bin/yacc/defs.h projects/sv/usr.bin/yacc/error.c projects/sv/usr.bin/yacc/lalr.c projects/sv/usr.bin/yacc/lr0.c projects/sv/usr.bin/yacc/main.c projects/sv/usr.bin/yacc/mkpar.c projects/sv/usr.bin/yacc/output.c projects/sv/usr.bin/yacc/reader.c projects/sv/usr.bin/yacc/skeleton.c projects/sv/usr.bin/yacc/symtab.c projects/sv/usr.bin/yacc/verbose.c projects/sv/usr.bin/yacc/warshall.c projects/sv/usr.bin/yacc/yacc.1 projects/sv/usr.sbin/Makefile projects/sv/usr.sbin/apmd/apmd.8 projects/sv/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c projects/sv/usr.sbin/config/main.c projects/sv/usr.sbin/config/mkmakefile.c projects/sv/usr.sbin/makefs/Makefile projects/sv/usr.sbin/makefs/ffs.c projects/sv/usr.sbin/makefs/ffs/buf.c projects/sv/usr.sbin/makefs/ffs/ffs_alloc.c projects/sv/usr.sbin/makefs/ffs/mkfs.c projects/sv/usr.sbin/makefs/makefs.8 projects/sv/usr.sbin/makefs/makefs.c projects/sv/usr.sbin/makefs/makefs.h projects/sv/usr.sbin/makefs/walk.c projects/sv/usr.sbin/mfiutil/mfi_cmd.c projects/sv/usr.sbin/pc-sysinstall/backend-query/disk-info.sh projects/sv/usr.sbin/rtadvd/rtadvd.conf.5 projects/sv/usr.sbin/tcpdump/tcpdump/Makefile projects/sv/usr.sbin/tcpdump/tcpdump/config.h projects/sv/usr.sbin/wpa/hostapd/Makefile projects/sv/usr.sbin/wpa/hostapd/driver_freebsd.c projects/sv/usr.sbin/wpa/wpa_passphrase/Makefile projects/sv/usr.sbin/wpa/wpa_supplicant/Makefile projects/sv/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/binutils/ (props changed) projects/sv/contrib/bzip2/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/contrib/xz/ (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/sys/dev/xen/xenpci/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/ObsoleteFiles.inc ============================================================================== --- projects/sv/ObsoleteFiles.inc Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/ObsoleteFiles.inc Tue Nov 9 02:53:24 2010 (r215028) @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20101101: headers moved to machine/ to x86/ +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/apicreg.h +OLD_FILES+=usr/include/machine/mca.h +.endif # 20101020: catch up with vm_page_sleep_if_busy rename OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz # 20101011: removed subblock.h from liblzma Modified: projects/sv/bin/rm/rm.1 ============================================================================== --- projects/sv/bin/rm/rm.1 Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/rm/rm.1 Tue Nov 9 02:53:24 2010 (r215028) @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd October 8, 2010 +.Dd October 31, 2010 .Dt RM 1 .Os .Sh NAME @@ -100,6 +100,11 @@ Specifying this flag for a read only fil .Nm to generate an error message and exit. The file will not be removed or overwritten. +.Pp +N.B.: The +.Fl P +flag is not considered a security feature +.Pq see Sx BUGS . .It Fl R Attempt to remove the file hierarchy rooted in each .Ar file @@ -229,8 +234,12 @@ command appeared in .Sh BUGS The .Fl P -option assumes that the underlying file system updates existing blocks -in-place and does not store new data in a new location. -This is true for UFS but not for ZFS, which is using a Copy-On-Write strategy. -In addition, only regular files are overwritten, other types of files -are not. +option assumes that the underlying storage overwrites file blocks +when data is written to an existing offset. +Several factors including the file system and its backing store could defeat +this assumption. +This includes, but is not limited to file systems that use a +Copy-On-Write strategy (e.g. ZFS or UFS when snapshots are being used), Flash +media that are using a wear leveling algorithm, or when the backing datastore +does journaling, etc. +In addition, only regular files are overwritten, other types of files are not. Modified: projects/sv/bin/sh/eval.c ============================================================================== --- projects/sv/bin/sh/eval.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/eval.c Tue Nov 9 02:53:24 2010 (r215028) @@ -196,6 +196,7 @@ void evaltree(union node *n, int flags) { int do_etest; + union node *next; do_etest = 0; if (n == NULL) { @@ -203,84 +204,88 @@ evaltree(union node *n, int flags) exitstatus = 0; goto out; } + do { + next = NULL; #ifndef NO_HISTORY - displayhist = 1; /* show history substitutions done with fc */ + displayhist = 1; /* show history substitutions done with fc */ #endif - TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type)); - switch (n->type) { - case NSEMI: - evaltree(n->nbinary.ch1, flags & ~EV_EXIT); - if (evalskip) - goto out; - evaltree(n->nbinary.ch2, flags); - break; - case NAND: - evaltree(n->nbinary.ch1, EV_TESTED); - if (evalskip || exitstatus != 0) { - goto out; + TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type)); + switch (n->type) { + case NSEMI: + evaltree(n->nbinary.ch1, flags & ~EV_EXIT); + if (evalskip) + goto out; + next = n->nbinary.ch2; + break; + case NAND: + evaltree(n->nbinary.ch1, EV_TESTED); + if (evalskip || exitstatus != 0) { + goto out; + } + next = n->nbinary.ch2; + break; + case NOR: + evaltree(n->nbinary.ch1, EV_TESTED); + if (evalskip || exitstatus == 0) + goto out; + next = n->nbinary.ch2; + break; + case NREDIR: + evalredir(n, flags); + break; + case NSUBSHELL: + evalsubshell(n, flags); + do_etest = !(flags & EV_TESTED); + break; + case NBACKGND: + evalsubshell(n, flags); + break; + case NIF: { + evaltree(n->nif.test, EV_TESTED); + if (evalskip) + goto out; + if (exitstatus == 0) + next = n->nif.ifpart; + else if (n->nif.elsepart) + next = n->nif.elsepart; + else + exitstatus = 0; + break; } - evaltree(n->nbinary.ch2, flags); - break; - case NOR: - evaltree(n->nbinary.ch1, EV_TESTED); - if (evalskip || exitstatus == 0) - goto out; - evaltree(n->nbinary.ch2, flags); - break; - case NREDIR: - evalredir(n, flags); - break; - case NSUBSHELL: - evalsubshell(n, flags); - do_etest = !(flags & EV_TESTED); - break; - case NBACKGND: - evalsubshell(n, flags); - break; - case NIF: { - evaltree(n->nif.test, EV_TESTED); - if (evalskip) - goto out; - if (exitstatus == 0) - evaltree(n->nif.ifpart, flags); - else if (n->nif.elsepart) - evaltree(n->nif.elsepart, flags); - else + case NWHILE: + case NUNTIL: + evalloop(n, flags & ~EV_EXIT); + break; + case NFOR: + evalfor(n, flags & ~EV_EXIT); + break; + case NCASE: + evalcase(n, flags); + break; + case NDEFUN: + defun(n->narg.text, n->narg.next); exitstatus = 0; - break; - } - case NWHILE: - case NUNTIL: - evalloop(n, flags & ~EV_EXIT); - break; - case NFOR: - evalfor(n, flags & ~EV_EXIT); - break; - case NCASE: - evalcase(n, flags); - break; - case NDEFUN: - defun(n->narg.text, n->narg.next); - exitstatus = 0; - break; - case NNOT: - evaltree(n->nnot.com, EV_TESTED); - exitstatus = !exitstatus; - break; - - case NPIPE: - evalpipe(n); - do_etest = !(flags & EV_TESTED); - break; - case NCMD: - evalcommand(n, flags, (struct backcmd *)NULL); - do_etest = !(flags & EV_TESTED); - break; - default: - out1fmt("Node type = %d\n", n->type); - flushout(&output); - break; - } + break; + case NNOT: + evaltree(n->nnot.com, EV_TESTED); + exitstatus = !exitstatus; + break; + + case NPIPE: + evalpipe(n); + do_etest = !(flags & EV_TESTED); + break; + case NCMD: + evalcommand(n, flags, (struct backcmd *)NULL); + do_etest = !(flags & EV_TESTED); + break; + default: + out1fmt("Node type = %d\n", n->type); + flushout(&output); + break; + } + n = next; + } while (n != NULL); out: if (pendingsigs) dotrap(); @@ -1130,7 +1135,7 @@ commandcmd(int argc, char **argv) return typecmd_impl(2, argv - 1, cmd, path); } if (argc != 0) - error("commandcmd() called while it should not be"); + error("commandcmd bad call"); /* * Do nothing successfully if no command was specified; Modified: projects/sv/bin/sh/expand.c ============================================================================== --- projects/sv/bin/sh/expand.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/expand.c Tue Nov 9 02:53:24 2010 (r215028) @@ -98,7 +98,7 @@ static struct arglist exparg; /* holds static void argstr(char *, int); static char *exptilde(char *, int); static void expbackq(union node *, int, int); -static int subevalvar(char *, char *, int, int, int, int); +static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(char *, int); static void varvalue(char *, int, int, int); @@ -216,7 +216,12 @@ argstr(char *p, int flag) char c; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */ int firsteq = 1; + int split_lit; + int lit_quoted; + split_lit = flag & EXP_SPLIT_LIT; + lit_quoted = flag & EXP_LIT_QUOTED; + flag &= ~(EXP_SPLIT_LIT | EXP_LIT_QUOTED); if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE))) p = exptilde(p, flag); for (;;) { @@ -225,17 +230,25 @@ argstr(char *p, int flag) case CTLENDVAR: goto breakloop; case CTLQUOTEMARK: + lit_quoted = 1; /* "$@" syntax adherence hack */ if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=') break; if ((flag & EXP_FULL) != 0) STPUTC(c, expdest); break; + case CTLQUOTEEND: + lit_quoted = 0; + break; case CTLESC: if (quotes) STPUTC(c, expdest); c = *p++; STPUTC(c, expdest); + if (split_lit && !lit_quoted) + recordregion(expdest - stackblock() - + (quotes ? 2 : 1), + expdest - stackblock(), 0); break; case CTLVAR: p = evalvar(p, flag); @@ -255,18 +268,21 @@ argstr(char *p, int flag) * assignments (after the first '=' and after ':'s). */ STPUTC(c, expdest); - if (flag & EXP_VARTILDE && *p == '~') { - if (c == '=') { - if (firsteq) - firsteq = 0; - else - break; - } + if (split_lit && !lit_quoted) + recordregion(expdest - stackblock() - 1, + expdest - stackblock(), 0); + if (flag & EXP_VARTILDE && *p == '~' && + (c != '=' || firsteq)) { + if (c == '=') + firsteq = 0; p = exptilde(p, flag); } break; default: STPUTC(c, expdest); + if (split_lit && !lit_quoted) + recordregion(expdest - stackblock() - 1, + expdest - stackblock(), 0); } } breakloop:; @@ -510,7 +526,7 @@ expbackq(union node *cmd, int quoted, in static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, - int varflags) + int varflags, int quotes) { char *startp; char *loc = NULL; @@ -555,12 +571,12 @@ subevalvar(char *p, char *str, int strlo for (loc = startp; loc < str; loc++) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, varflags & VSQUOTE)) { + if (patmatch(str, startp, quotes)) { *loc = c; goto recordleft; } *loc = c; - if ((varflags & VSQUOTE) && *loc == CTLESC) + if (quotes && *loc == CTLESC) loc++; } return 0; @@ -569,14 +585,13 @@ subevalvar(char *p, char *str, int strlo for (loc = str - 1; loc >= startp;) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, varflags & VSQUOTE)) { + if (patmatch(str, startp, quotes)) { *loc = c; goto recordleft; } *loc = c; loc--; - if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + if (quotes && loc > startp && *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -588,14 +603,13 @@ subevalvar(char *p, char *str, int strlo case VSTRIMRIGHT: for (loc = str - 1; loc >= startp;) { - if (patmatch(str, loc, varflags & VSQUOTE)) { + if (patmatch(str, loc, quotes)) { amount = loc - expdest; STADJUST(amount, expdest); return 1; } loc--; - if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + if (quotes && loc > startp && *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -607,12 +621,12 @@ subevalvar(char *p, char *str, int strlo case VSTRIMRIGHTMAX: for (loc = startp; loc < str - 1; loc++) { - if (patmatch(str, loc, varflags & VSQUOTE)) { + if (patmatch(str, loc, quotes)) { amount = loc - expdest; STADJUST(amount, expdest); return 1; } - if ((varflags & VSQUOTE) && *loc == CTLESC) + if (quotes && *loc == CTLESC) loc++; } return 0; @@ -742,7 +756,8 @@ record: case VSPLUS: case VSMINUS: if (!set) { - argstr(p, flag); + argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) | + (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } if (easy) @@ -762,7 +777,7 @@ record: STPUTC('\0', expdest); patloc = expdest - stackblock(); if (subevalvar(p, NULL, patloc, subtype, - startloc, varflags) == 0) { + startloc, varflags, quotes) == 0) { int amount = (expdest - stackblock() - patloc) + 1; STADJUST(-amount, expdest); } @@ -773,7 +788,8 @@ record: case VSASSIGN: case VSQUESTION: if (!set) { - if (subevalvar(p, var, 0, subtype, startloc, varflags)) { + if (subevalvar(p, var, 0, subtype, startloc, varflags, + quotes)) { varflags &= ~VSNUL; /* * Remove any recorded regions beyond @@ -1495,13 +1511,13 @@ rmescapes(char *str) char *p, *q; p = str; - while (*p != CTLESC && *p != CTLQUOTEMARK) { + while (*p != CTLESC && *p != CTLQUOTEMARK && *p != CTLQUOTEEND) { if (*p++ == '\0') return; } q = p; while (*p) { - if (*p == CTLQUOTEMARK) { + if (*p == CTLQUOTEMARK || *p == CTLQUOTEEND) { p++; continue; } Modified: projects/sv/bin/sh/expand.h ============================================================================== --- projects/sv/bin/sh/expand.h Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/expand.h Tue Nov 9 02:53:24 2010 (r215028) @@ -52,6 +52,8 @@ struct arglist { #define EXP_VARTILDE 0x4 /* expand tildes in an assignment */ #define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */ #define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */ +#define EXP_SPLIT_LIT 0x20 /* IFS split literal text ${v+-a b c} */ +#define EXP_LIT_QUOTED 0x40 /* for EXP_SPLIT_LIT, start off quoted */ union node; Modified: projects/sv/bin/sh/histedit.c ============================================================================== --- projects/sv/bin/sh/histedit.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/histedit.c Tue Nov 9 02:53:24 2010 (r215028) @@ -297,7 +297,7 @@ histcmd(int argc, char **argv) laststr = argv[1]; break; default: - error("too many args"); + error("too many arguments"); } /* * Turn into event numbers. @@ -329,7 +329,7 @@ histcmd(int argc, char **argv) editfile = editfilestr; if ((efp = fdopen(fd, "w")) == NULL) { close(fd); - error("can't allocate stdio buffer for temp"); + error("Out of space"); } } Modified: projects/sv/bin/sh/mksyntax.c ============================================================================== --- projects/sv/bin/sh/mksyntax.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/mksyntax.c Tue Nov 9 02:53:24 2010 (r215028) @@ -285,6 +285,7 @@ init(void) syntax[base + CTLARI] = "CCTL"; syntax[base + CTLENDARI] = "CCTL"; syntax[base + CTLQUOTEMARK] = "CCTL"; + syntax[base + CTLQUOTEEND] = "CCTL"; } Modified: projects/sv/bin/sh/parser.c ============================================================================== --- projects/sv/bin/sh/parser.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/parser.c Tue Nov 9 02:53:24 2010 (r215028) @@ -69,6 +69,11 @@ __FBSDID("$FreeBSD$"); #define EOFMARKLEN 79 #define PROMPTLEN 128 +/* values of checkkwd variable */ +#define CHKALIAS 0x1 +#define CHKKWD 0x2 +#define CHKNL 0x4 + /* values returned by readtoken */ #include "token.h" @@ -102,11 +107,8 @@ static int startlinno; /* line # where static int funclinno; /* line # where the current function started */ static struct parser_temp *parser_temp; -/* XXX When 'noaliases' is set to one, no alias expansion takes place. */ -static int noaliases = 0; - -static union node *list(int); +static union node *list(int, int); static union node *andor(void); static union node *pipeline(void); static union node *command(void); @@ -220,20 +222,20 @@ parsecmd(int interact) if (t == TNL) return NULL; tokpushback++; - return list(1); + return list(1, 1); } static union node * -list(int nlflag) +list(int nlflag, int erflag) { - union node *n1, *n2, *n3; + union node *ntop, *n1, *n2, *n3; int tok; - checkkwd = 2; - if (nlflag == 0 && tokendlist[peektoken()]) + checkkwd = CHKNL | CHKKWD | CHKALIAS; + if (!nlflag && !erflag && tokendlist[peektoken()]) return NULL; - n1 = NULL; + ntop = n1 = NULL; for (;;) { n2 = andor(); tok = readtoken(); @@ -250,14 +252,21 @@ list(int nlflag) n2 = n3; } } - if (n1 == NULL) { - n1 = n2; + if (ntop == NULL) + ntop = n2; + else if (n1 == NULL) { + n1 = (union node *)stalloc(sizeof (struct nbinary)); + n1->type = NSEMI; + n1->nbinary.ch1 = ntop; + n1->nbinary.ch2 = n2; + ntop = n1; } else { n3 = (union node *)stalloc(sizeof (struct nbinary)); n3->type = NSEMI; - n3->nbinary.ch1 = n1; + n3->nbinary.ch1 = n1->nbinary.ch2; n3->nbinary.ch2 = n2; + n1->nbinary.ch2 = n3; n1 = n3; } switch (tok) { @@ -269,28 +278,28 @@ list(int nlflag) if (tok == TNL) { parseheredoc(); if (nlflag) - return n1; + return ntop; } else if (tok == TEOF && nlflag) { parseheredoc(); - return n1; + return ntop; } else { tokpushback++; } - checkkwd = 2; - if (tokendlist[peektoken()]) - return n1; + checkkwd = CHKNL | CHKKWD | CHKALIAS; + if (!nlflag && !erflag && tokendlist[peektoken()]) + return ntop; break; case TEOF: if (heredoclist) parseheredoc(); else pungetc(); /* push back EOF on input */ - return n1; + return ntop; default: - if (nlflag) + if (nlflag || erflag) synexpect(-1); tokpushback++; - return n1; + return ntop; } } } @@ -332,7 +341,7 @@ pipeline(void) int negate, t; negate = 0; - checkkwd = 2; + checkkwd = CHKNL | CHKKWD | CHKALIAS; TRACE(("pipeline: entered\n")); while (readtoken() == TNOT) negate = !negate; @@ -348,7 +357,7 @@ pipeline(void) do { prev = lp; lp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - checkkwd = 2; + checkkwd = CHKNL | CHKKWD | CHKALIAS; t = readtoken(); tokpushback++; if (t == TNOT) @@ -381,7 +390,7 @@ command(void) union node *redir, **rpp; int t; - checkkwd = 2; + checkkwd = CHKNL | CHKKWD | CHKALIAS; redir = NULL; n1 = NULL; rpp = &redir; @@ -398,47 +407,47 @@ command(void) case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); n1->type = NIF; - if ((n1->nif.test = list(0)) == NULL) + if ((n1->nif.test = list(0, 0)) == NULL) synexpect(-1); if (readtoken() != TTHEN) synexpect(TTHEN); - n1->nif.ifpart = list(0); + n1->nif.ifpart = list(0, 0); n2 = n1; while (readtoken() == TELIF) { n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif)); n2 = n2->nif.elsepart; n2->type = NIF; - if ((n2->nif.test = list(0)) == NULL) + if ((n2->nif.test = list(0, 0)) == NULL) synexpect(-1); if (readtoken() != TTHEN) synexpect(TTHEN); - n2->nif.ifpart = list(0); + n2->nif.ifpart = list(0, 0); } if (lasttoken == TELSE) - n2->nif.elsepart = list(0); + n2->nif.elsepart = list(0, 0); else { n2->nif.elsepart = NULL; tokpushback++; } if (readtoken() != TFI) synexpect(TFI); - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; case TWHILE: case TUNTIL: { int got; n1 = (union node *)stalloc(sizeof (struct nbinary)); n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL; - if ((n1->nbinary.ch1 = list(0)) == NULL) + if ((n1->nbinary.ch1 = list(0, 0)) == NULL) synexpect(-1); if ((got=readtoken()) != TDO) { TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); synexpect(TDO); } - n1->nbinary.ch2 = list(0); + n1->nbinary.ch2 = list(0, 0); if (readtoken() != TDONE) synexpect(TDONE); - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; } case TFOR: @@ -480,17 +489,17 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken != TNL && lasttoken != TSEMI) tokpushback++; } - checkkwd = 2; + checkkwd = CHKNL | CHKKWD | CHKALIAS; if ((t = readtoken()) == TDO) t = TDONE; else if (t == TBEGIN) t = TEND; else synexpect(-1); - n1->nfor.body = list(0); + n1->nfor.body = list(0, 0); if (readtoken() != t) synexpect(t); - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; case TCASE: n1 = (union node *)stalloc(sizeof (struct ncase)); @@ -506,8 +515,7 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken != TWORD || ! equal(wordtext, "in")) synerror("expecting \"in\""); cpp = &n1->ncase.cases; - noaliases = 1; /* turn off alias expansion */ - checkkwd = 2, readtoken(); + checkkwd = CHKNL | CHKKWD, readtoken(); while (lasttoken != TESAC) { *cpp = cp = (union node *)stalloc(sizeof (struct nclist)); cp->type = NCLIST; @@ -519,43 +527,43 @@ TRACE(("expecting DO got %s %s\n", tokna ap->type = NARG; ap->narg.text = wordtext; ap->narg.backquote = backquotelist; - if (checkkwd = 2, readtoken() != TPIPE) + checkkwd = CHKNL | CHKKWD; + if (readtoken() != TPIPE) break; app = &ap->narg.next; readtoken(); } ap->narg.next = NULL; if (lasttoken != TRP) - noaliases = 0, synexpect(TRP); - cp->nclist.body = list(0); + synexpect(TRP); + cp->nclist.body = list(0, 0); - checkkwd = 2; + checkkwd = CHKNL | CHKKWD | CHKALIAS; if ((t = readtoken()) != TESAC) { if (t != TENDCASE) - noaliases = 0, synexpect(TENDCASE); + synexpect(TENDCASE); else - checkkwd = 2, readtoken(); + checkkwd = CHKNL | CHKKWD, readtoken(); } cpp = &cp->nclist.next; } - noaliases = 0; /* reset alias expansion */ *cpp = NULL; - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; case TLP: n1 = (union node *)stalloc(sizeof (struct nredir)); n1->type = NSUBSHELL; - n1->nredir.n = list(0); + n1->nredir.n = list(0, 0); n1->nredir.redirect = NULL; if (readtoken() != TRP) synexpect(TRP); - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; case TBEGIN: - n1 = list(0); + n1 = list(0, 0); if (readtoken() != TEND) synexpect(TEND); - checkkwd = 1; + checkkwd = CHKKWD | CHKALIAS; break; /* Handle an empty command like other simple commands. */ case TBACKGND: @@ -644,9 +652,13 @@ simplecmd(union node **rpp, union node * /* * - Require plain text. * - Functions with '/' cannot be called. + * - Reject name=(). + * - Reject ksh extended glob patterns. */ if (!noexpand(n->narg.text) || quoteflag || - strchr(n->narg.text, '/')) + strchr(n->narg.text, '/') || + strchr("!%*+-=?@}~", + n->narg.text[strlen(n->narg.text) - 1])) synerror("Bad function name"); rmescapes(n->narg.text); if (find_builtin(n->narg.text, &special) >= 0 && @@ -785,7 +797,6 @@ static int readtoken(void) { int t; - int savecheckkwd = checkkwd; struct alias *ap; #ifdef DEBUG int alreadyseen = tokpushback; @@ -794,25 +805,24 @@ readtoken(void) top: t = xxreadtoken(); - if (checkkwd) { - /* - * eat newlines - */ - if (checkkwd == 2) { - checkkwd = 0; - while (t == TNL) { - parseheredoc(); - t = xxreadtoken(); - } - } else - checkkwd = 0; - /* - * check for keywords and aliases - */ - if (t == TWORD && !quoteflag) - { - const char * const *pp; + /* + * eat newlines + */ + if (checkkwd & CHKNL) { + while (t == TNL) { + parseheredoc(); + t = xxreadtoken(); + } + } + + /* + * check for keywords and aliases + */ + if (t == TWORD && !quoteflag) + { + const char * const *pp; + if (checkkwd & CHKKWD) for (pp = parsekwd; *pp; pp++) { if (**pp == *wordtext && equal(*pp, wordtext)) { @@ -821,16 +831,16 @@ readtoken(void) goto out; } } - if (noaliases == 0 && - (ap = lookupalias(wordtext, 1)) != NULL) { - pushstring(ap->val, strlen(ap->val), ap); - checkkwd = savecheckkwd; - goto top; - } + if (checkkwd & CHKALIAS && + (ap = lookupalias(wordtext, 1)) != NULL) { + pushstring(ap->val, strlen(ap->val), ap); + goto top; } -out: - checkkwd = (t == TNOT) ? savecheckkwd : 0; } +out: + if (t != TNOT) + checkkwd = 0; + #ifdef DEBUG if (!alreadyseen) TRACE(("token %s %s\n", tokname[t], t == TWORD ? wordtext : "")); @@ -1066,7 +1076,7 @@ done: doprompt = 0; } - n = list(0); + n = list(0, oldstyle); if (oldstyle) doprompt = saveprompt; @@ -1161,7 +1171,7 @@ readtoken1(int firstc, char const *initi loop: { /* for each line, until end of word */ CHECKEND(); /* set c to PEOF if at end of here document */ for (;;) { /* until end of line or end of word */ - CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */ + CHECKSTRSPACE(4, out); /* permit 4 calls to USTPUTC */ synentry = state[level].syntax[c]; @@ -1203,12 +1213,18 @@ readtoken1(int firstc, char const *initi newvarnest == 0)) && (c != '}' || state[level].category != TSTATE_VAR_OLD)) USTPUTC('\\', out); + if ((eofmark == NULL || + newvarnest > 0) && + state[level].syntax == BASESYNTAX) + USTPUTC(CTLQUOTEMARK, out); if (SQSYNTAX[c] == CCTL) USTPUTC(CTLESC, out); - else if (eofmark == NULL || - newvarnest > 0) - USTPUTC(CTLQUOTEMARK, out); USTPUTC(c, out); + if ((eofmark == NULL || + newvarnest > 0) && + state[level].syntax == BASESYNTAX && + state[level].category == TSTATE_VAR_OLD) + USTPUTC(CTLQUOTEEND, out); quotef++; } break; @@ -1224,6 +1240,8 @@ readtoken1(int firstc, char const *initi if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); else { + if (state[level].category == TSTATE_VAR_OLD) + USTPUTC(CTLQUOTEEND, out); state[level].syntax = BASESYNTAX; quotef++; } @@ -1233,11 +1251,12 @@ readtoken1(int firstc, char const *initi break; case CENDVAR: /* '}' */ if (level > 0 && - (state[level].category == TSTATE_VAR_OLD || - state[level].category == TSTATE_VAR_NEW)) { - if (state[level].category == TSTATE_VAR_OLD) - state[level - 1].syntax = state[level].syntax; - else + ((state[level].category == TSTATE_VAR_OLD && + state[level].syntax == + state[level - 1].syntax) || + (state[level].category == TSTATE_VAR_NEW && + state[level].syntax == BASESYNTAX))) { + if (state[level].category == TSTATE_VAR_NEW) newvarnest--; level--; USTPUTC(CTLENDVAR, out); @@ -1725,7 +1744,7 @@ getprompt(void *unused __unused) char *fmt; const char *pwd; int i, trim; - static char internal_error[] = ""; + static char internal_error[] = "??"; /* * Select prompt format. Modified: projects/sv/bin/sh/parser.h ============================================================================== --- projects/sv/bin/sh/parser.h Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/parser.h Tue Nov 9 02:53:24 2010 (r215028) @@ -43,6 +43,7 @@ #define CTLARI '\206' #define CTLENDARI '\207' #define CTLQUOTEMARK '\210' +#define CTLQUOTEEND '\211' /* only for ${v+-...} */ /* variable substitution byte (follows CTLVAR) */ #define VSTYPE 0x0f /* type of variable substitution */ Modified: projects/sv/bin/sh/sh.1 ============================================================================== --- projects/sv/bin/sh/sh.1 Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/sh.1 Tue Nov 9 02:53:24 2010 (r215028) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd October 16, 2010 +.Dd October 31, 2010 .Dt SH 1 .Os .Sh NAME @@ -40,9 +40,24 @@ .Nd command interpreter (shell) .Sh SYNOPSIS .Nm -.Op Fl /+abCEefIimnPpsTuVvx +.Op Fl /+abCEefIimnPpTuVvx .Op Fl /+o Ar longname -.Op Fl c Ar string +.Oo +.Ar script +.Op Ar arg ... +.Oc +.Nm +.Op Fl /+abCEefIimnPpTuVvx +.Op Fl /+o Ar longname +.Fl c Ar string +.Oo +.Ar name +.Op Ar arg ... +.Oc +.Nm +.Op Fl /+abCEefIimnPpTuVvx +.Op Fl /+o Ar longname +.Fl s .Op Ar arg ... .Sh DESCRIPTION The @@ -1109,7 +1124,12 @@ the process ID and its exit status until .Ic wait built-in command reports completion of the process. .It Li $0 -(zero) Expands to the name of the shell or shell script. +(zero) Expands to the name of the shell script if passed on the command line, +the +.Ar name +operand if given (with +.Fl c ) +or otherwise argument 0 passed to the shell. .El .Ss Special Variables The following variables are set by the shell or Modified: projects/sv/bin/sh/var.c ============================================================================== --- projects/sv/bin/sh/var.c Tue Nov 9 02:51:38 2010 (r215027) +++ projects/sv/bin/sh/var.c Tue Nov 9 02:53:24 2010 (r215028) @@ -826,7 +826,7 @@ setvarcmd(int argc, char **argv) else if (argc == 3) setvar(argv[1], argv[2], 0); else - error("List assignment not implemented"); + error("too many arguments"); return 0; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 10 19:03:30 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 AF216106564A; Wed, 10 Nov 2010 19:03:30 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E4C68FC19; Wed, 10 Nov 2010 19:03:30 +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 oAAJ3UMx034284; Wed, 10 Nov 2010 19:03:30 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAAJ3UX2034282; Wed, 10 Nov 2010 19:03:30 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201011101903.oAAJ3UX2034282@svn.freebsd.org> From: Jeff Roberson Date: Wed, 10 Nov 2010 19:03:30 +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: r215098 - projects/ofed/head/sys/vm 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: Wed, 10 Nov 2010 19:03:30 -0000 Author: jeff Date: Wed Nov 10 19:03:30 2010 New Revision: 215098 URL: http://svn.freebsd.org/changeset/base/215098 Log: - The entry protection can be READ or EXECUTE for wire to succeed. Discussed with: jhb Modified: projects/ofed/head/sys/vm/vm_map.c Modified: projects/ofed/head/sys/vm/vm_map.c ============================================================================== --- projects/ofed/head/sys/vm/vm_map.c Wed Nov 10 18:50:12 2010 (r215097) +++ projects/ofed/head/sys/vm/vm_map.c Wed Nov 10 19:03:30 2010 (r215098) @@ -2301,7 +2301,7 @@ vm_map_wire(vm_map_t map, vm_offset_t st boolean_t fictitious, need_wakeup, result, user_wire; vm_prot_t prot; - prot = VM_PROT_READ | VM_PROT_EXECUTE; + prot = 0; if (flags & VM_MAP_WIRE_WRITE) prot |= VM_PROT_WRITE; user_wire = (flags & VM_MAP_WIRE_USER) ? TRUE : FALSE; @@ -2371,7 +2371,8 @@ vm_map_wire(vm_map_t map, vm_offset_t st * above.) */ entry->eflags |= MAP_ENTRY_IN_TRANSITION; - if ((entry->protection & prot) != prot) { + if ((entry->protection & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 + || (entry->protection & prot) != prot) { entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; if ((flags & VM_MAP_WIRE_HOLESOK) == 0) { end = entry->end; From owner-svn-src-projects@FreeBSD.ORG Thu Nov 11 20:52:25 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 66780106564A; Thu, 11 Nov 2010 20:52:25 +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 51C378FC0C; Thu, 11 Nov 2010 20:52:25 +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 oABKqPdg084183; Thu, 11 Nov 2010 20:52:25 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oABKqOEB084153; Thu, 11 Nov 2010 20:52:24 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201011112052.oABKqOEB084153@svn.freebsd.org> From: Dimitry Andric Date: Thu, 11 Nov 2010 20:52:24 +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: r215143 - in projects/binutils-2.17: . bin/test contrib/binutils/bfd contrib/bzip2 contrib/compiler-rt contrib/gdb/gdb contrib/top crypto/openssh crypto/openssh/openbsd-compat etc/perio... 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, 11 Nov 2010 20:52:25 -0000 Author: dim Date: Thu Nov 11 20:52:24 2010 New Revision: 215143 URL: http://svn.freebsd.org/changeset/base/215143 Log: Sync: merge r214895 through r215140 from ^/head. Added: projects/binutils-2.17/contrib/compiler-rt/ - copied from r215140, head/contrib/compiler-rt/ projects/binutils-2.17/crypto/openssh/openbsd-compat/strptime.c - copied unchanged from r215140, head/crypto/openssh/openbsd-compat/strptime.c projects/binutils-2.17/lib/libarchive/test/test_compat_zip_2.zip.uu - copied unchanged from r215140, head/lib/libarchive/test/test_compat_zip_2.zip.uu projects/binutils-2.17/lib/libblocksruntime/ - copied from r215140, head/lib/libblocksruntime/ projects/binutils-2.17/lib/libcompiler_rt/ - copied from r215140, head/lib/libcompiler_rt/ projects/binutils-2.17/lib/libkvm/kvm_minidump_mips.c - copied unchanged from r215140, head/lib/libkvm/kvm_minidump_mips.c projects/binutils-2.17/share/man/man4/usb_quirk.4 - copied unchanged from r215140, head/share/man/man4/usb_quirk.4 projects/binutils-2.17/sys/arm/xscale/ixp425/avila_gpio.c - copied unchanged from r215140, head/sys/arm/xscale/ixp425/avila_gpio.c projects/binutils-2.17/sys/mips/mips/minidump_machdep.c - copied unchanged from r215140, head/sys/mips/mips/minidump_machdep.c projects/binutils-2.17/sys/x86/acpica/OsdEnvironment.c - copied unchanged from r215140, head/sys/x86/acpica/OsdEnvironment.c projects/binutils-2.17/sys/x86/acpica/acpi_apm.c - copied unchanged from r215140, head/sys/x86/acpica/acpi_apm.c projects/binutils-2.17/sys/x86/acpica/madt.c - copied unchanged from r215140, head/sys/x86/acpica/madt.c projects/binutils-2.17/sys/x86/include/apm_bios.h - copied unchanged from r215140, head/sys/x86/include/apm_bios.h projects/binutils-2.17/sys/x86/include/mptable.h - copied unchanged from r215140, head/sys/x86/include/mptable.h projects/binutils-2.17/tools/regression/bin/test/ - copied from r215140, head/tools/regression/bin/test/ projects/binutils-2.17/usr.sbin/makefs/cd9660/ - copied from r215140, head/usr.sbin/makefs/cd9660/ projects/binutils-2.17/usr.sbin/makefs/cd9660.c - copied unchanged from r215140, head/usr.sbin/makefs/cd9660.c projects/binutils-2.17/usr.sbin/makefs/cd9660.h - copied unchanged from r215140, head/usr.sbin/makefs/cd9660.h projects/binutils-2.17/usr.sbin/makefs/compat/Makefile.inc - copied unchanged from r215140, head/usr.sbin/makefs/compat/Makefile.inc projects/binutils-2.17/usr.sbin/makefs/ffs.h - copied unchanged from r215140, head/usr.sbin/makefs/ffs.h projects/binutils-2.17/usr.sbin/makefs/ffs/Makefile.inc - copied unchanged from r215140, head/usr.sbin/makefs/ffs/Makefile.inc Deleted: projects/binutils-2.17/bin/test/TEST.README projects/binutils-2.17/bin/test/TEST.csh projects/binutils-2.17/bin/test/TEST.sh projects/binutils-2.17/crypto/openssh/ssh-pkcs11-helper.0 projects/binutils-2.17/sys/amd64/acpica/OsdEnvironment.c projects/binutils-2.17/sys/amd64/acpica/madt.c projects/binutils-2.17/sys/amd64/include/mptable.h projects/binutils-2.17/sys/amd64/include/mutex.h projects/binutils-2.17/sys/arm/include/mutex.h projects/binutils-2.17/sys/i386/acpica/OsdEnvironment.c projects/binutils-2.17/sys/i386/acpica/madt.c projects/binutils-2.17/sys/i386/include/mptable.h projects/binutils-2.17/sys/i386/include/mutex.h projects/binutils-2.17/sys/ia64/include/mutex.h projects/binutils-2.17/sys/mips/conf/SWARM_COMMON projects/binutils-2.17/sys/mips/include/mutex.h projects/binutils-2.17/sys/pc98/include/mptable.h projects/binutils-2.17/sys/pc98/include/mutex.h projects/binutils-2.17/sys/powerpc/include/mutex.h projects/binutils-2.17/sys/sparc64/include/mutex.h projects/binutils-2.17/sys/sun4v/include/mutex.h projects/binutils-2.17/usr.bin/objformat/ Modified: projects/binutils-2.17/Makefile projects/binutils-2.17/Makefile.inc1 projects/binutils-2.17/ObsoleteFiles.inc projects/binutils-2.17/contrib/binutils/bfd/opncls.c projects/binutils-2.17/contrib/bzip2/CHANGES projects/binutils-2.17/contrib/bzip2/LICENSE projects/binutils-2.17/contrib/bzip2/Makefile projects/binutils-2.17/contrib/bzip2/Makefile-libbz2_so projects/binutils-2.17/contrib/bzip2/README projects/binutils-2.17/contrib/bzip2/README.COMPILATION.PROBLEMS projects/binutils-2.17/contrib/bzip2/blocksort.c projects/binutils-2.17/contrib/bzip2/bzip2.1 projects/binutils-2.17/contrib/bzip2/bzip2.c projects/binutils-2.17/contrib/bzip2/bzip2recover.c projects/binutils-2.17/contrib/bzip2/bzlib.c projects/binutils-2.17/contrib/bzip2/bzlib.h projects/binutils-2.17/contrib/bzip2/bzlib_private.h projects/binutils-2.17/contrib/bzip2/compress.c projects/binutils-2.17/contrib/bzip2/crctable.c projects/binutils-2.17/contrib/bzip2/decompress.c projects/binutils-2.17/contrib/bzip2/huffman.c projects/binutils-2.17/contrib/bzip2/randtable.c projects/binutils-2.17/contrib/bzip2/spewG.c projects/binutils-2.17/contrib/bzip2/unzcrash.c projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.c projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.h projects/binutils-2.17/contrib/gdb/gdb/mipsfbsd-tdep.h projects/binutils-2.17/crypto/openssh/ChangeLog projects/binutils-2.17/crypto/openssh/PROTOCOL.certkeys projects/binutils-2.17/crypto/openssh/PROTOCOL.mux projects/binutils-2.17/crypto/openssh/README projects/binutils-2.17/crypto/openssh/auth-options.c projects/binutils-2.17/crypto/openssh/auth-options.h projects/binutils-2.17/crypto/openssh/auth-rsa.c projects/binutils-2.17/crypto/openssh/auth.c projects/binutils-2.17/crypto/openssh/auth.h projects/binutils-2.17/crypto/openssh/auth1.c projects/binutils-2.17/crypto/openssh/auth2-hostbased.c projects/binutils-2.17/crypto/openssh/auth2-none.c projects/binutils-2.17/crypto/openssh/auth2-pubkey.c projects/binutils-2.17/crypto/openssh/authfd.c projects/binutils-2.17/crypto/openssh/authfile.c projects/binutils-2.17/crypto/openssh/authfile.h projects/binutils-2.17/crypto/openssh/bufaux.c projects/binutils-2.17/crypto/openssh/channels.c projects/binutils-2.17/crypto/openssh/channels.h projects/binutils-2.17/crypto/openssh/clientloop.c projects/binutils-2.17/crypto/openssh/clientloop.h projects/binutils-2.17/crypto/openssh/config.h projects/binutils-2.17/crypto/openssh/config.h.in projects/binutils-2.17/crypto/openssh/jpake.c projects/binutils-2.17/crypto/openssh/key.c projects/binutils-2.17/crypto/openssh/key.h projects/binutils-2.17/crypto/openssh/loginrec.h projects/binutils-2.17/crypto/openssh/misc.c projects/binutils-2.17/crypto/openssh/misc.h projects/binutils-2.17/crypto/openssh/monitor.c projects/binutils-2.17/crypto/openssh/mux.c projects/binutils-2.17/crypto/openssh/myproposal.h projects/binutils-2.17/crypto/openssh/openbsd-compat/openbsd-compat.h projects/binutils-2.17/crypto/openssh/openbsd-compat/openssl-compat.h projects/binutils-2.17/crypto/openssh/openbsd-compat/port-tun.c projects/binutils-2.17/crypto/openssh/openbsd-compat/port-uw.c projects/binutils-2.17/crypto/openssh/packet.c projects/binutils-2.17/crypto/openssh/readconf.c projects/binutils-2.17/crypto/openssh/readconf.h projects/binutils-2.17/crypto/openssh/scp.c projects/binutils-2.17/crypto/openssh/servconf.c projects/binutils-2.17/crypto/openssh/servconf.h projects/binutils-2.17/crypto/openssh/session.c projects/binutils-2.17/crypto/openssh/sftp-client.c projects/binutils-2.17/crypto/openssh/sftp.c projects/binutils-2.17/crypto/openssh/ssh-add.c projects/binutils-2.17/crypto/openssh/ssh-agent.c projects/binutils-2.17/crypto/openssh/ssh-dss.c projects/binutils-2.17/crypto/openssh/ssh-keygen.1 projects/binutils-2.17/crypto/openssh/ssh-keygen.c projects/binutils-2.17/crypto/openssh/ssh-keyscan.c projects/binutils-2.17/crypto/openssh/ssh-keysign.8 projects/binutils-2.17/crypto/openssh/ssh-keysign.c projects/binutils-2.17/crypto/openssh/ssh-pkcs11.c projects/binutils-2.17/crypto/openssh/ssh-rsa.c projects/binutils-2.17/crypto/openssh/ssh.1 projects/binutils-2.17/crypto/openssh/ssh.c projects/binutils-2.17/crypto/openssh/ssh.h projects/binutils-2.17/crypto/openssh/ssh_config projects/binutils-2.17/crypto/openssh/ssh_config.5 projects/binutils-2.17/crypto/openssh/sshconnect.c projects/binutils-2.17/crypto/openssh/sshconnect2.c projects/binutils-2.17/crypto/openssh/sshd.8 projects/binutils-2.17/crypto/openssh/sshd.c projects/binutils-2.17/crypto/openssh/sshd_config projects/binutils-2.17/crypto/openssh/sshd_config.5 projects/binutils-2.17/crypto/openssh/version.h projects/binutils-2.17/etc/periodic/security/Makefile projects/binutils-2.17/gnu/lib/libgcc/Makefile projects/binutils-2.17/gnu/usr.bin/binutils/Makefile.inc0 projects/binutils-2.17/gnu/usr.bin/binutils/as/Makefile projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.arm projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.mips projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.arm projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.mips projects/binutils-2.17/gnu/usr.bin/cc/Makefile.inc projects/binutils-2.17/gnu/usr.bin/cc/Makefile.tgt projects/binutils-2.17/gnu/usr.bin/cc/cc_int/Makefile projects/binutils-2.17/gnu/usr.bin/cc/cc_tools/Makefile projects/binutils-2.17/gnu/usr.bin/gdb/Makefile.inc projects/binutils-2.17/gnu/usr.bin/gdb/arch/mips/Makefile projects/binutils-2.17/gnu/usr.bin/gdb/arch/mips/init.c projects/binutils-2.17/gnu/usr.bin/gdb/kgdb/Makefile projects/binutils-2.17/gnu/usr.bin/gdb/kgdb/trgt_mips.c projects/binutils-2.17/gnu/usr.bin/gdb/libgdb/Makefile projects/binutils-2.17/lib/Makefile projects/binutils-2.17/lib/libarchive/archive_read_support_format_zip.c projects/binutils-2.17/lib/libarchive/test/test_compat_zip.c projects/binutils-2.17/lib/libkvm/Makefile projects/binutils-2.17/lib/libkvm/kvm_minidump_amd64.c projects/binutils-2.17/lib/libkvm/kvm_mips.c projects/binutils-2.17/lib/libkvm/kvm_private.h projects/binutils-2.17/libexec/tftpd/tftp-utils.c projects/binutils-2.17/release/sparc64/boot_crunch.conf projects/binutils-2.17/share/man/man4/Makefile projects/binutils-2.17/share/man/man4/ada.4 projects/binutils-2.17/share/man/man4/aibs.4 projects/binutils-2.17/share/man/man4/bge.4 projects/binutils-2.17/share/man/man4/u3g.4 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/taskqueue.9 projects/binutils-2.17/share/misc/committers-src.dot projects/binutils-2.17/share/mk/bsd.cpu.mk projects/binutils-2.17/share/mk/bsd.endian.mk projects/binutils-2.17/sys/amd64/acpica/acpi_machdep.c projects/binutils-2.17/sys/amd64/amd64/amd64_mem.c projects/binutils-2.17/sys/amd64/amd64/minidump_machdep.c projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c projects/binutils-2.17/sys/amd64/include/apm_bios.h projects/binutils-2.17/sys/amd64/include/minidump.h projects/binutils-2.17/sys/arm/conf/AVILA projects/binutils-2.17/sys/arm/conf/AVILA.hints projects/binutils-2.17/sys/arm/conf/BWCT.hints projects/binutils-2.17/sys/arm/include/cpuconf.h projects/binutils-2.17/sys/arm/xscale/ixp425/files.avila projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425_qmgr.c projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425reg.h projects/binutils-2.17/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/binutils-2.17/sys/boot/common/loader.8 projects/binutils-2.17/sys/boot/fdt/dts/mpc8555cds.dts projects/binutils-2.17/sys/boot/forth/beastie.4th projects/binutils-2.17/sys/boot/i386/libi386/biosacpi.c projects/binutils-2.17/sys/boot/i386/libi386/i386_module.c projects/binutils-2.17/sys/boot/i386/loader/help.i386 projects/binutils-2.17/sys/cam/cam_periph.c projects/binutils-2.17/sys/compat/linprocfs/linprocfs.c projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/conf/Makefile.mips 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/contrib/octeon-sdk/cvmx-app-init.h projects/binutils-2.17/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/binutils-2.17/sys/contrib/octeon-sdk/cvmx-helper.c projects/binutils-2.17/sys/dev/acpica/acpi.c projects/binutils-2.17/sys/dev/acpica/acpivar.h projects/binutils-2.17/sys/dev/ahci/ahci.c projects/binutils-2.17/sys/dev/ata/ata-all.c projects/binutils-2.17/sys/dev/ata/ata-disk.c projects/binutils-2.17/sys/dev/ata/ata-lowlevel.c projects/binutils-2.17/sys/dev/drm/r300_reg.h projects/binutils-2.17/sys/dev/gpio/gpioled.c projects/binutils-2.17/sys/dev/iicbus/iiconf.c projects/binutils-2.17/sys/dev/isp/isp_freebsd.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe.c projects/binutils-2.17/sys/dev/mii/brgphy.c projects/binutils-2.17/sys/dev/mii/miidevs projects/binutils-2.17/sys/dev/msk/if_msk.c projects/binutils-2.17/sys/dev/nfe/if_nfe.c projects/binutils-2.17/sys/dev/nfe/if_nfereg.h projects/binutils-2.17/sys/dev/nfe/if_nfevar.h projects/binutils-2.17/sys/dev/ofw/ofw_fdt.c projects/binutils-2.17/sys/dev/ofw/openfirm.c projects/binutils-2.17/sys/dev/pccard/pccardvar.h projects/binutils-2.17/sys/dev/re/if_re.c projects/binutils-2.17/sys/dev/siis/siis.c projects/binutils-2.17/sys/dev/sk/if_sk.c projects/binutils-2.17/sys/dev/sound/sbus/cs4231.c projects/binutils-2.17/sys/dev/syscons/schistory.c projects/binutils-2.17/sys/dev/uart/uart_subr.c projects/binutils-2.17/sys/dev/usb/quirk/usb_quirk.c projects/binutils-2.17/sys/dev/usb/quirk/usb_quirk.h projects/binutils-2.17/sys/dev/usb/serial/u3g.c projects/binutils-2.17/sys/dev/usb/serial/usb_serial.c projects/binutils-2.17/sys/dev/wb/if_wb.c projects/binutils-2.17/sys/fs/nwfs/nwfs_vnops.c projects/binutils-2.17/sys/geom/part/g_part.c projects/binutils-2.17/sys/i386/acpica/acpi_machdep.c projects/binutils-2.17/sys/i386/bios/apm.c projects/binutils-2.17/sys/i386/i386/machdep.c projects/binutils-2.17/sys/i386/i386/mp_machdep.c projects/binutils-2.17/sys/i386/i386/pmap.c projects/binutils-2.17/sys/i386/include/apm_bios.h projects/binutils-2.17/sys/i386/xen/mptable.c projects/binutils-2.17/sys/ia64/acpica/OsdEnvironment.c projects/binutils-2.17/sys/ia64/ia64/db_machdep.c projects/binutils-2.17/sys/ia64/ia64/genassym.c projects/binutils-2.17/sys/ia64/ia64/machdep.c projects/binutils-2.17/sys/kern/kern_clocksource.c projects/binutils-2.17/sys/kern/kern_conf.c projects/binutils-2.17/sys/kern/kern_mutex.c projects/binutils-2.17/sys/kern/kern_proc.c projects/binutils-2.17/sys/kern/link_elf.c projects/binutils-2.17/sys/kern/sched_ule.c projects/binutils-2.17/sys/kern/subr_lock.c projects/binutils-2.17/sys/kern/subr_taskqueue.c projects/binutils-2.17/sys/mips/conf/SWARM projects/binutils-2.17/sys/mips/conf/SWARM64 projects/binutils-2.17/sys/mips/conf/SWARM64_SMP projects/binutils-2.17/sys/mips/conf/SWARM_SMP projects/binutils-2.17/sys/mips/conf/XLR projects/binutils-2.17/sys/mips/conf/XLR64 projects/binutils-2.17/sys/mips/conf/XLRN32 projects/binutils-2.17/sys/mips/include/cpuregs.h 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/mips/dump_machdep.c projects/binutils-2.17/sys/mips/mips/gdb_machdep.c projects/binutils-2.17/sys/mips/mips/machdep.c projects/binutils-2.17/sys/mips/mips/vm_machdep.c projects/binutils-2.17/sys/modules/acpi/Makefile projects/binutils-2.17/sys/modules/acpi/acpi/Makefile projects/binutils-2.17/sys/net/vnet.h projects/binutils-2.17/sys/netinet/in_pcb.c projects/binutils-2.17/sys/netinet/sctp.h 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_os_bsd.h projects/binutils-2.17/sys/netinet/sctp_output.c projects/binutils-2.17/sys/netinet/sctp_pcb.c projects/binutils-2.17/sys/netinet/sctp_timer.c projects/binutils-2.17/sys/netinet/sctp_timer.h projects/binutils-2.17/sys/netinet/sctp_uio.h projects/binutils-2.17/sys/netinet/sctp_usrreq.c projects/binutils-2.17/sys/netinet/sctputil.c projects/binutils-2.17/sys/netinet/sctputil.h projects/binutils-2.17/sys/pc98/include/apm_bios.h projects/binutils-2.17/sys/pci/if_rlreg.h projects/binutils-2.17/sys/powerpc/aim/clock.c projects/binutils-2.17/sys/powerpc/aim/machdep.c projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.c projects/binutils-2.17/sys/powerpc/aim/nexus.c projects/binutils-2.17/sys/powerpc/aim/ofw_machdep.c projects/binutils-2.17/sys/powerpc/aim/trap_subr32.S projects/binutils-2.17/sys/powerpc/booke/clock.c projects/binutils-2.17/sys/powerpc/booke/locore.S projects/binutils-2.17/sys/powerpc/booke/machdep.c projects/binutils-2.17/sys/powerpc/booke/pmap.c projects/binutils-2.17/sys/powerpc/booke/trap_subr.S projects/binutils-2.17/sys/powerpc/include/tlb.h projects/binutils-2.17/sys/powerpc/powermac/smu.c projects/binutils-2.17/sys/powerpc/powerpc/cpu.c projects/binutils-2.17/sys/security/mac_portacl/mac_portacl.c projects/binutils-2.17/sys/sparc64/include/vmparam.h projects/binutils-2.17/sys/sun4v/include/pmap.h projects/binutils-2.17/sys/sun4v/include/smp.h projects/binutils-2.17/sys/sun4v/sun4v/mp_machdep.c projects/binutils-2.17/sys/sys/cdefs.h projects/binutils-2.17/sys/sys/kernel.h projects/binutils-2.17/sys/sys/kerneldump.h projects/binutils-2.17/sys/sys/linker_set.h projects/binutils-2.17/sys/sys/mutex.h projects/binutils-2.17/sys/sys/param.h projects/binutils-2.17/sys/sys/pcpu.h projects/binutils-2.17/sys/sys/taskqueue.h projects/binutils-2.17/sys/ufs/ffs/ffs_inode.c projects/binutils-2.17/sys/ufs/ffs/ffs_softdep.c projects/binutils-2.17/sys/ufs/ffs/fs.h projects/binutils-2.17/sys/ufs/ufs/ufs_vnops.c projects/binutils-2.17/sys/vm/vm_map.c projects/binutils-2.17/sys/vm/vm_page.c projects/binutils-2.17/sys/vm/vm_reserv.c projects/binutils-2.17/sys/x86/cpufreq/hwpstate.c projects/binutils-2.17/sys/x86/x86/local_apic.c projects/binutils-2.17/sys/x86/x86/mptable.c projects/binutils-2.17/sys/x86/x86/mptable_pci.c projects/binutils-2.17/tools/build/mk/OptionalObsoleteFiles.inc projects/binutils-2.17/tools/regression/acltools/tools-nfs4.test projects/binutils-2.17/tools/regression/bin/Makefile 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/lex/Makefile projects/binutils-2.17/usr.bin/lex/initscan.c projects/binutils-2.17/usr.bin/seq/seq.c projects/binutils-2.17/usr.bin/yacc/Makefile projects/binutils-2.17/usr.bin/yacc/closure.c projects/binutils-2.17/usr.bin/yacc/defs.h projects/binutils-2.17/usr.bin/yacc/error.c projects/binutils-2.17/usr.bin/yacc/lalr.c projects/binutils-2.17/usr.bin/yacc/lr0.c projects/binutils-2.17/usr.bin/yacc/main.c projects/binutils-2.17/usr.bin/yacc/mkpar.c projects/binutils-2.17/usr.bin/yacc/output.c projects/binutils-2.17/usr.bin/yacc/reader.c projects/binutils-2.17/usr.bin/yacc/skeleton.c projects/binutils-2.17/usr.bin/yacc/symtab.c projects/binutils-2.17/usr.bin/yacc/verbose.c projects/binutils-2.17/usr.bin/yacc/warshall.c projects/binutils-2.17/usr.bin/yacc/yacc.1 projects/binutils-2.17/usr.sbin/apmd/apmd.8 projects/binutils-2.17/usr.sbin/config/configvers.h projects/binutils-2.17/usr.sbin/freebsd-update/freebsd-update.sh projects/binutils-2.17/usr.sbin/makefs/Makefile projects/binutils-2.17/usr.sbin/makefs/ffs.c projects/binutils-2.17/usr.sbin/makefs/ffs/buf.c projects/binutils-2.17/usr.sbin/makefs/ffs/ffs_alloc.c projects/binutils-2.17/usr.sbin/makefs/ffs/mkfs.c projects/binutils-2.17/usr.sbin/makefs/makefs.8 projects/binutils-2.17/usr.sbin/makefs/makefs.c projects/binutils-2.17/usr.sbin/makefs/makefs.h projects/binutils-2.17/usr.sbin/makefs/walk.c projects/binutils-2.17/usr.sbin/mptutil/mpt_cam.c projects/binutils-2.17/usr.sbin/mptutil/mpt_cmd.c projects/binutils-2.17/usr.sbin/mptutil/mpt_config.c projects/binutils-2.17/usr.sbin/mptutil/mpt_drive.c projects/binutils-2.17/usr.sbin/mptutil/mpt_evt.c projects/binutils-2.17/usr.sbin/mptutil/mpt_show.c projects/binutils-2.17/usr.sbin/mptutil/mpt_volume.c projects/binutils-2.17/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/binutils-2.17/usr.sbin/usbconfig/usbconfig.8 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/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/sys/dev/xen/xenpci/ (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/Makefile ============================================================================== --- projects/binutils-2.17/Makefile Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/Makefile Thu Nov 11 20:52:24 2010 (r215143) @@ -281,7 +281,7 @@ tinderbox: # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) -TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v +TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed Modified: projects/binutils-2.17/Makefile.inc1 ============================================================================== --- projects/binutils-2.17/Makefile.inc1 Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/Makefile.inc1 Thu Nov 11 20:52:24 2010 (r215143) @@ -118,16 +118,16 @@ VERSION+= ${OSRELDATE} # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -TARGET= ${TARGET_ARCH} +TARGET= ${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm} .endif # Otherwise, default to current machine type and architecture. TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -1123,7 +1123,7 @@ libraries: # # static libgcc.a prerequisite for shared libc # -_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc +_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt # These dependencies are not automatically generated: # @@ -1139,6 +1139,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} _startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif _startup_libs+= gnu/lib/libgcc +_startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc gnu/lib/libgcc__L: lib/libc__L Modified: projects/binutils-2.17/ObsoleteFiles.inc ============================================================================== --- projects/binutils-2.17/ObsoleteFiles.inc Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/ObsoleteFiles.inc Thu Nov 11 20:52:24 2010 (r215143) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20101109: headers moved to 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/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/apicreg.h Modified: projects/binutils-2.17/contrib/binutils/bfd/opncls.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/opncls.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/binutils/bfd/opncls.c Thu Nov 11 20:52:24 2010 (r215143) @@ -1465,7 +1465,7 @@ bfd_fill_in_gnu_debuglink_section (bfd * debuglink_size &= ~3; debuglink_size += 4; - contents = malloc (debuglink_size); + contents = bfd_zmalloc (debuglink_size); if (contents == NULL) { /* XXX Should we delete the section from the bfd ? */ Modified: projects/binutils-2.17/contrib/bzip2/CHANGES ============================================================================== --- projects/binutils-2.17/contrib/bzip2/CHANGES Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/CHANGES Thu Nov 11 20:52:24 2010 (r215143) @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -317,3 +317,11 @@ Fixes some minor bugs since the last ver ~~~~~~~~~~~~~~~~~ Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + +1.0.6 (6 Sept 10) +~~~~~~~~~~~~~~~~~ + +* Security fix for CVE-2010-0405. This was reported by Mikolaj + Izdebski. + +* Make the documentation build on Ubuntu 10.04 Modified: projects/binutils-2.17/contrib/bzip2/LICENSE ============================================================================== --- projects/binutils-2.17/contrib/bzip2/LICENSE Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/LICENSE Thu Nov 11 20:52:24 2010 (r215143) @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2007 Julian R Seward. All +documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,6 +37,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, jseward@bzip.org -bzip2/libbzip2 version 1.0.5 of 10 December 2007 +bzip2/libbzip2 version 1.0.6 of 6 September 2010 -------------------------------------------------------------------------- Modified: projects/binutils-2.17/contrib/bzip2/Makefile ============================================================================== --- projects/binutils-2.17/contrib/bzip2/Makefile Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/Makefile Thu Nov 11 20:52:24 2010 (r215143) @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ bzip2recover.o: bzip2recover.c distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.5 +DISTNAME=bzip2-1.0.6 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) Modified: projects/binutils-2.17/contrib/bzip2/Makefile-libbz2_so ============================================================================== --- projects/binutils-2.17/contrib/bzip2/Makefile-libbz2_so Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/Makefile-libbz2_so Thu Nov 11 20:52:24 2010 (r215143) @@ -1,6 +1,6 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.4, with soname libbz2.so.1.0, +# libbz2.so.1.0.6, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). # Please see the README file for some important info @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -35,13 +35,13 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c Modified: projects/binutils-2.17/contrib/bzip2/README ============================================================================== --- projects/binutils-2.17/contrib/bzip2/README Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/README Thu Nov 11 20:52:24 2010 (r215143) @@ -6,8 +6,8 @@ This version is fully compatible with th This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -181,6 +181,10 @@ WHAT'S NEW IN 1.0.5 ? See the CHANGES file. +WHAT'S NEW IN 1.0.6 ? + + See the CHANGES file. + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org @@ -208,3 +212,4 @@ Cambridge, UK. 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) 10 December 2007 (bzip2, version 1.0.5) + 6 Sept 2010 (bzip2, version 1.0.6) Modified: projects/binutils-2.17/contrib/bzip2/README.COMPILATION.PROBLEMS ============================================================================== --- projects/binutils-2.17/contrib/bzip2/README.COMPILATION.PROBLEMS Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/README.COMPILATION.PROBLEMS Thu Nov 11 20:52:24 2010 (r215143) @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ This program is released under the terms in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.5 should compile without problems on the vast majority of +bzip2-1.0.6 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file Modified: projects/binutils-2.17/contrib/bzip2/blocksort.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/blocksort.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/blocksort.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/bzip2.1 ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzip2.1 Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzip2.1 Thu Nov 11 20:52:24 2010 (r215143) @@ -1,7 +1,7 @@ .PU .TH bzip2 1 .SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4 +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6 .br bzcat \- decompresses files to stdout .br @@ -405,11 +405,11 @@ I/O error messages are not as helpful as tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading. -This manual page pertains to version 1.0.4 of +This manual page pertains to version 1.0.6 of .I bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions -0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following +0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following exception: 0.9.0 and above can correctly decompress multiple concatenated compressed files. 0.1pl2 cannot do this; it will stop after decompressing just the first file in the stream. Modified: projects/binutils-2.17/contrib/bzip2/bzip2.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzip2.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzip2.c Thu Nov 11 20:52:24 2010 (r215143) @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ void license ( void ) "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2007 by Julian Seward.\n" + " Copyright (C) 1996-2010 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.5 source distribution.\n" + " in the bzip2-1.0.6 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" Modified: projects/binutils-2.17/contrib/bzip2/bzip2recover.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzip2recover.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzip2recover.c Thu Nov 11 20:52:24 2010 (r215143) @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ Int32 main ( Int32 argc, Char** argv ) inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", Modified: projects/binutils-2.17/contrib/bzip2/bzlib.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzlib.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzlib.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/bzlib.h ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzlib.h Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzlib.h Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/bzlib_private.h ============================================================================== --- projects/binutils-2.17/contrib/bzip2/bzlib_private.h Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/bzlib_private.h Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.5, 10-Dec-2007" +#define BZ_VERSION "1.0.6, 6-Sept-2010" typedef char Char; typedef unsigned char Bool; Modified: projects/binutils-2.17/contrib/bzip2/compress.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/compress.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/compress.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/crctable.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/crctable.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/crctable.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/decompress.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/decompress.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/decompress.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -492,15 +492,28 @@ Int32 BZ2_decompress ( DState* s ) RETURN(BZ_DATA_ERROR); /*-- Set up cftab to facilitate generation of T^(-1) --*/ + /* Check: unzftab entries in range. */ + for (i = 0; i <= 255; i++) { + if (s->unzftab[i] < 0 || s->unzftab[i] > nblock) + RETURN(BZ_DATA_ERROR); + } + /* Actually generate cftab. */ s->cftab[0] = 0; for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1]; for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1]; + /* Check: cftab entries in range. */ for (i = 0; i <= 256; i++) { if (s->cftab[i] < 0 || s->cftab[i] > nblock) { /* s->cftab[i] can legitimately be == nblock */ RETURN(BZ_DATA_ERROR); } } + /* Check: cftab entries non-descending. */ + for (i = 1; i <= 256; i++) { + if (s->cftab[i-1] > s->cftab[i]) { + RETURN(BZ_DATA_ERROR); + } + } s->state_out_len = 0; s->state_out_ch = 0; Modified: projects/binutils-2.17/contrib/bzip2/huffman.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/huffman.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/huffman.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/randtable.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/randtable.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/randtable.c Thu Nov 11 20:52:24 2010 (r215143) @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/spewG.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/spewG.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/spewG.c Thu Nov 11 20:52:24 2010 (r215143) @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/bzip2/unzcrash.c ============================================================================== --- projects/binutils-2.17/contrib/bzip2/unzcrash.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/bzip2/unzcrash.c Thu Nov 11 20:52:24 2010 (r215143) @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. Modified: projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.c ============================================================================== --- projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.c Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.c Thu Nov 11 20:52:24 2010 (r215143) @@ -1495,6 +1495,7 @@ mips_mdebug_frame_cache (struct frame_in int kernel_trap; /* What registers have been saved? Bitmasks. */ unsigned long gen_mask, float_mask; + long reg_offset; if ((*this_cache) != NULL) return (*this_cache); @@ -1513,6 +1514,8 @@ mips_mdebug_frame_cache (struct frame_in /* Extract the frame's base. */ cache->base = (frame_unwind_register_signed (next_frame, NUM_REGS + PROC_FRAME_REG (proc_desc)) + PROC_FRAME_OFFSET (proc_desc) - PROC_FRAME_ADJUST (proc_desc)); + /* Save registers offset from scratching by following find_proc_desc call */ + reg_offset = PROC_REG_OFFSET (proc_desc); kernel_trap = PROC_REG_MASK (proc_desc) & 1; gen_mask = kernel_trap ? 0xFFFFFFFF : PROC_REG_MASK (proc_desc); @@ -1567,8 +1570,7 @@ mips_mdebug_frame_cache (struct frame_in /* Fill in the offsets for the registers which gen_mask says were saved. */ { - CORE_ADDR reg_position = (cache->base - + PROC_REG_OFFSET (proc_desc)); + CORE_ADDR reg_position = (cache->base + reg_offset); int ireg; for (ireg = MIPS_NUMREGS - 1; gen_mask; --ireg, gen_mask <<= 1) if (gen_mask & 0x80000000) @@ -2162,15 +2164,18 @@ restart: { PROC_REG_MASK (&temp_proc_desc) |= 1 << reg; set_reg_offset (temp_saved_regs, reg, sp + low_word); + /* Do we have registers offset yet? */ + if (!PROC_REG_OFFSET (&temp_proc_desc)) + PROC_REG_OFFSET (&temp_proc_desc) = low_word - PROC_FRAME_OFFSET (&temp_proc_desc); } else if ((high_word & 0xFFE0) == 0xffa0) /* sd reg,offset($sp) */ { - /* Irix 6.2 N32 ABI uses sd instructions for saving $gp and $ra, - but the register size used is only 32 bits. Make the address - for the saved register point to the lower 32 bits. */ PROC_REG_MASK (&temp_proc_desc) |= 1 << reg; set_reg_offset (temp_saved_regs, reg, - sp + low_word + 8 - mips_regsize (current_gdbarch)); + sp + low_word); + /* Do we have registers offset yet? */ + if (!PROC_REG_OFFSET (&temp_proc_desc)) + PROC_REG_OFFSET (&temp_proc_desc) = low_word - PROC_FRAME_OFFSET (&temp_proc_desc); } else if (high_word == 0x27be) /* addiu $30,$sp,size */ { Modified: projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.h ============================================================================== --- projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.h Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/gdb/gdb/mips-tdep.h Thu Nov 11 20:52:24 2010 (r215143) @@ -78,7 +78,7 @@ enum { MIPS_EMBED_BADVADDR_REGNUM = 35, MIPS_EMBED_CAUSE_REGNUM = 36, MIPS_EMBED_PC_REGNUM = 37, - MIPS_EMBED_FP0_REGNUM = 38 + MIPS_EMBED_FP0_REGNUM = 40 }; /* Defined in mips-tdep.c and used in remote-mips.c */ Modified: projects/binutils-2.17/contrib/gdb/gdb/mipsfbsd-tdep.h ============================================================================== --- projects/binutils-2.17/contrib/gdb/gdb/mipsfbsd-tdep.h Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/contrib/gdb/gdb/mipsfbsd-tdep.h Thu Nov 11 20:52:24 2010 (r215143) @@ -34,7 +34,7 @@ void mipsfbsd_fill_reg (char *, int); void mipsfbsd_supply_fpreg (char *, int); void mipsfbsd_fill_fpreg (char *, int); -#define SIZEOF_STRUCT_REG (38 * mips_regsize (current_gdbarch)) -#define SIZEOF_STRUCT_FPREG (33 * mips_regsize (current_gdbarch)) +#define SIZEOF_STRUCT_REG (40 * mips_regsize (current_gdbarch)) +#define SIZEOF_STRUCT_FPREG (34 * mips_regsize (current_gdbarch)) #endif /* mipsfbsd_TDEP_H */ Modified: projects/binutils-2.17/crypto/openssh/ChangeLog ============================================================================== --- projects/binutils-2.17/crypto/openssh/ChangeLog Thu Nov 11 20:18:33 2010 (r215142) +++ projects/binutils-2.17/crypto/openssh/ChangeLog Thu Nov 11 20:52:24 2010 (r215143) @@ -1,3 +1,522 @@ +20100823 + - (djm) Release OpenSSH-5.6p1 + +20100816 + - (dtucker) [configure.ac openbsd-compat/Makefile.in + openbsd-compat/openbsd-compat.h openbsd-compat/strptime.c] Add strptime to + the compat library which helps on platforms like old IRIX. Based on work + by djm, tested by Tom Christensen. + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/08/12 21:49:44 + [ssh.c] + close any extra file descriptors inherited from parent at start and + reopen stdin/stdout to /dev/null when forking for ControlPersist. + + prevents tools that fork and run a captive ssh for communication from + failing to exit when the ssh completes while they wait for these fds to + close. The inherited fds may persist arbitrarily long if a background + mux master has been started by ControlPersist. cvs and scp were effected + by this. + + "please commit" markus@ + - (djm) [regress/README.regress] typo + +20100812 + - (tim) [regress/login-timeout.sh regress/reconfigure.sh regress/reexec.sh + regress/test-exec.sh] Under certain conditions when testing with sudo + tests would fail because the pidfile could not be read by a regular user. + "cat: cannot open ...../regress/pidfile: Permission denied (error 13)" + Make sure cat is run by $SUDO. no objection from me. djm@ + - (tim) [auth.c] add cast to quiet compiler. Change only affects SVR5 systems. + +20100809 + - (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is + already set. Makes FreeBSD user openable tunnels useful; patch from + richard.burakowski+ossh AT mrburak.net, ok dtucker@ + - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id. + based in part on a patch from Colin Watson, ok djm@ + +20100809 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/08/08 16:26:42 + [version.h] + crank to 5.6 + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Crank version numbers + +20100805 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/08/04 05:37:01 + [ssh.1 ssh_config.5 sshd.8] + Remove mentions of weird "addr/port" alternate address format for IPv6 + addresses combinations. It hasn't worked for ages and we have supported + the more commen "[addr]:port" format for a long time. ok jmc@ markus@ + - djm@cvs.openbsd.org 2010/08/04 05:40:39 + [PROTOCOL.certkeys ssh-keygen.c] + tighten the rules for certificate encoding by requiring that options + appear in lexical order and make our ssh-keygen comply. ok markus@ + - djm@cvs.openbsd.org 2010/08/04 05:42:47 + [auth.c auth2-hostbased.c authfile.c authfile.h ssh-keysign.8] + [ssh-keysign.c ssh.c] + enable certificates for hostbased authentication, from Iain Morgan; + "looks ok" markus@ + - djm@cvs.openbsd.org 2010/08/04 05:49:22 + [authfile.c] + commited the wrong version of the hostbased certificate diff; this + version replaces some strlc{py,at} verbosity with xasprintf() at + the request of markus@ + - djm@cvs.openbsd.org 2010/08/04 06:07:11 + [ssh-keygen.1 ssh-keygen.c] + Support CA keys in PKCS#11 tokens; feedback and ok markus@ + - djm@cvs.openbsd.org 2010/08/04 06:08:40 + [ssh-keysign.c] + clean for -Wuninitialized (Id sync only; portable had this change) + - djm@cvs.openbsd.org 2010/08/05 13:08:42 + [channels.c] + Fix a trio of bugs in the local/remote window calculation for datagram + data channels (i.e. TunnelForward): + + Calculate local_consumed correctly in channel_handle_wfd() by measuring + the delta to buffer_len(c->output) from when we start to when we finish. + The proximal problem here is that the output_filter we use in portable + modified the length of the dequeued datagram (to futz with the headers + for !OpenBSD). + + In channel_output_poll(), don't enqueue datagrams that won't fit in the + peer's advertised packet size (highly unlikely to ever occur) or which + won't fit in the peer's remaining window (more likely). + + In channel_input_data(), account for the 4-byte string header in + datagram packets that we accept from the peer and enqueue in c->output. + + report, analysis and testing 2/3 cases from wierbows AT us.ibm.com; + "looks good" markus@ + +20100803 + - (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from + PAM to sane values in case the PAM method doesn't write to them. Spotted by + Bitman Zhou, ok djm@. + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/07/16 04:45:30 + [ssh-keygen.c] + avoid bogus compiler warning + - djm@cvs.openbsd.org 2010/07/16 14:07:35 + [ssh-rsa.c] + more timing paranoia - compare all parts of the expected decrypted + data before returning. AFAIK not exploitable in the SSH protocol. + "groovy" deraadt@ + - djm@cvs.openbsd.org 2010/07/19 03:16:33 + [sftp-client.c] + bz#1797: fix swapped args in upload_dir_internal(), breaking recursive + upload depth checks and causing verbose printing of transfers to always + be turned on; patch from imorgan AT nas.nasa.gov + - djm@cvs.openbsd.org 2010/07/19 09:15:12 + [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] + add a "ControlPersist" option that automatically starts a background + ssh(1) multiplex master when connecting. This connection can stay alive + indefinitely, or can be set to automatically close after a user-specified + duration of inactivity. bz#1330 - patch by dwmw2 AT infradead.org, but + further hacked on by wmertens AT cisco.com, apb AT cequrux.com, + martin-mindrot-bugzilla AT earth.li and myself; "looks ok" markus@ + - djm@cvs.openbsd.org 2010/07/21 02:10:58 + [misc.c] + sync timingsafe_bcmp() with the one dempsky@ committed to sys/lib/libkern + - dtucker@cvs.openbsd.org 2010/07/23 08:49:25 + [ssh.1] + Ciphers is documented in ssh_config(5) these days + +20100819 + - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more + details about its behaviour WRT existing directories. Patch from + asguthrie at gmail com, ok djm. + +20100716 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/07/02 04:32:44 + [misc.c] + unbreak strdelim() skipping past quoted strings, e.g. + AllowUsers "blah blah" blah + was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com + ok dtucker; + - djm@cvs.openbsd.org 2010/07/12 22:38:52 + [ssh.c] + Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f") + for protocol 2. ok markus@ + - djm@cvs.openbsd.org 2010/07/12 22:41:13 + [ssh.c ssh_config.5] + expand %h to the hostname in ssh_config Hostname options. While this + sounds useless, it is actually handy for working with unqualified + hostnames: + + Host *.* + Hostname %h + Host * + Hostname %h.example.org + + "I like it" markus@ + - djm@cvs.openbsd.org 2010/07/13 11:52:06 + [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c] + [packet.c ssh-rsa.c] + implement a timing_safe_cmp() function to compare memory without leaking + timing information by short-circuiting like memcmp() and use it for + some of the more sensitive comparisons (though nothing high-value was + readily attackable anyway); "looks ok" markus@ + - djm@cvs.openbsd.org 2010/07/13 23:13:16 + [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c packet.c] + [ssh-rsa.c] + s/timing_safe_cmp/timingsafe_bcmp/g + - jmc@cvs.openbsd.org 2010/07/14 17:06:58 + [ssh.1] + finally ssh synopsis looks nice again! this commit just removes a ton of + hacks we had in place to make it work with old groff; + - schwarze@cvs.openbsd.org 2010/07/15 21:20:38 + [ssh-keygen.1] + repair incorrect block nesting, which screwed up indentation; + problem reported and fix OK by jmc@ + +20100714 + - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass + (line 77) should have been for no_x11_askpass. + +20100702 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/06/26 00:57:07 + [ssh_config.5] + tweak previous; + - djm@cvs.openbsd.org 2010/06/26 23:04:04 + [ssh.c] + oops, forgot to #include ; spotted and patch from chl@ + - djm@cvs.openbsd.org 2010/06/29 23:15:30 + [ssh-keygen.1 ssh-keygen.c] + allow import (-i) and export (-e) of PEM and PKCS#8 encoded keys; + bz#1749; ok markus@ + - djm@cvs.openbsd.org 2010/06/29 23:16:46 + [auth2-pubkey.c sshd_config.5] + allow key options (command="..." and friends) in AuthorizedPrincipals; + ok markus@ + - jmc@cvs.openbsd.org 2010/06/30 07:24:25 + [ssh-keygen.1] + tweak previous; + - jmc@cvs.openbsd.org 2010/06/30 07:26:03 + [ssh-keygen.c] + sort usage(); + - jmc@cvs.openbsd.org 2010/06/30 07:28:34 + [sshd_config.5] + tweak previous; + - millert@cvs.openbsd.org 2010/07/01 13:06:59 + [scp.c] + Fix a longstanding problem where if you suspend scp at the + password/passphrase prompt the terminal mode is not restored. + OK djm@ + - phessler@cvs.openbsd.org 2010/06/27 19:19:56 + [regress/Makefile] + fix how we run the tests so we can successfully use SUDO='sudo -E' + in our env + - djm@cvs.openbsd.org 2010/06/29 23:59:54 + [cert-userkey.sh] + regress tests for key options in AuthorizedPrincipals + +20100627 + - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs + key.h. + +20100626 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/05/21 05:00:36 + [misc.c] + colon() returns char*, so s/return (0)/return NULL/ + - markus@cvs.openbsd.org 2010/06/08 21:32:19 + [ssh-pkcs11.c] + check length of value returned C_GetAttributValue for != 0 + from mdrtbugzilla@codefive.co.uk; bugzilla #1773; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/17 07:07:30 + [mux.c] + Correct sizing of object to be allocated by calloc(), replacing + sizeof(state) with sizeof(*state). This worked by accident since + the struct contained a single int at present, but could have broken + in the future. patch from hyc AT symas.com + - djm@cvs.openbsd.org 2010/06/18 00:58:39 + [sftp.c] + unbreak ls in working directories that contains globbing characters in + their pathnames. bz#1655 reported by vgiffin AT apple.com + - djm@cvs.openbsd.org 2010/06/18 03:16:03 + [session.c] + Missing check for chroot_director == "none" (we already checked against + NULL); bz#1564 from Jan.Pechanec AT Sun.COM + - djm@cvs.openbsd.org 2010/06/18 04:43:08 + [sftp-client.c] + fix memory leak in do_realpath() error path; bz#1771, patch from + anicka AT suse.cz + - djm@cvs.openbsd.org 2010/06/22 04:22:59 + [servconf.c sshd_config.5] + expose some more sshd_config options inside Match blocks: + AuthorizedKeysFile AuthorizedPrincipalsFile + HostbasedUsesNameFromPacketOnly PermitTunnel + bz#1764; feedback from imorgan AT nas.nasa.gov; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/22 04:32:06 + [ssh-keygen.c] + standardise error messages when attempting to open private key + files to include "progname: filename: error reason" + bz#1783; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/22 04:49:47 + [auth.c] + queue auth debug messages for bad ownership or permissions on the user's + keyfiles. These messages will be sent after the user has successfully + authenticated (where our client will display them with LogLevel=debug). + bz#1554; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/22 04:54:30 + [ssh-keyscan.c] + replace verbose and overflow-prone Linebuf code with read_keyfile_line() + based on patch from joachim AT joachimschipper.nl; bz#1565; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/22 04:59:12 + [session.c] + include the user name on "subsystem request for ..." log messages; + bz#1571; ok dtucker@ + - djm@cvs.openbsd.org 2010/06/23 02:59:02 + [ssh-keygen.c] + fix printing of extensions in v01 certificates that I broke in r1.190 + - djm@cvs.openbsd.org 2010/06/25 07:14:46 + [channels.c mux.c readconf.c readconf.h ssh.h] + bz#1327: remove hardcoded limit of 100 permitopen clauses and port + forwards per direction; ok markus@ stevesk@ + - djm@cvs.openbsd.org 2010/06/25 07:20:04 + [channels.c session.c] + bz#1750: fix requirement for /dev/null inside ChrootDirectory for + internal-sftp accidentally introduced in r1.253 by removing the code + that opens and dup /dev/null to stderr and modifying the channels code + to read stderr but discard it instead; ok markus@ + - djm@cvs.openbsd.org 2010/06/25 08:46:17 + [auth1.c auth2-none.c] + skip the initial check for access with an empty password when + PermitEmptyPasswords=no; bz#1638; ok markus@ + - djm@cvs.openbsd.org 2010/06/25 23:10:30 + [ssh.c] + log the hostname and address that we connected to at LogLevel=verbose + after authentication is successful to mitigate "phishing" attacks by + servers with trusted keys that accept authentication silently and + automatically before presenting fake password/passphrase prompts; + "nice!" markus@ + - djm@cvs.openbsd.org 2010/06/25 23:10:30 + [ssh.c] + log the hostname and address that we connected to at LogLevel=verbose + after authentication is successful to mitigate "phishing" attacks by + servers with trusted keys that accept authentication silently and + automatically before presenting fake password/passphrase prompts; + "nice!" markus@ + +20100622 + - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 + bz#1579; ok dtucker + +20100618 + - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~ + rather than assuming that $CWD == $HOME. bz#1500, patch from + timothy AT gelter.com + +20100617 + - (tim) [contrib/cygwin/README] Remove a reference to the obsolete + minires-devel package, and to add the reference to the libedit-devel + package since CYgwin now provides libedit. Patch from Corinna Vinschen. + +20100521 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/05/07 11:31:26 + [regress/Makefile regress/cert-userkey.sh] + regress tests for AuthorizedPrincipalsFile and "principals=" key option. + feedback and ok markus@ + - djm@cvs.openbsd.org 2010/05/11 02:58:04 + [auth-rsa.c] + don't accept certificates marked as "cert-authority" here; ok markus@ + - djm@cvs.openbsd.org 2010/05/14 00:47:22 + [ssh-add.c] + check that the certificate matches the corresponding private key before + grafting it on + - djm@cvs.openbsd.org 2010/05/14 23:29:23 + [channels.c channels.h mux.c ssh.c] + Pause the mux channel while waiting for reply from aynch callbacks. + Prevents misordering of replies if new requests arrive while waiting. + + Extend channel open confirm callback to allow signalling failure + conditions as well as success. Use this to 1) fix a memory leak, 2) + start using the above pause mechanism and 3) delay sending a success/ + failure message on mux slave session open until we receive a reply from + the server. + + motivated by and with feedback from markus@ + - markus@cvs.openbsd.org 2010/05/16 12:55:51 + [PROTOCOL.mux clientloop.h mux.c readconf.c readconf.h ssh.1 ssh.c] + mux support for remote forwarding with dynamic port allocation, + use with + LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost` + feedback and ok djm@ + - djm@cvs.openbsd.org 2010/05/20 11:25:26 + [auth2-pubkey.c] + fix logspam when key options (from="..." especially) deny non-matching + keys; reported by henning@ also bz#1765; ok markus@ dtucker@ + - djm@cvs.openbsd.org 2010/05/20 23:46:02 + [PROTOCOL.certkeys auth-options.c ssh-keygen.c] + Move the permit-* options to the non-critical "extensions" field for v01 + certificates. The logic is that if another implementation fails to + implement them then the connection just loses features rather than fails + outright. + + ok markus@ + +20100511 + - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve + circular dependency problem on old or odd platforms. From Tom Lane, ok + djm@. + - (djm) [openbsd-compat/openssl-compat.h] Fix build breakage on older + libcrypto by defining OPENSSL_[DR]SA_MAX_MODULUS_BITS if they aren't + already. ok dtucker@ + +20100510 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/04/23 01:47:41 + [ssh-keygen.c] + bz#1740: display a more helpful error message when $HOME is + inaccessible while trying to create .ssh directory. Based on patch + from jchadima AT redhat.com; ok dtucker@ + - djm@cvs.openbsd.org 2010/04/23 22:27:38 + [mux.c] + set "detach_close" flag when registering channel cleanup callbacks. + This causes the channel to close normally when its fds close and + hangs when terminating a mux slave using ~. bz#1758; ok markus@ + - djm@cvs.openbsd.org 2010/04/23 22:42:05 + [session.c] + set stderr to /dev/null for subsystems rather than just closing it. + avoids hangs if a subsystem or shell initialisation writes to stderr. + bz#1750; ok markus@ + - djm@cvs.openbsd.org 2010/04/23 22:48:31 + [ssh-keygen.c] + refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS, + since we would refuse to use them anyway. bz#1516; ok dtucker@ + - djm@cvs.openbsd.org 2010/04/26 22:28:24 + [sshconnect2.c] + bz#1502: authctxt.success is declared as an int, but passed by + reference to function that accepts sig_atomic_t*. Convert it to + the latter; ok markus@ dtucker@ + - djm@cvs.openbsd.org 2010/05/01 02:50:50 + [PROTOCOL.certkeys] + typo; jmeltzer@ + - dtucker@cvs.openbsd.org 2010/05/05 04:22:09 + [sftp.c] + restore mput and mget which got lost in the tab-completion changes. + found by Kenneth Whitaker, ok djm@ + - djm@cvs.openbsd.org 2010/05/07 11:30:30 + [auth-options.c auth-options.h auth.c auth.h auth2-pubkey.c] + [key.c servconf.c servconf.h sshd.8 sshd_config.5] + add some optional indirection to matching of principal names listed + in certificates. Currently, a certificate must include the a user's name + to be accepted for authentication. This change adds the ability to + specify a list of certificate principal names that are acceptable. + + When authenticating using a CA trusted through ~/.ssh/authorized_keys, + this adds a new principals="name1[,name2,...]" key option. + + For CAs listed through sshd_config's TrustedCAKeys option, a new config + option "AuthorizedPrincipalsFile" specifies a per-user file containing + the list of acceptable names. + + If either option is absent, the current behaviour of requiring the + username to appear in principals continues to apply. + + These options are useful for role accounts, disjoint account namespaces + and "user@realm"-style naming policies in certificates. + + feedback and ok markus@ + - jmc@cvs.openbsd.org 2010/05/07 12:49:17 + [sshd_config.5] + tweak previous; + +20100423 + - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir + in the openssl install directory (some newer openssl versions do this on at + least some amd64 platforms). + +20100418 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 17:20:19 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 3FEDF106566B; Fri, 12 Nov 2010 17:20:19 +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 297538FC20; Fri, 12 Nov 2010 17:20:19 +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 oACHKJ93017079; Fri, 12 Nov 2010 17:20:19 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACHKIfX017069; Fri, 12 Nov 2010 17:20:18 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201011121720.oACHKIfX017069@svn.freebsd.org> From: Dimitry Andric Date: Fri, 12 Nov 2010 17:20:18 +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: r215189 - in projects/binutils-2.17: . bin/sh bin/sh/bltin contrib/top contrib/xz contrib/xz/po contrib/xz/src/common contrib/xz/src/liblzma/api contrib/xz/src/liblzma/api/lzma contrib/... 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: Fri, 12 Nov 2010 17:20:19 -0000 Author: dim Date: Fri Nov 12 17:20:18 2010 New Revision: 215189 URL: http://svn.freebsd.org/changeset/base/215189 Log: Sync: merge r215141 through r215188 from ^/head. Added: projects/binutils-2.17/contrib/xz/po/xz.pot - copied unchanged from r215187, head/contrib/xz/po/xz.pot projects/binutils-2.17/sys/arm/xscale/ixp425/cambria_gpio.c - copied unchanged from r215166, head/sys/arm/xscale/ixp425/cambria_gpio.c projects/binutils-2.17/sys/netinet/cc/ - copied from r215166, head/sys/netinet/cc/ projects/binutils-2.17/sys/netinet/cc.h - copied unchanged from r215166, head/sys/netinet/cc.h projects/binutils-2.17/sys/powerpc/ofw/ofw_machdep.c - copied unchanged from r215166, head/sys/powerpc/ofw/ofw_machdep.c Deleted: projects/binutils-2.17/bin/sh/bltin/echo.1 projects/binutils-2.17/sys/powerpc/aim/ofw_machdep.c Modified: projects/binutils-2.17/ObsoleteFiles.inc projects/binutils-2.17/UPDATING projects/binutils-2.17/bin/sh/sh.1 projects/binutils-2.17/contrib/top/commands.c projects/binutils-2.17/contrib/xz/ChangeLog projects/binutils-2.17/contrib/xz/TODO projects/binutils-2.17/contrib/xz/po/cs.po projects/binutils-2.17/contrib/xz/po/de.po projects/binutils-2.17/contrib/xz/po/it.po projects/binutils-2.17/contrib/xz/src/common/sysdefs.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/base.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/bcj.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/block.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/container.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/filter.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/hardware.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/index.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/index_hash.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/lzma.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/stream_flags.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/version.h projects/binutils-2.17/contrib/xz/src/liblzma/api/lzma/vli.h projects/binutils-2.17/contrib/xz/src/liblzma/common/common.c projects/binutils-2.17/contrib/xz/src/liblzma/common/filter_encoder.c projects/binutils-2.17/contrib/xz/src/liblzma/common/filter_encoder.h projects/binutils-2.17/contrib/xz/src/liblzma/common/index.c projects/binutils-2.17/contrib/xz/src/liblzma/common/index_decoder.c projects/binutils-2.17/contrib/xz/src/liblzma/common/index_encoder.c projects/binutils-2.17/contrib/xz/src/liblzma/lzma/lzma2_decoder.c projects/binutils-2.17/contrib/xz/src/liblzma/lzma/lzma_decoder.c projects/binutils-2.17/contrib/xz/src/liblzma/lzma/lzma_encoder.c projects/binutils-2.17/contrib/xz/src/xz/message.c projects/binutils-2.17/contrib/xz/src/xz/message.h projects/binutils-2.17/contrib/xz/src/xz/signals.c projects/binutils-2.17/gnu/lib/libgcc/Makefile projects/binutils-2.17/lib/libc/sys/getsockopt.2 projects/binutils-2.17/lib/libcompiler_rt/Makefile projects/binutils-2.17/lib/liblzma/config.h projects/binutils-2.17/libexec/rtld-elf/Makefile projects/binutils-2.17/release/picobsd/build/picobsd projects/binutils-2.17/sbin/ipfw/ipfw.8 projects/binutils-2.17/sbin/ipfw/ipfw2.c projects/binutils-2.17/sbin/ipfw/ipfw2.h projects/binutils-2.17/share/man/man4/siftr.4 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/vflush.9 projects/binutils-2.17/share/man/man9/vgone.9 projects/binutils-2.17/share/mk/sys.mk projects/binutils-2.17/sys/arm/conf/CAMBRIA projects/binutils-2.17/sys/arm/conf/CAMBRIA.hints projects/binutils-2.17/sys/arm/xscale/ixp425/files.avila projects/binutils-2.17/sys/conf/files projects/binutils-2.17/sys/conf/files.powerpc projects/binutils-2.17/sys/dev/acpica/acpi_cpu.c projects/binutils-2.17/sys/dev/gpio/gpiobus.c projects/binutils-2.17/sys/dev/gpio/gpioc.c projects/binutils-2.17/sys/kern/kern_proc.c projects/binutils-2.17/sys/kern/uipc_socket.c projects/binutils-2.17/sys/netinet/ip_fw.h projects/binutils-2.17/sys/netinet/ipfw/ip_fw2.c projects/binutils-2.17/sys/netinet/ipfw/ip_fw_sockopt.c projects/binutils-2.17/sys/netinet/libalias/alias_sctp.c projects/binutils-2.17/sys/netinet/libalias/alias_sctp.h projects/binutils-2.17/sys/netinet/siftr.c projects/binutils-2.17/sys/netinet/tcp_input.c projects/binutils-2.17/sys/netinet/tcp_output.c projects/binutils-2.17/sys/netinet/tcp_sack.c projects/binutils-2.17/sys/netinet/tcp_subr.c projects/binutils-2.17/sys/netinet/tcp_timer.c projects/binutils-2.17/sys/netinet/tcp_usrreq.c projects/binutils-2.17/sys/netinet/tcp_var.h projects/binutils-2.17/sys/powerpc/aim/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/aim/mp_cpudep.c projects/binutils-2.17/sys/powerpc/aim/slb.c projects/binutils-2.17/sys/powerpc/booke/machdep.c projects/binutils-2.17/sys/powerpc/include/cpufunc.h projects/binutils-2.17/sys/powerpc/include/platform.h projects/binutils-2.17/sys/powerpc/include/spr.h projects/binutils-2.17/sys/powerpc/powerpc/cpu.c projects/binutils-2.17/sys/powerpc/powerpc/mp_machdep.c projects/binutils-2.17/sys/powerpc/powerpc/platform.c projects/binutils-2.17/sys/powerpc/powerpc/platform_if.m projects/binutils-2.17/sys/sys/param.h projects/binutils-2.17/sys/sys/signal.h projects/binutils-2.17/sys/sys/smp.h projects/binutils-2.17/sys/sys/socket.h projects/binutils-2.17/sys/sys/socketvar.h 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/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/sys/dev/xen/xenpci/ (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 Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/ObsoleteFiles.inc Fri Nov 12 17:20:18 2010 (r215189) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 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/ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/mptable.h Modified: projects/binutils-2.17/UPDATING ============================================================================== --- projects/binutils-2.17/UPDATING Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/UPDATING Fri Nov 12 17:20:18 2010 (r215189) @@ -22,6 +22,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20101111: + The TCP stack has received a significant update to add support for + modularised congestion control and generally improve the clarity of + congestion control decisions. Bump __FreeBSD_version to 900025. User + space tools that rely on the size of struct tcpcb in tcp_var.h (e.g. + sockstat) need to be recompiled. + 20101002: The man(1) utility has been replaced by a new version that no longer uses /etc/manpath.config. Please consult man.conf(5) for how to Modified: projects/binutils-2.17/bin/sh/sh.1 ============================================================================== --- projects/binutils-2.17/bin/sh/sh.1 Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/bin/sh/sh.1 Fri Nov 12 17:20:18 2010 (r215189) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd October 31, 2010 +.Dd November 12, 2010 .Dt SH 1 .Os .Sh NAME @@ -65,20 +65,13 @@ The utility is the standard command interpreter for the system. The current version of .Nm -is in the process of being changed to -conform with the -.St -p1003.2 +is close to the +.St -p1003.1 specification for the shell. -This version has many features which make -it appear -similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Nm pdksh . -Only features +It only supports features designated by .Tn POSIX , -plus a few Berkeley extensions, are being -incorporated into this shell. +plus a few Berkeley extensions. This man page is not intended to be a tutorial nor a complete specification of the shell. .Ss Overview Modified: projects/binutils-2.17/contrib/top/commands.c ============================================================================== --- projects/binutils-2.17/contrib/top/commands.c Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/contrib/top/commands.c Fri Nov 12 17:20:18 2010 (r215189) @@ -80,10 +80,12 @@ n or # - change number of processes to #ifdef ORDER if (displaymode == DISP_CPU) fputs("\ -o - specify sort order (pri, size, res, cpu, time, threads)\n", stdout); +o - specify sort order (pri, size, res, cpu, time, threads, jid)\n", + stdout); else fputs("\ -o - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout); +o - specify sort order (vcsw, ivcsw, read, write, fault, total, jid)\n", + stdout); #endif fputs("\ r - renice a process\n\ Modified: projects/binutils-2.17/contrib/xz/ChangeLog ============================================================================== --- projects/binutils-2.17/contrib/xz/ChangeLog Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/contrib/xz/ChangeLog Fri Nov 12 17:20:18 2010 (r215189) @@ -1,3 +1,114 @@ +commit e45929260cd902036efd40c5610a8d0a50d5712b +Author: Lasse Collin +Date: Sat Oct 23 17:25:52 2010 +0300 + + Build: Fix mydist rule when .git doesn't exist. + +commit 6e1326fcdf6b6209949be57cfe3ad4b781b65168 +Author: Lasse Collin +Date: Sat Oct 23 14:15:35 2010 +0300 + + Add NEWS for 5.0.0. + +commit b667a3ef6338a2c1db7b7706b1f6c99ea392221c +Author: Lasse Collin +Date: Sat Oct 23 14:02:53 2010 +0300 + + Bump version to 5.0.0 and liblzma version-info to 5:0:0. + +commit 8c947e9291691629714dafb4536c718b6cc24fbd +Author: Lasse Collin +Date: Sat Oct 23 12:30:54 2010 +0300 + + liblzma: Make lzma_code() check the reserved members in lzma_stream. + + If any of the reserved members in lzma_stream are non-zero + or non-NULL, LZMA_OPTIONS_ERROR is returned. It is possible + that a new feature in the future is indicated by just setting + a reserved member to some other value, so the old liblzma + version need to catch it as an unsupported feature. + +commit e61d85e082743ebd2dd0ff28fc0a82482ede0538 +Author: Lasse Collin +Date: Sat Oct 23 12:26:33 2010 +0300 + + Windows: Use MinGW's stdio functions. + + The non-standard ones from msvcrt.dll appear to work + most of the time with XZ Utils, but there are some + corner cases where things may go very wrong. So it's + good to use the better replacements provided by + MinGW(-w64) runtime. + +commit 23e23f1dc029146714c9a98313ab3ea93d71a2fc +Author: Lasse Collin +Date: Sat Oct 23 12:21:32 2010 +0300 + + liblzma: Use 512 as INDEX_GROUP_SIZE. + + This lets compiler use shifting instead of 64-bit division. + +commit 613939fc82603b75b59eee840871a05bc8dd08e0 +Author: Lasse Collin +Date: Sat Oct 23 12:20:11 2010 +0300 + + liblzma: A few ABI tweaks to reserve space in structures. + +commit 68b83f252df3d27480a9f6f03445d16f6506fef1 +Author: Lasse Collin +Date: Thu Oct 21 23:16:11 2010 +0300 + + xz: Make sure that message_strm() can never return NULL. + +commit d09c5753e33ff96ee57edb6d1e98e34041203695 +Author: Lasse Collin +Date: Thu Oct 21 23:06:31 2010 +0300 + + liblzma: Update the comments in the API headers. + + Adding support for LZMA_FINISH for Index encoding and + decoding needed tiny additions to the relevant .c files too. + +commit 33c1c0e102eb529588503b8beea0903a45488fad +Author: Lasse Collin +Date: Tue Oct 19 12:08:30 2010 +0300 + + Update INSTALL.generic. + +commit 0076e03641f201c4b77dddd5a6db5880be19a78c +Author: Lasse Collin +Date: Tue Oct 19 11:44:37 2010 +0300 + + Clean up a few FIXMEs and TODOs. + + lzma_chunk_size() was commented out because it is + currently useless. + +commit ce34ec4f54ff8b753da236f371ad8dd23c8135c9 +Author: Lasse Collin +Date: Tue Oct 19 10:21:08 2010 +0300 + + Update docs. + +commit f0fa880d247e73264d2c04fe31fb3412318a0026 +Author: Lasse Collin +Date: Tue Oct 12 15:13:30 2010 +0300 + + xz: Avoid raise() also on OpenVMS. + + This is similar to DOS/DJGPP that killing the program + with a signal will print a backtrace or a similar message. + +commit ac462b1c47c451f5c62e428306314c4bdad8ae7f +Author: Lasse Collin +Date: Mon Oct 11 21:26:19 2010 +0300 + + xz: Avoid SA_RESTART for portability reasons. + + SA_RESTART is not as portable as I had hoped. It's missing + at least from OpenVMS, QNX, and DJGPP). Luckily we can do + fine without SA_RESTART. + commit d52b411716a614c202e89ba732492efb9916cd3f Author: Lasse Collin Date: Sun Oct 10 17:58:58 2010 +0300 Modified: projects/binutils-2.17/contrib/xz/TODO ============================================================================== --- projects/binutils-2.17/contrib/xz/TODO Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/contrib/xz/TODO Fri Nov 12 17:20:18 2010 (r215189) @@ -18,15 +18,20 @@ Known bugs XZ Utils compress some files significantly worse than LZMA Utils. This is due to faster compression presets used by XZ Utils, and - can be worked around by using "xz --extreme". However, the presets - need some tweaking and maybe this issue can be minimized without - making the typical case too much slower. + can often be worked around by using "xz --extreme". With some files + --extreme isn't enough though: it's most likely with files that + compress extremely well, so going from compression ratio of 0.003 + to 0.004 means big relative increase in the compressed file size. xz doesn't quote unprintable characters when it displays file names given on the command line. tuklib_exit() doesn't block signals => EINTR is possible. + SIGTSTP is not handled. If xz is stopped, the estimated remaining + time and calculated (de)compression speed won't make sense in the + progress indicator (xz --verbose). + Missing features ---------------- @@ -41,11 +46,13 @@ Missing features Buffer-to-buffer coding could use less RAM (especially when decompressing LZMA1 or LZMA2). - I/O library is not implemented. It will possibly be named libzzf. + I/O library is not implemented (similar to gzopen() in zlib). + It will be a separate library that supports uncompressed, .gz, + .bz2, .lzma, and .xz files. lzma_strerror() to convert lzma_ret to human readable form? This is tricky, because the same error codes are used with - slightly different meanings. + slightly different meanings, and this cannot be fixed anymore. Documentation Modified: projects/binutils-2.17/contrib/xz/po/cs.po ============================================================================== --- projects/binutils-2.17/contrib/xz/po/cs.po Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/contrib/xz/po/cs.po Fri Nov 12 17:20:18 2010 (r215189) @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2010-09-17 18:33+0200\n" +"POT-Creation-Date: 2010-10-23 17:48+0300\n" "PO-Revision-Date: 2010-09-17 18:54+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" @@ -30,8 +30,7 @@ msgstr "%s: Neznámý typ kontroly integ #: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." -msgstr "" -"Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor" +msgstr "Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor" #: src/xz/args.c:445 #, c-format @@ -52,8 +51,7 @@ msgstr "Použití přednastavení v rež #: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." -msgstr "" -"Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." +msgstr "Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." #: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" @@ -74,12 +72,8 @@ msgstr "Dekomprimace bude vyžadovat %s #: src/xz/coder.c:247 #, c-format -msgid "" -"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the " -"memory usage limit of %s MiB" -msgstr "" -"Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo " -"překročeno omezení použitelné paměti %s MiB" +msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" +msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" #. TRANSLATORS: When compression or decompression finishes, #. and xz is going to remove the source file, xz first checks @@ -159,8 +153,7 @@ msgstr "%s: Selhalo zavření souboru: % #: src/xz/file_io.c:762 src/xz/file_io.c:946 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" -msgstr "" -"%s: Selhalo nastavení pozice při pokusu o vytvoření záložního souboru: %s" +msgstr "%s: Selhalo nastavení pozice při pokusu o vytvoření záložního souboru: %s" #: src/xz/file_io.c:821 #, c-format @@ -319,12 +312,10 @@ msgstr " Zarovnání proudu: %s\ #: src/xz/list.c:693 msgid "" " Streams:\n" -" Stream Blocks CompOffset UncompOffset CompSize " -"UncompSize Ratio Check Padding" +" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" msgstr "" " Proudy:\n" -" Proud Bloky KomprPozice NekomprPozice KomprVelikost " -"NekomprVelikost Poměr Kontrola Zarovnání" +" Proud Bloky KomprPozice NekomprPozice KomprVelikost NekomprVelikost Poměr Kontrola Zarovnání" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. @@ -332,12 +323,10 @@ msgstr "" #, c-format msgid "" " Blocks:\n" -" Stream Block CompOffset UncompOffset TotalSize " -"UncompSize Ratio Check" +" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" msgstr "" " Bloky:\n" -" Proud Blok KomprPozice NekomprPozice CelkVelikost " -"NekomprVelikost Poměr Kontrola" +" Proud Blok KomprPozice NekomprPozice CelkVelikost NekomprVelikost Poměr Kontrola" #. TRANSLATORS: These are additional column headings #. for the most verbose listing mode. CheckVal @@ -408,78 +397,69 @@ msgstr "%s: Neočekávaný konec vstupu #: src/xz/main.c:120 #, c-format -msgid "" -"%s: Null character found when reading filenames; maybe you meant to use `--" -"files0' instead of `--files'?" -msgstr "" -"%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou " -"použít „--files0“ místo „--files“?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou použít „--files0“ místo „--files“?" #: src/xz/main.c:174 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimace a dekomprimace s přepínačem --robot není zatím podporovaná." #: src/xz/main.c:231 -msgid "" -"Cannot read data from standard input when reading filenames from standard " -"input" -msgstr "" -"Ze standardního vstupu nelze číst data, když se ze standardního vstupu " -"načítají názvy souborů" +msgid "Cannot read data from standard input when reading filenames from standard input" +msgstr "Ze standardního vstupu nelze číst data, když se ze standardního vstupu načítají názvy souborů" -#: src/xz/message.c:800 src/xz/message.c:844 +#: src/xz/message.c:792 src/xz/message.c:842 msgid "Internal error (bug)" msgstr "Interní chyba" -#: src/xz/message.c:807 +#: src/xz/message.c:799 msgid "Cannot establish signal handlers" msgstr "Nelze ustanovit ovladač signálu" -#: src/xz/message.c:816 +#: src/xz/message.c:808 msgid "No integrity check; not verifying file integrity" msgstr "Žádná kontrola integrity; integrita souboru se nebude ověřovat" -#: src/xz/message.c:819 +#: src/xz/message.c:811 msgid "Unsupported type of integrity check; not verifying file integrity" -msgstr "" -"Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat" +msgstr "Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat" -#: src/xz/message.c:826 +#: src/xz/message.c:818 msgid "Memory usage limit reached" msgstr "Dosaženo omezení použitelné paměti" -#: src/xz/message.c:829 +#: src/xz/message.c:821 msgid "File format not recognized" msgstr "Formát souboru nebyl rozpoznán" -#: src/xz/message.c:832 +#: src/xz/message.c:824 msgid "Unsupported options" msgstr "Nepodporovaná volba" -#: src/xz/message.c:835 +#: src/xz/message.c:827 msgid "Compressed data is corrupt" msgstr "Komprimovaná data jsou poškozená" -#: src/xz/message.c:838 +#: src/xz/message.c:830 msgid "Unexpected end of input" msgstr "Neočekávaný konec vstupu" -#: src/xz/message.c:886 +#: src/xz/message.c:881 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Je vyžadováno %s MiB paměti. Limit je %s." -#: src/xz/message.c:1053 +#: src/xz/message.c:1048 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Omezující filtr: %s\n" -#: src/xz/message.c:1063 +#: src/xz/message.c:1058 #, c-format msgid "Try `%s --help' for more information." msgstr "Zkuste „%s --help“ pro více informací" -#: src/xz/message.c:1089 +#: src/xz/message.c:1084 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -490,18 +470,15 @@ msgstr "" "Komprimuje nebo dekomprimuje SOUBORy ve formátu xz.\n" "\n" -#: src/xz/message.c:1096 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké " -"přepínače.\n" +#: src/xz/message.c:1091 +msgid "Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké přepínače.\n" -#: src/xz/message.c:1100 +#: src/xz/message.c:1095 msgid " Operation mode:\n" msgstr "Operační režim:\n" -#: src/xz/message.c:1103 +#: src/xz/message.c:1098 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -513,7 +490,7 @@ msgstr "" " -t, --test testovat integritu komprimovaného souboru\n" " -l, --list vypsat informace o souborech .xz" -#: src/xz/message.c:1109 +#: src/xz/message.c:1104 msgid "" "\n" " Operation modifiers:\n" @@ -521,39 +498,33 @@ msgstr "" "\n" "Modifikátory operací:\n" -#: src/xz/message.c:1112 +#: src/xz/message.c:1107 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" " -c, --stdout write to standard output and don't delete input files" msgstr "" " -k, --keep zachovat (nemazat) vstupní soubory\n" -" -f, --force vynutit přepis výstupního souboru a de/komprimovat " -"odkazy\n" -" -c, --stdout zapisovat na standardní výstup a nemazat vstupní " -"soubory" +" -f, --force vynutit přepis výstupního souboru a de/komprimovat odkazy\n" +" -c, --stdout zapisovat na standardní výstup a nemazat vstupní soubory" -#: src/xz/message.c:1118 +#: src/xz/message.c:1113 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" -" filenames must be terminated with the newline " -"character\n" +" filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" " --no-sparse nevytvářet při dekomprimaci záložní soubory\n" " -S, --suffix=.PRIP použít u komprimovaných souborů příponu „.PRIP“\n" -" --files[=SOUBOR] číst názvy souborů, které se mají zpracovat, ze " -"SOUBORu;\n" -" pokud není SOUBOR zadán, čte se ze standardního " -"vstupu;\n" +" --files[=SOUBOR] číst názvy souborů, které se mají zpracovat, ze SOUBORu;\n" +" pokud není SOUBOR zadán, čte se ze standardního vstupu;\n" " názvy souborů musí být zakončeny znakem nového řádku\n" -" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový " -"znak" +" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový znak" -#: src/xz/message.c:1126 +#: src/xz/message.c:1121 msgid "" "\n" " Basic file format and compression options:\n" @@ -561,7 +532,7 @@ msgstr "" "\n" "Základní přepínače pro formát souboru a komprimaci:\n" -#: src/xz/message.c:1128 +#: src/xz/message.c:1123 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -570,76 +541,62 @@ msgid "" msgstr "" " -F, --format=FORMÁT formát souboru k zakódování nebo dekódování; možné\n" " hodnoty jsou „auto“ (výchozí), „xz“, „lzma“ a „raw“\n" -" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s " -"rozmyslem),\n" +" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s rozmyslem),\n" " „crc32“, „crc64“ (výchozí) nebo „sha256“" -#: src/xz/message.c:1135 +#: src/xz/message.c:1130 msgid "" -" -0 ... -9 compression preset; default is 6; take compressor " -"*and*\n" -" decompressor memory usage into account before using " -"7-9!" -msgstr "" -" -0 .. -9 přednastavení komprimace; výchozí je 6; než " -"použijete\n" -" hodnoty 7 – 9, vezměte do úvahy množství použité " -"paměti" +" -0 ... -9 compression preset; default is 6; take compressor *and*\n" +" decompressor memory usage into account before using 7-9!" +msgstr "" +" -0 .. -9 přednastavení komprimace; výchozí je 6; než použijete\n" +" hodnoty 7 – 9, vezměte do úvahy množství použité paměti" -#: src/xz/message.c:1139 +#: src/xz/message.c:1134 msgid "" -" -e, --extreme try to improve compression ratio by using more CPU " -"time;\n" +" -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" msgstr "" " -e, --extreme zkusit zlepšit poměr komprimace využitím více času\n" " procesoru; nemá vliv na paměťové nároky dekomprimace" -#: src/xz/message.c:1144 +#: src/xz/message.c:1139 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" " --memlimit-decompress=LIMIT\n" " -M, --memlimit=LIMIT\n" -" set memory usage limit for compression, " -"decompression,\n" +" set memory usage limit for compression, decompression,\n" " or both; LIMIT is in bytes, % of RAM, or 0 for defaults" msgstr "" " --memlimit-compress=LIMIT\n" " --memlimit-decompress=LIMIT\n" " -M, --memlimit=LIMIT\n" " nastaví omezení použitelné paměti pro komprimaci,\n" -" dekomprimaci nebo obojí; LIMIT je v bajtech, % z " -"paměti\n" +" dekomprimaci nebo obojí; LIMIT je v bajtech, % z paměti\n" " RAM nebo 0 pro výchozí" -#: src/xz/message.c:1151 +#: src/xz/message.c:1146 msgid "" -" --no-adjust if compression settings exceed the memory usage " -"limit,\n" -" give an error instead of adjusting the settings " -"downwards" +" --no-adjust if compression settings exceed the memory usage limit,\n" +" give an error instead of adjusting the settings downwards" msgstr "" -" --no-adjust pokud nastavení komprimace přesáhne omezení " -"použitelné\n" +" --no-adjust pokud nastavení komprimace přesáhne omezení použitelné\n" " paměti, předat chybu namísto snížení nastavení" -#: src/xz/message.c:1157 +#: src/xz/message.c:1152 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" "\n" -"Vlastní omezující filtr pro komprimaci (alternativa k použití " -"přednastavených):" +"Vlastní omezující filtr pro komprimaci (alternativa k použití přednastavených):" -#: src/xz/message.c:1166 +#: src/xz/message.c:1161 msgid "" "\n" -" --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero " -"or\n" -" --lzma2[=OPTS] more of the following options (valid values; " -"default):\n" +" --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" +" --lzma2[=OPTS] more of the following options (valid values; default):\n" " preset=PRE reset options to a preset (0-9[e])\n" " dict=NUM dictionary size (4KiB - 1536MiB; 8MiB)\n" " lc=NUM number of literal context bits (0-4; 3)\n" @@ -647,33 +604,24 @@ msgid "" " pb=NUM number of position bits (0-4; 2)\n" " mode=MODE compression mode (fast, normal; normal)\n" " nice=NUM nice length of a match (2-273; 64)\n" -" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; " -"bt4)\n" -" depth=NUM maximum search depth; 0=automatic " -"(default)" -msgstr "" -"\n" -" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam " -"žádné\n" -" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; " -"výchozí):\n" -" preset=PŘE změnit volby na PŘEdnastavené (0 – 9" -"[e])\n" -" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 " -"MiB)\n" -" lc=POČ počet kontextových bitů literálu (0 – 4; " -"3)\n" -" lp=POČ počet pozičních bitů literálu (0 – 4; " -"0)\n" +" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; bt4)\n" +" depth=NUM maximum search depth; 0=automatic (default)" +msgstr "" +"\n" +" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam žádné\n" +" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; výchozí):\n" +" preset=PŘE změnit volby na PŘEdnastavené (0 – 9[e])\n" +" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 MiB)\n" +" lc=POČ počet kontextových bitů literálu (0 – 4; 3)\n" +" lp=POČ počet pozičních bitů literálu (0 – 4; 0)\n" " pb=POČ počet pozičních bitů (0 – 4; 2)\n" " mode=REŽIM režim komprimace (fast, normal; normal)\n" " nice=NUM příznivá délka shody (2 – 273; 64)\n" -" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; " -"bt4)\n" +" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; bt4)\n" " depth=POČ maximální hloubka prohledávání;\n" " 0 = automaticky (výchozí)" -#: src/xz/message.c:1181 +#: src/xz/message.c:1176 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -695,7 +643,7 @@ msgstr "" " Platné volby pro všechny filtry BCJ:\n" " start=POČ počáteční posun pro převody (výchozí=0)" -#: src/xz/message.c:1193 +#: src/xz/message.c:1188 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -704,11 +652,10 @@ msgid "" msgstr "" "\n" " --delta[=VOLBY] Filtr Delta; platné VOLBY (platné hodnoty; výchozí):\n" -" dist=POČ vzdálenost mezi bajty, které jsou " -"odečítány\n" +" dist=POČ vzdálenost mezi bajty, které jsou odečítány\n" " jeden od druhého (1 – 256; 1)" -#: src/xz/message.c:1201 +#: src/xz/message.c:1196 msgid "" "\n" " Other options:\n" @@ -716,79 +663,71 @@ msgstr "" "\n" " Ostatní přepínače:\n" -#: src/xz/message.c:1204 +#: src/xz/message.c:1199 msgid "" -" -q, --quiet suppress warnings; specify twice to suppress errors " -"too\n" +" -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i " -"chyby\n" +" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i chyby\n" " -v, --verbose podrobnější zprávy; zadáním dvakrát, budou ještě\n" " podrobnější" -#: src/xz/message.c:1209 +#: src/xz/message.c:1204 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn způsobí, že varování neovlivní stav ukončení" -#: src/xz/message.c:1211 -msgid "" -" --robot use machine-parsable messages (useful for scripts)" +#: src/xz/message.c:1206 +msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot použít strojově analyzovatelné zprávy (užitečné pro\n" " skripty)" -#: src/xz/message.c:1214 +#: src/xz/message.c:1209 msgid "" -" --info-memory display the total amount of RAM and the currently " -"active\n" +" --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr "" -" --info-memory zobrazit celkové množství paměti RAM a současné " -"aktivní\n" +" --info-memory zobrazit celkové množství paměti RAM a současné aktivní\n" " omezení použitelné paměti a skončit" -#: src/xz/message.c:1217 +#: src/xz/message.c:1212 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -" -h, --help zobrazit krátkou nápovědu (vypíše jen základní " -"přepínače)\n" +" -h, --help zobrazit krátkou nápovědu (vypíše jen základní přepínače)\n" " -H, --long-help zobrazit tuto úplnou nápovědu a skončit" -#: src/xz/message.c:1221 +#: src/xz/message.c:1216 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" " -h, --help zobrazit tuto zkrácenou nápovědu a skončit\n" -" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé " -"přepínače)" +" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé přepínače)" -#: src/xz/message.c:1226 +#: src/xz/message.c:1221 msgid " -V, --version display the version number and exit" msgstr " -V, --version zobrazit číslo verze a skončit" -#: src/xz/message.c:1228 +#: src/xz/message.c:1223 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" -"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního " -"vstupu.\n" +"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního vstupu.\n" #. TRANSLATORS: This message indicates the bug reporting address #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1234 +#: src/xz/message.c:1229 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Chyby hlaste na <%s> (v angličtině nebo finštině).\n" -#: src/xz/message.c:1236 +#: src/xz/message.c:1231 #, c-format msgid "%s home page: <%s>\n" msgstr "Domovská stránka %s: <%s>\n" @@ -824,11 +763,8 @@ msgstr "Vybraný vyhledávač shod vyža #: src/xz/suffix.c:79 src/xz/suffix.c:164 #, c-format -msgid "" -"%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "" -"%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do " -"standardního výstupu" +msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" +msgstr "%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do standardního výstupu" #: src/xz/suffix.c:99 #, c-format @@ -857,9 +793,7 @@ msgstr "%s: Neplatná jednotka s předpo #: src/xz/util.c:105 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgstr "" -"Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a " -"„GiB“ (2^30 B)." +msgstr "Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a „GiB“ (2^30 B)." #: src/xz/util.c:122 #, c-format @@ -893,49 +827,37 @@ msgstr "Neznámá chyba" #~ msgstr "%s MiB (%s bajtů)\n" #~ msgid "" -#~ " -e, --extreme use more CPU time when encoding to increase " -#~ "compression\n" +#~ " -e, --extreme use more CPU time when encoding to increase compression\n" #~ " ratio without increasing memory usage of the decoder" #~ msgstr "" -#~ " -e, --extreme využít více procesorového času pro kódování, čímž " -#~ "se\n" -#~ " zvýší kompresní poměr bez zvýšení paměti použité " -#~ "kodérem" +#~ " -e, --extreme využít více procesorového času pro kódování, čímž se\n" +#~ " zvýší kompresní poměr bez zvýšení paměti použité kodérem" #~ msgid "" -#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 " -#~ "indicates\n" +#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 indicates\n" #~ " the default setting, which is 40 % of total RAM" #~ msgstr "" -#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 " -#~ "znamená\n" -#~ " výchozí nastavení, což je 40% celkového množství " -#~ "paměti" +#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 znamená\n" +#~ " výchozí nastavení, což je 40% celkového množství paměti" #~ msgid "" #~ "\n" -#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; " -#~ "default):\n" +#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; default):\n" #~ " size=NUM number of bytes of data per subblock\n" #~ " (1 - 256Mi; 4Ki)\n" -#~ " rle=NUM run-length encoder chunk size (0-256; " -#~ "0)" +#~ " rle=NUM run-length encoder chunk size (0-256; 0)" #~ msgstr "" #~ "\n" -#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; " -#~ "výchozí):\n" +#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; výchozí):\n" #~ " size=POČ počet bajtů dat na subblok\n" #~ " (1 - 256 Mi; 4 Ki)\n" -#~ " rle=POČ velikost dávky pro kodér run-length " -#~ "(0-256; 0)" +#~ " rle=POČ velikost dávky pro kodér run-length (0-256; 0)" #~ msgid "" -#~ "On this system and configuration, this program will use a maximum of " -#~ "roughly\n" +#~ "On this system and configuration, this program will use a maximum of roughly\n" #~ "%s MiB RAM and " #~ msgstr "" -#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze " -#~ "zhruba\n" +#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze zhruba\n" #~ "%s MiB RAM a " #~ msgid "" Modified: projects/binutils-2.17/contrib/xz/po/de.po ============================================================================== --- projects/binutils-2.17/contrib/xz/po/de.po Fri Nov 12 17:10:12 2010 (r215188) +++ projects/binutils-2.17/contrib/xz/po/de.po Fri Nov 12 17:20:18 2010 (r215189) @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: XZ Utils 4.999.9beta\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2010-09-11 17:07+0200\n" +"POT-Creation-Date: 2010-10-23 17:48+0300\n" "PO-Revision-Date: 2010-09-07 20:27+0200\n" "Last-Translator: \n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,8 +28,7 @@ msgstr "%s: Integritäts-Check Typ nicht #: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." -msgstr "" -"Nur ein file kann als Argument für --files oder --files0 angegeben werden." +msgstr "Nur ein file kann als Argument für --files oder --files0 angegeben werden." #: src/xz/args.c:445 #, c-format @@ -41,8 +41,7 @@ msgstr "Maximal vier Filter möglich" #: src/xz/coder.c:108 msgid "Memory usage limit is too low for the given filter setup." -msgstr "" -"Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration." +msgstr "Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration." #: src/xz/coder.c:129 msgid "Using a preset in raw mode is discouraged." @@ -50,9 +49,7 @@ msgstr "Verwendung der Voreinstellung im #: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." -msgstr "" -"Die genauen Optionen der Voreinstellung können zwischen Software Versionen " -"variieren." +msgstr "Die genauen Optionen der Voreinstellung können zwischen Software Versionen variieren." #: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" @@ -73,12 +70,8 @@ msgstr "Dekompression wird %s MiB Speich #: src/xz/coder.c:247 #, c-format -msgid "" -"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the " -"memory usage limit of %s MiB" -msgstr "" -"Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das " -"Speicher Nutzungslimit von %s MiB zu übersteigen" +msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" +msgstr "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das Speicher Nutzungslimit von %s MiB zu übersteigen" #. TRANSLATORS: When compression or decompression finishes, #. and xz is going to remove the source file, xz first checks @@ -93,8 +86,7 @@ msgstr "" #: src/xz/file_io.c:137 #, c-format msgid "%s: File seems to have been moved, not removing" -msgstr "" -"%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" +msgstr "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" #: src/xz/file_io.c:144 src/xz/file_io.c:590 #, c-format @@ -149,8 +141,7 @@ msgstr "%s: Eingabedatei hat mehr als ei #: src/xz/file_io.c:714 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" -msgstr "" -"Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" +msgstr "Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" #: src/xz/file_io.c:726 #, c-format @@ -160,8 +151,7 @@ msgstr "%s: Fehler beim Schießen der Da #: src/xz/file_io.c:762 src/xz/file_io.c:946 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" -msgstr "" -"%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" +msgstr "%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" #: src/xz/file_io.c:821 #, c-format @@ -212,7 +202,7 @@ msgstr "Kein" #. but the Check ID is known (here 2). This and other "Unknown-N" #. strings are used in tables, so the width must not exceed ten #. columns with a fixed-width font. It's OK to omit the dash if -#. you need space for one extra letter. +#. you need space for one extra letter, but don't use spaces. #: src/xz/list.c:69 msgid "Unknown-2" msgstr "Unbek.2" @@ -320,12 +310,10 @@ msgstr " Strom Auffüllung: %s\n" #: src/xz/list.c:693 msgid "" " Streams:\n" -" Stream Blocks CompOffset UncompOffset CompSize " -"UncompSize Ratio Check Padding" +" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" msgstr "" " Ströme:\n" -" Strom Blöcke KompOffset UnkompOffset KompGröße " -"UnkompGröße Verh. Check Auffüllung" +" Strom Blöcke KompOffset UnkompOffset KompGröße UnkompGröße Verh. Check Auffüllung" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. @@ -333,12 +321,10 @@ msgstr "" #, c-format msgid "" " Blocks:\n" -" Stream Block CompOffset UncompOffset TotalSize " -"UncompSize Ratio Check" +" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" msgstr "" " Blöcke:\n" -" Strom Block KompOffset UnkompOffset TotalGröße " -"UnkompGröße Verh. Check" +" Strom Block KompOffset UnkompOffset TotalGröße UnkompGröße Verh. Check" #. TRANSLATORS: These are additional column headings #. for the most verbose listing mode. CheckVal @@ -390,8 +376,7 @@ msgstr " Anzahl Dateien: %s\n" #: src/xz/list.c:1072 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 19:06:20 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 37057106566B; Fri, 12 Nov 2010 19:06:20 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AF688FC16; Fri, 12 Nov 2010 19:06:20 +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 oACJ6JhW020417; Fri, 12 Nov 2010 19:06:19 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACJ6JZS020415; Fri, 12 Nov 2010 19:06:19 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011121906.oACJ6JZS020415@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 19:06:19 +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: r215192 - projects/jbuild/usr.bin/jbuild 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: Fri, 12 Nov 2010 19:06:20 -0000 Author: obrien Date: Fri Nov 12 19:06:19 2010 New Revision: 215192 URL: http://svn.freebsd.org/changeset/base/215192 Log: Bump due to r212984. Modified: projects/jbuild/usr.bin/jbuild/jbuild_version Modified: projects/jbuild/usr.bin/jbuild/jbuild_version ============================================================================== --- projects/jbuild/usr.bin/jbuild/jbuild_version Fri Nov 12 18:10:27 2010 (r215191) +++ projects/jbuild/usr.bin/jbuild/jbuild_version Fri Nov 12 19:06:19 2010 (r215192) @@ -1,5 +1,5 @@ # $FreeBSD$ -JBUILD_VERSION = 18 +JBUILD_VERSION = 19 CFLAGS += -DJBUILD_VERSION=\"${JBUILD_VERSION}\" From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 19:25:12 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 5078B106564A; Fri, 12 Nov 2010 19:25:12 +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 3EC808FC0C; Fri, 12 Nov 2010 19:25:12 +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 oACJPCOW020909; Fri, 12 Nov 2010 19:25:12 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACJPCY4020907; Fri, 12 Nov 2010 19:25:12 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201011121925.oACJPCY4020907@svn.freebsd.org> From: Dimitry Andric Date: Fri, 12 Nov 2010 19:25:12 +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: r215193 - projects/binutils-2.17/sys/mips/conf 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: Fri, 12 Nov 2010 19:25:12 -0000 Author: dim Date: Fri Nov 12 19:25:11 2010 New Revision: 215193 URL: http://svn.freebsd.org/changeset/base/215193 Log: Missed file due to svn:ignore properties... Added: projects/binutils-2.17/sys/mips/conf/std.SWARM Added: projects/binutils-2.17/sys/mips/conf/std.SWARM ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/sys/mips/conf/std.SWARM Fri Nov 12 19:25:11 2010 (r215193) @@ -0,0 +1,60 @@ +# +# $FreeBSD: projects/binutils-2.17/sys/mips/conf/std.SWARM 215068 2010-11-10 00:28:20Z imp $ +# + +files "../sibyte/files.sibyte" +hints "SWARM.hints" + +options CFE +options CFE_CONSOLE +options CFE_ENV +options ALT_BREAK_TO_DEBUGGER + +cpu CPU_SB1 + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="" + +options DDB +options KDB + +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions + +# Debugging for use in -current +#options DEADLKRES +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + +options FFS #Fast filesystem + +options KTRACE + +device pci +device miibus +device bge +device loop +device ether +device md +device random + +options USB_DEBUG +device usb +device ohci +device uhci +device ehci + +device umass + +device scbus +device da + +device ata +device atadisk +device atapicd +options ATA_STATIC_ID From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 21:26:14 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 2AA8A106567A; Fri, 12 Nov 2010 21:26:14 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 184758FC14; Fri, 12 Nov 2010 21:26:14 +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 oACLQDEg023913; Fri, 12 Nov 2010 21:26:13 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLQDfh023909; Fri, 12 Nov 2010 21:26:13 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011122126.oACLQDfh023909@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 21:26:13 +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: r215202 - projects/jbuild/usr.bin/jdirdep 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: Fri, 12 Nov 2010 21:26:14 -0000 Author: obrien Date: Fri Nov 12 21:26:13 2010 New Revision: 215202 URL: http://svn.freebsd.org/changeset/base/215202 Log: * jbuild(1) does not rely on SQL libs. * #ifdef out the use of INCMK - which is irrelevant since the *.dirdep file was introduced. Obtained from: Juniper Networks Modified: projects/jbuild/usr.bin/jdirdep/Buildfile.common projects/jbuild/usr.bin/jdirdep/Makefile.common projects/jbuild/usr.bin/jdirdep/jdirdep.c Modified: projects/jbuild/usr.bin/jdirdep/Buildfile.common ============================================================================== --- projects/jbuild/usr.bin/jdirdep/Buildfile.common Fri Nov 12 21:11:49 2010 (r215201) +++ projects/jbuild/usr.bin/jdirdep/Buildfile.common Fri Nov 12 21:26:13 2010 (r215202) @@ -6,6 +6,7 @@ SRCS += jdirdep.c CFLAGS += -I${BSDSRCTOP}/usr.bin/jdirdep -DJDIRDEP +.if ${PROG} == "jdirdep" .if defined(USE_SQLITE3) CFLAGS += -DUSE_SQLITE3 -pthread CFLAGS += -I/usr/local/include @@ -18,3 +19,4 @@ MYSQL_LIBS != mysql_config --libs CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS} LDADD += ${MYSQL_LIBS} .endif +.endif Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common ============================================================================== --- projects/jbuild/usr.bin/jdirdep/Makefile.common Fri Nov 12 21:11:49 2010 (r215201) +++ projects/jbuild/usr.bin/jdirdep/Makefile.common Fri Nov 12 21:26:13 2010 (r215202) @@ -4,6 +4,7 @@ SRCS += jdirdep.c CFLAGS += -I${.CURDIR}/../jdirdep -DJDIRDEP +.if ${PROG} == "jdirdep" .if defined(USE_SQLITE3) CFLAGS += -DUSE_SQLITE3 -pthread CFLAGS += -I/usr/local/include @@ -17,5 +18,6 @@ CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS} LDADD += ${MYSQL_LIBS} LDADD += -static .else +.endif SRCS += jdirdep_db_stub.c .endif Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c ============================================================================== --- projects/jbuild/usr.bin/jdirdep/jdirdep.c Fri Nov 12 21:11:49 2010 (r215201) +++ projects/jbuild/usr.bin/jdirdep/jdirdep.c Fri Nov 12 21:26:13 2010 (r215202) @@ -38,13 +38,13 @@ struct march { char *machine_arch; TAILQ_ENTRY(march) link; }; - +#ifdef NEED_INCMK struct incmk { char *s; size_t l; TAILQ_ENTRY(incmk) link; }; - +#endif struct metas { char *s; TAILQ_ENTRY(metas) link; @@ -58,7 +58,9 @@ struct file_track { static TAILQ_HEAD(, dirdep) dirdeps = TAILQ_HEAD_INITIALIZER(dirdeps); static TAILQ_HEAD(, dirdep) srcdirdeps = TAILQ_HEAD_INITIALIZER(srcdirdeps); +#ifdef NEED_INCMK static TAILQ_HEAD(, incmk) incmks = TAILQ_HEAD_INITIALIZER(incmks); +#endif static TAILQ_HEAD(, march) marchs = TAILQ_HEAD_INITIALIZER(marchs); static TAILQ_HEAD(, metas) metass = TAILQ_HEAD_INITIALIZER(metass); static int f_db = 0; @@ -229,6 +231,7 @@ dirdep_add(const char *srcrel, const cha TAILQ_INSERT_BEFORE(dn, dd, link); } +#ifdef JDIRDEP_MAIN static int recid_lookup(void *thing, int argc __unused, char **argv __unused, char **colname __unused) { @@ -324,6 +327,7 @@ meta_dep_add(void) } } } +#endif static void delete_dep(const char *relname __unused) @@ -334,6 +338,7 @@ delete_dep(const char *relname __unused) static void move_dep(const char *srcname, const char *dstname, const char *reldir) { +#ifdef JDIRDEP_MAIN int64_t filid_used; int64_t filid_using; @@ -344,11 +349,13 @@ move_dep(const char *srcname, const char filid_used = file_table_add(srcname, NULL); file_dep_add(filid_using, filid_used); +#endif } static void read_dep(const char *relname) { +#ifdef JDIRDEP_MAIN int64_t filid; if (!f_db) @@ -357,11 +364,13 @@ read_dep(const char *relname) filid = file_table_add(relname, NULL); file_track_add(&read_filids, filid); +#endif } static void write_dep(const char *relname, const char *reldir) { +#ifdef JDIRDEP_MAIN int64_t filid; if (!f_db) @@ -370,6 +379,7 @@ write_dep(const char *relname, const cha filid = file_table_add(relname, reldir); file_track_add(&write_filids, filid); +#endif } /* @@ -602,8 +612,9 @@ parse_meta(const char *srctop, const cha fclose(fp); } +#ifdef JDIRDEP_MAIN meta_dep_add(); - +#endif file_track_reset(); } @@ -694,9 +705,10 @@ do_dirdep(const char *srctop, const char if (fstat(fileno(fp), &fs) != 0) err(1, "Could not get file status of file '%s'", fname); +#ifdef JDIRDEP_MAIN if (f_db) reldir_table_add(srcrel); - +#endif if ((bufr = malloc(fs.st_size)) == NULL) err(1, "Could not allocate %zd bytes for the dirdep buffer", (size_t) fs.st_size); @@ -1207,6 +1219,7 @@ jdirdep_supmac(const char *p) } } +#ifdef NEED_INCMK void jdirdep_incmk(const char *p) { @@ -1226,6 +1239,7 @@ jdirdep_incmk(const char *p) TAILQ_INSERT_TAIL(&incmks, incmkp, link); } } +#endif /* This is the public function. */ int @@ -1240,12 +1254,13 @@ jdirdep(const char *srctop, const char * int ret = 0; struct metas *metasp; +#ifdef JDIRDEP_MAIN if (filedep_name != NULL) { f_db = 1; jdirdep_db_open(filedep_name); } - +#endif if (meta_created != NULL) { meta_str = strdup(meta_created); str = meta_str; @@ -1286,8 +1301,9 @@ jdirdep(const char *srctop, const char * else do_dirdep(srctop, curdir, srcrel, objroot, sharedobj, options, p_jbuild); +#ifdef JDIRDEP_MAIN jdirdep_db_close(); - +#endif if (meta_str != NULL) free(meta_str); @@ -1342,12 +1358,12 @@ main(int argc, char *argv[]) errx(1, "SUPMAC is missing from the environment"); jdirdep_supmac(p); - +#ifdef NEED_INCMK if ((p = getenv("INCMK")) == NULL) errx(1, "INCMK is missing from the environment"); jdirdep_incmk(p); - +#endif /* * The current source relative directory is the bit after the * source top bit has been removed. From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 21:29:57 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 A036310656B8; Fri, 12 Nov 2010 21:29:57 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8EB078FC0A; Fri, 12 Nov 2010 21:29:57 +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 oACLTveK024031; Fri, 12 Nov 2010 21:29:57 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLTvIY024029; Fri, 12 Nov 2010 21:29:57 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011122129.oACLTvIY024029@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 21:29:57 +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: r215203 - projects/jbuild/usr.bin/jbuild/port 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: Fri, 12 Nov 2010 21:29:57 -0000 Author: obrien Date: Fri Nov 12 21:29:57 2010 New Revision: 215203 URL: http://svn.freebsd.org/changeset/base/215203 Log: Install the kernel module into /boot/modules to match 'pkg-list'. Modified: projects/jbuild/usr.bin/jbuild/port/Makefile Modified: projects/jbuild/usr.bin/jbuild/port/Makefile ============================================================================== --- projects/jbuild/usr.bin/jbuild/port/Makefile Fri Nov 12 21:26:13 2010 (r215202) +++ projects/jbuild/usr.bin/jbuild/port/Makefile Fri Nov 12 21:29:57 2010 (r215203) @@ -13,6 +13,8 @@ CATEGORIES= devel MAINTAINER= rodrigc@FreeBSD.org COMMENT= Utility for building software and tracking build dependencies. +KMODDIR= /boot/modules + BUILD_DEPENDS += ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql60-client MAN1= jbuild.1 From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 21:37:11 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 68252106564A; Fri, 12 Nov 2010 21:37:11 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 048228FC1B; Fri, 12 Nov 2010 21:37:11 +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 oACLbAuq024235; Fri, 12 Nov 2010 21:37:10 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLbApG024233; Fri, 12 Nov 2010 21:37:10 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011122137.oACLbApG024233@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 21:37:10 +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: r215204 - projects/jbuild/usr.bin/jbuild/port 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: Fri, 12 Nov 2010 21:37:11 -0000 Author: obrien Date: Fri Nov 12 21:37:10 2010 New Revision: 215204 URL: http://svn.freebsd.org/changeset/base/215204 Log: Allow KMODDIR to be set on the make(1) command line. Modified: projects/jbuild/usr.bin/jbuild/port/Makefile Modified: projects/jbuild/usr.bin/jbuild/port/Makefile ============================================================================== --- projects/jbuild/usr.bin/jbuild/port/Makefile Fri Nov 12 21:29:57 2010 (r215203) +++ projects/jbuild/usr.bin/jbuild/port/Makefile Fri Nov 12 21:37:10 2010 (r215204) @@ -13,7 +13,7 @@ CATEGORIES= devel MAINTAINER= rodrigc@FreeBSD.org COMMENT= Utility for building software and tracking build dependencies. -KMODDIR= /boot/modules +KMODDIR?= /boot/modules BUILD_DEPENDS += ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql60-client From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 21:46:58 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 D785E1065675; Fri, 12 Nov 2010 21:46:58 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ABAC88FC18; Fri, 12 Nov 2010 21:46:58 +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 oACLkwqp024477; Fri, 12 Nov 2010 21:46:58 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLkwGS024474; Fri, 12 Nov 2010 21:46:58 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011122146.oACLkwGS024474@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 21:46:58 +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: r215205 - projects/jbuild/usr.bin/jdirdep 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: Fri, 12 Nov 2010 21:46:58 -0000 Author: obrien Date: Fri Nov 12 21:46:58 2010 New Revision: 215205 URL: http://svn.freebsd.org/changeset/base/215205 Log: patch-gone-wild Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common projects/jbuild/usr.bin/jdirdep/jdirdep.c Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common ============================================================================== --- projects/jbuild/usr.bin/jdirdep/Makefile.common Fri Nov 12 21:37:10 2010 (r215204) +++ projects/jbuild/usr.bin/jdirdep/Makefile.common Fri Nov 12 21:46:58 2010 (r215205) @@ -5,19 +5,19 @@ SRCS += jdirdep.c CFLAGS += -I${.CURDIR}/../jdirdep -DJDIRDEP .if ${PROG} == "jdirdep" -.if defined(USE_SQLITE3) +. if defined(USE_SQLITE3) CFLAGS += -DUSE_SQLITE3 -pthread CFLAGS += -I/usr/local/include SRCS += jdirdep_sqlite3.c LDADD += /usr/local/lib/libsqlite3.a -.elif defined(USE_MYSQL) +. elif defined(USE_MYSQL) SRCS += jdirdep_mysql.c MYSQL_CFLAGS != mysql_config --cflags MYSQL_LIBS != mysql_config --libs CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS} LDADD += ${MYSQL_LIBS} LDADD += -static -.else -.endif +. else SRCS += jdirdep_db_stub.c +. endif .endif Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c ============================================================================== --- projects/jbuild/usr.bin/jdirdep/jdirdep.c Fri Nov 12 21:37:10 2010 (r215204) +++ projects/jbuild/usr.bin/jdirdep/jdirdep.c Fri Nov 12 21:46:58 2010 (r215205) @@ -38,6 +38,7 @@ struct march { char *machine_arch; TAILQ_ENTRY(march) link; }; + #ifdef NEED_INCMK struct incmk { char *s; @@ -45,6 +46,7 @@ struct incmk { TAILQ_ENTRY(incmk) link; }; #endif + struct metas { char *s; TAILQ_ENTRY(metas) link; @@ -1358,12 +1360,14 @@ main(int argc, char *argv[]) errx(1, "SUPMAC is missing from the environment"); jdirdep_supmac(p); + #ifdef NEED_INCMK if ((p = getenv("INCMK")) == NULL) errx(1, "INCMK is missing from the environment"); jdirdep_incmk(p); #endif + /* * The current source relative directory is the bit after the * source top bit has been removed. From owner-svn-src-projects@FreeBSD.ORG Fri Nov 12 22:10:20 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 14B441065670; Fri, 12 Nov 2010 22:10:20 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02F898FC1C; Fri, 12 Nov 2010 22:10:20 +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 oACMAJu1025146; Fri, 12 Nov 2010 22:10:19 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACMAJj7025144; Fri, 12 Nov 2010 22:10:19 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201011122210.oACMAJj7025144@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 12 Nov 2010 22:10:19 +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: r215208 - projects/jbuild/usr.bin/make 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: Fri, 12 Nov 2010 22:10:20 -0000 Author: obrien Date: Fri Nov 12 22:10:19 2010 New Revision: 215208 URL: http://svn.freebsd.org/changeset/base/215208 Log: * jbuild(1) does not rely on SQL libs. * #ifdef out the use of INCMK - which is irrelevant since the *.dirdep file was introduced. Obtained from: Juniper Networks Modified: projects/jbuild/usr.bin/make/job.c Modified: projects/jbuild/usr.bin/make/job.c ============================================================================== --- projects/jbuild/usr.bin/make/job.c Fri Nov 12 22:03:02 2010 (r215207) +++ projects/jbuild/usr.bin/make/job.c Fri Nov 12 22:10:19 2010 (r215208) @@ -564,10 +564,14 @@ meta_exit(void) * If there is no include makefile list variable defined, then * we can't update dependencies. */ +#ifdef NEED_INCMK + /* This is OBE by the .dirdep file. */ if ((p_incmk = Var_Value("INCMK", VAR_GLOBAL)) != NULL) { /* Initialise the include makefile name list. */ jdirdep_incmk(Var_Value("INCMK", VAR_GLOBAL)); - +#else + { +#endif p_machine = Var_Value("MACHINE", VAR_GLOBAL); p_machine_arch = Var_Value("MACHINE_ARCH", VAR_GLOBAL);