From: Colin McInnes Date: Thu, 30 Apr 2026 16:42:43 +0000 (-0600) Subject: Add missing SPDX-License tags (#591) X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5524da4cebfa8768fa68c0b5ce3f6a3f34fb359d;p=thirdparty%2Fdhcpcd.git 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 b70022c82..58ad8e8cf 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,3 +1,6 @@ + + + # Building dhcpcd This attempts to document various ways of building dhcpcd for your diff --git a/Makefile b/Makefile index 4f7caffd5..15744ea24 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2006-2025 Roy Marples + SUBDIRS= src hooks PACKAGE= dhcpcd diff --git a/Makefile.inc b/Makefile.inc index 782ea969b..996c79f0a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2009-2025 Roy Marples + # System definitions PICFLAG?= -fPIC diff --git a/README.md b/README.md index a2e0892ed..917afe9c6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + # dhcpcd dhcpcd is a diff --git a/compat/_strtoi.h b/compat/_strtoi.h index fcbd18f9b..0d90a8c8b 100644 --- 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 d61d61ffa..a07f84e31 100644 --- 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 * Copyright (c) 2008, Damien Miller * Copyright (c) 2013, Markus Friedl diff --git a/compat/arc4random.h b/compat/arc4random.h index ea1d63692..910e080fa 100644 --- 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 . * * Modification and redistribution in source and binary forms is diff --git a/compat/arc4random_uniform.c b/compat/arc4random_uniform.c index 451172290..8ba736bb6 100644 --- 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 * * Permission to use, copy, modify, and distribute this software for any diff --git a/compat/arc4random_uniform.h b/compat/arc4random_uniform.h index d7c0a35d4..3edc7e1ca 100644 --- a/compat/arc4random_uniform.h +++ b/compat/arc4random_uniform.h @@ -1,4 +1,5 @@ /* + * SPDX-License-Identifier: ISC * Copyright (c) 2008, Damien Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/compat/bitops.h b/compat/bitops.h index 31979a20f..9c6c1ab7b 100644 --- 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 b0427b6b3..fca420559 100644 --- 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 70ce71f6b..3fd5f4232 100644 --- 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 * diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h index 983064841..2a5d19e6c 100644 --- a/compat/consttime_memequal.h +++ b/compat/consttime_memequal.h @@ -1,4 +1,5 @@ /* + * SPDX-License-Identifier: CC0-1.0 * Written by Matthias Drochner . * Public domain. */ diff --git a/compat/crypt/hmac.c b/compat/crypt/hmac.c index 55e331ffa..94249c48e 100644 --- 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 af3f77adb..5c7da1883 100644 --- 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 dea2356de..9bddb5888 100644 --- 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 402309c33..7e9e8ea8e 100644 --- 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 ccc00a4b0..dc145e328 100644 --- 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 02a09f935..601093725 100644 --- 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 5f55cc30b..d749ef7e4 100644 --- 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 5729ed5b3..ab59fb990 100644 --- 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 a1595835d..960e30f7b 100644 --- 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 74fabab7e..4dca425f7 100644 --- 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 2ef81ade8..738e0c048 100644 --- 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 * All rights reserved diff --git a/compat/dprintf.h b/compat/dprintf.h index 9defbcb83..c48ce25f9 100644 --- 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 * All rights reserved diff --git a/compat/endian.h b/compat/endian.h index 8d01738bd..f63e48404 100644 --- 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 * All rights reserved diff --git a/compat/pidfile.c b/compat/pidfile.c index b89738bd2..2242bd262 100644 --- 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 ed833e152..c71b0ff6f 100644 --- 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 f03fe02ed..6af75dc5f 100644 --- a/compat/queue.h +++ b/compat/queue.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * Copyright (c) 2014-2025 Roy Marples + */ + /* 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 9ff9c20b3..4dfdd8c8f 100644 --- 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 . * All rights reserved. * diff --git a/compat/reallocarray.h b/compat/reallocarray.h index d855e7b25..4726d8139 100644 --- 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 . * All rights reserved. * diff --git a/compat/setproctitle.c b/compat/setproctitle.c index 8c03c3922..322b13fa2 100644 --- 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 * diff --git a/compat/setproctitle.h b/compat/setproctitle.h index 32dc56bdd..173e88a42 100644 --- 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 * diff --git a/compat/strlcpy.c b/compat/strlcpy.c index eceb4b4c0..bc6e5382f 100644 --- 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 * * Permission to use, copy, modify, and distribute this software for any diff --git a/compat/strlcpy.h b/compat/strlcpy.h index 2131cdec3..b8a573c72 100644 --- 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 * * Permission to use, copy, modify, and distribute this software for any diff --git a/compat/strtoi.c b/compat/strtoi.c index 567d86edd..ff4b70db7 100644 --- 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 bd976fcf3..d35880b50 100644 --- 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 f300dcc23..e18ab8700 100644 --- 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 c7a8de384..c02aa5ea6 100644 --- a/config-null.mk +++ b/config-null.mk @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2014 Roy Marples + # This space left intentionally blank DHCPCD_SRCS+= dhcpcd-embedded.c diff --git a/configure b/configure index e9c08f180..0cb6f2880 100755 --- a/configure +++ b/configure @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2009-2025 Roy Marples + # Try and be like autotools configure, but without autotools echo "configure args: $*" diff --git a/hooks/01-test b/hooks/01-test index 99499425e..e7d532163 100644 --- a/hooks/01-test +++ b/hooks/01-test @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2020 Roy Marples + # 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 e27ea170c..131e33d5e 100644 --- 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 + # 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 3d5173286..97ab18c91 100644 --- a/hooks/15-timezone +++ b/hooks/15-timezone @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2020 Roy Marples + # Configure timezone : ${localtime:=/etc/localtime} diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf index bd0b0df56..0ef599f8f 100644 --- 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 + # 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 a1540dd98..7c6d3ab89 100644 --- 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 + # Lookup the hostname in DNS if not set lookup_hostname() diff --git a/hooks/30-hostname.in b/hooks/30-hostname.in index 98e419f8a..773eca241 100644 --- 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 + # 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 0d6256e6a..e9c406faf 100644 --- 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 + # 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 c6b36933c..9000d37e7 100644 --- 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 + # 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 f213bd8c4..82807fcef 100644 --- 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 + if [ ! -d /run/systemd/system ]; then return fi diff --git a/hooks/50-yp.conf b/hooks/50-yp.conf index c5cdad902..f91eb9a22 100644 --- 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 + # 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 6d55228c7..017936a79 100644 --- 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 + # Sample dhcpcd hook for ypbind # This script is only suitable for the BSD versions. diff --git a/hooks/Makefile b/hooks/Makefile index aee0255c6..7382be862 100644 --- a/hooks/Makefile +++ b/hooks/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2023 Roy Marples + TOP= ../ include ${TOP}/iconfig.mk diff --git a/hooks/dhcpcd-run-hooks.8.in b/hooks/dhcpcd-run-hooks.8.in index 4bed386bc..93b0d4b9d 100644 --- 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 91df64b1a..999f2ec94 100644 --- 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 + # dhcpcd client configuration script # Handy variables and functions for our hooks to use diff --git a/iconfig.mk b/iconfig.mk index 50c50340c..7aacda909 100644 --- a/iconfig.mk +++ b/iconfig.mk @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2014-2019 Roy Marples + # 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 f66ad94c6..257a87ecb 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017 Roy Marples + # 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 96faf7a5a..3cb43bc95 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2025 Roy Marples + # dhcpcd Makefile PROG= dhcpcd diff --git a/src/arp.c b/src/arp.c index 3136c7687..4b80228b9 100644 --- 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 * All rights reserved diff --git a/src/arp.h b/src/arp.h index d336f0eff..cce813356 100644 --- 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 * All rights reserved diff --git a/src/auth.c b/src/auth.c index 594d6a450..8e780d2d5 100644 --- 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 * All rights reserved diff --git a/src/auth.h b/src/auth.h index fbffd8ed9..e985d70ba 100644 --- 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 * All rights reserved diff --git a/src/bpf.c b/src/bpf.c index 7c5212618..8444816bc 100644 --- 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 * All rights reserved diff --git a/src/bpf.h b/src/bpf.h index 1ffcd65a8..4c7ecfd20 100644 --- 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 * All rights reserved diff --git a/src/common.c b/src/common.c index 6a2668923..4ffd07e3f 100644 --- 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 * All rights reserved diff --git a/src/common.h b/src/common.h index a2a7abdac..f471ff33c 100644 --- 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 * All rights reserved diff --git a/src/control.c b/src/control.c index ec1c633c8..b32d9391a 100644 --- 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 * All rights reserved diff --git a/src/control.h b/src/control.h index ef5922689..d88004a61 100644 --- 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 * All rights reserved diff --git a/src/defs.h b/src/defs.h index 637e8440f..5bb386ade 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/src/dev.c b/src/dev.c index c20a3f49b..5bf744e02 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/src/dev.h b/src/dev.h index 210e15de0..598623697 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/src/dev/Makefile b/src/dev/Makefile index 26e2e60d2..12ed63fc8 100644 --- a/src/dev/Makefile +++ b/src/dev/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2025 Roy Marples + TOP= ../../ include ${TOP}/Makefile.inc include ${TOP}/config.mk diff --git a/src/dev/udev.c b/src/dev/udev.c index 5cef941c3..31d62a2e7 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/src/dhcp-common.c b/src/dhcp-common.c index 14d2d92a8..122e02ae6 100644 --- 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 * All rights reserved diff --git a/src/dhcp-common.h b/src/dhcp-common.h index ecee7674c..20b09779e 100644 --- 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 * All rights reserved diff --git a/src/dhcp.c b/src/dhcp.c index 4c1b35ea0..01b3af9c3 100644 --- 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 * All rights reserved diff --git a/src/dhcp.h b/src/dhcp.h index e8c2a1e39..bda70d6e1 100644 --- 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 * All rights reserved diff --git a/src/dhcp6.c b/src/dhcp6.c index 913419944..4f7ea90a2 100644 --- 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 * All rights reserved diff --git a/src/dhcp6.h b/src/dhcp6.h index 008981c78..990ec1a92 100644 --- 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 * All rights reserved diff --git a/src/dhcpcd-definitions-small.conf b/src/dhcpcd-definitions-small.conf index 0c874ae11..fe19d31ae 100644 --- 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 # All rights reserved diff --git a/src/dhcpcd-definitions.conf b/src/dhcpcd-definitions.conf index e350aa9f4..d1eff0e22 100644 --- 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 # All rights reserved diff --git a/src/dhcpcd-embedded.c.in b/src/dhcpcd-embedded.c.in index e2d32987a..2c4fb575f 100644 --- 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 * All rights reserved diff --git a/src/dhcpcd-embedded.h.in b/src/dhcpcd-embedded.h.in index 49a7bed3a..8b63bcb3d 100644 --- 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 * All rights reserved diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in index ebbf06c0f..86b69132c 100644 --- 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 6299c67ce..a5fd5084a 100644 --- 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 * All rights reserved diff --git a/src/dhcpcd.conf b/src/dhcpcd.conf index c8363b333..065da2485 100644 --- a/src/dhcpcd.conf +++ b/src/dhcpcd.conf @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2025 Roy Marples + # 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 179be73ee..0f663aae3 100644 --- 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 9464a9028..7377eef86 100644 --- 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 * All rights reserved diff --git a/src/duid.c b/src/duid.c index 13c339c96..5943296ff 100644 --- 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 * 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 da6e864f1..943152510 100644 --- 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 * 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 52dd206ac..7806cc212 100644 --- 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 * All rights reserved. diff --git a/src/eloop.h b/src/eloop.h index a511a52e5..9e2d1c660 100644 --- 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 * All rights reserved diff --git a/src/genembedc b/src/genembedc index 81545cd86..976e7ff08 100755 --- a/src/genembedc +++ b/src/genembedc @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2020 Roy Marples + set -e : ${TOOL_CAT:=cat} diff --git a/src/genembedh b/src/genembedh index 1762a6042..e2a9088df 100755 --- a/src/genembedh +++ b/src/genembedh @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2019 Roy Marples + set -e : ${TOOL_SED:=sed} diff --git a/src/if-bsd.c b/src/if-bsd.c index 02347e3a1..b92747096 100644 --- 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 * All rights reserved diff --git a/src/if-linux-wext.c b/src/if-linux-wext.c index f395fc897..f99415076 100644 --- 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 * All rights reserved diff --git a/src/if-linux.c b/src/if-linux.c index 7e0e3c720..118ef69e1 100644 --- 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 * All rights reserved diff --git a/src/if-options.c b/src/if-options.c index c4b1141f3..1bb294746 100644 --- 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 * All rights reserved diff --git a/src/if-options.h b/src/if-options.h index 51d282dca..906c29f73 100644 --- 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 * All rights reserved diff --git a/src/if-sun.c b/src/if-sun.c index 24ef5b58d..fe525de78 100644 --- 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 * All rights reserved diff --git a/src/if.c b/src/if.c index 0283f060a..af39da9df 100644 --- 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 * All rights reserved diff --git a/src/if.h b/src/if.h index 8d1aeccff..7989b0a30 100644 --- 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 * All rights reserved diff --git a/src/ipv4.c b/src/ipv4.c index 4137e326a..2fc76bf6f 100644 --- 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 * All rights reserved diff --git a/src/ipv4.h b/src/ipv4.h index b94b1c567..fef037e68 100644 --- 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 * All rights reserved diff --git a/src/ipv4ll.c b/src/ipv4ll.c index c16a1dca9..a82b70aef 100644 --- 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 * All rights reserved diff --git a/src/ipv4ll.h b/src/ipv4ll.h index 9d8ec447e..c7c91eebc 100644 --- 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 * All rights reserved diff --git a/src/ipv6.c b/src/ipv6.c index 81249a6a6..ece0fecb9 100644 --- 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 * All rights reserved diff --git a/src/ipv6.h b/src/ipv6.h index fd9f4f233..fd5575006 100644 --- 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 * All rights reserved diff --git a/src/ipv6nd.c b/src/ipv6nd.c index ccf712410..ced9b6c52 100644 --- 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 * All rights reserved diff --git a/src/ipv6nd.h b/src/ipv6nd.h index acf3a6914..d08321515 100644 --- 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 * All rights reserved diff --git a/src/logerr.c b/src/logerr.c index e04493d33..7ae4d2b7a 100644 --- 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 * All rights reserved diff --git a/src/logerr.h b/src/logerr.h index b6d708cac..037660979 100644 --- 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 * All rights reserved diff --git a/src/privsep-bpf.c b/src/privsep-bpf.c index e2b170bd7..ca2ad9ecc 100644 --- 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 * All rights reserved diff --git a/src/privsep-bpf.h b/src/privsep-bpf.h index 1539c3ae5..1280ce9c0 100644 --- 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 * All rights reserved diff --git a/src/privsep-bsd.c b/src/privsep-bsd.c index ce649b7e6..c99bf11bc 100644 --- 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 * All rights reserved diff --git a/src/privsep-control.c b/src/privsep-control.c index b9ea7f9c5..8a8cab4e3 100644 --- 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 * All rights reserved diff --git a/src/privsep-control.h b/src/privsep-control.h index f1a2bff1f..589c2e2e8 100644 --- 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 * All rights reserved diff --git a/src/privsep-inet.c b/src/privsep-inet.c index 5ca356a14..5ff6daf48 100644 --- 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 * All rights reserved diff --git a/src/privsep-inet.h b/src/privsep-inet.h index f46056d14..98dbeafba 100644 --- 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 * All rights reserved diff --git a/src/privsep-linux.c b/src/privsep-linux.c index 43470a2d6..3d10739d5 100644 --- 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 * All rights reserved diff --git a/src/privsep-root.c b/src/privsep-root.c index f4e65b0e0..44db191a3 100644 --- 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 * All rights reserved diff --git a/src/privsep-root.h b/src/privsep-root.h index fa5a6e132..bca4bf72a 100644 --- 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 * All rights reserved diff --git a/src/privsep-sun.c b/src/privsep-sun.c index 0da788a56..4c0b56566 100644 --- 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 * All rights reserved diff --git a/src/privsep.c b/src/privsep.c index 17507a5cb..e036725b8 100644 --- 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 * All rights reserved diff --git a/src/privsep.h b/src/privsep.h index 3ab67db7e..f52c71629 100644 --- 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 * All rights reserved diff --git a/src/queue.h b/src/queue.h index d83fc62cb..be1a6de5f 100644 --- a/src/queue.h +++ b/src/queue.h @@ -1,3 +1,8 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * Copyright (c) 2025 Roy Marples + */ + /* * 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 35c26110f..95f1ff8d3 100644 --- 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 * All rights reserved diff --git a/src/route.h b/src/route.h index 6aae9bcb6..83d7d6eec 100644 --- 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 * All rights reserved diff --git a/src/sa.c b/src/sa.c index 3d184f47d..fa75be07b 100644 --- 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 * All rights reserved diff --git a/src/sa.h b/src/sa.h index d303b9941..a471b2b28 100644 --- 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 * All rights reserved diff --git a/src/script.c b/src/script.c index 51e7ccf24..8b2eb0c39 100644 --- 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 * All rights reserved diff --git a/src/script.h b/src/script.h index e5e1d7a4a..3f217583d 100644 --- 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 * All rights reserved diff --git a/tests/Makefile b/tests/Makefile index 16a229ff4..41d4b0cfd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2019 Roy Marples + SUBDIRS= crypt eloop-bench all: diff --git a/tests/crypt/.gitignore b/tests/crypt/.gitignore index 4390dc850..770bf61b9 100644 --- a/tests/crypt/.gitignore +++ b/tests/crypt/.gitignore @@ -1 +1,4 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017 Roy Marples + run-test diff --git a/tests/crypt/GNUmakefile b/tests/crypt/GNUmakefile index 2e838d5e7..16154b815 100644 --- a/tests/crypt/GNUmakefile +++ b/tests/crypt/GNUmakefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017 Roy Marples + # 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 c3df1a31f..b62487349 100644 --- a/tests/crypt/Makefile +++ b/tests/crypt/Makefile @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017-2023 Roy Marples + TOP= ../.. include ${TOP}/iconfig.mk diff --git a/tests/crypt/README.md b/tests/crypt/README.md index 8269e51fe..7213e2a10 100644 --- a/tests/crypt/README.md +++ b/tests/crypt/README.md @@ -1,3 +1,6 @@ + + + # 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 91cc89830..e9c697edd 100644 --- 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 * All rights reserved diff --git a/tests/crypt/test.h b/tests/crypt/test.h index 3c9070a5c..ca8b8c3a6 100644 --- 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 * All rights reserved diff --git a/tests/crypt/test_hmac_md5.c b/tests/crypt/test_hmac_md5.c index aed6345d5..119e64a6a 100644 --- 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 * All rights reserved diff --git a/tests/crypt/test_sha256.c b/tests/crypt/test_sha256.c index 986e0513c..9654c8328 100644 --- 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 * Copyright (c) 2006-2018 Roy Marples * All rights reserved diff --git a/tests/eloop-bench/.gitignore b/tests/eloop-bench/.gitignore index 346bbde39..adbfb3b6e 100644 --- a/tests/eloop-bench/.gitignore +++ b/tests/eloop-bench/.gitignore @@ -1 +1,4 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2017 Roy Marples + eloop-bench diff --git a/tests/eloop-bench/Makefile b/tests/eloop-bench/Makefile index a0ebafd9c..865880ee2 100644 --- 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 + TOP= ../.. include ${TOP}/iconfig.mk diff --git a/tests/eloop-bench/README.md b/tests/eloop-bench/README.md index 6f4a20c7e..098cccac9 100644 --- a/tests/eloop-bench/README.md +++ b/tests/eloop-bench/README.md @@ -1,3 +1,6 @@ + + + # 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 1a6dc246e..984c2e8b1 100644 --- 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 * All rights reserved. diff --git a/vendor/README.md b/vendor/README.md index 0627a5be3..0a6707358 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -1,3 +1,6 @@ + + + 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 5e1105517..e76155213 100644 --- 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 b54f288b3..877f4210a 100644 --- 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 0cc976ed7..628d92563 100644 --- 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. *