Add missing SPDX-License tags (#591)

* Add missing SPDX-License tags

If copyright block is present, add missing SPDX-License tag

If copyright block is not present, add one. Use BSD-3-Clause and infer author list from git blame.

Resolves #570

* Ensure all non-copyrighted files are BSD-2

Overall project is BSD-2, not 3, so ensure any new license header was BSD-2.

General formatting cleanup.

* Update md5.h to put SPDX copyright in correct place

Brain fart, I put it right before the line containing "copyright" but that was in the middle of a sentence.

diff --git a/BUILDING.md b/BUILDING.md
index b70022c823c10bd58f4e4a1b69f93e15206e0c68..58ad8e8cf136ec204b4ea05d6220d3649fca0f9f 100644 (file)
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: BSD-2-Clause -->
+<!-- Copyright (c) 2017-2025 Roy Marples <roy@marples.name> -->
+
 # Building dhcpcd
 
 This attempts to document various ways of building dhcpcd for your

diff --git a/Makefile b/Makefile
index 4f7caffd5f9ced0a22145db51837f92e1bb72d1a..15744ea2488285caa818f1ff996748069e6ce940 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
+
 SUBDIRS=       src hooks
 
 PACKAGE=       dhcpcd

diff --git a/Makefile.inc b/Makefile.inc
index 782ea969b10d87b9a9274cea96c98a72a01c5b95..996c79f0adbe1a9161abed2cab2a261916d8ea5f 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2009-2025 Roy Marples <roy@marples.name>
+
 # System definitions
 
 PICFLAG?=      -fPIC

diff --git a/README.md b/README.md
index a2e0892edf2e478cb98393e93fec52788782601e..917afe9c6863b150760039d45c0e4549fe2e692e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: BSD-2-Clause -->
+<!-- Copyright (c) 2017-2023 Roy Marples <roy@marples.name> -->
+
 # dhcpcd
 
 dhcpcd is a

diff --git a/compat/_strtoi.h b/compat/_strtoi.h
index fcbd18f9b344c5f5a2db65afdb7eea4987b29f94..0d90a8c8bd3554fb5382f5d7a7926251da6eba30 100644 (file)
--- a/compat/_strtoi.h
+++ b/compat/_strtoi.h
@@ -1,6 +1,7 @@
 /*     $NetBSD: _strtoi.h,v 1.1 2015/01/22 02:15:59 christos Exp $     */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

diff --git a/compat/arc4random.c b/compat/arc4random.c
index d61d61ffa7885ed22f7886246506042625e53db4..a07f84e3102b28d5b0dfc1dca5666fec1b4039dd 100644 (file)
--- a/compat/arc4random.c
+++ b/compat/arc4random.c
@@ -1,6 +1,7 @@
 /*     $OpenBSD: arc4random.c,v 1.58 2022/07/31 13:41:45 tb Exp $      */
 
 /*
+ * SPDX-License-Identifier: ISC
  * Copyright (c) 1996, David Mazieres <dm@uun.org>
  * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
  * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>

diff --git a/compat/arc4random.h b/compat/arc4random.h
index ea1d6369235b6c44abe45fe209a09d44f4022906..910e080fa7f3c51ed62b2ee497127d5882cb04ad 100644 (file)
--- a/compat/arc4random.h
+++ b/compat/arc4random.h
@@ -1,5 +1,6 @@
 /*
  * Arc4 random number generator for OpenBSD.
+ * SPDX-License-Identifier: ISC
  * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
  *
  * Modification and redistribution in source and binary forms is

diff --git a/compat/arc4random_uniform.c b/compat/arc4random_uniform.c
index 4511722909b3c3b566701f29b91a61c653fb37cc..8ba736bb61be6d18b59935635a5b33d269b9ebb7 100644 (file)
--- a/compat/arc4random_uniform.c
+++ b/compat/arc4random_uniform.c
@@ -1,6 +1,7 @@
 /*     $OpenBSD: arc4random_uniform.c,v 1.3 2019/01/20 02:59:07 bcook Exp $    */
 
 /*
+ * SPDX-License-Identifier: ISC
  * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/compat/arc4random_uniform.h b/compat/arc4random_uniform.h
index d7c0a35d4cba9f061e93539952633d2fb761b78e..3edc7e1cabccccec47ef3b98a30562f4faf69274 100644 (file)
--- a/compat/arc4random_uniform.h
+++ b/compat/arc4random_uniform.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: ISC
  * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/compat/bitops.h b/compat/bitops.h
index 31979a20f458bdb26529327cd67fd7f00b0f4103..9c6c1ab7bd1ac075af75d68e27caf440ca1f27ac 100644 (file)
--- a/compat/bitops.h
+++ b/compat/bitops.h
@@ -1,6 +1,7 @@
 /*     $NetBSD: bitops.h,v 1.11 2012/12/07 02:27:58 christos Exp $     */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/compat/chacha_private.h b/compat/chacha_private.h
index b0427b6b3e86021d8389881c91fd21bf4f8814f8..fca420559c5c97686f60c52c227911aca3c3a24a 100644 (file)
--- a/compat/chacha_private.h
+++ b/compat/chacha_private.h
@@ -1,8 +1,10 @@
 /*
-chacha-merged.c version 20080118
-D. J. Bernstein
-Public domain.
-*/
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * chacha-merged.c version 20080118
+ * D. J. Bernstein
+ * Public domain.
+ */
 
 /* $OpenBSD: chacha_private.h,v 1.3 2022/02/28 21:56:29 dtucker Exp $ */
 

diff --git a/compat/closefrom.h b/compat/closefrom.h
index 70ce71f6bd639c9f81dfb59fcce1f8e9b0041be3..3fd5f42327c3d3281a03376f71965394e247df4e 100644 (file)
--- a/compat/closefrom.h
+++ b/compat/closefrom.h
@@ -1,6 +1,5 @@
 /*
  * SPDX-License-Identifier: ISC
- *
  * Copyright (c) 2004-2005, 2007, 2010, 2012-2015, 2017-2018
  *     Todd C. Miller <Todd.Miller@sudo.ws>
  *

diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h
index 9830648410751c45911281b08459b1a8fb4099fd..2a5d19e6caad63b41cdf053b7a4f9f85eccac2f9 100644 (file)
--- a/compat/consttime_memequal.h
+++ b/compat/consttime_memequal.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: CC0-1.0
  * Written by Matthias Drochner <drochner@NetBSD.org>.
  * Public domain.
  */

diff --git a/compat/crypt/hmac.c b/compat/crypt/hmac.c
index 55e331ffa02172408e0fc880f76568cc7d75abd1..94249c48edc74ca302abdf18c579c2fa2807c2dd 100644 (file)
--- a/compat/crypt/hmac.c
+++ b/compat/crypt/hmac.c
@@ -1,6 +1,7 @@
 /*     $NetBSD: hmac.c,v 1.5 2017/10/05 09:59:04 roy Exp $     */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/compat/crypt/hmac.h b/compat/crypt/hmac.h
index af3f77adb0258bb45ba1cd0556511c9f7fe74715..5c7da1883a81b91d005d0d2a585ef2a5fe00be73 100644 (file)
--- a/compat/crypt/hmac.h
+++ b/compat/crypt/hmac.h
@@ -1,6 +1,7 @@
 /*     $NetBSD: hmac.c,v 1.5 2017/10/05 09:59:04 roy Exp $     */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/compat/crypt/md5.c b/compat/crypt/md5.c
index dea2356de76da0362e1ac52bd7f5e8be6f01965a..9bddb5888a95461617944088f295d01145f3f035 100644 (file)
--- a/compat/crypt/md5.c
+++ b/compat/crypt/md5.c
@@ -1,4 +1,4 @@
-/*
+/* SPDX-License-Identifier: CC0-1.0
  * This code implements the MD5 message-digest algorithm.
  * The algorithm is due to Ron Rivest. This code was
  * written by Colin Plumb in 1993, no copyright is claimed.

diff --git a/compat/crypt/md5.h b/compat/crypt/md5.h
index 402309c33ae60b0b7ec696226be1120229059f04..7e9e8ea8e556486fe1c5a01e10723e5e877d62fc 100644 (file)
--- a/compat/crypt/md5.h
+++ b/compat/crypt/md5.h
@@ -1,5 +1,6 @@
 /*
  * This code implements the MD5 message-digest algorithm.
+ * SPDX-License-Identifier: CC0-1.0
  * The algorithm is due to Ron Rivest. This code was
  * written by Colin Plumb in 1993, no copyright is claimed.
  * This code is in the public domain; do with it what you wish.

diff --git a/compat/crypt/sha256.c b/compat/crypt/sha256.c
index ccc00a4b06de2ba6925804afdd74e495630707a1..dc145e328c201d8af99b82b9658ed0742d610d85 100644 (file)
--- a/compat/crypt/sha256.c
+++ b/compat/crypt/sha256.c
@@ -1,4 +1,5 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright 2005 Colin Percival
  * All rights reserved.
  *

diff --git a/compat/crypt/sha256.h b/compat/crypt/sha256.h
index 02a09f935b200e4fa2fb3a632b4c44de6c0cb7b6..601093725c8133afaf61a600b07a55448a786a7f 100644 (file)
--- a/compat/crypt/sha256.h
+++ b/compat/crypt/sha256.h
@@ -1,4 +1,5 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright 2005 Colin Percival
  * All rights reserved.
  *

diff --git a/compat/crypt_openssl/hmac.c b/compat/crypt_openssl/hmac.c
index 5f55cc30b10542feb627d03eefd99fa8f622f002..d749ef7e46d9130f848610949136002fe48e8058 100644 (file)
--- a/compat/crypt_openssl/hmac.c
+++ b/compat/crypt_openssl/hmac.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2023 Canonical Ltd.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/compat/crypt_openssl/hmac.h b/compat/crypt_openssl/hmac.h
index 5729ed5b31fa4ea956557a687ffb9aba4eae8e8f..ab59fb990928bb7e1e14125e5b8fc60bd9573026 100644 (file)
--- a/compat/crypt_openssl/hmac.h
+++ b/compat/crypt_openssl/hmac.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2023 Canonical Ltd.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/compat/crypt_openssl/sha256.c b/compat/crypt_openssl/sha256.c
index a1595835d2fe9599aac27025dd2b241ab3545581..960e30f7be7d4d687db24dd68c90806d926261df 100644 (file)
--- a/compat/crypt_openssl/sha256.c
+++ b/compat/crypt_openssl/sha256.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2023 Canonical Ltd.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/compat/crypt_openssl/sha256.h b/compat/crypt_openssl/sha256.h
index 74fabab7e76c7c6c5f0a84293c5bdb45f9cfcfbc..4dca425f788b2145740f4dfafdf7303be1b3a580 100644 (file)
--- a/compat/crypt_openssl/sha256.h
+++ b/compat/crypt_openssl/sha256.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2023 Canonical Ltd.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/compat/dprintf.c b/compat/dprintf.c
index 2ef81ade814b00a1632c7685b4420fae96a67084..738e0c048702b83b08845859972c7a751e997fc3 100644 (file)
--- a/compat/dprintf.c
+++ b/compat/dprintf.c
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2017 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/compat/dprintf.h b/compat/dprintf.h
index 9defbcb835ff1152ec7fefae0b57aa54e91777a0..c48ce25f915b5b9bdc8ca2e82faa01646e0172d0 100644 (file)
--- a/compat/dprintf.h
+++ b/compat/dprintf.h
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2017 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/compat/endian.h b/compat/endian.h
index 8d01738bd2428fa893dc4cf23c75340c4fc687a0..f63e484046a1d04cedb8040e6b7baa21dcbeba78 100644 (file)
--- a/compat/endian.h
+++ b/compat/endian.h
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2014 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/compat/pidfile.c b/compat/pidfile.c
index b89738bd23a970e44ffa3a1c288fd5f53725326d..2242bd262ebe0dc054cf777213c0dea68a58c9b3 100644 (file)
--- a/compat/pidfile.c
+++ b/compat/pidfile.c
@@ -1,6 +1,7 @@
 /*     $NetBSD: pidfile.c,v 1.16 2021/08/01 15:29:29 andvar Exp $      */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 1999, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/compat/pidfile.h b/compat/pidfile.h
index ed833e15232cf8a354a9b1b57efee5ec54f19f6a..c71b0ff6ff0dfadca1620bed76ec21b1641e76ac 100644 (file)
--- a/compat/pidfile.h
+++ b/compat/pidfile.h
@@ -1,4 +1,5 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 1999, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/compat/queue.h b/compat/queue.h
index f03fe02edfb3ef85a0d7a66c58485f6fa93863b2..6af75dc5f2616b1396863f165b6fdbfc17be3bf0 100644 (file)
--- a/compat/queue.h
+++ b/compat/queue.h
@@ -1,3 +1,8 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright (c) 2014-2025 Roy Marples <roy@marples.name>
+ */
+
 /* This stub exists to avoid including queue.h in the vendor folder
  * for source imports */
 #ifdef BSD

diff --git a/compat/reallocarray.c b/compat/reallocarray.c
index 9ff9c20b30fb0d3ad3b2cd756073149622cc8ac3..4dfdd8c8f0d9551dd8b13fe184bc3a27deda2a3c 100644 (file)
--- a/compat/reallocarray.c
+++ b/compat/reallocarray.c
@@ -1,6 +1,7 @@
 /* $NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $ */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
  *

diff --git a/compat/reallocarray.h b/compat/reallocarray.h
index d855e7b259fb6cbfddb656c43a369147d7a1c65d..4726d81390540e798de8f21b1421656812b20542 100644 (file)
--- a/compat/reallocarray.h
+++ b/compat/reallocarray.h
@@ -1,6 +1,7 @@
 /* $NetBSD: reallocarr.c,v 1.4 2015/08/20 20:08:04 joerg Exp $ */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
  *

diff --git a/compat/setproctitle.c b/compat/setproctitle.c
index 8c03c3922c07ac3be72a8aad9f55e0f1b3ed0731..322b13fa2d3a0060bd7c6c22b1d0632230543980 100644 (file)
--- a/compat/setproctitle.c
+++ b/compat/setproctitle.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: MIT
  * Copyright © 2010 William Ahern
  * Copyright © 2012-2013 Guillem Jover <guillem@hadrons.org>
  *

diff --git a/compat/setproctitle.h b/compat/setproctitle.h
index 32dc56bdd38f79d47c32a436da6cd395eb48ee77..173e88a4209a5f689aa1f551ad289e07a04f6ec7 100644 (file)
--- a/compat/setproctitle.h
+++ b/compat/setproctitle.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: MIT
  * Copyright © 2010 William Ahern
  * Copyright © 2012-2013 Guillem Jover <guillem@hadrons.org>
  *

diff --git a/compat/strlcpy.c b/compat/strlcpy.c
index eceb4b4c05df787a055ae6d3c414904719dc4334..bc6e5382fb7513f568f2eede6d77df2aa148fd7e 100644 (file)
--- a/compat/strlcpy.c
+++ b/compat/strlcpy.c
@@ -1,6 +1,7 @@
 /*     $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $    */
 
 /*
+ * SPDX-License-Identifier: ISC
  * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/compat/strlcpy.h b/compat/strlcpy.h
index 2131cdec305fbff5d07446aa5aef2cde75e39ed0..b8a573c72a22c0e30eb14888a2b3d8c1f9a76ec8 100644 (file)
--- a/compat/strlcpy.h
+++ b/compat/strlcpy.h
@@ -1,6 +1,7 @@
 /*     $OpenBSD: strlcpy.c,v 1.15 2016/10/16 17:37:39 dtucker Exp $    */
 
 /*
+ * SPDX-License-Identifier: ISC
  * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/compat/strtoi.c b/compat/strtoi.c
index 567d86edde8959aae7f9b19c3dd43aca2e0b4e4c..ff4b70db738b2ef15469324c46c4eca05e990b34 100644 (file)
--- a/compat/strtoi.c
+++ b/compat/strtoi.c
@@ -1,6 +1,7 @@
 /*     $NetBSD: strtoi.c,v 1.3 2019/11/28 12:33:23 roy Exp $   */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
  * Copyright (c) 2003 Citrus Project,
  * All rights reserved.

diff --git a/compat/strtoi.h b/compat/strtoi.h
index bd976fcf3ca389f8401283395fdf2cac675f3bc3..d35880b503736bc3193941300134fbf517fadcd9 100644 (file)
--- a/compat/strtoi.h
+++ b/compat/strtoi.h
@@ -1,4 +1,5 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

diff --git a/compat/strtou.c b/compat/strtou.c
index f300dcc238175e009edf2c21dfa2333697b80198..e18ab8700fc2a5908f657c83afc875002011fd32 100644 (file)
--- a/compat/strtou.c
+++ b/compat/strtou.c
@@ -1,6 +1,7 @@
 /*     $NetBSD: strtou.c,v 1.3 2019/11/28 12:33:23 roy Exp $   */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
  * Copyright (c) 2003 Citrus Project,
  * All rights reserved.

diff --git a/config-null.mk b/config-null.mk
index c7a8de384f491dfbe9e12e59ef31deb19ff69a17..c02aa5ea6767239ae01e7e714f4b5ee60a42ccac 100644 (file)
--- a/config-null.mk
+++ b/config-null.mk
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2014 Roy Marples <roy@marples.name>
+
 # This space left intentionally blank
 
 DHCPCD_SRCS+=  dhcpcd-embedded.c

diff --git a/configure b/configure
index e9c08f18027c63702b1e85efebcb40976271ff63..0cb6f2880257f2475a9940be342ee2de7fcd7d91 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,7 @@
 #!/bin/sh
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2009-2025 Roy Marples <roy@marples.name>
+
 # Try and be like autotools configure, but without autotools
 
 echo "configure args: $*"

diff --git a/hooks/01-test b/hooks/01-test
index 99499425e00db564e5bc442958e58707ba6c38d9..e7d53216353216696d2e528a4f00e951e2c072e3 100644 (file)
--- a/hooks/01-test
+++ b/hooks/01-test
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2020 Roy Marples <roy@marples.name>
+
 # Echo the interface flags, reason and message options
 
 if [ "$reason" = "TEST" ]; then

diff --git a/hooks/10-wpa_supplicant b/hooks/10-wpa_supplicant
index e27ea170c53223d0e1335dafcf871029593e0d2f..131e33d5e365af3e1df7f3ea819e67bd0156e208 100644 (file)
--- a/hooks/10-wpa_supplicant
+++ b/hooks/10-wpa_supplicant
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2024 Roy Marples <roy@marples.name>
+
 # Start, reconfigure and stop wpa_supplicant per wireless interface.
 #
 # This is only needed when using wpa_supplicant-2.5 or older, OR

diff --git a/hooks/15-timezone b/hooks/15-timezone
index 3d5173286335d745e46f2e1de44eca67e0a88a03..97ab18c91d763127620763f2e9b2e7b115853de7 100644 (file)
--- a/hooks/15-timezone
+++ b/hooks/15-timezone
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2020 Roy Marples <roy@marples.name>
+
 # Configure timezone
 
 : ${localtime:=/etc/localtime}

diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf
index bd0b0df562242ed572499608e25a0f3ccfb256de..0ef599f8faa74d1685cd4842f219b2bad5df3910 100644 (file)
--- a/hooks/20-resolv.conf
+++ b/hooks/20-resolv.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2025 Roy Marples <roy@marples.name>
+
 # Generate /etc/resolv.conf
 # Support resolvconf(8) if available
 # We can merge other dhcpcd resolv.conf files into one like resolvconf,

diff --git a/hooks/29-lookup-hostname b/hooks/29-lookup-hostname
index a1540dd983409e0b0c9def03b04b309a77b85471..7c6d3ab89ccfeba19e908d675e4f2d1d75a58107 100644 (file)
--- a/hooks/29-lookup-hostname
+++ b/hooks/29-lookup-hostname
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2022 Roy Marples <roy@marples.name>
+
 # Lookup the hostname in DNS if not set
 
 lookup_hostname()

diff --git a/hooks/30-hostname.in b/hooks/30-hostname.in
index 98e419f8a5238cb13118ad31fa7d6cb45bd5ddbf..773eca2414670cfba5a99f3eb2d41b77997cc144 100644 (file)
--- a/hooks/30-hostname.in
+++ b/hooks/30-hostname.in
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2020-2024 Roy Marples <roy@marples.name>
+
 # Set the hostname from DHCP data if required
 
 # A hostname can either be a short hostname or a FQDN.

diff --git a/hooks/50-dhcpcd-compat b/hooks/50-dhcpcd-compat
index 0d6256e6ae6cbba1c905d62ee5aecf22e1d37f37..e9c406fafc850d5aaebc26f7c6d830074f13c498 100644 (file)
--- a/hooks/50-dhcpcd-compat
+++ b/hooks/50-dhcpcd-compat
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017 Roy Marples <roy@marples.name>
+
 # Compat enter hook shim for older dhcpcd versions
 
 IPADDR=$new_ip_address

diff --git a/hooks/50-ntp.conf b/hooks/50-ntp.conf
index c6b36933cce4f752da5f41c52b57811829397055..9000d37e7b72a5818b12d06ec275645333e17da5 100644 (file)
--- a/hooks/50-ntp.conf
+++ b/hooks/50-ntp.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2026 Roy Marples <roy@marples.name>
+
 # Sample dhcpcd hook script for NTP
 # It will configure either one of NTP, OpenNTP or Chrony (in that order)
 # and will default to NTP if no default config is found.

diff --git a/hooks/50-timesyncd.conf b/hooks/50-timesyncd.conf
index f213bd8c495c1ad133da089e7a55390a9fe06ea5..82807fcef6623d038cc3d50056e76db48552f628 100644 (file)
--- a/hooks/50-timesyncd.conf
+++ b/hooks/50-timesyncd.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2022-2026 Roy Marples <roy@marples.name>
+
 if [ ! -d /run/systemd/system ]; then
        return
 fi

diff --git a/hooks/50-yp.conf b/hooks/50-yp.conf
index c5cdad90260d69a1dbffb2d526a5194db6199b5f..f91eb9a22761cb7d208a67c432ef57330130fbbb 100644 (file)
--- a/hooks/50-yp.conf
+++ b/hooks/50-yp.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2020 Roy Marples <roy@marples.name>
+
 # Sample dhcpcd hook for ypbind
 # This script is only suitable for the Linux version.
 

diff --git a/hooks/50-ypbind.in b/hooks/50-ypbind.in
index 6d55228c78c6ce9af74510a26472915bd2364e01..017936a79532936136f9af5e898d1541122e7ba8 100644 (file)
--- a/hooks/50-ypbind.in
+++ b/hooks/50-ypbind.in
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2021 Roy Marples <roy@marples.name>
+
 # Sample dhcpcd hook for ypbind
 # This script is only suitable for the BSD versions.
 

diff --git a/hooks/Makefile b/hooks/Makefile
index aee0255c64f9bd95cb9f9d81cda9d0b1e369d4e2..7382be862ae0e43d1f4211693f674d4be0c6b43a 100644 (file)
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2023 Roy Marples <roy@marples.name>
+
 TOP=   ../
 include ${TOP}/iconfig.mk
 

diff --git a/hooks/dhcpcd-run-hooks.8.in b/hooks/dhcpcd-run-hooks.8.in
index 4bed386bce96c62a152d87215fe2413f6edf9c18..93b0d4b9d62336d9203a4db406097f4a5f0b52a0 100644 (file)
--- a/hooks/dhcpcd-run-hooks.8.in
+++ b/hooks/dhcpcd-run-hooks.8.in
@@ -1,3 +1,4 @@
+.\" SPDX-License-Identifier: BSD-2-Clause
 .\" Copyright (c) 2006-2025 Roy Marples
 .\" All rights reserved
 .\"

diff --git a/hooks/dhcpcd-run-hooks.in b/hooks/dhcpcd-run-hooks.in
index 91df64b1a8093f94158ec9d1f90c47f16c605023..999f2ec94a6a4b0513ef8c81a0be0b5151733340 100644 (file)
--- a/hooks/dhcpcd-run-hooks.in
+++ b/hooks/dhcpcd-run-hooks.in
@@ -1,4 +1,7 @@
 #!/bin/sh
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2022 Roy Marples <roy@marples.name>
+
 # dhcpcd client configuration script 
 
 # Handy variables and functions for our hooks to use

diff --git a/iconfig.mk b/iconfig.mk
index 50c50340c17e8b3ae34c80b9427e253b2d8bf5f2..7aacda90912db96843c17a97b4c02debee8175f1 100644 (file)
--- a/iconfig.mk
+++ b/iconfig.mk
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2014-2019 Roy Marples <roy@marples.name>
+
 # Nasty hack so that make clean works without configure being run
 TOP?=          .
 _CONFIG_MK!=   test -e ${TOP}/config.mk && \

diff --git a/src/GNUmakefile b/src/GNUmakefile
index f66ad94c6e0ef21ae8fa55ad77d07d051da5fb6e..257a87ecba5522ec65afa48e4d47e25868ee74b1 100644 (file)
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017 Roy Marples <roy@marples.name>
+
 # GNU Make does not automagically include .depend
 # Luckily it does read GNUmakefile over Makefile so we can work around it
 

diff --git a/src/Makefile b/src/Makefile
index 96faf7a5ad7def84c4a403335cfad9e65a634b43..3cb43bc959f675fcea1a4402ba2d28f54822da20 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2025 Roy Marples <roy@marples.name>
+
 # dhcpcd Makefile
 
 PROG=          dhcpcd

diff --git a/src/arp.c b/src/arp.c
index 3136c7687299fbb91a9b85c76e43d4ac9da9270b..4b80228b9c18342e61b7298f4570b61224634b9b 100644 (file)
--- a/src/arp.c
+++ b/src/arp.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - ARP handler
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/arp.h b/src/arp.h
index d336f0effade69cce2351ba9e5b99011bf612a28..cce813356561f86c2b7dbfa5789d4d88739b6e2a 100644 (file)
--- a/src/arp.h
+++ b/src/arp.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/auth.c b/src/auth.c
index 594d6a45005fbbdfe297dd5ab193fa4f96c74769..8e780d2d5a185cb362625fcfa55a7522777f5c82 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/auth.h b/src/auth.h
index fbffd8ed95cee1c1ef9e72afde9defa321940013..e985d70ba99e75879b46c22a1f14f3cd623da35f 100644 (file)
--- a/src/auth.h
+++ b/src/auth.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/bpf.c b/src/bpf.c
index 7c52126187a1a855ff94e7532e4b49eb6fc47330..8444816bc8ec949caf363ed8075d28d8e26fa1b0 100644 (file)
--- a/src/bpf.c
+++ b/src/bpf.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd: BPF arp and bootp filtering
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/bpf.h b/src/bpf.h
index 1ffcd65a83ed8ab217a54da954ebe677b531b6be..4c7ecfd209901c9dbb7297f31df495e018fce5ce 100644 (file)
--- a/src/bpf.h
+++ b/src/bpf.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd: BPF arp and bootp filtering
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/common.c b/src/common.c
index 6a26689237dba37ff928db2abec7147d31966874..4ffd07e3fb6a221bb30513de6ee0cec763024bf0 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/common.h b/src/common.h
index a2a7abdac75b14b666b0f4062286fcf21d2feb43..f471ff33c0cff7504dba169cc5692af1664b014a 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/control.c b/src/control.c
index ec1c633c88645308b55abf5561e3fe8ece073558..b32d9391ac52b08da1a77112f20fec5e36bbc295 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/control.h b/src/control.h
index ef5922689e57487f234c11326439b5cf18782e54..d88004a61554b87da82d2854095eeaa8af9ea19d 100644 (file)
--- a/src/control.h
+++ b/src/control.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/defs.h b/src/defs.h
index 637e8440f758b1ac65bd9788e92833fe62c767a8..5bb386adeb1314c8f12ce3d0259f086ebb7fb573 100644 (file)
--- a/src/defs.h
+++ b/src/defs.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/dev.c b/src/dev.c
index c20a3f49b7b61cf528fffa5ccefe2c7c91aa36fd..5bf744e027255afb71239972abc837ca2ec520c2 100644 (file)
--- a/src/dev.c
+++ b/src/dev.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/dev.h b/src/dev.h
index 210e15de0b75553a363dcf2287425740d3769b39..59862369730bf3432a8d0bf85a8c1063907b8cde 100644 (file)
--- a/src/dev.h
+++ b/src/dev.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/dev/Makefile b/src/dev/Makefile
index 26e2e60d213d53cc2cf28453dd835f1c76993d8f..12ed63fc84f3c2d7562c2e68538c434ff1052eb8 100644 (file)
--- a/src/dev/Makefile
+++ b/src/dev/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2025 Roy Marples <roy@marples.name>
+
 TOP=   ../../
 include ${TOP}/Makefile.inc
 include ${TOP}/config.mk

diff --git a/src/dev/udev.c b/src/dev/udev.c
index 5cef941c37acc3d389a6fa3028151996f9900952..31d62a2e71a1c4a1dab25ff9599aef5e7e5c253b 100644 (file)
--- a/src/dev/udev.c
+++ b/src/dev/udev.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/dhcp-common.c b/src/dhcp-common.c
index 14d2d92a8f05d9d428aa141f3ed4a5290552e9eb..122e02ae6981a740cc14b38073bdd5d9d8e19884 100644 (file)
--- a/src/dhcp-common.c
+++ b/src/dhcp-common.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcp-common.h b/src/dhcp-common.h
index ecee7674c25036e91623cc476453f12ef77909ec..20b09779eba080e35898ceb88870c785374b7b9f 100644 (file)
--- a/src/dhcp-common.h
+++ b/src/dhcp-common.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcp.c b/src/dhcp.c
index 4c1b35ea004505054ba4330f931d07b30dd2f25b..01b3af9c3f7112d673ebc7ec2991d15b2e180d4b 100644 (file)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcp.h b/src/dhcp.h
index e8c2a1e3962dbac3d5f5269577a421242f0cbd8f..bda70d6e1f7e0a9da756cdd08eb773be3bc70872 100644 (file)
--- a/src/dhcp.h
+++ b/src/dhcp.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 913419944e44a7393a435efa97d3ee98040c942c..4f7ea90a2aea017ef79dceda236d578c2a638045 100644 (file)
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcp6.h b/src/dhcp6.h
index 008981c78066f034a667f9d1576b0c721c44174f..990ec1a92e4a9e35328dc10d31d5c3fc56f5c3cc 100644 (file)
--- a/src/dhcp6.h
+++ b/src/dhcp6.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcpcd-definitions-small.conf b/src/dhcpcd-definitions-small.conf
index 0c874ae115c3562bfc45cb70ba6638b401d4fa69..fe19d31aef4a76b51deb991a802c9d82d60ad746 100644 (file)
--- a/src/dhcpcd-definitions-small.conf
+++ b/src/dhcpcd-definitions-small.conf
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: BSD-2-Clause
 # Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
 # All rights reserved
 

diff --git a/src/dhcpcd-definitions.conf b/src/dhcpcd-definitions.conf
index e350aa9f402c9093620db961d73cc9aac8a37375..d1eff0e227227d0de07fd95a1725f847a884bb4e 100644 (file)
--- a/src/dhcpcd-definitions.conf
+++ b/src/dhcpcd-definitions.conf
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: BSD-2-Clause
 # Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
 # All rights reserved
 

diff --git a/src/dhcpcd-embedded.c.in b/src/dhcpcd-embedded.c.in
index e2d32987a2a07f3d31e9f7e14719adfeb8ec9b70..2c4fb575fa8d1c4c72688a337b6433ead135b47c 100644 (file)
--- a/src/dhcpcd-embedded.c.in
+++ b/src/dhcpcd-embedded.c.in
@@ -6,6 +6,7 @@
 
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcpcd-embedded.h.in b/src/dhcpcd-embedded.h.in
index 49a7bed3a553d2462be15b79f4e6ac135e9fccd1..8b63bcb3d9a45ef527e74d85202383118829a20b 100644 (file)
--- a/src/dhcpcd-embedded.h.in
+++ b/src/dhcpcd-embedded.h.in
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
index ebbf06c0f737eda05c8aede08c44cc270d359a41..86b69132c4f07d953d4c2f2a9bfcecccba5d34fa 100644 (file)
--- a/src/dhcpcd.8.in
+++ b/src/dhcpcd.8.in
@@ -1,5 +1,4 @@
 .\" SPDX-License-Identifier: BSD-2-Clause
-.\"
 .\" Copyright (c) 2006-2025 Roy Marples
 .\" All rights reserved
 .\"

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 6299c67ce6f4011d8b55b1f4bf1d2baa6464a414..a5fd5084a3aa325efa28f16a78c2e9b18fc3a22c 100644 (file)
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/dhcpcd.conf b/src/dhcpcd.conf
index c8363b333d7721c3278e10dcb14e92046987a4cc..065da248510450351b64237448007303eac2155b 100644 (file)
--- a/src/dhcpcd.conf
+++ b/src/dhcpcd.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2025 Roy Marples <roy@marples.name>
+
 # A sample configuration for dhcpcd.
 # See dhcpcd.conf(5) for details.
 

diff --git a/src/dhcpcd.conf.5.in b/src/dhcpcd.conf.5.in
index 179be73ee3df5b5532f504d7bf896a01674092fd..0f663aae3d8bae031359fa5a8e25bb2072d593f5 100644 (file)
--- a/src/dhcpcd.conf.5.in
+++ b/src/dhcpcd.conf.5.in
@@ -1,5 +1,4 @@
 .\" SPDX-License-Identifier: BSD-2-Clause
-.\"
 .\" Copyright (c) 2006-2025 Roy Marples
 .\" All rights reserved
 .\"

diff --git a/src/dhcpcd.h b/src/dhcpcd.h
index 9464a902839c7e568dd5dc2667ca53903c397dd8..7377eef868678f8d49842e75a2b550a89ed915be 100644 (file)
--- a/src/dhcpcd.h
+++ b/src/dhcpcd.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/duid.c b/src/duid.c
index 13c339c9685b40b3ceaed6dd98fcb42a81665b98..5943296ff974d86cf0833f0842553ba29b142e3f 100644 (file)
--- a/src/duid.c
+++ b/src/duid.c
@@ -1,9 +1,9 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
-
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

diff --git a/src/duid.h b/src/duid.h
index da6e864f10ee60fd18504fdbcd0730df2e418d1f..9431525108f4d583aff6837bb19a5f601cb33e95 100644 (file)
--- a/src/duid.h
+++ b/src/duid.h
@@ -1,9 +1,8 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-/*
- * dhcpcd - DHCP client daemon
+/* dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
-
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

diff --git a/src/eloop.c b/src/eloop.c
index 52dd206acd2ab05d76a6c9a6044206c93ec2ede2..7806cc212bcf3c3d8fc48ecafd2b06d1013c711a 100644 (file)
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * eloop - portable event based main loop.
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved.
 

diff --git a/src/eloop.h b/src/eloop.h
index a511a52e5903364a33ba31d6dac0fd66bd1edf8f..9e2d1c6606a74f3e7c3422555b68d746e38cdb54 100644 (file)
--- a/src/eloop.h
+++ b/src/eloop.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/genembedc b/src/genembedc
index 81545cd86b428b59583119520743dee50644d7a3..976e7ff089496a8708905e1d02a965a2701c91b3 100755 (executable)
--- a/src/genembedc
+++ b/src/genembedc
@@ -1,4 +1,7 @@
 #!/bin/sh
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2020 Roy Marples <roy@marples.name>
+
 set -e
 
 : ${TOOL_CAT:=cat}

diff --git a/src/genembedh b/src/genembedh
index 1762a60429098c4bb6bcb4d163957c1c30a11617..e2a9088df3757a43ea0180cb36d4ab916fa1d3bd 100755 (executable)
--- a/src/genembedh
+++ b/src/genembedh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2019 Roy Marples <roy@marples.name>
+
 set -e
 
 : ${TOOL_SED:=sed}

diff --git a/src/if-bsd.c b/src/if-bsd.c
index 02347e3a103734a6cf206f75d6e957e235ae182e..b92747096cc5596875f280d43f4ebd1c4aaee91c 100644 (file)
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * BSD interface driver for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if-linux-wext.c b/src/if-linux-wext.c
index f395fc89745fccf461175b18c96d0d757bc2ee90..f994150767414afde886a17465129b770dd18d3a 100644 (file)
--- a/src/if-linux-wext.c
+++ b/src/if-linux-wext.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2009-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if-linux.c b/src/if-linux.c
index 7e0e3c7203710a24b33eaf5eceefd67be3e0f1fa..118ef69e10c68d3ec22867c750dca382f0c86744 100644 (file)
--- a/src/if-linux.c
+++ b/src/if-linux.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Linux interface driver for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if-options.c b/src/if-options.c
index c4b1141f3971a211d400d1fb6794bfbd1d7b221d..1bb294746d660ab42692ad092271797769ff611b 100644 (file)
--- a/src/if-options.c
+++ b/src/if-options.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if-options.h b/src/if-options.h
index 51d282dcaf432c10072a2a80d8afaddb3473d112..906c29f7307c6e94a57c78e5b38b631c209efcc5 100644 (file)
--- a/src/if-options.h
+++ b/src/if-options.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if-sun.c b/src/if-sun.c
index 24ef5b58d087510444b5223206970b8e2195f4d5..fe525de7888afe3e72702b3d086ba4f00694475a 100644 (file)
--- a/src/if-sun.c
+++ b/src/if-sun.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Solaris interface driver for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2016-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if.c b/src/if.c
index 0283f060a42cbcf001fa4f98c13d631c9278f8ae..af39da9dfaceed6cdcbbc80f1417b31f350f2d5a 100644 (file)
--- a/src/if.c
+++ b/src/if.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/if.h b/src/if.h
index 8d1aeccff814f7b5019132370e9dd669e89964e8..7989b0a305146b9f51e230dacf7fcb6163f62bbe 100644 (file)
--- a/src/if.h
+++ b/src/if.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv4.c b/src/ipv4.c
index 4137e326aeb74e90e06c02a88fff0c2b2f296385..2fc76bf6f5dcd6cbe39e772c7ab5dbacdfa28165 100644 (file)
--- a/src/ipv4.c
+++ b/src/ipv4.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv4.h b/src/ipv4.h
index b94b1c56758b22eb3afe4d96f109a98a2183b014..fef037e686a62332e30e51ea53bf66c435c15166 100644 (file)
--- a/src/ipv4.h
+++ b/src/ipv4.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv4ll.c b/src/ipv4ll.c
index c16a1dca983ac755c42a9a143f8e040214deb039..a82b70aef4fa1c8b1c425884d7d920fb0ef2c326 100644 (file)
--- a/src/ipv4ll.c
+++ b/src/ipv4ll.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv4ll.h b/src/ipv4ll.h
index 9d8ec447e128e26b99f8196f55cdaf4c468913ec..c7c91eebcc2c938aaa5330dcc5b339424799ee28 100644 (file)
--- a/src/ipv4ll.h
+++ b/src/ipv4ll.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv6.c b/src/ipv6.c
index 81249a6a657515f8703d003fe25529b945187720..ece0fecb9ee5a8464704e9b179296b753a67c70e 100644 (file)
--- a/src/ipv6.c
+++ b/src/ipv6.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv6.h b/src/ipv6.h
index fd9f4f2338c697cd0d4e8ca3ab80e115b3a89693..fd5575006a081bdb88a4ce1fd9ef7900bdfbfb89 100644 (file)
--- a/src/ipv6.h
+++ b/src/ipv6.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv6nd.c b/src/ipv6nd.c
index ccf712410679615718cf03feb63f7ba3b5d54e02..ced9b6c52491caa5c91791b9ac4aa9e5e202dce7 100644 (file)
--- a/src/ipv6nd.c
+++ b/src/ipv6nd.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - IPv6 ND handling
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/ipv6nd.h b/src/ipv6nd.h
index acf3a691415c91c54feaae101f04851f96cf1869..d0832151568cc1fb4d18478f1c807ddee915a0b5 100644 (file)
--- a/src/ipv6nd.h
+++ b/src/ipv6nd.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - IPv6 ND handling
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/logerr.c b/src/logerr.c
index e04493d33a3f6c3b30970cc831736c4b4ef337c7..7ae4d2b7ae82b8cbb7afa2c610c733b8fcda6152 100644 (file)
--- a/src/logerr.c
+++ b/src/logerr.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * logerr: errx with logging
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/logerr.h b/src/logerr.h
index b6d708cac7dae7fd46522d4cfb38b7414b3f2dba..037660979447739d72ac8881486a6d4293873c75 100644 (file)
--- a/src/logerr.h
+++ b/src/logerr.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * logerr: errx with logging
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-bpf.c b/src/privsep-bpf.c
index e2b170bd790a56318938b73f801a6adf9e7d3064..ca2ad9ecc0a33d0227b22ed289a86a83d728a062 100644 (file)
--- a/src/privsep-bpf.c
+++ b/src/privsep-bpf.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation BPF Initiator
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-bpf.h b/src/privsep-bpf.h
index 1539c3ae577acb3e67396706c52bcb456c203ac5..1280ce9c0c5654d2b8a6c589029d258eb80a7158 100644 (file)
--- a/src/privsep-bpf.h
+++ b/src/privsep-bpf.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-bsd.c b/src/privsep-bsd.c
index ce649b7e6baec265df66ab3d03aef192e35fc93c..c99bf11bc14496cc5185073f7760bbfcb5cedf61 100644 (file)
--- a/src/privsep-bsd.c
+++ b/src/privsep-bsd.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, BSD driver
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-control.c b/src/privsep-control.c
index b9ea7f9c5d163c30c45296a4a55abd99e94c0b78..8a8cab4e34b607534012c8cd88351df94ece0e8c 100644 (file)
--- a/src/privsep-control.c
+++ b/src/privsep-control.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, control proxy
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-control.h b/src/privsep-control.h
index f1a2bff1f8b8a52b8da887a936281aee7b0e97b4..589c2e2e844770dfb6863fc55ce34c91b81f1347 100644 (file)
--- a/src/privsep-control.h
+++ b/src/privsep-control.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-inet.c b/src/privsep-inet.c
index 5ca356a14d158acb4e57448457f0e5a56d321634..5ff6daf485fd6e8e67236eb979d0f46b1eabc378 100644 (file)
--- a/src/privsep-inet.c
+++ b/src/privsep-inet.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, network proxy
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-inet.h b/src/privsep-inet.h
index f46056d14929f9abc1c176ef521b01bd10146a83..98dbeafba999b725076ceefbd01610e8ba44ad81 100644 (file)
--- a/src/privsep-inet.h
+++ b/src/privsep-inet.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-linux.c b/src/privsep-linux.c
index 43470a2d6fd48adbf0c0164f072d495b1e45b808..3d10739d57286894273ee155eb5ee764af39824a 100644 (file)
--- a/src/privsep-linux.c
+++ b/src/privsep-linux.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, Linux driver
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-root.c b/src/privsep-root.c
index f4e65b0e068fe71b115d0cee439f3084870418c8..44db191a3ee425ad8a51ef4d57303a32279e2caa 100644 (file)
--- a/src/privsep-root.c
+++ b/src/privsep-root.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, privileged proxy
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-root.h b/src/privsep-root.h
index fa5a6e132029296cb5727814c1dc3f618d31c589..bca4bf72acb89f10da2d980f84df922f9cb55642 100644 (file)
--- a/src/privsep-root.h
+++ b/src/privsep-root.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep-sun.c b/src/privsep-sun.c
index 0da788a56f2f4b46f3cabcb2bc0ae488694152bc..4c0b5656607183122d266b30fd15dd88e4910dc7 100644 (file)
--- a/src/privsep-sun.c
+++ b/src/privsep-sun.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd, Solaris driver
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep.c b/src/privsep.c
index 17507a5cbd6ce2bec689e170797b0f47caa28bbe..e036725b86e3cd796b939515dde42ea4e644b4aa 100644 (file)
--- a/src/privsep.c
+++ b/src/privsep.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/privsep.h b/src/privsep.h
index 3ab67db7e872d1c3eb1a60bb4c9ad4d4614c2b81..f52c71629f43b3afb1894127b7658284d4292012 100644 (file)
--- a/src/privsep.h
+++ b/src/privsep.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Privilege Separation for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/queue.h b/src/queue.h
index d83fc62cba18ff071172777436fd9326ef2a33fe..be1a6de5feeb5bfd650fc440d60756e1fd443b20 100644 (file)
--- a/src/queue.h
+++ b/src/queue.h
@@ -1,3 +1,8 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright (c) 2025 Roy Marples <roy@marples.name>
+ */
+
 /*
  * This stub exists becuase we know a modern BSD supports all TAILQ
  * and glibc, musl et all, don't.

diff --git a/src/route.c b/src/route.c
index 35c26110fe5d8d14469400323ced911a778a815c..95f1ff8d311d2e24401f527d2f651872d5463477 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - route management
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/route.h b/src/route.h
index 6aae9bcb6d2d5b14e7e24f13118be5295d1cd44c..83d7d6eec10fdd26ec2317ed77d408cea73a8e76 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - route management
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/sa.c b/src/sa.c
index 3d184f47dcf3316f9e7d936cf97d7354c83808c8..fa75be07b185046ce04e8e26dd9705b293f27466 100644 (file)
--- a/src/sa.c
+++ b/src/sa.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Socket Address handling for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2015-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/sa.h b/src/sa.h
index d303b9941136fc83c22bb35ceb8dccaad8d5c96e..a471b2b28a219cd71b8f1a8945f4cd41412ff657 100644 (file)
--- a/src/sa.h
+++ b/src/sa.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Socket Address handling for dhcpcd
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2015-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/script.c b/src/script.c
index 51e7ccf24a42748b59351ccb491007d872056f31..8b2eb0c39922aad21b4642d922a3769166f34b23 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/src/script.h b/src/script.h
index e5e1d7a4a8852415498d42ee6d81c4613bc8b73a..3f217583d3cc46ad9b6c9752956a316d101bf49e 100644 (file)
--- a/src/script.h
+++ b/src/script.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2025 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/tests/Makefile b/tests/Makefile
index 16a229ff47afc6e9dfe449e3e437757d986ca5ac..41d4b0cfd5be08ed137ecb046b681b3e7c28d7a8 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2019 Roy Marples <roy@marples.name>
+
 SUBDIRS=       crypt eloop-bench
 
 all: 

diff --git a/tests/crypt/.gitignore b/tests/crypt/.gitignore
index 4390dc85072817ff259465dbcaef5ed55b4c4deb..770bf61b9a8b5b0ee7531ceb82d31e42ee1c0e5b 100644 (file)
--- a/tests/crypt/.gitignore
+++ b/tests/crypt/.gitignore
@@ -1 +1,4 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017 Roy Marples <roy@marples.name>
+
 run-test

diff --git a/tests/crypt/GNUmakefile b/tests/crypt/GNUmakefile
index 2e838d5e7283dde04ac494ed10c02fc05fd680e5..16154b8154e73ea4bdda62339dc8335c630f796f 100644 (file)
--- a/tests/crypt/GNUmakefile
+++ b/tests/crypt/GNUmakefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017 Roy Marples <roy@marples.name>
+
 # GNU Make does not automagically include .depend
 # Luckily it does read GNUmakefile over Makefile so we can work around it
 

diff --git a/tests/crypt/Makefile b/tests/crypt/Makefile
index c3df1a31f5ad36f9381158384010821d509ec02d..b62487349682f98fda3199471367b58fde340798 100644 (file)
--- a/tests/crypt/Makefile
+++ b/tests/crypt/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2023 Roy Marples <roy@marples.name>
+
 TOP=   ../..
 include ${TOP}/iconfig.mk
 

diff --git a/tests/crypt/README.md b/tests/crypt/README.md
index 8269e51fee56db76c0014821e64865ca25f960c7..7213e2a10c1804de68e8c74b8159a33c43829bd7 100644 (file)
--- a/tests/crypt/README.md
+++ b/tests/crypt/README.md
@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: BSD-2-Clause -->
+<!-- Copyright (c) 2017 Roy Marples <roy@marples.name> -->
+
 # dhcpcd Test Suite
 
 Currently this just tests the RFC2202 MD5 implementation in dhcpcd.

diff --git a/tests/crypt/run-test.c b/tests/crypt/run-test.c
index 91cc898303054473fe38b01a4e09e06f72992b26..e9c697eddfb942fa2ed90039730ea141bc0452de 100644 (file)
--- a/tests/crypt/run-test.c
+++ b/tests/crypt/run-test.c
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2018 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/tests/crypt/test.h b/tests/crypt/test.h
index 3c9070a5c83d782a2ab4e2320c16199cd8358ea2..ca8b8c3a63520c37dd0abf297c6a0e9574a2f178 100644 (file)
--- a/tests/crypt/test.h
+++ b/tests/crypt/test.h
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2018 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/tests/crypt/test_hmac_md5.c b/tests/crypt/test_hmac_md5.c
index aed6345d5707a25adf5e08a25cd71eae80e76f05..119e64a6ad4991c90a4c77b6ca29a04fe7df0625 100644 (file)
--- a/tests/crypt/test_hmac_md5.c
+++ b/tests/crypt/test_hmac_md5.c
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2018 Roy Marples <roy@marples.name>
  * All rights reserved
 

diff --git a/tests/crypt/test_sha256.c b/tests/crypt/test_sha256.c
index 986e0513c34c4e7d53c56dc096b588549dd169d5..9654c8328fe3e3c43beaf744ca1900b26ccb4940 100644 (file)
--- a/tests/crypt/test_sha256.c
+++ b/tests/crypt/test_sha256.c
@@ -1,5 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2023 Tobias Heider <tobias.heider@canonical.com>
  * Copyright (c) 2006-2018 Roy Marples <roy@marples.name>
  * All rights reserved

diff --git a/tests/eloop-bench/.gitignore b/tests/eloop-bench/.gitignore
index 346bbde39b1351e9d2e981620aa46b0b059dfdef..adbfb3b6ebc7e77fb931b6a2442e636cc5eb0cbe 100644 (file)
--- a/tests/eloop-bench/.gitignore
+++ b/tests/eloop-bench/.gitignore
@@ -1 +1,4 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017 Roy Marples <roy@marples.name>
+
 eloop-bench

diff --git a/tests/eloop-bench/Makefile b/tests/eloop-bench/Makefile
index a0ebafd9c0f981575478da28f8f81990d0836673..865880ee210a2901ae3cc8b2ceb894eaa711a478 100644 (file)
--- a/tests/eloop-bench/Makefile
+++ b/tests/eloop-bench/Makefile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2017-2023 Roy Marples <roy@marples.name>
+
 TOP=   ../..
 include ${TOP}/iconfig.mk
 

diff --git a/tests/eloop-bench/README.md b/tests/eloop-bench/README.md
index 6f4a20c7ea81aa9d3acf73934c11e6b78417c8b9..098cccac915d5e3a1724a305b90512e5393b6742 100644 (file)
--- a/tests/eloop-bench/README.md
+++ b/tests/eloop-bench/README.md
@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: BSD-2-Clause -->
+<!-- Copyright (c) 2017 Roy Marples <roy@marples.name> -->
+
 # eloop-bench
 
 eloop is a portable event loop designed to be dropped into the code of a

diff --git a/tests/eloop-bench/eloop-bench.c b/tests/eloop-bench/eloop-bench.c
index 1a6dc246e88bed08562683791101ccdcadfed5e6..984c2e8b1f796465665a9562f59ca547f5d6f09d 100644 (file)
--- a/tests/eloop-bench/eloop-bench.c
+++ b/tests/eloop-bench/eloop-bench.c
@@ -1,5 +1,6 @@
 /*
  * eloop benchmark
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2006-2024 Roy Marples <roy@marples.name>
  * All rights reserved.
 

diff --git a/vendor/README.md b/vendor/README.md
index 0627a5be326286e0c9c90d0e518527f0bb912783..0a67073588a0e2c97c37a398cef17c8e6ff0870f 100644 (file)
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: BSD-2-Clause -->
+<!-- Copyright (c) 2025 Roy Marples <roy@marples.name> -->
+
 This area is for 3rd party software we include directly.
 All imports should be made on a branch vendor/NAME (initially orphaned) and
 merged into the master branch.

diff --git a/vendor/queue.h b/vendor/queue.h
index 5e11055172fdf73757e6585f756b301cc889c399..e761552137ba0b16c81594fcd6f5818c7daaaa15 100644 (file)
--- a/vendor/queue.h
+++ b/vendor/queue.h
@@ -1,6 +1,7 @@
 /*     $NetBSD: queue.h,v 1.77 2024/05/12 10:34:56 rillig Exp $        */
 
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

diff --git a/vendor/rbtree.c b/vendor/rbtree.c
index b54f288b343f25aea545737212a558dda7642944..877f4210a94fc6b4a2bd0fdbb6428cfd5a03eebe 100644 (file)
--- a/vendor/rbtree.c
+++ b/vendor/rbtree.c
@@ -1,6 +1,7 @@
 /*     $NetBSD: rbtree.c,v 1.2 2025/10/29 08:08:44 roy Exp $   */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

diff --git a/vendor/rbtree.h b/vendor/rbtree.h
index 0cc976ed7c9026a9c39a01d4bc01a213b60c6800..628d92563895b62c4bcced62f3ddaf6aa8fce13b 100644 (file)
--- a/vendor/rbtree.h
+++ b/vendor/rbtree.h
@@ -1,6 +1,7 @@
 /*     $NetBSD: rbtree.h,v 1.14 2025/10/29 08:08:44 roy Exp $  */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *