Date: Fri, 23 Nov 2012 22:02:18 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219830 for review Message-ID: <201211232202.qANM2IR7013392@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219830?ac=10 Change 219830 by rwatson@rwatson_cinnamon on 2012/11/23 22:02:17 Integrate OpenBSM 1.2-alpha2 from its project branch into contrib/openbsm in a FreeBSD -CURRENT merge branch. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/NEWS#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditd/auditd_control.defs#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.8#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.conf.5#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/faccessat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/fstatat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/openat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/pjdlog.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/pjdlog.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_common.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_impl.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_socketpair.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tcp.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_tls.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/proto_uds.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/renameat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sigtimedwait.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/strndup.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/token.l#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/unlinkat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/closefrom.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/compat.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/endian_enc.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/flopen.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/pidfile.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/queue.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/compat/vis.h#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/config/ylwrap#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_fcntl_cmd.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/m4/libtool.m4#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/m4/ltoptions.m4#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/m4/ltsugar.m4#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/m4/ltversion.m4#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/m4/lt~obsolete.m4#1 branch .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/tools/audump.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/CREDITS#2 (text) ==== @@ -29,6 +29,12 @@ Stacey Son Todd Heberlein Gary Hoo + Dave Bertouille + Jonathan Anderson + Pawel Jakub Dawidek + Joel Dahl + Ryan Steinmetz + The FreeBSD Foundation 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 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/INSTALL#2 (text) ==== @@ -14,6 +14,12 @@ CFLAGS="-Wall -Werror" ./configure +On Linux systems, OpenSSL headers may have to be installed to support +encryption of on-the-wire audit streams using auditdistd; the following +appears to work on Ubuntu: + + sudo apt-get install libssl-dev + To install the library, binaries, and man pages, use: make install ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/LICENSE#2 (text) ==== @@ -2,34 +2,37 @@ OpenBSM is covered by a number of copyrights, with licenses being either two or three clause BSD licenses. Individual file headers should be consulted -for specific copyrights on specific components. The TrustedBSD Project would -appreciate the contribution of fixes and enhancements under identical or -substantially similar licenses: +for copyrights on specific elements of the distribution. + +The following copyright and license are asserted over the OpenBSM distribution +as a whole: + + Copyright (c) 2005-2012 Robert N.M. Watson + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. - * Copyright (c) <year> <copyright holder> - * All rights reserved. - * - * <any additional comments or credits> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. +The TrustedBSD Project would appreciate the contribution of fixes and +enhancements under an identical license in order to avoid potentially +confusing license proliferation. -$P4: //depot/projects/trustedbsd/openbsm/LICENSE#5 $ +$P4$ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/Makefile.am#2 (text) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#4 $ -# +## +## $P4$ +## SUBDIRS = \ bsm @@ -17,6 +17,7 @@ modules \ sys +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1994-2012 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. @@ -13,14 +13,28 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $ -# VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -40,10 +54,14 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ - $(top_srcdir)/configure INSTALL NEWS TODO config/config.guess \ - config/config.sub config/depcomp config/install-sh \ - config/ltmain.sh config/missing + $(srcdir)/Makefile.in $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.h.in \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ + $(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \ + NEWS TODO config/config.guess config/config.sub config/depcomp \ + config/install-sh config/ltmain.sh config/missing \ + config/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -53,6 +71,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -62,21 +81,61 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = bsm libauditd libbsm bin man modules sys DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -90,45 +149,52 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -137,13 +203,15 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -190,6 +258,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ CHANGELOG \ LICENSE \ @@ -200,21 +269,21 @@ all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -230,21 +299,20 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config/config.h: config/stamp-h1 - @if test ! -f $@; then \ - rm -f config/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f config/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; else :; fi config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @rm -f config/stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config/config.h $(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f config/stamp-h1 touch $@ @@ -258,16 +326,16 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -276,7 +344,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -284,50 +356,23 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -335,14 +380,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -354,7 +399,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -363,36 +408,65 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ 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; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -408,66 +482,84 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -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 $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -475,26 +567,31 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -515,14 +612,24 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ 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 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -553,16 +660,22 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -583,6 +696,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -591,18 +706,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211232202.qANM2IR7013392>