Date: Mon, 26 Nov 2012 22:29:42 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219848 for review Message-ID: <201211262229.qAQMTgEw082504@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219848?ac=10 Change 219848 by rwatson@rwatson_cinnamon on 2012/11/26 22:29:10 Slide the version of OpenBSM in our FreeBSD audit merge tree forward very slightly further forward to pick up license cleanups, reducing conflicts against the kernel version of some of this code. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/NEWS#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/NEWS#3 (text) ==== @@ -1,5 +1,10 @@ OpenBSM Version History +OpenBSM 1.2 alpha 3 + +- Various minor tweaks to the auditdistd build to make it fit the FreeBSD + build environment better. + OpenBSM 1.2 alpha 2 - auditdistd, a distributed audit trail management daemon, has now been @@ -489,4 +494,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#43 $ +$P4$ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_2alpha2 +OPENBSM_1_2alpha3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.c#3 (text) ==== @@ -11,7 +11,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure#3 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2. +# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha3. # # Report bugs to <trustedbsd-audit@TrustesdBSD.org>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.2alpha2' -PACKAGE_STRING='OpenBSM 1.2alpha2' +PACKAGE_VERSION='1.2alpha3' +PACKAGE_STRING='OpenBSM 1.2alpha3' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.2alpha3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";; + short | recursive ) echo "Configuration of OpenBSM 1.2alpha3:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.2alpha2 +OpenBSM configure 1.2alpha3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.2alpha2, which was +It was created by OpenBSM $as_me 1.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11552,7 +11552,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.2alpha2 + VERSION=1.2alpha3 cat >>confdefs.h <<_ACEOF @@ -14172,7 +14172,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.2alpha2, which was +This file was extended by OpenBSM $as_me 1.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14238,7 +14238,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenBSM config.status 1.2alpha2 +OpenBSM config.status 1.2alpha3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure.ac#3 (text) ==== @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_INIT([OpenBSM], [1.2alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) AC_REVISION([$P4$]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/audit_submit.3#3 (text) ==== @@ -11,9 +11,6 @@ .\" 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. -.\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of -.\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_audit.c#3 (text) ==== @@ -14,7 +14,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_class.c#3 (text) ==== @@ -11,7 +11,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_io.c#3 (text) ==== @@ -16,7 +16,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#3 (text) ==== @@ -15,7 +15,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211262229.qAQMTgEw082504>