Robert Watson wrote: > > > I've now imported OpenBSM 1.1 into 8.x. There is an ABI change in the > auditon(2) system call, which requires you be running an up-to-date kernel > in > order for an up-to-date userland to work (new kernel and old userland is > fine, > per usual). Of course, you were going to do that anyway, right? :-) > > Robert N M Watson > Computer Laboratory > University of Cambridge > > ---------- Forwarded message ---------- > Date: Sun, 19 Apr 2009 16:17:13 +0000 (UTC) > From: Robert Watson <rwatson_at_FreeBSD.org> > To: src-committers_at_freebsd.org, svn-src-all_at_freebsd.org, > svn-src-head_at_freebsd.org > Subject: svn commit: r191273 - in head: contrib/openbsm > contrib/openbsm/bin > contrib/openbsm/bin/audit contrib/openbsm/bin/auditd > contrib/openbsm/bin/auditfilterd contrib/openbsm/bin/auditreduce > contrib/open... > > Author: rwatson > Date: Sun Apr 19 16:17:13 2009 > New Revision: 191273 > URL: http://svn.freebsd.org/changeset/base/191273 > > Log: > Merge OpenBSM 1.1 from OpenBSM vendor branch to head. > > OpenBSM history for imported revision below for reference. > > MFC after: 2 weeks > Sponsored by: Apple, Inc. > Obtained from: TrustedBSD Project > > OpenBSM 1.1 > > - Change auditon(2) parameters and data structures to be 32/64-bit > architecture > independent. Add more information to man page about auditon(2) > parameters. > - Add wrapper functions for auditon(2) to use legacy commands when the > new > commands are not supported. > - Add default for 'expire-after' in audit_control to expire trail files > when > the audit directory is more than 10 megabytes ('10M'). > - Interface to convert between local and BSM fcntl(2) command values > has been > added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with > definitions of constants in audit_fcntl.h. > - A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 > tokens > generated by audit_submit(3) were improperly encoded has been fixed. > - Fix example in audit_submit(3) man page. Also, make it clear that we > want > the audit ID as the argument. > - A new audit event class 'aa', for post-login authentication and > authorization events, has been added. > > Added: > head/contrib/openbsm/libbsm/au_fcntl_cmd.3 > - copied unchanged from r191272, > vendor/openbsm/dist/libbsm/au_fcntl_cmd.3 > head/contrib/openbsm/libbsm/bsm_fcntl.c > - copied unchanged from r191272, > vendor/openbsm/dist/libbsm/bsm_fcntl.c > head/contrib/openbsm/sys/bsm/audit_fcntl.h > - copied unchanged from r191272, > vendor/openbsm/dist/sys/bsm/audit_fcntl.h > Modified: > head/contrib/openbsm/ (props changed) > head/contrib/openbsm/CREDITS > head/contrib/openbsm/INSTALL > head/contrib/openbsm/Makefile.in > head/contrib/openbsm/NEWS > head/contrib/openbsm/README > head/contrib/openbsm/TODO > head/contrib/openbsm/VERSION > head/contrib/openbsm/aclocal.m4 > head/contrib/openbsm/bin/Makefile.in > head/contrib/openbsm/bin/audit/Makefile.in > head/contrib/openbsm/bin/audit/audit.c > head/contrib/openbsm/bin/auditd/Makefile.in > head/contrib/openbsm/bin/auditd/auditd.c > head/contrib/openbsm/bin/auditd/auditd_darwin.c > head/contrib/openbsm/bin/auditd/auditd_fbsd.c > head/contrib/openbsm/bin/auditfilterd/Makefile.in > head/contrib/openbsm/bin/auditfilterd/auditfilterd.8 > head/contrib/openbsm/bin/auditreduce/Makefile.in > head/contrib/openbsm/bin/praudit/Makefile.in > head/contrib/openbsm/bsm/Makefile.in > head/contrib/openbsm/bsm/audit_uevents.h > head/contrib/openbsm/bsm/libbsm.h > head/contrib/openbsm/config/config.h.in > head/contrib/openbsm/config/ltmain.sh > head/contrib/openbsm/configure > head/contrib/openbsm/configure.ac > head/contrib/openbsm/etc/audit_class > head/contrib/openbsm/etc/audit_control > head/contrib/openbsm/etc/audit_event > head/contrib/openbsm/libauditd/Makefile.in > head/contrib/openbsm/libauditd/auditd_lib.c > head/contrib/openbsm/libbsm/Makefile.am > head/contrib/openbsm/libbsm/Makefile.in > head/contrib/openbsm/libbsm/au_control.3 > head/contrib/openbsm/libbsm/audit_submit.3 > head/contrib/openbsm/libbsm/bsm_audit.c > head/contrib/openbsm/libbsm/bsm_control.c > head/contrib/openbsm/libbsm/bsm_domain.c > head/contrib/openbsm/libbsm/bsm_io.c > head/contrib/openbsm/libbsm/bsm_notify.c > head/contrib/openbsm/libbsm/bsm_token.c > head/contrib/openbsm/libbsm/bsm_wrappers.c > head/contrib/openbsm/libbsm/libbsm.3 > head/contrib/openbsm/man/Makefile.in > head/contrib/openbsm/man/auditon.2 > head/contrib/openbsm/modules/Makefile.in > head/contrib/openbsm/modules/auditfilter_noop/Makefile.in > head/contrib/openbsm/sys/Makefile.in > head/contrib/openbsm/sys/bsm/Makefile.am > head/contrib/openbsm/sys/bsm/Makefile.in > head/contrib/openbsm/sys/bsm/audit.h > head/contrib/openbsm/sys/bsm/audit_domain.h > head/contrib/openbsm/sys/bsm/audit_kevents.h > head/contrib/openbsm/sys/bsm/audit_record.h > head/contrib/openbsm/test/Makefile.in > head/contrib/openbsm/test/bsm/Makefile.in > head/contrib/openbsm/tools/Makefile.in > head/lib/libbsm/Makefile > head/sys/bsm/audit_domain.h > > Modified: head/contrib/openbsm/CREDITS > ============================================================================== > --- head/contrib/openbsm/CREDITS Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/CREDITS Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -28,6 +28,7 _at__at_ the development of OpenBSM: > Xin LI > Stacey Son > Todd Heberlein > + Gary Hoo > > 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 > > Modified: head/contrib/openbsm/INSTALL > ============================================================================== > --- head/contrib/openbsm/INSTALL Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/INSTALL Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -2,9 +2,8 _at__at_ OpenBSM Build and Installation Instructi > > OpenBSM is currently built using autoconf and automake, which should > allow > 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: > +and Linux. Some components are built only if appropriate kernel audit > +suppport is found. Typical builds will be performed using: > > ./configure > make > _at__at_ -15,10 +14,14 _at__at_ force the compile to fail if a warning i > > CFLAGS="-Wall -Werror" ./configure > > -To install, use: > +To install the library, binaries, and man pages, use: > > make install > > +The OpenBSM install will not install files in /etc; these have to be > +manually installed or merged. Currently, the locations of these files > are > +not configurable. > + > You may wish to specify that the OpenBSM components not be installed in > the > base system, rather in a specific directory. This may be done using the > --prefix argument to configure. If installing to a specific directory, > _at__at_ -29,7 +32,3 _at__at_ directory the correct libbsm is used: > make > make install > LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export > LD_LIBRARY_PATH > - > -You will need to manually propagate openbsm/etc/* into /etc/security 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. > > Modified: head/contrib/openbsm/Makefile.in > ============================================================================== > --- head/contrib/openbsm/Makefile.in Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/Makefile.in Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -1,8 +1,8 _at__at_ > -# Makefile.in generated by automake 1.10 from Makefile.am. > +# Makefile.in generated by automake 1.10.1 from Makefile.am. > # _at_configure_input_at_ > > # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, > -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. > +# 2003, 2004, 2005, 2006, 2007, 2008 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. > _at__at_ -15,7 +15,7 _at__at_ > _at_SET_MAKE_at_ > > # > -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $ > +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $ > # > VPATH = _at_srcdir_at_ > pkgdatadir = $(datadir)/_at_PACKAGE_at_ > _at__at_ -97,6 +97,7 _at__at_ CXXFLAGS = _at_CXXFLAGS_at_ > CYGPATH_W = _at_CYGPATH_W_at_ > DEFS = _at_DEFS_at_ > DEPDIR = _at_DEPDIR_at_ > +DSYMUTIL = _at_DSYMUTIL_at_ > ECHO = _at_ECHO_at_ > ECHO_C = _at_ECHO_C_at_ > ECHO_N = _at_ECHO_N_at_ > _at__at_ -121,6 +122,7 _at__at_ MAINT = _at_MAINT_at_ > MAKEINFO = _at_MAKEINFO_at_ > MIG = _at_MIG_at_ > MKDIR_P = _at_MKDIR_P_at_ > +NMEDIT = _at_NMEDIT_at_ > OBJEXT = _at_OBJEXT_at_ > PACKAGE = _at_PACKAGE_at_ > PACKAGE_BUGREPORT = _at_PACKAGE_BUGREPORT_at_ > _at__at_ -184,6 +186,7 _at__at_ sharedstatedir = _at_sharedstatedir_at_ > srcdir = _at_srcdir_at_ > sysconfdir = _at_sysconfdir_at_ > target_alias = _at_target_alias_at_ > +top_build_prefix = _at_top_build_prefix_at_ > top_builddir = _at_top_builddir_at_ > top_srcdir = _at_top_srcdir_at_ > SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys > _at__at_ -332,8 +335,8 _at__at_ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > mkid -fID $$unique > tags: TAGS > > _at__at_ -358,8 +361,8 _at__at_ TAGS: tags-recursive $(HEADERS) $(SOURCE > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ > test -n "$$unique" || unique=$$empty_fix; \ > $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > _at__at_ -369,13 +372,12 _at__at_ ctags: CTAGS > CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ > $(TAGS_FILES) $(LISP) > tags=; \ > - here=`pwd`; \ > list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > test -z "$(CTAGS_ARGS)$$tags$$unique" \ > || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ > $$tags $$unique > _at__at_ -446,6 +448,10 _at__at_ dist-bzip2: distdir > tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 > $(am__remove_distdir) > > +dist-lzma: distdir > + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma > + $(am__remove_distdir) > + > dist-tarZ: distdir > tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z > $(am__remove_distdir) > _at__at_ -472,6 +478,8 _at__at_ distcheck: dist > GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ > *.tar.bz2*) \ > bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ > + *.tar.lzma*) \ > + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ > *.tar.Z*) \ > uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ > *.shar.gz*) \ > _at__at_ -623,8 +631,8 _at__at_ uninstall-am: > .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 \ > + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ > + distclean distclean-generic distclean-hdr distclean-libtool \ > 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 \ > > Modified: head/contrib/openbsm/NEWS > ============================================================================== > --- head/contrib/openbsm/NEWS Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/NEWS Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -1,5 +1,23 _at__at_ > OpenBSM Version History > > +OpenBSM 1.1 > + > +- Change auditon(2) parameters and data structures to be 32/64-bit > architecture > + independent. Add more information to man page about auditon(2) > parameters. > +- Add wrapper functions for auditon(2) to use legacy commands when the > new > + commands are not supported. > +- Add default for 'expire-after' in audit_control to expire trail files > when > + the audit directory is more than 10 megabytes ('10M'). > +- Interface to convert between local and BSM fcntl(2) command values has > been > + added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with > + definitions of constants in audit_fcntl.h. > +- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens > + generated by audit_submit(3) were improperly encoded has been fixed. > +- Fix example in audit_submit(3) man page. Also, make it clear that we > want > + the audit ID as the argument. > +- A new audit event class 'aa', for post-login authentication and > + authorization events, has been added. > + > OpenBSM 1.1 beta 1 > > - The filesz parameter in audit_control(5) now accepts suffixes: 'B' for > _at__at_ -431,4 +449,4 _at__at_ OpenBSM 1.0 alpha 1 > to support reloading of kernel event table. > - Allow comments in /etc/security configuration files. > > -$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $ > +$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $ > > Modified: head/contrib/openbsm/README > ============================================================================== > --- head/contrib/openbsm/README Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/README Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -1,15 +1,22 _at__at_ > -OpenBSM 1.1 beta 1 > +OpenBSM 1.1 > > 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. 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. > +OpenBSM is an open source implementation of Sun's BSM event auditing file > +format and API. Originally created for Apple Computer by McAfee > Research, > +OpenBSM is now maintained by volunteers and through the generous > contribution > +of several organizations. > + > +OpenBSM includes several command line tools, including auditreduce(8) and > +praudit(8) for reducing and printing audit trails, as well as the > libbsm(3) > +library to manage configuration files, generate audit records, and parse > and > +print audit trils. > + > +Coupled with a kernel audit implementation, OpenBSM can be used to > maintain > +system audit streams, and is a foundation for a full 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 > > _at__at_ -17,7 +24,7 _at__at_ OpenBSM consists of several directories: > > bin/ Audit-related command line tools > bsm/ Library include files for BSM > - compat/ Compatibility code to build on various OS's > + compat/ Compatibility code to build on various operating > systems > etc/ Sample /etc/security configuration files > libauditd Common audit management functions for auditd and > launchd > libbsm/ Implementation of BSM library interfaces and man > pages > _at__at_ -44,7 +51,8 _at__at_ Please see the file INSTALL for build an > > The TrustedBSD Project would appreciate the contribution of bug fixes, > enhancements, etc, under identically or substantially similar licenses > to > -those present on the remainder of the OpenBSM source code. > +those present on the remainder of the OpenBSM source code. Please see > the > +file CREDITS to learn more about who has contributed to the project. > > Location > > _at__at_ -56,4 +64,4 _at__at_ Information on TrustedBSD may be found o > > http://www.TrustedBSD.org/ > > -$P4: //depot/projects/trustedbsd/openbsm/README#35 $ > +$P4: //depot/projects/trustedbsd/openbsm/README#36 $ > > Modified: head/contrib/openbsm/TODO > ============================================================================== > --- head/contrib/openbsm/TODO Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/TODO Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -16,11 +16,10 _at__at_ OpenBSM TODO > just at the beginning of a record. This will make it easier to use > praudit in test suites processing single-token files without header > and > trailer context. > -- Put hostname in trail file name. > - Document audit_warn event arguments. > - Allow the path /etc/security to be configured at configure-time so > that > alternative locations can be used. > - NLS support for au_strerror(3), which provides error strings for BSM > errors > not available on the local OS platform. > > -$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $ > +$P4: //depot/projects/trustedbsd/openbsm/TODO#13 $ > > Modified: head/contrib/openbsm/VERSION > ============================================================================== > --- head/contrib/openbsm/VERSION Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/VERSION Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -1 +1 _at__at_ > -OPENBSM_1_1_BETA_1 > +OPENBSM_1_1 > > Modified: head/contrib/openbsm/aclocal.m4 > ============================================================================== > --- head/contrib/openbsm/aclocal.m4 Sun Apr 19 15:19:26 2009 (r191272) > +++ head/contrib/openbsm/aclocal.m4 Sun Apr 19 16:17:13 2009 (r191273) > _at__at_ -1,7 +1,7 _at__at_ > -# generated automatically by aclocal 1.10 -*- Autoconf -*- > +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- > > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, > -# 2005, 2006 Free Software Foundation, Inc. > +# 2005, 2006, 2007, 2008 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. > _at__at_ -11,14 +11,17 _at__at_ > # 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])]) > +m4_ifndef([AC_AUTOCONF_VERSION], > + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > +m4_if(AC_AUTOCONF_VERSION, [2.62],, > +[m4_warning([this file was generated for autoconf 2.62. > +You have another version of autoconf. It may work, but is not guaranteed > to. > +If you have problems, you may need to regenerate the build system > entirely. > +To do so, use the procedure documented by the package, typically > `autoreconf'.])]) > > # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- > > -# serial 51 AC_PROG_LIBTOOL > +# serial 52 AC_PROG_LIBTOOL > > > # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) > _at__at_ -106,7 +109,6 _at__at_ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl > AC_REQUIRE([AC_OBJEXT])dnl > AC_REQUIRE([AC_EXEEXT])dnl > dnl > - > AC_LIBTOOL_SYS_MAX_CMD_LEN > AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE > AC_LIBTOOL_OBJDIR > _at__at_ -208,6 +210,8 _at__at_ file_magic*) > ;; > esac > > +_LT_REQUIRED_DARWIN_CHECKS > + > AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, > enable_dlopen=no) > AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], > enable_win32_dll=yes, enable_win32_dll=no) > _at__at_ -287,9 +291,80 _at__at_ 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* > +$rm -r conftest* > ])# _LT_LINKER_BOILERPLATE > > +# _LT_REQUIRED_DARWIN_CHECKS > +# -------------------------- > +# Check for some things on darwin > +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ > + case $host_os in > + rhapsody* | darwin*) > + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) > + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) > + > + AC_CACHE_CHECK([for -single_module linker > flag],[lt_cv_apple_cc_single_mod], > + [lt_cv_apple_cc_single_mod=no > + if test -z "${LT_MULTI_MODULE}"; then > + # By default we will add the -single_module flag. You can override > + # by either setting the environment variable LT_MULTI_MODULE > + # non-empty at configure time, or by adding -multi_module to the > + # link flags. > + echo "int foo(void){return 1;}" > conftest.c > + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ > + -dynamiclib ${wl}-single_module conftest.c > + if test -f libconftest.dylib; then > + lt_cv_apple_cc_single_mod=yes > + rm -rf libconftest.dylib* > + fi > + rm conftest.c > + fi]) > + AC_CACHE_CHECK([for -exported_symbols_list linker flag], > + [lt_cv_ld_exported_symbols_list], > + [lt_cv_ld_exported_symbols_list=no > + save_LDFLAGS=$LDFLAGS > + echo "_main" > conftest.sym > + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" > + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], > + [lt_cv_ld_exported_symbols_list=yes], > + [lt_cv_ld_exported_symbols_list=no]) > + LDFLAGS="$save_LDFLAGS" > + ]) > + case $host_os in > + rhapsody* | darwin1.[[0123]]) > + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; > + darwin1.*) > + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined > ${wl}suppress' ;; > + darwin*) > + # if running on 10.5 or later, the deployment target defaults > + # to the OS version, if on x86, and 10.4, the deployment > + # target defaults to 10.4. Don't you love it? > + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in > + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) > + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; > + 10.[[012]]*) > + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined > ${wl}suppress' ;; > + 10.*) > + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; > + esac > + ;; > + esac > + if test "$lt_cv_apple_cc_single_mod" = "yes"; then > + _lt_dar_single_mod='$single_module' > + fi > + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then > + _lt_dar_export_syms=' > ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' > + else > + _lt_dar_export_syms="~$NMEDIT -s > \$output_objdir/\${libname}-symbols.expsym \${lib}" > + fi > + if test "$DSYMUTIL" != ":"; then > + _lt_dsymutil="~$DSYMUTIL \$lib || :" > + else > + _lt_dsymutil= > + fi > + ;; > + esac > +]) > > # _LT_AC_SYS_LIBPATH_AIX > # ---------------------- > _at__at_ -614,7 +689,11 _at__at_ sparc*-*solaris*) > *64-bit*) > case $lt_cv_prog_gnu_ld in > yes*) LD="${LD-ld} -m elf64_sparc" ;; > - *) LD="${LD-ld} -64" ;; > + *) > + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; > then > + LD="${LD-ld} -64" > + fi > + ;; > esac > ;; > esac > _at__at_ -707,7 +786,7 _at__at_ AC_CACHE_CHECK([$1], [$2], > $2=yes > fi > fi > - $rm conftest* > + $rm -r conftest* > LDFLAGS="$save_LDFLAGS" > ]) > > _at__at_ -978,7 +1057,7 _at__at_ else > AC_CHECK_FUNC([shl_load], > [lt_cv_dlopen="shl_load"], > [AC_CHECK_LIB([dld], [shl_load], > - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], > + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], > [AC_CHECK_FUNC([dlopen], > [lt_cv_dlopen="dlopen"], > [AC_CHECK_LIB([dl], [dlopen], > _at__at_ -986,7 +1065,7 _at__at_ else > [AC_CHECK_LIB([svld], [dlopen], > [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], > [AC_CHECK_LIB([dld], [dld_link], > - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) > + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) > ]) > ]) > ]) > _at__at_ -1303,7 +1382,7 _at__at_ aix3*) > soname_spec='${libname}${release}${shared_ext}$major' > ;; > > -aix4* | aix5*) > +aix[[4-9]]*) > version_type=linux > need_lib_prefix=no > need_version=no > _at__at_ -1824,6 +1903,13 _at__at_ esac > AC_MSG_RESULT([$dynamic_linker]) > test "$dynamic_linker" = no && can_build_shared=no > > +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], > +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) > +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" > +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], > +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) > +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" > + > variables_saved_for_relink="PATH $shlibpath_var $runpath_var" > if test "$GCC" = yes; then > variables_saved_for_relink="$variables_saved_for_relink > GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" > _at__at_ -2323,7 +2409,7 _at__at_ lt_cv_deplibs_check_method='unknown' > # whether `pass_all' will *always* work, you probably want this one. > > case $host_os in > -aix4* | aix5*) > +aix[[4-9]]*) > lt_cv_deplibs_check_method=pass_all > ;; > > _at__at_ -2759,7 +2845,7 _at__at_ aix3*) > fi > ;; > > -aix4* | aix5*) > +aix[[4-9]]*) > if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; > then > test "$enable_shared" = yes && enable_static=no > fi > _at__at_ -2816,6 +2902,7 _at__at_ _LT_AC_TAGVAR(postdep_objects, $1)= > _LT_AC_TAGVAR(predeps, $1)= > _LT_AC_TAGVAR(postdeps, $1)= > _LT_AC_TAGVAR(compiler_lib_search_path, $1)= > +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= > > # Source file extension for C++ test sources. > ac_ext=cpp > _at__at_ -2925,7 +3012,7 _at__at_ case $host_os in > # FIXME: insert proper C++ library support > _LT_AC_TAGVAR(ld_shlibs, $1)=no > ;; > - aix4* | aix5*) > + aix[[4-9]]*) > if test "$host_cpu" = ia64; then > # On IA64, the linker does run time linking by default, so we > don't > # have to do anything special. > _at__at_ -2938,7 +3025,7 _at__at_ case $host_os in > # Test if we are trying to use run time linking or normal > # AIX style linking. If -brtl is somewhere in LDFLAGS, we > # need to do runtime linking. > - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) > + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) > for ld_flag in $LDFLAGS; do > case $ld_flag in > *-brtl*) > _at__at_ -3084,51 +3171,23 _at__at_ case $host_os in > fi > ;; > darwin* | rhapsody*) > - case $host_os in > - rhapsody* | darwin1.[[012]]) > - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined > ${wl}suppress' > - ;; > - *) # Darwin 1.3 on > - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then > - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace > ${wl}-undefined ${wl}suppress' > - else > - case ${MACOSX_DEPLOYMENT_TARGET} in > - 10.[[012]]) > - _LT_AC_TAGVAR(allow_undefined_flag, > $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' > - ;; > - 10.*) > - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined > ${wl}dynamic_lookup' > - ;; > - esac > - fi > - ;; > - esac > _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no > _LT_AC_TAGVAR(hardcode_direct, $1)=no > _LT_AC_TAGVAR(hardcode_automatic, $1)=yes > _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported > _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' > _LT_AC_TAGVAR(link_all_deplibs, $1)=yes > - > - if test "$GXX" = yes ; then > - lt_int_apple_cc_single_mod=no > + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" > + if test "$GXX" = yes ; then > output_verbose_link_cmd='echo' > - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then > - lt_int_apple_cc_single_mod=yes > + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib > \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags > -install_name \$rpath/\$soname \$verstring > $_lt_dar_single_mod${_lt_dsymutil}" > + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o > \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" > + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < > \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC > -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs > \$compiler_flags -install_name \$rpath/\$soname \$verstring > ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" > + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < > \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC > \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs > \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" > + if test "$lt_cv_apple_cc_single_mod" != "yes"; then > + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs > -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib > \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs > \$compiler_flags -install_name \$rpath/\$soname > \$verstring${_lt_dsymutil}" > + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < > \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r > -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC > -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs > \$compiler_flags -install_name \$rpath/\$soname > \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" > fi > - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then > - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module > $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags > -install_name $rpath/$soname $verstring' > - else > - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs > -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib > $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags > -install_name $rpath/$soname $verstring' > - fi > - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib > -bundle $libobjs $deplibs$compiler_flags' > - # Don't fix this by using the ld -exported_symbols_list flag, it > doesn't exist in older darwin lds > - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then > - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e > "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module > $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags > -install_name $rpath/$soname $verstring~nmedit -s > $output_objdir/${libname}-symbols.expsym ${lib}' > - else > - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e > "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs > -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib > $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags > -install_name $rpath/$soname $verstring~nmedit -s > $output_objdir/${libname}-symbols.expsym ${lib}' > - fi > - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e > "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o > $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s > $output_objdir/${libname}-symbols.expsym ${lib}' > else > case $cc_basename in > xlc*) > _at__at_ -3379,7 +3438,7 _at__at_ case $host_os in > _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' > _LT_AC_TAGVAR(whole_archive_flag_spec, > $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' > ;; > - pgCC*) > + pgCC* | pgcpp*) > # Portland Group C++ compiler > _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects > $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname > ${wl}$soname -o $lib' > _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag > $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags > ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols > -o $lib' > _at__at_ -3814,7 +3873,8 _at__at_ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld > # compiler output when linking a shared library. > # Parse the compiler output and extract the necessary > # objects, libraries and library flags. > -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ > +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], > +[AC_REQUIRE([LT_AC_PROG_SED])dnl > dnl we can't use the lt_simple_compile_test_code here, > dnl because it contains code intended for an executable, > dnl not a library. It's possible we should let each > _at__at_ -3939,6 +3999,11 _at__at_ fi > > $rm -f confest.$objext > > +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= > +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then > + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " > ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e > 's!^ !!'` > +fi > + > # PORTME: override above test on systems where it is broken > ifelse([$1],[CXX], > [case $host_os in > _at__at_ -3995,7 +4060,6 _at__at_ solaris*) > ;; > esac > ]) > - > case " $_LT_AC_TAGVAR(postdeps, $1) " in > *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; > esac > _at__at_ -4080,7 +4144,7 _at__at_ aix3*) > postinstall_cmds='$RANLIB $lib' > fi > ;; > -aix4* | aix5*) > +aix[[4-9]]*) > if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; > then > test "$enable_shared" = yes && enable_static=no > fi > _at__at_ -4257,6 +4321,7 _at__at_ if test -f "$ltmain"; then > _LT_AC_TAGVAR(predeps, $1) \ > _LT_AC_TAGVAR(postdeps, $1) \ > _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ > + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ > _LT_AC_TAGVAR(archive_cmds, $1) \ > _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ > _LT_AC_TAGVAR(postinstall_cmds, $1) \ > _at__at_ -4319,7 +4384,7 _at__at_ ifelse([$1], [], > # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) > # NOTE: Changes made to this file will be lost: look at ltmain.sh. > # > -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, > 2005, 2006, 2007 > +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, > 2005, 2006, 2007, 2008 > # Free Software Foundation, Inc. > # > # This file is part of GNU Libtool: > _at__at_ -4556,6 +4621,10 _at__at_ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) > # shared library. > postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) > > +# The directories searched by this compiler when creating a shared > +# library > +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, > $1) > + > # The library search path used internally by the compiler when linking > # a shared library. > compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, > $1) > _at__at_ -4905,7 +4974,7 _at__at_ EOF > echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD > cat conftest.$ac_ext >&5 > fi > - rm -f conftest* conftst* > + rm -rf conftest* conftst* > > # Do not use the global_symbol_pipe unless it works. > if test "$pipe_works" = yes; then > _at__at_ -4962,7 +5031,8 _at__at_ AC_MSG_CHECKING([for $compiler option to > # built for inclusion in a dll (and should export symbols for > example). > # Although the cygwin gcc ignores -fPIC, still need this for > old-style > # (--disable-auto-import) libraries > - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' > + m4_if([$1], [GCJ], [], > + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) > ;; > darwin* | rhapsody*) > # PIC is the default on this platform > _at__at_ -4999,7 +5069,7 _at__at_ AC_MSG_CHECKING([for $compiler option to > esac > else > case $host_os in > - aix4* | aix5*) > + aix[[4-9]]*) > # All AIX code is PIC. > if test "$host_cpu" = ia64; then > # AIX 5 now supports IA64 processor > _at__at_ -5095,7 +5165,7 _at__at_ AC_MSG_CHECKING([for $compiler option to > _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' > _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' > ;; > - pgCC*) > + pgCC* | pgcpp*) > # Portland Group C++ compiler. > _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' > _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' > _at__at_ -5246,7 +5316,8 _at__at_ AC_MSG_CHECKING([for $compiler option to > # built for inclusion in a dll (and should export symbols for > example). > # Although the cygwin gcc ignores -fPIC, still need this for > old-style > # (--disable-auto-import) libraries > - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' > + m4_if([$1], [GCJ], [], > + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) > ;; > > darwin* | rhapsody*) > _at__at_ -5316,7 +5387,8 _at__at_ AC_MSG_CHECKING([for $compiler option to > mingw* | cygwin* | pw32* | os2*) > # This hack is so that the source file can tell whether it is > being > # built for inclusion in a dll (and should export symbols for > example). > - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' > + m4_if([$1], [GCJ], [], > + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) > ;; > > hpux9* | hpux10* | hpux11*) > _at__at_ -5453,7 +5525,7 _at__at_ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co > # > if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then > AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag > $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], > - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), > + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), > [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ > -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], > [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in > "" | " "*) ;; > _at__at_ -5477,7 +5549,7 _at__at_ esac > # > wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval > lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" > AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag > works], > - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), > + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), > $lt_tmp_static_flag, > [], > [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) > _at__at_ -5493,7 +5565,7 _at__at_ AC_MSG_CHECKING([whether the $compiler l > ifelse([$1],[CXX],[ > _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | > $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > > $export_symbols' > case $host_os in > - aix4* | aix5*) > + aix[[4-9]]*) > # If we're using GNU nm, then we don't want the "-C" option. > # -C means demangle to AIX nm, but means don't demangle with GNU nm > if $NM -V 2>&1 | grep 'GNU' > /dev/null; then > _at__at_ -5512,6 +5584,7 _at__at_ ifelse([$1],[CXX],[ > _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | > $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > > $export_symbols' > ;; > esac > + _LT_AC_TAGVAR(exclude_expsyms, > $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] > ],[ > runpath_var= > _LT_AC_TAGVAR(allow_undefined_flag, $1)= > _at__at_ -5542,12 +5615,14 _at__at_ ifelse([$1],[CXX],[ > # it will be wrapped by ` (' and `)$', so one must not match beginning > or > # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and > `bc', > # as well as any symbol that contains `d'. > - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" > + _LT_AC_TAGVAR(exclude_expsyms, > $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] > # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out > # platforms (ab)use it in PIC code, but their linkers get confused if > # the symbol is explicitly referenced. Since portable code cannot > # rely on this symbol name, it's probably fine to never include it in > # preloaded symbol tables. > + # Exclude shared library initialization/finalization symbols. > +dnl Note also adjust exclude_expsyms for C++ above. > extract_expsyms_cmds= > # Just being paranoid about ensuring that cc_basename is set. > _LT_CC_BASENAME([$compiler]) > _at__at_ -5597,7 +5672,7 _at__at_ ifelse([$1],[CXX],[ > > # See if GNU ld supports shared libraries. > case $host_os in > - aix3* | aix4* | aix5*) > + aix[[3-9]]*) > # On AIX/PPC, the GNU linker is very broken > if test "$host_cpu" != ia64; then > _LT_AC_TAGVAR(ld_shlibs, $1)=no > _at__at_ -5816,7 +5891,7 _at__at_ _LT_EOF > fi > ;; > > - aix4* | aix5*) > + aix[[4-9]]*) > if test "$host_cpu" = ia64; then > # On IA64, the linker does run time linking by default, so we don't > # have to do anything special. > _at__at_ -5836,7 +5911,7 _at__at_ _LT_EOF > # Test if we are trying to use run time linking or normal > # AIX style linking. If -brtl is somewhere in LDFLAGS, we > # need to do runtime linking. > - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) > + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) > for ld_flag in $LDFLAGS; do > if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then > aix_use_runtimelinking=yes > _at__at_ -5996,11 +6071,10 _at__at_ _LT_EOF > _LT_AC_TAGVAR(link_all_deplibs, $1)=yes > if test "$GCC" = yes ; then > output_verbose_link_cmd='echo' > - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib > $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags > -install_name $rpath/$soname $verstring' > - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib > -bundle $libobjs $deplibs$compiler_flags' > - # Don't fix this by using the ld -exported_symbols_list flag, it > doesn't exist in older darwin lds > - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ > ]*,," -e "s,^\(..*\),_&," < $export_symbols > > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib > $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags > -install_name $rpath/$soname $verstring~nmedit -s > $output_objdir/${libname}-symbols.expsym ${lib}' > - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ > ]*,," -e "s,^\(..*\),_&," < $export_symbols > > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o > $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s > $output_objdir/${libname}-symbols.expsym ${lib}' > + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib > \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags > -install_name \$rpath/\$soname \$verstring > $_lt_dar_single_mod${_lt_dsymutil}" > + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o > \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" > + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < > \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC > -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs > \$compiler_flags -install_name \$rpath/\$soname \$verstring > ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" > + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < > \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC > \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs > \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" > else > case $cc_basename in > xlc*) > _at__at_ -6581,7 +6655,7 _at__at_ AC_SUBST([SED]) > AC_MSG_RESULT([$SED]) > ]) > > -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. > +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, > Inc. > # > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, > _at__at_ -6596,7 +6670,7 _at__at_ AC_DEFUN([AM_AUTOMAKE_VERSION], > [am__api_version='1.10' > dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to > dnl require some minimum version. Point them to the right macro. > -m4_if([$1], [1.10], [], > +m4_if([$1], [1.10.1], [], > [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl > ]) > > _at__at_ -6612,8 +6686,10 _at__at_ m4_define([_AM_AUTOCONF_VERSION], []) > # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be > traced. > # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. > AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], > -[AM_AUTOMAKE_VERSION([1.10])dnl > -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) > +[AM_AUTOMAKE_VERSION([1.10.1])dnl > +m4_ifndef([AC_AUTOCONF_VERSION], > + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) > > # AM_AUX_DIR_EXPAND -*- Autoconf > -*- > > _at__at_ -6885,7 +6961,7 _at__at_ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS > # each Makefile.in and add a new line on top of each file to say so. > # Grep'ing the whole file is not good either: AIX grep has a line > # limit of 2048, but all sed's we know have understand at least 4000. > - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; > then > + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null > 2>&1; then > dirpart=`AS_DIRNAME("$mf")` > else > continue > _at__at_ -6933,13 +7009,13 _at__at_ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] > # Do all the work for Automake. -*- Autoconf > -*- > > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, > -# 2005, 2006 Free Software Foundation, Inc. > +# 2005, 2006, 2008 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. > > -# serial 12 > +# serial 13 > > # This macro actually does too much. Some checks are only needed if > # your package does certain things. But this isn't really a big deal. > _at__at_ -7044,16 +7120,17 _at__at_ AC_PROVIDE_IFELSE([AC_PROG_OBJC], > # our stamp files there. > AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], > [# Compute $1's index in $config_headers. > +_am_arg=$1 > _am_stamp_count=1 > for _am_header in $config_headers :; do > case $_am_header in > - $1 | $1:* ) > + $_am_arg | $_am_arg:* ) > break ;; > * ) > _am_stamp_count=`expr $_am_stamp_count + 1` ;; > esac > done > -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) > +echo "timestamp for $_am_arg" > >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) > > # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. > # > _at__at_ -7354,7 +7431,7 _at__at_ AC_SUBST([INSTALL_STRIP_PROGRAM])]) > > # _AM_SUBST_NOTMAKE(VARIABLE) > # --------------------------- > -# Prevent Automake from outputing VARIABLE = _at_VARIABLE_at_ in Makefile.in. > +# Prevent Automake from outputting VARIABLE = _at_VARIABLE_at_ in Makefile.in. > # This macro is traced by Automake. > AC_DEFUN([_AM_SUBST_NOTMAKE]) > > > Modified: head/contrib/openbsm/bin/Makefile.in > ============================================================================== > --- head/contrib/openbsm/bin/Makefile.in Sun Apr 19 15:19:26 2009 > (r191272) > +++ head/contrib/openbsm/bin/Makefile.in Sun Apr 19 16:17:13 2009 > (r191273) > _at__at_ -1,8 +1,8 _at__at_ > -# Makefile.in generated by automake 1.10 from Makefile.am. > +# Makefile.in generated by automake 1.10.1 from Makefile.am. > # _at_configure_input_at_ > > # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, > -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. > +# 2003, 2004, 2005, 2006, 2007, 2008 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. > _at__at_ -15,7 +15,7 _at__at_ > _at_SET_MAKE_at_ > > # > -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 $ > +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#11 $ > # > VPATH = _at_srcdir_at_ > pkgdatadir = $(datadir)/_at_PACKAGE_at_ > _at__at_ -82,6 +82,7 _at__at_ CXXFLAGS = _at_CXXFLAGS_at_ > CYGPATH_W = _at_CYGPATH_W_at_ > DEFS = _at_DEFS_at_ > DEPDIR = _at_DEPDIR_at_ > +DSYMUTIL = _at_DSYMUTIL_at_ > ECHO = _at_ECHO_at_ > ECHO_C = _at_ECHO_C_at_ > ECHO_N = _at_ECHO_N_at_ > _at__at_ -106,6 +107,7 _at__at_ MAINT = _at_MAINT_at_ > MAKEINFO = _at_MAKEINFO_at_ > MIG = _at_MIG_at_ > MKDIR_P = _at_MKDIR_P_at_ > +NMEDIT = _at_NMEDIT_at_ > OBJEXT = _at_OBJEXT_at_ > PACKAGE = _at_PACKAGE_at_ > PACKAGE_BUGREPORT = _at_PACKAGE_BUGREPORT_at_ > _at__at_ -169,6 +171,7 _at__at_ sharedstatedir = _at_sharedstatedir_at_ > srcdir = _at_srcdir_at_ > sysconfdir = _at_sysconfdir_at_ > target_alias = _at_target_alias_at_ > +top_build_prefix = _at_top_build_prefix_at_ > top_builddir = _at_top_builddir_at_ > top_srcdir = _at_top_srcdir_at_ > SUBDIRS = auditfilterd auditreduce praudit $(am__append_1) > _at__at_ -286,8 +289,8 _at__at_ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > mkid -fID $$unique > tags: TAGS > > _at__at_ -312,8 +315,8 _at__at_ TAGS: tags-recursive $(HEADERS) $(SOURCE > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ > test -n "$$unique" || unique=$$empty_fix; \ > $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > _at__at_ -323,13 +326,12 _at__at_ ctags: CTAGS > CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ > $(TAGS_FILES) $(LISP) > tags=; \ > - here=`pwd`; \ > list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ > unique=`for i in $$list; do \ > if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > done | \ > - $(AWK) ' { files[$$0] = 1; } \ > - END { for (i in files) print i; }'`; \ > + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ > + END { if (nonempty) { for (i in files) print i; }; }'`; \ > test -z "$(CTAGS_ARGS)$$tags$$unique" \ > || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ > $$tags $$unique > > Modified: head/contrib/openbsm/bin/audit/Makefile.in > ============================================================================== > --- head/contrib/openbsm/bin/audit/Makefile.in Sun Apr 19 15:19:26 2009 > (r191272) > +++ head/contrib/openbsm/bin/audit/Makefile.in Sun Apr 19 16:17:13 2009 > (r191273) > _at__at_ -1,8 +1,8 _at__at_ > -# Makefile.in generated by automake 1.10 from Makefile.am. > +# Makefile.in generated by automake 1.10.1 from Makefile.am. > # _at_configure_input_at_ > > # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, > -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. > +# 2003, 2004, 2005, 2006, 2007, 2008 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. > _at__at_ -15,7 +15,7 _at__at_ > _at_SET_MAKE_at_ > > # > -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 $ > +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#12 $ > # > > VPATH = _at_srcdir_at_ > _at__at_ -55,7 +55,7 _at__at_ am__audit_SOURCES_DIST = audit.c auditd_ > _at_USE_MACH_IPC_TRUE_at_ audit.$(OBJEXT) > audit_OBJECTS = $(am_audit_OBJECTS) > audit_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la > -DEFAULT_INCLUDES = -I. -I$(top_builddir)/config_at_am__isrc_at_ > +DEFAULT_INCLUDES = -I._at_am__isrc_at_ -I$(top_builddir)/config > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** > _______________________________________________ > freebsd-current_at_freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org" > > Hello. After updating to revision 191274, I cannot login. "could not determine audit condition" Sorry for bothering you, but I don't know how to deal with it. -best regards, Jakub Lach -- View this message in context: http://www.nabble.com/OpenBSM-1.1-imported-%28was%3A-svn-commit%3A-r191273---in-head%3A-contrib-openbsm-contrib-openbsm-bin-contrib-openbsm-bin-audit-contrib-openbsm-bin-auditd-contrib-openbsm-bin-auditfilterd-contrib-openbsm-bin-auditreduce-contrib-open...-%28fwd%29%29-tp23124717p23127561.html Sent from the freebsd-current mailing list archive at Nabble.com.Received on Sun Apr 19 2009 - 19:25:27 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:46 UTC