From owner-p4-projects@FreeBSD.ORG Mon Jul 3 12:42:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDC8E16A4A7; Mon, 3 Jul 2006 12:42:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5CF516A52E for ; Mon, 3 Jul 2006 12:42:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 015E243E74 for ; Mon, 3 Jul 2006 12:42:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63CgkN2079758 for ; Mon, 3 Jul 2006 12:42:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63CgiDf079755 for perforce@freebsd.org; Mon, 3 Jul 2006 12:42:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 12:42:44 GMT Message-Id: <200607031242.k63CgiDf079755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 100493 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: Mon, 03 Jul 2006 12:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=100493 Change 100493 by rwatson@rwatson_zoo on 2006/07/03 12:42:02 Integrate TrustedBSD base branch: - OpenBSM 1.0 alpha 7 loopback. - More MPSAFE system calls, almost the default. - More ARMishness. - Linuxulator enhancements, de-stack-gap. - Normal plethora of driver enhancements, bug fixes, etc. - INPLOOKUP_WILDCARD. - ifaddr and if_addrlist sanitization. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#39 integrate .. //depot/projects/trustedbsd/base/UPDATING#67 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/trustedbsd/base/include/malloc_np.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#28 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#103 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_core.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ipc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/CHANGELOG.TXT#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ispfw/ispfw.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/acphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/amphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/bmtphy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/exphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/inphy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/lxtphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mlphy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/pnaphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/qsphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rlphy.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tlphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ukphy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/xmphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pccard.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#65 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#21 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#40 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/md_var.h#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#49 integrate .. //depot/projects/trustedbsd/base/sys/modules/bktr/bktr_mem/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/streams/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#46 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#46 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#63 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_cksum.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#23 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#17 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/extern.h#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/forward.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kgmon/kgmon.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#27 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/config.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/connect.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/debug.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/list.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/main.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/mkpeer.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/msg.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/name.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/rmhook.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/show.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/status.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/types.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/write.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#39 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.136 2006/07/01 10:51:54 markm Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,10 +35,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. -telnet markm Heads-up appreciated. Try not to break it. -secure/* markm Heads-up appreciated. Try not to break it. -kerberos5 nectar Pre-commit review requested. -heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -91,8 +87,6 @@ libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -libc nectar Opportuntity for pre-commit review appreciated for - nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -147,12 +141,7 @@ games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch sbin/dhclient/Makefile.inc:MAINTAINER= mbr -sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org -sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org -sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch ==== //depot/projects/trustedbsd/base/UPDATING#67 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060627: + The XBOX kernel now defaults to the nfe(4) driver instead of + the nve(4) driver. Please update your configuration + accordingly. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -580,4 +585,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.449 2006/05/15 15:47:45 keramida Exp $ +$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#4 (text) ==== @@ -30,15 +30,15 @@ Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm - cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ - TrustedBSD OPENBSM_1_0_ALPHA_1 + cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ + src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1 -Replacing the version string as required. Use the "-n" argument to CVS to -do a test run. +Replacing the version string as required. Remove the "-n" argument once +the import is tested in order to perform the actual import. Propagation of changes to src/sys/{bsm,security/audit} is something that requires careful coordination and attention to detail. These files are not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.4 2006/03/05 13:30:37 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.5 2006/06/27 17:55:38 rwatson Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#3 (text) ==== @@ -1,3 +1,13 @@ +OpenBSM 1.0 alpha 7 + +- Adopted Solaris-compatible format for subject32_ex and subject64_ex + tokens, which previously did not correctly implement variable length + address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. + OpenBSM 1.0 alpha 6 - Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); @@ -165,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#12 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_6 +OPENBSM_1_0_ALPHA_7 ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#2 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#3 (text) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#5 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#2 (text) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac >>> TRUNCATED FOR MAIL (1000 lines) <<<