Merge OpenBSM 1.2 alpha 4.

MFC after:	2 weeks
Relnotes:	yes

10 files changed, 0 insertions, 13 deletions

diff --git a/contrib/openbsm/compat/clock_gettime.h b/contrib/openbsm/compat/clock_gettime.h
index ad9315f..7492b16 100644
--- a/contrib/openbsm/compat/clock_gettime.h
+++ b/contrib/openbsm/compat/clock_gettime.h
@@ -22,8 +22,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/clock_gettime.h#3 $
  */
 
 /*
diff --git a/contrib/openbsm/compat/closefrom.h b/contrib/openbsm/compat/closefrom.h
index b0545f3..fdfcfcf 100644
--- a/contrib/openbsm/compat/closefrom.h
+++ b/contrib/openbsm/compat/closefrom.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/closefrom.h#1 $
  */
 
 #ifndef	_CLOSEFROM_H_
diff --git a/contrib/openbsm/compat/compat.h b/contrib/openbsm/compat/compat.h
index 5cd7446..e3c4d35 100644
--- a/contrib/openbsm/compat/compat.h
+++ b/contrib/openbsm/compat/compat.h
@@ -25,8 +25,6 @@
  * 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/compat/compat.h#1 $
  */
 
 #ifndef	_COMPAT_H_
diff --git a/contrib/openbsm/compat/endian.h b/contrib/openbsm/compat/endian.h
index d01c7d4..b4961d5 100644
--- a/contrib/openbsm/compat/endian.h
+++ b/contrib/openbsm/compat/endian.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#10 $
  */
 
 #ifndef _COMPAT_ENDIAN_H_
diff --git a/contrib/openbsm/compat/endian_enc.h b/contrib/openbsm/compat/endian_enc.h
index 9e671b7..c131e43 100644
--- a/contrib/openbsm/compat/endian_enc.h
+++ b/contrib/openbsm/compat/endian_enc.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian_enc.h#1 $
  */
 
 #ifndef _COMPAT_ENDIAN_ENC_H_
diff --git a/contrib/openbsm/compat/flopen.h b/contrib/openbsm/compat/flopen.h
index c68f4a2..7871b13 100644
--- a/contrib/openbsm/compat/flopen.h
+++ b/contrib/openbsm/compat/flopen.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD head/lib/libutil/flopen.c r193591
- * $P4: //depot/projects/trustedbsd/openbsm/compat/flopen.h#1 $
  */
 
 #include <sys/file.h>
diff --git a/contrib/openbsm/compat/pidfile.h b/contrib/openbsm/compat/pidfile.h
index c3a259b..5286b69 100644
--- a/contrib/openbsm/compat/pidfile.h
+++ b/contrib/openbsm/compat/pidfile.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD head/lib/libutil/pidfile.c r231938
- * $P4: //depot/projects/trustedbsd/openbsm/compat/pidfile.h#1 $
  */
 
 #include <sys/param.h>
diff --git a/contrib/openbsm/compat/queue.h b/contrib/openbsm/compat/queue.h
index a73a1f7..4236e62 100644
--- a/contrib/openbsm/compat/queue.h
+++ b/contrib/openbsm/compat/queue.h
@@ -29,7 +29,6 @@
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  *
  * Derived from FreeBSD src/sys/sys/queue.h:1.63.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#3 $
  */
 
 #ifndef _COMPAT_QUEUE_H_
diff --git a/contrib/openbsm/compat/strlcat.h b/contrib/openbsm/compat/strlcat.h
index f10109b..70a851c 100644
--- a/contrib/openbsm/compat/strlcat.h
+++ b/contrib/openbsm/compat/strlcat.h
@@ -25,7 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * dollar OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 $
  */
 
 /*
diff --git a/contrib/openbsm/compat/strlcpy.h b/contrib/openbsm/compat/strlcpy.h
index 2f6455d..1d206b6 100644
--- a/contrib/openbsm/compat/strlcpy.h
+++ b/contrib/openbsm/compat/strlcpy.h
@@ -25,7 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * dollar OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp dollar
- * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcpy.h#1 $
  */
 
 /*