Revert r314020

The test build I ran unfortunately didn't catch the fact that the sha384.h
compat header is missing on ^/stable/10 due to some code not being MFCed

8 files changed, 3 insertions, 199 deletions

diff --git a/lib/libnetbsd/glob.h b/lib/libnetbsd/glob.h
deleted file mode 100644
index a42d823..0000000
--- a/lib/libnetbsd/glob.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2017 Dell, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _LIBNETBSD_GLOB_H_
-#define _LIBNETBSD_GLOB_H_
-
-#include_next <glob.h>
-
-#ifndef	__gl_stat_t
-#define	__gl_stat_t struct stat
-#endif
-
-#endif
diff --git a/lib/libnetbsd/pthread.h b/lib/libnetbsd/pthread.h
deleted file mode 100644
index f436574..0000000
--- a/lib/libnetbsd/pthread.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2017 Dell, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _LIBNETBSD_PTHREAD_H_
-#define _LIBNETBSD_PTHREAD_H_
-
-#include_next <pthread.h>
-#include <pthread_np.h>
-
-#endif
diff --git a/lib/libnetbsd/sha1.h b/lib/libnetbsd/sha1.h
index 9da870e..41280c5 100644
--- a/lib/libnetbsd/sha1.h
+++ b/lib/libnetbsd/sha1.h
@@ -35,11 +35,8 @@
 
 #include <sha.h>
 
-#define	SHA1_CTX	SHA_CTX
-
 #define	SHA1End		SHA1_End
 #define	SHA1File	SHA1_File
-#define	SHA1Final	SHA1_Final
 #define	SHA1Init	SHA1_Init
 #define	SHA1Update	SHA1_Update
 
diff --git a/lib/libnetbsd/sha2.h b/lib/libnetbsd/sha2.h
index 6329284..b67691d 100644
--- a/lib/libnetbsd/sha2.h
+++ b/lib/libnetbsd/sha2.h
@@ -34,7 +34,6 @@
 #define _SHA2_H_
 
 #include <sha256.h>
-#include <sha384.h>
 #include <sha512.h>
 
 #endif /* _SHA2_H_ */
diff --git a/lib/libnetbsd/sys/event.h b/lib/libnetbsd/sys/event.h
deleted file mode 100644
index 88a363c..0000000
--- a/lib/libnetbsd/sys/event.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2017 Dell, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * $FreeBSD$ *
- */
-
-#ifndef _LIBNETBSD_SYS_EVENT_H_
-#define	_LIBNETBSD_SYS_EVENT_H_
-
-/*
- * kqueue on FreeBSD requires sys/event.h, which in turn uses uintptr_t
- * (defined in sys/types.h), so in order to accomodate their requirements,
- * pull in sys/types.h as part of event.h.
- */
-#include <sys/types.h>
-
-#include_next <sys/event.h>
-
-#endif
diff --git a/lib/libnetbsd/sys/types.h b/lib/libnetbsd/sys/types.h
deleted file mode 100644
index e14dd49..0000000
--- a/lib/libnetbsd/sys/types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2017 Dell, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * $FreeBSD$ *
- */
-
-#ifndef _LIBNETBSD_SYS_TYPES_H_
-#define	_LIBNETBSD_SYS_TYPES_H_
-
-#include_next <sys/types.h>
-
-#include <sys/param.h>	/* For NBBY */
-
-#endif
diff --git a/lib/libnetbsd/sys/wait.h b/lib/libnetbsd/sys/wait.h
deleted file mode 100644
index a936980..0000000
--- a/lib/libnetbsd/sys/wait.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2017 Dell, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * $FreeBSD$ *
- */
-
-#ifndef _LIBNETBSD_SYS_WAIT_H_
-#define	_LIBNETBSD_SYS_WAIT_H_
-
-#include_next <sys/wait.h>
-
-#define	wrusage	__wrusage
-
-#endif
diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h
index 99bc3ca..c7d32e1 100644
--- a/lib/libnetbsd/util.h
+++ b/lib/libnetbsd/util.h
@@ -30,13 +30,12 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _LIBNETBSD_UTIL_H_
-#define _LIBNETBSD_UTIL_H_
+#ifndef _UTIL_H_
+#define _UTIL_H_
 
-#include <sys/types.h>
 #include <libutil.h>
 
 char	*flags_to_string(u_long flags, const char *def);
 int	 string_to_flags(char **stringp, u_long *setp, u_long *clrp);
 
-#endif
+#endif	/* _UTIL_H_ */