From 498c7b5e98c82ca5a0055f676f2a6e4214e2d9a8 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 13 Dec 2021 18:04:28 +0000
Subject: [PATCH] Kill sys/cdefs.h includes, because overly complicated
 include+macro for a sccsid replacement scheme which results an namespace
 damage is an unfair trade ok bluhm

---
 regress/gnu/lib/libexecinfo/t_backtrace.c         | 5 +++--
 regress/lib/libagentx/log.h                       | 3 +--
 regress/lib/libm/msun/cexp_test.c                 | 5 +----
 regress/lib/libm/msun/conj_test.c                 | 5 +----
 regress/lib/libm/msun/csqrt_test.c                | 5 +----
 regress/lib/libm/msun/ctrig_test.c                | 5 +----
 regress/lib/libm/msun/exponential_test.c          | 5 +----
 regress/lib/libm/msun/fenv_test.c                 | 5 +----
 regress/lib/libm/msun/fls.c                       | 5 +----
 regress/lib/libm/msun/fma_test.c                  | 5 +----
 regress/lib/libm/msun/fmaxmin_test.c              | 5 +----
 regress/lib/libm/msun/invctrig_test.c             | 5 +----
 regress/lib/libm/msun/invtrig_test.c              | 5 +----
 regress/lib/libm/msun/logarithm_test.c            | 5 +----
 regress/lib/libm/msun/lrint_test.c                | 5 +----
 regress/lib/libm/msun/lround_test.c               | 5 +----
 regress/lib/libm/msun/macros.h                    | 3 +--
 regress/lib/libm/msun/nan_test.c                  | 5 +----
 regress/lib/libm/msun/nearbyint_test.c            | 5 +----
 regress/lib/libm/msun/next_test.c                 | 5 +----
 regress/lib/libm/msun/rem_test.c                  | 5 +----
 regress/lib/libm/msun/trig_test.c                 | 5 +----
 regress/sys/kern/pledge/execpromise/execpromise.c | 4 ++--
 23 files changed, 26 insertions(+), 84 deletions(-)

diff --git a/regress/gnu/lib/libexecinfo/t_backtrace.c b/regress/gnu/lib/libexecinfo/t_backtrace.c
index cc9867ed2f0..2796095fcb8 100644
--- a/regress/gnu/lib/libexecinfo/t_backtrace.c
+++ b/regress/gnu/lib/libexecinfo/t_backtrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_backtrace.c,v 1.1 2021/06/10 23:40:46 jca Exp $	*/
+/*	$OpenBSD: t_backtrace.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -28,7 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <sys/cdefs.h>
+
+#include <sys/types.h>
 
 #include <atf-c.h>
 #include <string.h>
diff --git a/regress/lib/libagentx/log.h b/regress/lib/libagentx/log.h
index 33c5f287541..3a67418e1cc 100644
--- a/regress/lib/libagentx/log.h
+++ b/regress/lib/libagentx/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.h,v 1.1 2021/01/04 19:24:55 rob Exp $	*/
+/*	$OpenBSD: log.h,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
 #define LOG_H
 
 #include <stdarg.h>
-#include <sys/cdefs.h>
 
 void	log_init(int, int);
 void	log_procinit(const char *);
diff --git a/regress/lib/libm/msun/cexp_test.c b/regress/lib/libm/msun/cexp_test.c
index 58f5e266db0..bbaaa74c7d6 100644
--- a/regress/lib/libm/msun/cexp_test.c
+++ b/regress/lib/libm/msun/cexp_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cexp_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: cexp_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2011 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for corner cases in cexp*().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 
 #include <complex.h>
diff --git a/regress/lib/libm/msun/conj_test.c b/regress/lib/libm/msun/conj_test.c
index ce2135142ee..fc3d254f256 100644
--- a/regress/lib/libm/msun/conj_test.c
+++ b/regress/lib/libm/msun/conj_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conj_test.c,v 1.3 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: conj_test.c,v 1.4 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -29,9 +29,6 @@
  * Tests for conj{,f,l}()
  */
 
-#include <sys/cdefs.h>
-/* $FreeBSD: head/lib/msun/tests/conj_test.c 314650 2017-03-04 10:07:46Z ngie $ */
-
 #include <complex.h>
 #include <fenv.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/csqrt_test.c b/regress/lib/libm/msun/csqrt_test.c
