From owner-p4-projects@FreeBSD.ORG Sun Jan 27 23:00:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A42316A418; Sun, 27 Jan 2008 23:00:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A978916A41B for ; Sun, 27 Jan 2008 23:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98C4613C45A for ; Sun, 27 Jan 2008 23:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RN0Ars059988 for ; Sun, 27 Jan 2008 23:00:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RMxshC059917 for perforce@freebsd.org; Sun, 27 Jan 2008 22:59:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 27 Jan 2008 22:59:54 GMT Message-Id: <200801272259.m0RMxshC059917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2008 23:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=134255 Change 134255 by jb@jb_freebsd1 on 2008/01/27 22:59:44 IF7 Affected files ... .. //depot/projects/dtrace7/src/COPYRIGHT#2 integrate .. //depot/projects/dtrace7/src/Makefile.inc1#3 integrate .. //depot/projects/dtrace7/src/bin/mv/mv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/dtrace7/src/contrib/gcc/gthr-posix.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/CREDITS#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/HISTORY#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/INSTALL#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/LICENSE#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/MANIFEST#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/README#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/compile#1 branch .. //depot/projects/dtrace7/src/contrib/openpam/config.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure.ac#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/configure.in#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/depcomp#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/dtrace7/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/install-sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/ltconfig#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/missing#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/dtrace7/src/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace7/src/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/dtrace7/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/dtrace7/src/etc/gss/mech#2 integrate .. //depot/projects/dtrace7/src/etc/namedb/named.conf#2 integrate .. //depot/projects/dtrace7/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/hostapd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/dtrace7/src/etc/rc.firewall#2 integrate .. //depot/projects/dtrace7/src/etc/rc.firewall6#2 integrate .. //depot/projects/dtrace7/src/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/dtrace7/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/common.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/common.h#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/fetch.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/file.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/dtrace7/src/lib/libfetch/http.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/dtrace7/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace7/src/lib/libstand/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libutil/pty.3#2 integrate .. //depot/projects/dtrace7/src/lib/libutil/pty.c#4 integrate .. //depot/projects/dtrace7/src/release/Makefile#4 integrate .. //depot/projects/dtrace7/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/dtrace7/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/fixit.profile#3 integrate .. //depot/projects/dtrace7/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/scripts/package-split.py#2 integrate .. //depot/projects/dtrace7/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/dtrace7/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/add.c#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/boot.c#1 branch .. //depot/projects/dtrace7/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/dtrace7/src/sbin/gpt/show.c#2 integrate .. //depot/projects/dtrace7/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/dtrace7/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/coda.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/syncache.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man7/ports.7#2 integrate .. //depot/projects/dtrace7/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/dtrace7/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/dtrace7/src/share/misc/iso3166#2 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/dtrace7/src/share/mk/sys.mk#4 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/asia#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/backward#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/europe#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/dtrace7/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/dtrace7/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/dtrace7/src/sys/conf/files.amd64#3 integrate .. //depot/projects/dtrace7/src/sys/conf/files.i386#3 integrate .. //depot/projects/dtrace7/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#3 integrate .. //depot/projects/dtrace7/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_enc.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/route.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/route.h#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/amdsmb.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/dtrace7/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/copyright.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/gpt.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/param.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/proc.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/signal.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/pmap.h#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/dtrace7/src/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_FORTRAN#2 delete .. //depot/projects/dtrace7/src/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/dtrace7/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/ppp/auth.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/dtrace7/src/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.8 2006/12/31 16:34:16 delphij Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.8.2.1 2008/01/01 09:35:58 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved. +Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/dtrace7/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.588.2.2 2007/10/11 12:34:40 kensmith Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.588.2.3 2008/01/21 18:49:04 brueffer Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -229,7 +229,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ ==== //depot/projects/dtrace7/src/bin/mv/mv.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46.2.1 2008/01/27 07:38:39 dds Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +/* Exit code for a failed exec. */ +#define EXEC_FAILED 127 + int fflg, iflg, nflg, vflg; int copy(char *, char *); @@ -198,6 +201,11 @@ } } } + /* + * Rename on FreeBSD will fail with EISDIR and ENOTDIR, before failing + * with EXDEV. Therefore, copy() doesn't have to perform the checks + * specified in the Step 3 of the POSIX mv specification. + */ if (!rename(from, to)) { if (vflg) printf("%s -> %s\n", from, to); @@ -219,7 +227,7 @@ if (!S_ISLNK(sb.st_mode)) { /* Can't mv(1) a mount point. */ if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + warn("cannot resolve %s: %s", from, path); return (1); } if (!statfs(path, &sfs) && @@ -252,9 +260,9 @@ struct timeval tval[2]; static u_int blen; static char *bp; + acl_t acl; mode_t oldmode; int nread, from_fd, to_fd; - acl_t acl; if ((from_fd = open(from, O_RDONLY, 0)) < 0) { warn("%s", from); @@ -305,7 +313,7 @@ } /* * POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect - * for dest_file, then it's ACLs shall reflect the ACLs of the + * for dest_file, then its ACLs shall reflect the ACLs of the * source_file. */ if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 && @@ -355,43 +363,76 @@ int copy(char *from, char *to) { + struct stat sb; int pid, status; - if ((pid = fork()) == 0) { + if (lstat(to, &sb) == 0) { + /* Destination path exists. */ + if (S_ISDIR(sb.st_mode)) { + if (rmdir(to) != 0) { + warn("rmdir %s", to); + return (1); + } + } else { + if (unlink(to) != 0) { + warn("unlink %s", to); + return (1); + } + } + } else if (errno != ENOENT) { + warn("%s", to); + return (1); + } + + /* Copy source to destination. */ + if (!(pid = vfork())) { execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, (char *)NULL); - warn("%s", _PATH_CP); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_CP); + warn("%s %s %s: waitpid", _PATH_CP, from, to); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_CP); + warnx("%s %s %s: did not terminate normally", + _PATH_CP, from, to); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_CP, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s %s: exec failed", _PATH_CP, from, to); + return (1); + default: + warnx("%s %s %s: terminated with %d (non-zero) status", + _PATH_CP, from, to, WEXITSTATUS(status)); return (1); } + + /* Delete the source. */ if (!(pid = vfork())) { execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL); - warn("%s", _PATH_RM); - _exit(1); + _exit(EXEC_FAILED); } if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_RM); + warn("%s %s: waitpid", _PATH_RM, from); return (1); } if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_RM); + warnx("%s %s: did not terminate normally", _PATH_RM, from); return (1); } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_RM, WEXITSTATUS(status)); + switch (WEXITSTATUS(status)) { + case 0: + break; + case EXEC_FAILED: + warnx("%s %s: exec failed", _PATH_RM, from); + return (1); + default: + warnx("%s %s: terminated with %d (non-zero) status", + _PATH_RM, from, WEXITSTATUS(status)); return (1); } return (0); ==== //depot/projects/dtrace7/src/contrib/cvs/src/parseinfo.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3.18.1 2008/01/07 09:02:02 peter Exp $ */ #include "cvs.h" @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a ==== //depot/projects/dtrace7/src/contrib/gcc/fold-const.c#2 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/dtrace7/src/contrib/gcc/gthr-posix.h#2 (text+ko) ==== @@ -152,9 +152,12 @@ it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) static volatile int __gthread_active = -1; @@ -197,7 +200,7 @@ return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -207,7 +210,7 @@ return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ ==== //depot/projects/dtrace7/src/contrib/openpam/CREDITS#2 (text) ==== @@ -14,6 +14,7 @@ Andrew Morgan Brian Fundakowski Feldman Christos Zoulas + Daniel Richard G. Darren J. Moffat Dmitry V. Levin Emmanuel Dreyfus @@ -24,11 +25,13 @@ Hubert Feyrer Mark Murray Mike Petullo + Mikhail Teterin Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto + Wojciech A. Koszek Yar Tikhiy -$P4: //depot/projects/openpam/CREDITS#12 $ +$Id: CREDITS 400 2007-10-24 15:04:23Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/HISTORY#2 (text) ==== @@ -1,4 +1,27 @@ -OpenPAM Figwort 2005-06-16 +OpenPAM Hydrangea 2007-12-21 + + - ENHANCE: when compiling with GCC, mark up API functions with GCC + attributes where appropriate. + + - BUGFIX: fixed numerous warnings uncovered by GCC 4. + + - ENHANCE: building the documentation is now optional. + + - ENHANCE: corrected a number of mistakes and style issues in the + build system. + + - ENHANCE: API function arguments are now const where appropriate, to + match corresponding changes in the Solaris PAM and Linux-PAM APIs. + + - ENHANCE: corrected a number of C namespace violations. + + - ENHANCE: the module cache has been removed, allowing long-lived + applications to pick up module changes. This also allows multiple + threads to use PAM simultaneously (as long as they use separate PAM + contexts), since the module cache was the only part of OpenPAM that + was not thread-safe. +============================================================================ +OpenPAM Figwort 2005-06-16 - BUGFIX: Correct several small signedness and initialization bugs discovered during review by the NetBSD team. @@ -304,4 +327,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#24 $ +$Id: HISTORY 409 2007-12-21 11:38:50Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/INSTALL#2 (text) ==== @@ -16,23 +16,29 @@ Use the "configure" shell script to configure OpenPAM for your system. Options include: + --enable-debug + Turn debugging on by default. + --with-modules-dir=DIR Indicates the directory where PAM modules will be installed. This option should not be used if you intend to install PAM modules in the system library directory. - --with-pam-su - Builds the sample PAM application. + --without-doc + Skips the documentation. --with-pam-unix Builds the sample PAM module. + --with-su + Builds the sample su(1) implementation. + For more information about configuration options, use the --help option. A typical invocation might look like this: - # ./configure --with-pam-su --with-pam-unix + # ./configure --with-pam-unix --with-su 3. COMPILATION @@ -49,4 +55,4 @@ # make install -$P4: //depot/projects/openpam/INSTALL#4 $ +$Id: INSTALL 388 2006-04-12 10:31:52Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/LICENSE#2 (text) ==== @@ -1,5 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. +Copyright (c) 2004-2007 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +32,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#6 $ +$Id: LICENSE 408 2007-12-21 11:36:24Z des $ ==== //depot/projects/dtrace7/src/contrib/openpam/Makefile.am#2 (text) ==== @@ -1,5 +1,17 @@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ + +SUBDIRS = lib bin modules include -SUBDIRS = lib bin modules doc include +if WITH_DOC +SUBDIRS += doc +endif -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ + RELNOTES \ + autogen.sh \ + misc/gendoc.pl ==== //depot/projects/dtrace7/src/contrib/openpam/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -38,6 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@WITH_DOC_TRUE@am__append_1 = doc DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure INSTALL compile config.guess \ @@ -49,7 +50,7 @@ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(mkdir_p) +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = SOURCES = @@ -62,7 +63,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib bin modules include doc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -105,6 +106,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -127,20 +129,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WITH_PAM_SU_FALSE = @WITH_PAM_SU_FALSE@ -WITH_PAM_SU_TRUE = @WITH_PAM_SU_TRUE@ +WITH_DOC_FALSE = @WITH_DOC_FALSE@ +WITH_DOC_TRUE = @WITH_DOC_TRUE@ WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@ WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@ -ac_ct_AR = @ac_ct_AR@ +WITH_SU_FALSE = @WITH_SU_FALSE@ +WITH_SU_TRUE = @WITH_SU_TRUE@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -148,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -155,23 +159,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -180,8 +191,17 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = lib bin modules doc include -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +SUBDIRS = lib bin modules include $(am__append_1) +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ >>> TRUNCATED FOR MAIL (1000 lines) <<<