diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-12-08 15:57:29 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-12-08 15:57:29 +0000 |
| commit | 6e778a7efdc0e804471750157f6bacd1ef7d1580 (patch) | |
| tree | 114426c35a331377f55f7aa6cec9231203e5af0b /include | |
| parent | fb006e46e77344e136739fdc0ee5d0a77a34519d (diff) | |
| download | src-6e778a7efdc0e804471750157f6bacd1ef7d1580.tar.gz src-6e778a7efdc0e804471750157f6bacd1ef7d1580.zip | |
SPDX: license IDs for some ISC-related files.
Notes
Notes:
svn path=/head/; revision=326695
Diffstat (limited to 'include')
| -rw-r--r-- | include/arpa/inet.h | 2 | ||||
| -rw-r--r-- | include/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | include/ftw.h | 4 | ||||
| -rw-r--r-- | include/hesiod.h | 2 | ||||
| -rw-r--r-- | include/netdb.h | 2 | ||||
| -rw-r--r-- | include/readpassphrase.h | 4 | ||||
| -rw-r--r-- | include/res_update.h | 4 | ||||
| -rw-r--r-- | include/resolv.h | 2 | ||||
| -rw-r--r-- | include/unwind.h | 6 | ||||
| -rw-r--r-- | include/wchar.h | 2 |
10 files changed, 22 insertions, 12 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 854d720e5812..357a444a0d2e 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND ISC) * * ++Copyright++ 1983, 1993 * - diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index f0e3482a8d24..5dcc4f3b911c 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: (ISC AND BSD-3-Clause) + * * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1996-2003 Internet Software Consortium. * @@ -16,8 +18,6 @@ */ /*- - * SPDX-License-Identifier: BSD-3-Clause - * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/include/ftw.h b/include/ftw.h index f01fda20d925..95f2ef285c1a 100644 --- a/include/ftw.h +++ b/include/ftw.h @@ -1,6 +1,8 @@ /* $OpenBSD: ftw.h,v 1.1 2003/07/21 21:13:18 millert Exp $ */ -/* +/*- + * SPDX-License-Identifier: ISC + * * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/hesiod.h b/include/hesiod.h index 5879632e09bc..e8c38d84dccb 100644 --- a/include/hesiod.h +++ b/include/hesiod.h @@ -3,7 +3,7 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC) * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/netdb.h b/include/netdb.h index f46f5a3cf506..a106338a1802 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND ISC) * * Copyright (c) 1980, 1983, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/include/readpassphrase.h b/include/readpassphrase.h index d9641faaa10d..fd54642da21b 100644 --- a/include/readpassphrase.h +++ b/include/readpassphrase.h @@ -1,7 +1,9 @@ /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ /* $FreeBSD$ */ -/* +/*- + * SPDX-License-Identifier: ISC + * * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com> * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/res_update.h b/include/res_update.h index 06f3b3a5dd54..32d363bacfae 100644 --- a/include/res_update.h +++ b/include/res_update.h @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999 by Internet Software Consortium, Inc. * diff --git a/include/resolv.h b/include/resolv.h index 1f4a9bc8d6de..2226c481c7e6 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (ISC AND BSD-3-Clause) * * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1995-2003 Internet Software Consortium. diff --git a/include/unwind.h b/include/unwind.h index b87722261185..5a07fd819f50 100644 --- a/include/unwind.h +++ b/include/unwind.h @@ -1,6 +1,10 @@ /* $FreeBSD$ */ -/* libunwind - a platform-independent unwind library +/*- + libunwind - a platform-independent unwind library + + SPDX-License-Identifier: ISC + Copyright (C) 2003 Hewlett-Packard Co Contributed by David Mosberger-Tang <davidm@hpl.hp.com> diff --git a/include/wchar.h b/include/wchar.h index 5951a2c7cc65..1c9d232d47e3 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause + * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause-NetBSD) * * Copyright (c)1999 Citrus Project, * All rights reserved. |