Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

21 files changed, 7 insertions, 49 deletions

diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index ddc8eec0fad3..b57a784dc5e7 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
  * Simple authentication database handling code.
  *
  * Copyright (c) 1998
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 77db2266f5e2..24bcc39a35e9 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Eric Anderson <anderson@FreeBSD.org>
  * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 436ec2018653..d03357eae95c 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c
index 796cbf021ded..fcc08209e0cc 100644
--- a/lib/libutil/gr_util.c
+++ b/lib/libutil/gr_util.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/hexdump.c b/lib/libutil/hexdump.c
index 735204885108..76b93ce7a383 100644
--- a/lib/libutil/hexdump.c
+++ b/lib/libutil/hexdump.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1986, 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 5e8fe3dfd188..675a969aaa1e 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
  * Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
  * All rights reserved.
diff --git a/lib/libutil/kinfo_getallproc.c b/lib/libutil/kinfo_getallproc.c
index 609d77a259ac..8620f48545dc 100644
--- a/lib/libutil/kinfo_getallproc.c
+++ b/lib/libutil/kinfo_getallproc.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Robert N. M. Watson
  * Copyright (c) 2009 Ulf Lilleengen
  * All rights reserved.
diff --git a/lib/libutil/kinfo_getproc.c b/lib/libutil/kinfo_getproc.c
index 4d16b1c16a13..496f71f55559 100644
--- a/lib/libutil/kinfo_getproc.c
+++ b/lib/libutil/kinfo_getproc.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Ulf Lilleengen
  * All rights reserved.
  *
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index 970ee50e2936..b4a6ab6d6fbf 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index bc9447055c07..b20ffa291a90 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index b5ab10e6be85..c65fc9b8328a 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2000 Brian Fundakowski Feldman
  * All rights reserved.
  *
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index ef082ba07d74..92dc87fe710c 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index 21df5d2a27ed..157a53c7448f 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index f65a970e685b..a944f9d2fb23 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
  *
  * Simple property list handling code.
  *
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 4869bdfb1520..7e0640804082 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index c91f55f3161c..627d79b301c5 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -1,6 +1,4 @@
-/*--
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c
index 2172a5b8e430..27444c2e31a5 100644
--- a/lib/libutil/quotafile.c
+++ b/lib/libutil/quotafile.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008 Marshall Kirk McKusick
  * All rights reserved.
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 31dd1a50445c..87ac1dda85cb 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index 55d6e0c45fba..ec78a3503609 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2000 Brian Fundakowski Feldman
  * All rights reserved.
  *
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index a783070bcd8c..85c27e0a1c10 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
  *   Based on original work by Atsushi Murai <amurai@FreeBSD.org>
  * All rights reserved.
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 3bde858e6c6d..424ac26651e1 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *