Merge OpenBSM 1.2-alpha3 from the vendor branch to 10-CURRENT; this version

included various upstreamed patches from the FreeBSD base to make OpenBSM
compile more easily with bmake, higher warning levels, clang, and several
other loose ends.

Obtained from:	TrustedBSD Project

1 files changed, 18 insertions, 16 deletions

diff --git a/contrib/openbsm/configure b/contrib/openbsm/configure
index f1a473e..197a9be 100755
--- a/contrib/openbsm/configure
+++ b/contrib/openbsm/configure
@@ -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#65 .
 # 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.2-alpha3.
 #
 # Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2alpha2'
-PACKAGE_STRING='OpenBSM 1.2alpha2'
+PACKAGE_VERSION='1.2-alpha3'
+PACKAGE_STRING='OpenBSM 1.2-alpha3'
 PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
 PACKAGE_URL=''
 
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # 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.2-alpha3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1397,7 @@ fi
 
 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.2-alpha3:";;
    esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.2alpha2
+OpenBSM configure 1.2-alpha3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
 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.2-alpha3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -11552,7 +11552,7 @@ fi
 # Define the identity of the package.
 
  PACKAGE=OpenBSM
- VERSION=1.2alpha2
+ VERSION=1.2-alpha3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13559,12 +13559,14 @@ int
 main ()
 {
 
-	bswap16(0);
-	bswap32(0);
-	bswap64(0);
+	int i;
+
+	i = bswap16(0);
+	i = bswap32(0);
+	i = bswap64(0);
 	be32enc(NULL, 0);
-	htole64(0);
-	le64toh(0);
+	i = htole64(0);
+	i = le64toh(0);
 
   ;
   return 0;
@@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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.2-alpha3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14238,7 +14240,7 @@ _ACEOF
 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.2-alpha3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"