PERFORCE change 129101 for review
John Birrell
jb at FreeBSD.org
Thu Nov 15 13:52:23 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129101
Change 129101 by jb at jb_freebsd1 on 2007/11/15 21:52:00
IF6
Affected files ...
.. //depot/projects/dtrace6/src/contrib/openbsm/HISTORY#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/README#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/TODO#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/aclocal.m4#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/audit.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bsm/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/bsm/libbsm.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/compat/clock_gettime.h#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/config/config.h.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/config/ltmain.sh#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/configure#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_class#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_control#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_user#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_warn#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_class.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_control.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_event.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_io.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_mask.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_open.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_token.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_user.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/libbsm.3#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit.log.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_class.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_control.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_event.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_user.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_warn.5#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/auditctl.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/auditon.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/getaudit.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/getauid.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/setaudit.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/man/setauid.2#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/modules/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/bsm/generate.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/arg32_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/data_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/file_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/in_addr_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/ip_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/ipc_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/iport_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/opaque_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/path_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record#2 delete
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token#2 delete
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64_record#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64_token#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/return32_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/seq_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/text_record#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/zonename_record#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/zonename_token#1 branch
.. //depot/projects/dtrace6/src/contrib/openbsm/tools/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/openbsm/tools/audump.c#2 integrate
.. //depot/projects/dtrace6/src/etc/defaults/devfs.rules#2 integrate
.. //depot/projects/dtrace6/src/etc/freebsd-update.conf#2 integrate
.. //depot/projects/dtrace6/src/lib/libdisk/open_disk.c#2 integrate
.. //depot/projects/dtrace6/src/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/dtrace6/src/release/picobsd/tinyware/login/Makefile#2 integrate
.. //depot/projects/dtrace6/src/share/man/man5/freebsd-update.conf.5#2 integrate
.. //depot/projects/dtrace6/src/sys/bsm/audit.h#2 integrate
.. //depot/projects/dtrace6/src/sys/bsm/audit_internal.h#2 integrate
.. //depot/projects/dtrace6/src/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/dtrace6/src/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/dtrace6/src/sys/security/audit/audit.c#3 integrate
.. //depot/projects/dtrace6/src/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/lsvfs/lsvfs.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.8#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.h#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#3 integrate
Differences ...
==== //depot/projects/dtrace6/src/contrib/openbsm/HISTORY#2 (text) ====
@@ -1,3 +1,41 @@
+OpenBSM 1.0
+
+- Fix bug in auditreduce(8) which resulted in a memory fault/crash when
+ the user specified an event name with -m.
+- Remove AU_.* hard-coded audit class constants, as udit classes are now
+ entirely dynamically configured using /etc/security/audit_class.
+
+OpenBSM 1.0 alpha 15
+
+- Fix bug when processing in_addr_ex tokens.
+- Restore the behavior of printing the string/text specified while
+ auditing arg32 tokens.
+- Synchronized audit event list to Solaris, picking up the *at(2) system call
+ definitions, now required for FreeBSD and Linux. Added additional events
+ for *at(2) system calls not present in Solaris.
+- Bugs in auditreduce(8) fixed allowing partial date strings to be used in
+ filtering events.
+
+OpenBSM 1.0 alpha 14
+
+- Fix endian issues when processing IPv6 addresses for extended subject
+ and process tokens.
+- gcc41 warnings clean.
+- Teach audit_submit(3) about getaudit_addr(2).
+- Add support for zonename tokens.
+
+OpenBSM 1.0 alpha 13
+
+- compat/clock_gettime.h now provides a compatibility implementation of
+ clock_gettime(), which fixes building on Mac OS X.
+- Countless man page improvements, markup fixes, content fixs, etc.
+- XML printing support via "praudit -x".
+- audit.log.5 expanded to include additional BSM token types.
+- Added encoding and decoding routines for process64_ex, process32_ex,
+ subject32_ex, header64, and attr64 tokens.
+- Additional audit event identifiers for listen, mlockall/munlockall,
+ getpath, POSIX message queues, and mandatory access control.
+
OpenBSM 1.0 alpha 12
- Correct bug in auditreduce which prevented the -c option from working
@@ -264,4 +302,4 @@
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/HISTORY#39 $
+$P4: //depot/projects/trustedbsd/openbsm/HISTORY#57 $
==== //depot/projects/dtrace6/src/contrib/openbsm/Makefile.in#2 (text) ====
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -15,17 +15,13 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#5 $
#
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -39,18 +35,18 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \
$(top_srcdir)/configure TODO config/config.guess \
config/config.sub config/depcomp config/install-sh \
config/ltmain.sh config/missing
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config/config.h
CONFIG_CLEAN_FILES =
@@ -58,10 +54,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -77,8 +76,6 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -105,8 +102,8 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@
-HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -118,9 +115,8 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -130,20 +126,18 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
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@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -155,28 +149,39 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = \
bsm \
libbsm \
@@ -231,7 +236,7 @@
config/config.h: config/stamp-h1
@if test ! -f $@; then \
rm -f config/stamp-h1; \
- $(MAKE) config/stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \
else :; fi
config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status
@@ -253,7 +258,6 @@
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -286,8 +290,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -389,24 +392,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/config
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -420,7 +421,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -428,6 +429,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -435,7 +438,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -510,7 +513,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -580,12 +583,20 @@
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -606,24 +617,26 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
==== //depot/projects/dtrace6/src/contrib/openbsm/README#2 (text) ====
@@ -3,11 +3,13 @@
Introduction
OpenBSM provides an open source implementation of Sun's BSM Audit API.
-Originally created under contract to Apple Computer by McAfee Research,
-this implementation is now maintained by volunteers and the generous
-contribution of several organizations. Coupled with a kernel audit
-implementation, OpenBSM can be used to maintain system audit streams, and
-is a foundation for an Audit-enabled system.
+Originally created under contract to Apple Computer by McAfee Research, this
+implementation is now maintained by volunteers and the generous contribution
+of several organizations. Coupled with a kernel audit implementation,
+OpenBSM can be used to maintain system audit streams, and is a foundation for
+an Audit-enabled system. Portions of OpenBSM, including include files and
+token-building routines, are reusable in a kernel audit implementation, and
+may be found in the FreeBSD and Mac OS X kernels.
Contents
@@ -15,13 +17,22 @@
bin/ Audit-related command line tools
bsm/ System include files for BSM
+ compat/ Compatibility code to build on various OS's
etc/ Sample /etc/security configuration files
libbsm/ Implementation of BSM library interfaces and man pages
man/ System call and configuration file man pages
+ modules/ Directory for auditfilterd module source
+ test/ Test token sets and geneneration program
+ tools/ Tool directory, including audump to dump databases
-OpenBSM currently builds on FreeBSD and Darwin. With Makefile adjustment
-and minor tweaks, it should build without problems on a broad range of
-POSIX-like systems.
+The following programs are included with OpenBSM:
+
+ audit Command line audit control tool
+ auditd Audit management daemon
+ auditfilterd Experimental event monitoring framework
+ auditreduce Audit trail reduction tool
+ audump Debugging tool to parse and print audit databases
+ praudit Tool to print audit trails
Building
@@ -29,7 +40,7 @@
for building on a range of operating systems, including FreeBSD, Mac OS X,
and Linux. Depending on the availability of audit facilities in the
underlying operating system, some components that depend on kernel audit
-support are built conditionally. Typically, build will be performed using
+support are built conditionally. Typically, build will be performed using:
./configure
make
@@ -51,13 +62,12 @@
You will need to manually propagate openbsm/etc/* into /etc on your system;
this is not done automatically so as to avoid disrupting the current
-configuration. Currently, the locations of these files is not
-configurable.
+configuration. Currently, the locations of these files is not configurable.
Credits
-The following organizations and individuals have contributed substantially
-to the development of OpenBSM:
+The following organizations and individuals have contributed substantially to
+the development of OpenBSM:
Apple Computer, Inc.
McAfee Research, McAfee, Inc.
@@ -76,6 +86,10 @@
Martin Fong
Pawel Worach
Martin Englund
+ Ruslan Ermilov
+ Martin Voros
+ Diego Giagio
+ Alex Samorukov
In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel
Software's FlexeLint tool were used to identify a number of bugs in the
@@ -97,4 +111,4 @@
http://www.TrustedBSD.org/
-$P4: //depot/projects/trustedbsd/openbsm/README#19 $
+$P4: //depot/projects/trustedbsd/openbsm/README#24 $
==== //depot/projects/dtrace6/src/contrib/openbsm/TODO#2 (text) ====
@@ -1,4 +1,3 @@
-- Teach praudit how to general XML format BSM streams.
- Teach libbsm about any additional 64-bit token types that are present
in more recent Solaris versions.
- Build a regression test suite for libbsm that generates each token
@@ -20,4 +19,4 @@
- Put hostname in trail file name.
- Document audit_warn event arguments.
-$P4: //depot/projects/trustedbsd/openbsm/TODO#8 $
+$P4: //depot/projects/trustedbsd/openbsm/TODO#9 $
==== //depot/projects/dtrace6/src/contrib/openbsm/VERSION#2 (text) ====
@@ -1,1 +1,1 @@
-OPENBSM_1_0_ALPHA_12
+OPENBSM_1_0
==== //depot/projects/dtrace6/src/contrib/openbsm/aclocal.m4#2 (text) ====
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file 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.
@@ -11,9 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 47 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -163,6 +168,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
@@ -175,17 +181,17 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -233,6 +239,9 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
])# _LT_AC_SYS_COMPILER
@@ -259,9 +268,10 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
])# _LT_COMPILER_BOILERPLATE
@@ -272,9 +282,10 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
])# _LT_LINKER_BOILERPLATE
@@ -289,12 +300,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -525,13 +544,17 @@
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -548,6 +571,9 @@
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -580,6 +606,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -603,7 +645,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -622,9 +664,9 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
fi
@@ -644,19 +686,20 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
[$2=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
- $SED '/^$/d' conftest.err >conftest.er2
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
@@ -731,6 +774,12 @@
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -744,25 +793,39 @@
esac
fi
;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
*)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
])
@@ -775,7 +838,7 @@
# _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
@@ -783,7 +846,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
@@ -849,6 +912,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}]
@@ -859,7 +924,7 @@
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
x$lt_dlneed_uscore) $2 ;;
- x$lt_unknown|x*) $3 ;;
+ x$lt_dlunknown|x*) $3 ;;
esac
else :
# compilation failed
@@ -871,7 +936,7 @@
# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
@@ -942,7 +1007,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -955,7 +1020,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
@@ -987,7 +1052,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -995,7 +1061,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list