head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.7.18.1.4.2
	RELENG_9_1:1.7.18.1.0.4
	RELENG_9_1_BP:1.7.18.1
	RELENG_8_3_0_RELEASE:1.7.12.1.8.1
	RELENG_8_3:1.7.12.1.0.8
	RELENG_8_3_BP:1.7.12.1
	RELENG_9_0_0_RELEASE:1.7.18.1.2.1
	RELENG_9_0:1.7.18.1.0.2
	RELENG_9_0_BP:1.7.18.1
	RELENG_9:1.7.0.18
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.7.16.1
	RELENG_8_2_0_RELEASE:1.7.12.1.6.1
	RELENG_7_4:1.7.0.16
	RELENG_7_4_BP:1.7
	RELENG_8_2:1.7.12.1.0.6
	RELENG_8_2_BP:1.7.12.1
	RELENG_8_1_0_RELEASE:1.7.12.1.4.1
	RELENG_8_1:1.7.12.1.0.4
	RELENG_8_1_BP:1.7.12.1
	RELENG_7_3_0_RELEASE:1.7.14.1
	RELENG_7_3:1.7.0.14
	RELENG_7_3_BP:1.7
	RELENG_8_0_0_RELEASE:1.7.12.1.2.1
	RELENG_8_0:1.7.12.1.0.2
	RELENG_8_0_BP:1.7.12.1
	RELENG_8:1.7.0.12
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.7.10.1
	RELENG_7_2:1.7.0.10
	RELENG_7_2_BP:1.7
	RELENG_7_1_0_RELEASE:1.7.8.1
	RELENG_6_4_0_RELEASE:1.7.2.1.6.1
	RELENG_7_1:1.7.0.8
	RELENG_7_1_BP:1.7
	RELENG_6_4:1.7.2.1.0.6
	RELENG_6_4_BP:1.7.2.1
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.7.2.1
	RELENG_7_0:1.7.0.6
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.7.2.1.0.4
	RELENG_6_3_BP:1.7.2.1
	RELENG_7:1.7.0.4
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.7.2.1
	RELENG_6_2:1.7.2.1.0.2
	RELENG_6_2_BP:1.7.2.1
	RELENG_6:1.7.0.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.48.55;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2006.09.02.09.56.28;	author rwatson;	state Exp;
branches
	1.7.2.1
	1.7.4.1
	1.7.8.1
	1.7.10.1
	1.7.12.1
	1.7.14.1
	1.7.16.1
	1.7.18.1;
next	1.6;

1.6
date	2006.08.26.10.35.54;	author rwatson;	state Exp;
branches;
next	1.5;

1.5
date	2006.06.27.17.55.38;	author rwatson;	state Exp;
branches;
next	1.4;

1.4
date	2006.03.05.13.30.37;	author rwatson;	state Exp;
branches;
next	1.3;

1.3
date	2006.03.04.16.50.04;	author rwatson;	state Exp;
branches;
next	1.2;

1.2
date	2006.02.06.00.03.39;	author rwatson;	state Exp;
branches;
next	1.1;

1.1
date	2006.02.04.18.29.51;	author rwatson;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.48.55;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.01.52;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2006.09.02.10.45.57;	author rwatson;	state Exp;
branches
	1.7.2.1.6.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.07.38.53;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.7.4.1
date	2012.11.17.08.01.06;	author svnexp;	state Exp;
branches;
next	;

1.7.8.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.7.10.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.7.12.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.12.1.2.1
	1.7.12.1.4.1
	1.7.12.1.6.1
	1.7.12.1.8.1;
next	1.7.12.2;

1.7.12.2
date	2012.11.17.10.35.54;	author svnexp;	state Exp;
branches;
next	;

1.7.12.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.7.12.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.7.12.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.7.12.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.12.1.8.2;

1.7.12.1.8.2
date	2012.11.17.08.24.36;	author svnexp;	state Exp;
branches;
next	;

1.7.14.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.7.16.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.16.2;

1.7.16.2
date	2012.11.17.08.16.35;	author svnexp;	state Exp;
branches;
next	;

1.7.18.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.18.1.2.1
	1.7.18.1.4.1;
next	1.7.18.2;

1.7.18.2
date	2012.11.17.11.36.09;	author svnexp;	state Exp;
branches;
next	;

1.7.18.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.18.1.2.2;

1.7.18.1.2.2
date	2012.11.17.08.36.09;	author svnexp;	state Exp;
branches;
next	;