index a7b66da5ab8..83e0fe0c58b 100644
--- a/regress/lib/libm/msun/csqrt_test.c
+++ b/regress/lib/libm/msun/csqrt_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csqrt_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: csqrt_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2007 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -27,9 +27,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 
 #include <complex.h>
diff --git a/regress/lib/libm/msun/ctrig_test.c b/regress/lib/libm/msun/ctrig_test.c
index 31e38c287ee..3620cc4594a 100644
--- a/regress/lib/libm/msun/ctrig_test.c
+++ b/regress/lib/libm/msun/ctrig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctrig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: ctrig_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2011 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for csin[h](), ccos[h](), and ctan[h]().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <complex.h>
 #include <fenv.h>
diff --git a/regress/lib/libm/msun/exponential_test.c b/regress/lib/libm/msun/exponential_test.c
index 739f0c4dfa5..8308de0bbff 100644
--- a/regress/lib/libm/msun/exponential_test.c
+++ b/regress/lib/libm/msun/exponential_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exponential_test.c,v 1.2 2021/10/22 18:07:01 mbuhl Exp $	*/
+/*	$OpenBSD: exponential_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for corner cases in exp*().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/fenv_test.c b/regress/lib/libm/msun/fenv_test.c
index 529d8cc5e09..7cb690e961c 100644
--- a/regress/lib/libm/msun/fenv_test.c
+++ b/regress/lib/libm/msun/fenv_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv_test.c,v 1.6 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: fenv_test.c,v 1.7 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Test the correctness and C99-compliance of various fenv.h features.
  */
 
-#include <sys/cdefs.h>
-/* $FreeBSD: head/lib/msun/tests/fenv_test.c 314650 2017-03-04 10:07:46Z ngie $ */
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
diff --git a/regress/lib/libm/msun/fls.c b/regress/lib/libm/msun/fls.c
index f588acfc900..8d540c4e2d9 100644
--- a/regress/lib/libm/msun/fls.c
+++ b/regress/lib/libm/msun/fls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fls.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: fls.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <strings.h>
 
 /*
diff --git a/regress/lib/libm/msun/fma_test.c b/regress/lib/libm/msun/fma_test.c
index cd45a7a3ca6..7b1eea26080 100644
--- a/regress/lib/libm/msun/fma_test.c
+++ b/regress/lib/libm/msun/fma_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fma_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: fma_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for fma{,f,l}().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/fmaxmin_test.c b/regress/lib/libm/msun/fmaxmin_test.c
index e84a94c1c9d..68510e9b822 100644
--- a/regress/lib/libm/msun/fmaxmin_test.c
+++ b/regress/lib/libm/msun/fmaxmin_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fmaxmin_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: fmaxmin_test.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for fmax{,f,l}() and fmin{,f,l}.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/invctrig_test.c b/regress/lib/libm/msun/invctrig_test.c
index 368ebd11a21..25b47cbb184 100644
--- a/regress/lib/libm/msun/invctrig_test.c
+++ b/regress/lib/libm/msun/invctrig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: invctrig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: invctrig_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2013 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for casin[h](), cacos[h](), and catan[h]().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <complex.h>
 #include <fenv.h>
diff --git a/regress/lib/libm/msun/invtrig_test.c b/regress/lib/libm/msun/invtrig_test.c
index 7c06a897313..4f2f9ea2bb7 100644
--- a/regress/lib/libm/msun/invtrig_test.c
+++ b/regress/lib/libm/msun/invtrig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: invtrig_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: invtrig_test.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -33,9 +33,6 @@
  * sanity checks, not intended to be comprehensive.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/logarithm_test.c b/regress/lib/libm/msun/logarithm_test.c
index 3cf65274033..2769a7d1005 100644
--- a/regress/lib/libm/msun/logarithm_test.c
+++ b/regress/lib/libm/msun/logarithm_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logarithm_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: logarithm_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2010 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Tests for corner cases in log*().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/lrint_test.c b/regress/lib/libm/msun/lrint_test.c
index 5a1e281abc4..d17618a7276 100644
--- a/regress/lib/libm/msun/lrint_test.c
+++ b/regress/lib/libm/msun/lrint_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lrint_test.c,v 1.4 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: lrint_test.c,v 1.5 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005-2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -29,9 +29,6 @@
  * Test for lrint(), lrintf(), llrint(), and llrintf().
  */
 
-#include <sys/cdefs.h>
-/* $FreeBSD: head/lib/msun/tests/lrint_test.c 314650 2017-03-04 10:07:46Z ngie $ */
-
 #include <fenv.h>
 #include <limits.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/lround_test.c b/regress/lib/libm/msun/lround_test.c
index 9f83b09f8f1..04d3cbce301 100644
--- a/regress/lib/libm/msun/lround_test.c
+++ b/regress/lib/libm/msun/lround_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lround_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: lround_test.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Test for lround(), lroundf(), llround(), and llroundf().
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <limits.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/macros.h b/regress/lib/libm/msun/macros.h
index 00ea394dbc1..b415f3cfee5 100644
--- a/regress/lib/libm/msun/macros.h
+++ b/regress/lib/libm/msun/macros.h
@@ -1,7 +1,6 @@
-/*      $OpenBSD: macros.h,v 1.2 2021/12/13 16:56:48 deraadt Exp $       */
+/*      $OpenBSD: macros.h,v 1.3 2021/12/13 18:04:28 deraadt Exp $       */
 /* Public domain - Moritz Buhl */
 
-#define __FBSDID(a)
 #define rounddown(x, y)	(((x)/(y))*(y))
 #define fpequal(a, b)	fpequal_cs(a, b, 1)
 #define hexdump(...)
diff --git a/regress/lib/libm/msun/nan_test.c b/regress/lib/libm/msun/nan_test.c
index 99883fb94c3..f074da2b7a4 100644
--- a/regress/lib/libm/msun/nan_test.c
+++ b/regress/lib/libm/msun/nan_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nan_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: nan_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (C) 2007 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -32,9 +32,6 @@
  * and sscanf("nan(...)", ...) work identically.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/nearbyint_test.c b/regress/lib/libm/msun/nearbyint_test.c
index 68053aa98a1..095c99f403f 100644
--- a/regress/lib/libm/msun/nearbyint_test.c
+++ b/regress/lib/libm/msun/nearbyint_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nearbyint_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: nearbyint_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2010 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -35,9 +35,6 @@
  * - tests for harder values (more mantissa bits than float)
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <fenv.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/next_test.c b/regress/lib/libm/msun/next_test.c
index 650eaf46f23..020fe7b3124 100644
--- a/regress/lib/libm/msun/next_test.c
+++ b/regress/lib/libm/msun/next_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: next_test.c,v 1.1 2021/10/22 18:00:23 mbuhl Exp $	*/
+/*	$OpenBSD: next_test.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -31,9 +31,6 @@
  * Test the correctness of nextafter{,f,l} and nexttoward{,f,l}.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/rem_test.c b/regress/lib/libm/msun/rem_test.c
index 6a50ca23a42..79946d66d96 100644
--- a/regress/lib/libm/msun/rem_test.c
+++ b/regress/lib/libm/msun/rem_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rem_test.c,v 1.1 2021/10/22 18:00:23 mbuhl Exp $	*/
+/*	$OpenBSD: rem_test.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005-2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -33,9 +33,6 @@
  * Missing tests: fmod, fmodf.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/regress/lib/libm/msun/trig_test.c b/regress/lib/libm/msun/trig_test.c
index c6b2afa9710..36433167116 100644
--- a/regress/lib/libm/msun/trig_test.c
+++ b/regress/lib/libm/msun/trig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: trig_test.c,v 1.3 2021/12/13 18:04:28 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -36,9 +36,6 @@
  * available at http://www.cs.berkeley.edu/~wkahan/testpi/ .
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 
 #include <fenv.h>
diff --git a/regress/sys/kern/pledge/execpromise/execpromise.c b/regress/sys/kern/pledge/execpromise/execpromise.c
index 50ba587f364..d79a878e1cc 100644
--- a/regress/sys/kern/pledge/execpromise/execpromise.c
+++ b/regress/sys/kern/pledge/execpromise/execpromise.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: execpromise.c,v 1.1 2017/12/16 11:00:49 florian Exp $	*/
+/*	$OpenBSD: execpromise.c,v 1.2 2021/12/13 18:04:28 deraadt Exp $	*/
 /*
  * Copyright (c) 2017 Florian Obser <florian@openbsd.org>
  *
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <err.h>
-- 
2.20.1