1.7.18.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.18.1.4.2;

1.7.18.1.4.2
date	2012.11.17.08.46.58;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@Upgrade Instructions for OpenBSM
--------------------------------

OpenBSM integrates into the FreeBSD source tree in several places:

src/contrib/openbsm        The OpenBSM distribution itself
src/sys/bsm                Modified versions of some bsm/ include files
src/sys/security/audit     Kernel audit framework, some OpenBSM-based files
src/usr.sbin/*audit*       Makefiles for various OpenBSM tools
src/etc/Makefile           Installation of /etc OpenBSM files
src/lib/libbsm/*           Build for OpenBSM library

OpenBSM is normally built using an integrated autoconf/automake build
system.  For the purposes of tight integration with FreeBSD, we use an
adapted BSD make (bmake) build system loosely based on the automake
setup.  We also rely on a static config.h generated when OpenBSM is
imported, rather than re-configuring every build.  This leads to a
more reproduceable build environment, and avoids dependence on things
not in the base tree (i.e., autoconf, automake, GNU make, etc).  An
upgrade of OpenBSM generally involves the following steps:

- Vendor import of OpenBSM into src/contrib.
- Run configure, commit src/contrib/openbsm/config/config.h.
- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm.
- Possible updates to src/sys/security/audit, especially relating to
  audit_bsm_token.c.
- Update any library, tool, or etc BSD Makefiles to add new files,
  defines, or other generally useful or necessary things.

Certain files are present only in the vendor branch, and not in FreeBSD
development branches:

  contrib/openbsm/bsm  audit.h audit_internal.h audit_kevents.h 
                       audit_record.h 

This prevents confusion regarding whether the src/sys/bsm or contrib
versions of the include files should be used in the build.  Normally, the
CVS vendor import goes along the following lines:

  cd ~/p4/projects/trustedbsd/openbsm
  cvs -n -d rwatson@@repoman.FreeBSD.org:/home/ncvs -q import \
	src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1

Replacing the version string as required.  Remove the "-n" argument once
the import is tested in order to perform the actual import.

Propagation of changes to src/sys/{bsm,security/audit} is something that
requires careful coordination and attention to detail.  These files are
not on CVS vendor branches, but do have the same local vs. vendor merge
issues.  Remember that contrib/openbsm (and the rest of the system) will
be built with the version of the bsm/ include files in src/sys/bsm, not
the version in contrib/openbsm/bsm, so buildworld tests before committing
are necessary, and the commits to various parts of the system must be
made in close succession.

$FreeBSD: head/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.8.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:01:52 +0000
@
text
@d1 56
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 56
Upgrade Instructions for OpenBSM
--------------------------------

OpenBSM integrates into the FreeBSD source tree in several places:

src/contrib/openbsm        The OpenBSM distribution itself
src/sys/bsm                Modified versions of some bsm/ include files
src/sys/security/audit     Kernel audit framework, some OpenBSM-based files
src/usr.sbin/*audit*       Makefiles for various OpenBSM tools
src/etc/Makefile           Installation of /etc OpenBSM files
src/lib/libbsm/*           Build for OpenBSM library

OpenBSM is normally built using an integrated autoconf/automake build
system.  For the purposes of tight integration with FreeBSD, we use an
adapted BSD make (bmake) build system loosely based on the automake
setup.  We also rely on a static config.h generated when OpenBSM is
imported, rather than re-configuring every build.  This leads to a
more reproduceable build environment, and avoids dependence on things
not in the base tree (i.e., autoconf, automake, GNU make, etc).  An
upgrade of OpenBSM generally involves the following steps:

- Vendor import of OpenBSM into src/contrib.
- Run configure, commit src/contrib/openbsm/config/config.h.
- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm.
- Possible updates to src/sys/security/audit, especially relating to
  audit_bsm_token.c.
- Update any library, tool, or etc BSD Makefiles to add new files,
  defines, or other generally useful or necessary things.

Certain files are present only in the vendor branch, and not in FreeBSD
development branches:

  contrib/openbsm/bsm  audit.h audit_internal.h audit_kevents.h 
                       audit_record.h 

This prevents confusion regarding whether the src/sys/bsm or contrib
versions of the include files should be used in the build.  Normally, the
CVS vendor import goes along the following lines:

  cd ~/p4/projects/trustedbsd/openbsm
  cvs -n -d rwatson@@repoman.FreeBSD.org:/home/ncvs -q import \
	src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1

Replacing the version string as required.  Remove the "-n" argument once
the import is tested in order to perform the actual import.

Propagation of changes to src/sys/{bsm,security/audit} is something that
requires careful coordination and attention to detail.  These files are
not on CVS vendor branches, but do have the same local vs. vendor merge
issues.  Remember that contrib/openbsm (and the rest of the system) will
be built with the version of the bsm/ include files in src/sys/bsm, not
the version in contrib/openbsm/bsm, so buildworld tests before committing
are necessary, and the commits to various parts of the system must be
made in close succession.

$FreeBSD: releng/8.4/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7
log
@Note removal of certain contrib/openbsm/bsm include files from
FreeBSD development branches, they exist only in the vendor branch.

Obtained from:	TrustedBSD Project
@
text
@d56 1
a56 1
$FreeBSD$
@


1.7.4.1
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: stable/7/contrib/openbsm/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.7.18.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.18.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d56 1
a56 1
$FreeBSD: stable/9/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7.18.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.18.1.4.2
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: releng/9.1/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7.18.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.18.1.2.2
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: releng/9.0/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7.16.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.7.16.2
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: releng/7.4/contrib/openbsm/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.7.14.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.7.12.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.7.12.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d56 1
a56 1
$FreeBSD: stable/8/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7.12.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.12.1.8.2
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: releng/8.3/contrib/openbsm/FREEBSD-upgrade 161866 2006-09-02 09:56:28Z rwatson $
@


1.7.12.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.7.12.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.7.12.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.7.10.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.7.8.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1
log
@MFC OpenBSM 1.0 alpha 10 from HEAD to RELENG_6; OpenBSM is the user space
portion of the TrustedBSD audit implementation, which has now been
settling in 7-CURRENT for several months, and is intended to provide a
Common Criteria/CAPP-compliant fine-grained security event log subsystem.
OpenBSM includes libraries, documentation, configuration files, and audit
audit trail printing and audit trail reduction tools.

This code drop is based on Apple's BSM implementation, implemented by
McAfee Research, and has been substantially enhanced by the TrustedBSD
Project.

Audit support will be considered "experimental" for 6.2-RELEASE.

Obtained from:	TrustedBSD Project
@
text
@d56 1
a56 1
$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.7 2006/09/02 09:56:28 rwatson Exp $
@


1.7.2.2
log
@Switch importer
@
text
@d56 1
a56 1
$FreeBSD: stable/6/contrib/openbsm/FREEBSD-upgrade 161868 2006-09-02 10:46:03Z rwatson $
@


1.7.2.1.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@d56 1
a56 1
$FreeBSD$
@


1.6
log
@Update FreeBSD upgrade notes for OpenBSM.

Obtained from:	TrustedBSD Project
@
text
@d30 9
a38 1
Normally, the CVS vendor import goes along the following lines:
@


1.5
log
@Modify import instructions to include "-n" in the sample command line for
the CVS import, and suggest removing it for the real import, rather than
suggesting it for testing.  This will hopefully prevent me (and others)
from making errors.
@
text
@d26 1
a26 1
  bsm_token.c.
d42 5
a46 1
issues.
@


1.4
log
@Fix spelling error.

Submitted by:	remko
@
text
@d33 2
a34 2
  cvs -d rwatson@@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \
        TrustedBSD OPENBSM_1_0_ALPHA_1
d36 2
a37 2
Replacing the version string as required.  Use the "-n" argument to CVS to
do a test run.
@


1.3
log
@Update FreeBSD import instructions for OpenBSM based on the new autoconf
and automake OpenBSM world order.

Obtained from:	TrustedBSD Project
@
text
@d15 1
a15 1
adapted BSD make (bmake) build system loosely based on the autmake
@


1.2
log
@Correct typo in sample CVS import line: must specify full path to the
CVS repository on repoman.
@
text
@d4 27
a30 1
Currently this is very straight forward:
d39 4
a42 5
Right now, no local FreeBSD modification or configuration is required.  In
future OpenBSM versions, this is likely to change.

After importing OpenBSM, make sure to propagate any changes to files that
appear in both contrib/openbsm/bsm and sys/bsm.
@


1.1
log
@Add a brief FREEBSD-upgrade file to provide direction on how to perform
OpenBSM upgrades.  Right now, this is very easy, but in the future it
will probably become more complicated.
@
text
@d7 1
a7 1
  cvs -d rwatson@@repoman.FreeBSD.org -q import src/contrib/openbsm \
@

