INN commit: branches/2.6 (81 files)

INN Commit rra at isc.org
Fri Feb 16 21:12:42 UTC 2018


    Date: Friday, February 16, 2018 @ 13:12:42
  Author: iulius
Revision: 10246

Update license information from rra-c-util upstream version

Also fix two gcc warnings in addr-ipv6-t.c and snprintf-t.c.

Modified:
  branches/2.6/include/clibrary.h
  branches/2.6/include/inn/buffer.h
  branches/2.6/include/inn/fdflag.h
  branches/2.6/include/inn/macros.h
  branches/2.6/include/inn/messages.h
  branches/2.6/include/inn/network.h
  branches/2.6/include/inn/vector.h
  branches/2.6/include/inn/xmalloc.h
  branches/2.6/include/inn/xwrite.h
  branches/2.6/include/portable/getaddrinfo.h
  branches/2.6/include/portable/getnameinfo.h
  branches/2.6/include/portable/macros.h
  branches/2.6/include/portable/socket-unix.h
  branches/2.6/include/portable/socket.h
  branches/2.6/include/portable/stdbool.h
  branches/2.6/include/portable/uio.h
  branches/2.6/lib/asprintf.c
  branches/2.6/lib/buffer.c
  branches/2.6/lib/fdflag.c
  branches/2.6/lib/getaddrinfo.c
  branches/2.6/lib/getnameinfo.c
  branches/2.6/lib/inet_aton.c
  branches/2.6/lib/inet_ntoa.c
  branches/2.6/lib/inet_ntop.c
  branches/2.6/lib/messages.c
  branches/2.6/lib/mkstemp.c
  branches/2.6/lib/network.c
  branches/2.6/lib/reallocarray.c
  branches/2.6/lib/setenv.c
  branches/2.6/lib/seteuid.c
  branches/2.6/lib/snprintf.c
  branches/2.6/lib/vector.c
  branches/2.6/lib/xmalloc.c
  branches/2.6/lib/xwrite.c
  branches/2.6/m4/bdb.m4
  branches/2.6/m4/cc-flags.m4
  branches/2.6/m4/inet-ntoa.m4
  branches/2.6/m4/krb5-config.m4
  branches/2.6/m4/krb5.m4
  branches/2.6/m4/lib-depends.m4
  branches/2.6/m4/lib-helper.m4
  branches/2.6/m4/lib-pathname.m4
  branches/2.6/m4/openssl.m4
  branches/2.6/m4/pam-const.m4
  branches/2.6/m4/perl.m4
  branches/2.6/m4/sasl.m4
  branches/2.6/m4/snprintf.m4
  branches/2.6/m4/socket-unix.m4
  branches/2.6/m4/socket.m4
  branches/2.6/m4/vamacros.m4
  branches/2.6/m4/zlib.m4
  branches/2.6/support/getrra-c-util
  branches/2.6/tests/lib/asprintf-t.c
  branches/2.6/tests/lib/buffer-t.c
  branches/2.6/tests/lib/fakewrite.c
  branches/2.6/tests/lib/fakewrite.h
  branches/2.6/tests/lib/fdflag-t.c
  branches/2.6/tests/lib/getaddrinfo-t.c
  branches/2.6/tests/lib/getnameinfo-t.c
  branches/2.6/tests/lib/inet_aton-t.c
  branches/2.6/tests/lib/inet_ntoa-t.c
  branches/2.6/tests/lib/inet_ntop-t.c
  branches/2.6/tests/lib/messages-t.c
  branches/2.6/tests/lib/mkstemp-t.c
  branches/2.6/tests/lib/network/addr-ipv4-t.c
  branches/2.6/tests/lib/network/addr-ipv6-t.c
  branches/2.6/tests/lib/network/client-t.c
  branches/2.6/tests/lib/network/server-t.c
  branches/2.6/tests/lib/reallocarray-t.c
  branches/2.6/tests/lib/setenv-t.c
  branches/2.6/tests/lib/snprintf-t.c
  branches/2.6/tests/lib/vector-t.c
  branches/2.6/tests/lib/xmalloc.c
  branches/2.6/tests/lib/xmalloc.t
  branches/2.6/tests/lib/xwrite-t.c
  branches/2.6/tests/tap/messages.c
  branches/2.6/tests/tap/messages.h
  branches/2.6/tests/tap/process.c
  branches/2.6/tests/tap/process.h
  branches/2.6/tests/tap/string.c
  branches/2.6/tests/tap/string.h

---------------------------------+
 include/clibrary.h              |   16 +++++++++-------
 include/inn/buffer.h            |   12 ++++++------
 include/inn/fdflag.h            |   11 ++++++-----
 include/inn/macros.h            |   16 +++++++++-------
 include/inn/messages.h          |   10 +++++-----
 include/inn/network.h           |   12 ++++++------
 include/inn/vector.h            |   16 +++++++++-------
 include/inn/xmalloc.h           |   11 ++++++-----
 include/inn/xwrite.h            |    9 +++++----
 include/portable/getaddrinfo.h  |   16 +++++++++-------
 include/portable/getnameinfo.h  |   16 +++++++++-------
 include/portable/macros.h       |   16 +++++++++-------
 include/portable/socket-unix.h  |   15 +++++++--------
 include/portable/socket.h       |   10 +++++-----
 include/portable/stdbool.h      |   15 ++++++++-------
 include/portable/uio.h          |   15 ++++++++-------
 lib/asprintf.c                  |   16 +++++++++-------
 lib/buffer.c                    |   12 ++++++------
 lib/fdflag.c                    |    9 +++++----
 lib/getaddrinfo.c               |   17 ++++++++++-------
 lib/getnameinfo.c               |   16 +++++++++-------
 lib/inet_aton.c                 |   16 +++++++++-------
 lib/inet_ntoa.c                 |   16 +++++++++-------
 lib/inet_ntop.c                 |   16 +++++++++-------
 lib/messages.c                  |   12 ++++++------
 lib/mkstemp.c                   |   15 ++++++++-------
 lib/network.c                   |   12 ++++++------
 lib/reallocarray.c              |   16 +++++++++-------
 lib/setenv.c                    |   16 +++++++++-------
 lib/seteuid.c                   |   16 +++++++++-------
 lib/snprintf.c                  |    2 ++
 lib/vector.c                    |   16 +++++++++-------
 lib/xmalloc.c                   |   11 ++++++-----
 lib/xwrite.c                    |   11 ++++++-----
 m4/bdb.m4                       |    2 ++
 m4/cc-flags.m4                  |    6 ++++--
 m4/inet-ntoa.m4                 |    6 ++++--
 m4/krb5-config.m4               |    4 +++-
 m4/krb5.m4                      |    4 +++-
 m4/lib-depends.m4               |    4 +++-
 m4/lib-helper.m4                |    2 ++
 m4/lib-pathname.m4              |    4 +++-
 m4/openssl.m4                   |    2 ++
 m4/pam-const.m4                 |    7 ++++---
 m4/perl.m4                      |    8 ++++----
 m4/sasl.m4                      |    2 ++
 m4/snprintf.m4                  |    4 +++-
 m4/socket-unix.m4               |    8 ++++----
 m4/socket.m4                    |   10 +++++-----
 m4/vamacros.m4                  |    4 +++-
 m4/zlib.m4                      |    2 ++
 support/getrra-c-util           |    6 +++---
 tests/lib/asprintf-t.c          |   16 +++++++++-------
 tests/lib/buffer-t.c            |   16 +++++++++-------
 tests/lib/fakewrite.c           |    4 +++-
 tests/lib/fakewrite.h           |    4 +++-
 tests/lib/fdflag-t.c            |    4 +++-
 tests/lib/getaddrinfo-t.c       |   17 ++++++++++-------
 tests/lib/getnameinfo-t.c       |   16 +++++++++-------
 tests/lib/inet_aton-t.c         |   16 +++++++++-------
 tests/lib/inet_ntoa-t.c         |   16 +++++++++-------
 tests/lib/inet_ntop-t.c         |   16 +++++++++-------
 tests/lib/messages-t.c          |    6 ++++--
 tests/lib/mkstemp-t.c           |   15 ++++++++-------
 tests/lib/network/addr-ipv4-t.c |    4 +++-
 tests/lib/network/addr-ipv6-t.c |   13 +++++++++----
 tests/lib/network/client-t.c    |    6 ++++--
 tests/lib/network/server-t.c    |    2 ++
 tests/lib/reallocarray-t.c      |   16 +++++++++-------
 tests/lib/setenv-t.c            |   16 +++++++++-------
 tests/lib/snprintf-t.c          |    9 +++++----
 tests/lib/vector-t.c            |   16 +++++++++-------
 tests/lib/xmalloc.c             |    6 ++++--
 tests/lib/xmalloc.t             |    6 ++++--
 tests/lib/xwrite-t.c            |    4 +++-
 tests/tap/messages.c            |    7 +++++--
 tests/tap/messages.h            |    5 ++++-
 tests/tap/process.c             |    6 ++++--
 tests/tap/process.h             |    4 +++-
 tests/tap/string.c              |    4 +++-
 tests/tap/string.h              |    4 +++-
 81 files changed, 476 insertions(+), 344 deletions(-)

Modified: include/clibrary.h
===================================================================
--- include/clibrary.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/clibrary.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -27,14 +27,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014, 2016, 2018 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef CLIBRARY_H

Modified: include/inn/buffer.h
===================================================================
--- include/inn/buffer.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/buffer.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -17,13 +17,11 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2014, 2015 Russ Allbery <eagle at eyrie.org>
- * Copyright 2011, 2012
+ * Copyright 2014-2015 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2011-2012
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -39,6 +37,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_BUFFER_H

Modified: include/inn/fdflag.h
===================================================================
--- include/inn/fdflag.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/fdflag.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,12 +5,11 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2008, 2010, 2011
+ * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2010-2011
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -26,6 +25,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_FDFLAG_H

Modified: include/inn/macros.h
===================================================================
--- include/inn/macros.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/macros.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008-2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef INN_MACROS_H

Modified: include/inn/messages.h
===================================================================
--- include/inn/messages.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/messages.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -7,12 +7,10 @@
  *
  * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2015 Russ Allbery <eagle at eyrie.org>
- * Copyright 2008, 2010, 2013, 2014
+ * Copyright 2008, 2010, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -28,6 +26,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_MESSAGES_H

Modified: include/inn/network.h
===================================================================
--- include/inn/network.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/network.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,13 +6,11 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2014, 2016, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2012, 2013
+ * Copyright 2014, 2016-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2013
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006, 2007, 2008, 2010
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -28,6 +26,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_NETWORK_H

Modified: include/inn/vector.h
===================================================================
--- include/inn/vector.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/vector.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -13,14 +13,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2001-2006 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005-2006, 2008-2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef INN_VECTOR_H

Modified: include/inn/xmalloc.h
===================================================================
--- include/inn/xmalloc.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/xmalloc.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,12 +5,11 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2010, 2012, 2013, 2014
+ * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2010, 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -26,6 +25,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_XMALLOC_H

Modified: include/inn/xwrite.h
===================================================================
--- include/inn/xwrite.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/inn/xwrite.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,12 +5,11 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
+ * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2008, 2010, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -26,6 +25,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef INN_XWRITE_H

Modified: include/portable/getaddrinfo.h
===================================================================
--- include/portable/getaddrinfo.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/getaddrinfo.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -14,14 +14,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2003, 2005 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008-2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_GETADDRINFO_H

Modified: include/portable/getnameinfo.h
===================================================================
--- include/portable/getnameinfo.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/getnameinfo.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -13,14 +13,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005, 2007 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2010-2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_GETNAMEINFO_H

Modified: include/portable/macros.h
===================================================================
--- include/portable/macros.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/macros.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2015 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011-2012
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_MACROS_H

Modified: include/portable/socket-unix.h
===================================================================
--- include/portable/socket-unix.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/socket-unix.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,15 +9,14 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014 Russ Allbery <eagle at eyrie.org>
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_SOCKET_UNIX_H

Modified: include/portable/socket.h
===================================================================
--- include/portable/socket.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/socket.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -18,12 +18,10 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Copyright 2014, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2008, 2009, 2011, 2013
+ * Copyright 2008-2009, 2011, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006, 2007
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -39,6 +37,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #ifndef PORTABLE_SOCKET_H

Modified: include/portable/stdbool.h
===================================================================
--- include/portable/stdbool.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/stdbool.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -10,14 +10,15 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_STDBOOL_H

Modified: include/portable/uio.h
===================================================================
--- include/portable/uio.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ include/portable/uio.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -10,14 +10,15 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #ifndef PORTABLE_UIO_H

Modified: lib/asprintf.c
===================================================================
--- lib/asprintf.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/asprintf.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,14 +9,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006, 2015 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008-2009, 2011, 2013
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/buffer.c
===================================================================
--- lib/buffer.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/buffer.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -17,13 +17,11 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2015, 2016 Russ Allbery <eagle at eyrie.org>
- * Copyright 2011, 2012, 2014
+ * Copyright 2015-2016 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2011-2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -39,6 +37,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: lib/fdflag.c
===================================================================
--- lib/fdflag.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/fdflag.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -8,12 +8,11 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
+ * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2008, 2011, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -29,6 +28,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: lib/getaddrinfo.c
===================================================================
--- lib/getaddrinfo.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/getaddrinfo.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -21,14 +21,17 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2003-2005, 2016-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2015 Julien ÉLIE <julien at trigofacile.com>
+ * Copyright 2008, 2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/getnameinfo.c
===================================================================
--- lib/getnameinfo.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/getnameinfo.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -18,14 +18,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/inet_aton.c
===================================================================
--- lib/inet_aton.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/inet_aton.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -10,14 +10,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2001, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011, 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/inet_ntoa.c
===================================================================
--- lib/inet_ntoa.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/inet_ntoa.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -11,14 +11,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2001, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011, 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/inet_ntop.c
===================================================================
--- lib/inet_ntop.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/inet_ntop.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -12,14 +12,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/messages.c
===================================================================
--- lib/messages.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/messages.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -55,13 +55,11 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2015, 2016 Russ Allbery <eagle at eyrie.org>
- * Copyright 2008, 2009, 2010, 2013, 2014
+ * Copyright 2015-2016 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008-2010, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -77,6 +75,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: lib/mkstemp.c
===================================================================
--- lib/mkstemp.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/mkstemp.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,14 +9,15 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009, 2011, 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/network.c
===================================================================
--- lib/network.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/network.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -21,13 +21,11 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2014, 2015, 2016, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2011, 2012, 2013, 2014
+ * Copyright 2014-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009, 2011-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006, 2007, 2008
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2008 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -43,6 +41,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: lib/reallocarray.c
===================================================================
--- lib/reallocarray.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/reallocarray.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -11,14 +11,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/setenv.c
===================================================================
--- lib/setenv.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/setenv.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,14 +9,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000, 2014 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2011-2012, 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/seteuid.c
===================================================================
--- lib/seteuid.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/seteuid.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -17,14 +17,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/snprintf.c
===================================================================
--- lib/snprintf.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/snprintf.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -36,6 +36,8 @@
  * This code is based on code written by Patrick Powell (papowell at astart.com)
  * It may be used for any purpose as long as this notice remains intact
  * on all source code distributions
+ *
+ * There is no SPDX-License-Identifier registered for this license.
  */
 
 /**************************************************************

Modified: lib/vector.c
===================================================================
--- lib/vector.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/vector.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -25,14 +25,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2001-2006, 2016 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005-2006, 2008-2011, 2013-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #include "config.h"

Modified: lib/xmalloc.c
===================================================================
--- lib/xmalloc.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/xmalloc.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -63,13 +63,12 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
+ * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2015 Russ Allbery <eagle at eyrie.org>
- * Copyright 2012, 2013, 2014
+ * Copyright 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -85,6 +84,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: lib/xwrite.c
===================================================================
--- lib/xwrite.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ lib/xwrite.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -25,12 +25,11 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2008, 2013, 2014
+ * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2004, 2005, 2006
- *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
  *
  * This code is derived from software contributed to the Internet Software
  * Consortium by Rich Salz.
@@ -46,6 +45,8 @@
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * SPDX-License-Identifier: ISC
  */
 
 #include "config.h"

Modified: m4/bdb.m4
===================================================================
--- m4/bdb.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/bdb.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -36,6 +36,8 @@
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
 dnl versions that include the Berkeley DB flags.  Used as a wrapper, with

Modified: m4/cc-flags.m4
===================================================================
--- m4/cc-flags.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/cc-flags.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -8,11 +8,11 @@
 dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
-dnl Copyright 2016, 2017 Russ Allbery <eagle at eyrie.org>
+dnl Copyright 2016-2018 Russ Allbery <eagle at eyrie.org>
 dnl Copyright 2006, 2009, 2016
 dnl     by Internet Systems Consortium, Inc. ("ISC")
 dnl
-dnl Permission to use, copy, modify, and distribute this software for any
+dnl Permission to use, copy, modify, and/or distribute this software for any
 dnl purpose with or without fee is hereby granted, provided that the above
 dnl copyright notice and this permission notice appear in all copies.
 dnl
@@ -23,6 +23,8 @@
 dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 dnl IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl SPDX-License-Identifier: ISC
 
 dnl Used to build the result cache name.
 AC_DEFUN([_INN_PROG_CC_FLAG_CACHE],

Modified: m4/inet-ntoa.m4
===================================================================
--- m4/inet-ntoa.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/inet-ntoa.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -10,13 +10,15 @@
 dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
-dnl Copyright 1999, 2000, 2001, 2003 Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2008, 2009
+dnl Copyright 1999-2001, 2003 Russ Allbery <eagle at eyrie.org>
+dnl Copyright 2008-2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Source used by INN_FUNC_INET_NTOA.
 AC_DEFUN([_INN_FUNC_INET_NTOA_SOURCE], [[

Modified: m4/krb5-config.m4
===================================================================
--- m4/krb5-config.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/krb5-config.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -12,12 +12,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2011, 2012
+dnl Copyright 2011-2012
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Check for krb5-config in the user's path and set PATH_KRB5_CONFIG.  This
 dnl is moved into a separate macro so that it can be loaded via AC_REQUIRE,

Modified: m4/krb5.m4
===================================================================
--- m4/krb5.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/krb5.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -51,12 +51,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014
+dnl Copyright 2005-2011, 2013-2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Ignore Automake conditionals if not using Automake.
 m4_define_default([AM_CONDITIONAL], [:])

Modified: m4/lib-depends.m4
===================================================================
--- m4/lib-depends.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/lib-depends.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -14,12 +14,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2005, 2006, 2007
+dnl Copyright 2005-2007
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 AC_DEFUN([INN_ENABLE_REDUCED_DEPENDS],
 [inn_reduced_depends=false

Modified: m4/lib-helper.m4
===================================================================
--- m4/lib-helper.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/lib-helper.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -19,6 +19,8 @@
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Add the library flags to the default compiler flags and then remove them.
 dnl

Modified: m4/lib-pathname.m4
===================================================================
--- m4/lib-pathname.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/lib-pathname.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -17,12 +17,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2008, 2009
+dnl Copyright 2008-2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Probe for the alternate library name that we should attempt on this
 dnl architecture, given the size of an int, and set inn_lib_arch_name to that

Modified: m4/openssl.m4
===================================================================
--- m4/openssl.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/openssl.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -35,6 +35,8 @@
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
 dnl versions that include the SSL or crypto flags.  Used as a wrapper, with

Modified: m4/pam-const.m4
===================================================================
--- m4/pam-const.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/pam-const.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -11,17 +11,18 @@
 dnl Since this is just for compiler warnings, it's not horribly important if
 dnl we guess wrong.  This test is ugly, but it seems to work.
 dnl
-dnl Contributed by Markus Moeller.
-dnl
 dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
+dnl Written by Markus Moeller
 dnl Copyright 2007, 2015 Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2007, 2008 Markus Moeller
+dnl Copyright 2007-2008 Markus Moeller
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Source used by INN_HEADER_PAM_CONST.
 AC_DEFUN([_INN_HEADER_PAM_CONST_SOURCE],

Modified: m4/perl.m4
===================================================================
--- m4/perl.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/perl.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -20,10 +20,8 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Copyright 2016 Russ Allbery <eagle at eyrie.org>
-dnl Copyright (c) 2006, 2009, 2011
-dnl     by Internet Systems Consortium, Inc. ("ISC")
-dnl Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003
-dnl     by The Internet Software Consortium
+dnl Copyright 2006, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
+dnl Copyright 1998-2003 The Internet Software Consortium
 dnl
 dnl Permission to use, copy, modify, and distribute this software for any
 dnl purpose with or without fee is hereby granted, provided that the above
@@ -36,6 +34,8 @@
 dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 dnl IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl SPDX-License-Identifier: ISC
 
 dnl Check for the path to Perl and ensure it meets our minimum version
 dnl requirement (given as the argument).  Honor the $PERL environment

Modified: m4/sasl.m4
===================================================================
--- m4/sasl.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/sasl.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -32,6 +32,8 @@
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
 dnl versions that include the Cyrus SASL flags.  Used as a wrapper, with

Modified: m4/snprintf.m4
===================================================================
--- m4/snprintf.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/snprintf.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -14,12 +14,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2006, 2008, 2009
+dnl Copyright 2006, 2008-2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Source used by INN_FUNC_SNPRINTF.
 AC_DEFUN([_INN_FUNC_SNPRINTF_SOURCE], [[

Modified: m4/socket-unix.m4
===================================================================
--- m4/socket-unix.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/socket-unix.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -14,10 +14,8 @@
 dnl
 dnl Copyright 2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
-dnl Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
-dnl     by Internet Systems Consortium, Inc. ("ISC")
-dnl Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-dnl     2002, 2003 by The Internet Software Consortium and Rich Salz
+dnl Copyright 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+dnl Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
 dnl
 dnl This code is derived from software contributed to the Internet Software
 dnl Consortium by Rich Salz.
@@ -33,6 +31,8 @@
 dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 dnl IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl SPDX-License-Identifier: ISC
 
 dnl Source used by INN_MACRO_SUN_LEN.
 AC_DEFUN([_INN_MACRO_SUN_LEN_SOURCE], [[

Modified: m4/socket.m4
===================================================================
--- m4/socket.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/socket.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -13,12 +13,10 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Copyright 2017 Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2008, 2009, 2011
+dnl Copyright 2008-2009, 2011
 dnl     The Board of Trustees of the Leland Stanford Junior University
-dnl Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
-dnl     by Internet Systems Consortium, Inc. ("ISC")
-dnl Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-dnl     2002, 2003 by The Internet Software Consortium and Rich Salz
+dnl Copyright 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+dnl Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz
 dnl
 dnl This code is derived from software contributed to the Internet Software
 dnl Consortium by Rich Salz.
@@ -34,6 +32,8 @@
 dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 dnl IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl SPDX-License-Identifier: ISC
 
 dnl Source used by INN_FUNC_GETADDRINFO_ADDRCONFIG.
 AC_DEFUN([_INN_FUNC_GETADDRINFO_ADDRCONFIG_SOURCE], [[

Modified: m4/vamacros.m4
===================================================================
--- m4/vamacros.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/vamacros.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -18,12 +18,14 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2006, 2008, 2009
+dnl Copyright 2006, 2008-2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 AC_DEFUN([_INN_C_C99_VAMACROS_SOURCE], [[
 #include <stdio.h>

Modified: m4/zlib.m4
===================================================================
--- m4/zlib.m4	2018-02-16 21:11:59 UTC (rev 10245)
+++ m4/zlib.m4	2018-02-16 21:12:42 UTC (rev 10246)
@@ -30,6 +30,8 @@
 dnl This file is free software; the authors give unlimited permission to copy
 dnl and/or distribute it, with or without modifications, as long as this
 dnl notice is preserved.
+dnl
+dnl SPDX-License-Identifier: FSFULLR
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
 dnl versions that include the zlib flags.  Used as a wrapper, with

Modified: support/getrra-c-util
===================================================================
--- support/getrra-c-util	2018-02-16 21:11:59 UTC (rev 10245)
+++ support/getrra-c-util	2018-02-16 21:12:42 UTC (rev 10246)
@@ -107,7 +107,7 @@
                  -e 's/PORTABLE_SYSTEM_H/CLIBRARY_H/g' \
                  -e "8 i \\
  *     #include \"inn/macros.h\"" \
-                 -e "101 i \\
+                 -e "103 i \\
 /*\\
  * This almost certainly isn't necessary, but it's not hurting anything.\\
  * gcc assumes that if SEEK_SET isn't defined none of the rest are either,\\
@@ -119,7 +119,7 @@
 # define SEEK_END 2\\
 #endif\\
 " \
-                 -e "115 i \\
+                 -e "117 i \\
 /*\\
  * Handle defining fseeko and ftello.  If HAVE_FSEEKO is defined, the system\\
  * header files take care of this for us.  Otherwise, see if we're building\\
@@ -161,7 +161,7 @@
 extern int symlink(const char *, const char *);\\
 #endif\\
 " \
-               -e "156 i \\
+               -e "158 i \\
 #if !HAVE_DECL_STRLCAT\\
 extern size_t strlcat(char *, const char *, size_t);\\
 #endif\\

Modified: tests/lib/asprintf-t.c
===================================================================
--- tests/lib/asprintf-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/asprintf-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014, 2018 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/buffer-t.c
===================================================================
--- tests/lib/buffer-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/buffer-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2002-2004, 2006, 2014-2015 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2011-2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/fakewrite.c
===================================================================
--- tests/lib/fakewrite.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/fakewrite.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,7 +5,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2000, 2001, 2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/fakewrite.h
===================================================================
--- tests/lib/fakewrite.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/fakewrite.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,7 +5,7 @@
  * This header defines the interfaces to fake write functions used to test
  * error handling wrappers around system write functions.
  *
- * Copyright 2000, 2001, 2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/fdflag-t.c
===================================================================
--- tests/lib/fdflag-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/fdflag-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,7 +6,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2008, 2009
+ * Copyright 2008-2009
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,6 +26,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/getaddrinfo-t.c
===================================================================
--- tests/lib/getaddrinfo-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/getaddrinfo-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,17 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2003-2005, 2016 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2015 Julien ÉLIE <julien at trigofacile.com>
+ * Copyright 2007-2009, 2011-2013
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/getnameinfo-t.c
===================================================================
--- tests/lib/getnameinfo-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/getnameinfo-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005-2006, 2014 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2007-2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/inet_aton-t.c
===================================================================
--- tests/lib/inet_aton-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/inet_aton-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2001, 2004, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2007-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/inet_ntoa-t.c
===================================================================
--- tests/lib/inet_ntoa-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/inet_ntoa-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2001, 2004, 2016-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/inet_ntop-t.c
===================================================================
--- tests/lib/inet_ntop-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/inet_ntop-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2005, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/messages-t.c
===================================================================
--- tests/lib/messages-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/messages-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,8 +6,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2002, 2004, 2005, 2015, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2012
+ * Copyright 2002, 2004-2005, 2015, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/mkstemp-t.c
===================================================================
--- tests/lib/mkstemp-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/mkstemp-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,15 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/network/addr-ipv4-t.c
===================================================================
--- tests/lib/network/addr-ipv4-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/network/addr-ipv4-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -7,7 +7,7 @@
  *
  * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2005, 2013, 2016 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2012, 2013
+ * Copyright 2009-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/network/addr-ipv6-t.c
===================================================================
--- tests/lib/network/addr-ipv6-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/network/addr-ipv6-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,8 +6,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2005, 2013, 2016, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2012, 2013
+ * Copyright 2005, 2013, 2016-2018 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1
@@ -60,8 +62,7 @@
 int
 main(void)
 {
-    int flag, status;
-    socklen_t flaglen;
+    int status;
     struct addrinfo *ai4, *ai6;
     struct addrinfo hints;
     char addr[INET6_ADDRSTRLEN];
@@ -69,6 +70,10 @@
     socket_type fd;
     static const char *port = "119";
     static const char *ipv6_addr = "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210";
+#if defined(SO_REUSEADDR) || defined(IPV6_V6ONLY) || defined(IP_FREEBIND)
+    int flag;
+    socklen_t flaglen;
+#endif
 
 #ifndef HAVE_INET6
     skip_all("IPv6 not supported");

Modified: tests/lib/network/client-t.c
===================================================================
--- tests/lib/network/client-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/network/client-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,8 +6,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2005, 2013, 2014, 2016, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2012, 2013
+ * Copyright 2005, 2013-2014, 2016-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/network/server-t.c
===================================================================
--- tests/lib/network/server-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/network/server-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/reallocarray-t.c
===================================================================
--- tests/lib/reallocarray-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/reallocarray-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,14 +9,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2014
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/setenv-t.c
===================================================================
--- tests/lib/setenv-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/setenv-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2006, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2009, 2011
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/snprintf-t.c
===================================================================
--- tests/lib/snprintf-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/snprintf-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,9 +6,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006
- *     Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010
+ * Copyright 2000-2006, 2018 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2010
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 1995 Patrick Powell
  * Copyright 2001 Hrvoje Niksic
@@ -16,6 +15,8 @@
  * This code is based on code written by Patrick Powell (papowell at astart.com)
  * It may be used for any purpose as long as this notice remains intact
  * on all source code distributions
+ *
+ * There is no SPDX-License-Identifier registered for this license.
  */
 
 #define LIBTEST_NEW_FORMAT 1
@@ -162,7 +163,7 @@
                 &count, string, &lcount);
     is_int(0, count, "correct output from two %%n");
     is_int(31, lcount, "correct output from long %%ln");
-    test_format(true, "(null)", 6, "%s", NULL);
+    test_format(true, "(null)", 6, "%s", (char *) NULL);
 
     for (i = 0; fp_formats[i] != NULL; i++)
         for (j = 0; j < ARRAY_SIZE(fp_nums); j++) {

Modified: tests/lib/vector-t.c
===================================================================
--- tests/lib/vector-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/vector-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,14 +6,16 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2001-2002, 2004-2006, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006, 2008-2013
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
+ * Copying and distribution of this file, with or without modification, are
+ * permitted in any medium without royalty provided the copyright notice and
+ * this notice are preserved.  This file is offered as-is, without any
+ * warranty.
+ *
+ * SPDX-License-Identifier: FSFAP
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/xmalloc.c
===================================================================
--- tests/lib/xmalloc.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/xmalloc.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,8 +5,8 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2000, 2001, 2006, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2008, 2012, 2013, 2014
+ * Copyright 2000-2001, 2006, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2008, 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,6 +26,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/lib/xmalloc.t
===================================================================
--- tests/lib/xmalloc.t	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/xmalloc.t	2018-02-16 21:12:42 UTC (rev 10246)
@@ -8,8 +8,8 @@
 # which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
 # Written by Russ Allbery <eagle at eyrie.org>
-# Copyright 2000, 2001, 2006, 2014, 2016 Russ Allbery <eagle at eyrie.org>
-# Copyright 2008, 2009, 2010, 2012
+# Copyright 2000-2001, 2006, 2014, 2016 Russ Allbery <eagle at eyrie.org>
+# Copyright 2008-2010, 2012
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,6 +29,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
+#
+# SPDX-License-Identifier: MIT
 
 . "$C_TAP_SOURCE/tap/libtap.sh"
 cd "$C_TAP_BUILD/lib"

Modified: tests/lib/xwrite-t.c
===================================================================
--- tests/lib/xwrite-t.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/lib/xwrite-t.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,7 +5,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2000, 2001, 2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2000-2002, 2004, 2017 Russ Allbery <eagle at eyrie.org>
  * Copyright 2009, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -26,6 +26,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/tap/messages.c
===================================================================
--- tests/tap/messages.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/messages.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -9,8 +9,9 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2002, 2004, 2005, 2015 Russ Allbery <eagle at eyrie.org>
- * Copyright 2006, 2007, 2009, 2012, 2014
+ * Written by Russ Allbery <eagle at eyrie.org>
+ * Copyright 2002, 2004-2005, 2015 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2006-2007, 2009, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,6 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #include "config.h"

Modified: tests/tap/messages.h
===================================================================
--- tests/tap/messages.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/messages.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -5,8 +5,9 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
+ * Written by Russ Allbery <eagle at eyrie.org>
  * Copyright 2002 Russ Allbery <eagle at eyrie.org>
- * Copyright 2006, 2007, 2009
+ * Copyright 2006-2007, 2009
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TAP_MESSAGES_H

Modified: tests/tap/process.c
===================================================================
--- tests/tap/process.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/process.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -15,8 +15,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2002, 2004, 2005, 2013, 2016, 2017 Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2011, 2013, 2014
+ * Copyright 2002, 2004-2005, 2013, 2016-2017 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2009-2011, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -36,6 +36,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #define LIBTEST_NEW_FORMAT 1

Modified: tests/tap/process.h
===================================================================
--- tests/tap/process.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/process.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -6,7 +6,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle at eyrie.org>
- * Copyright 2009, 2010, 2013
+ * Copyright 2009-2010, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,6 +26,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TAP_PROCESS_H

Modified: tests/tap/string.c
===================================================================
--- tests/tap/string.c	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/string.c	2018-02-16 21:12:42 UTC (rev 10246)
@@ -8,7 +8,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2011, 2012 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2011-2012 Russ Allbery <eagle at eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #include "config.h"

Modified: tests/tap/string.h
===================================================================
--- tests/tap/string.h	2018-02-16 21:11:59 UTC (rev 10245)
+++ tests/tap/string.h	2018-02-16 21:12:42 UTC (rev 10246)
@@ -8,7 +8,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2011, 2012 Russ Allbery <eagle at eyrie.org>
+ * Copyright 2011-2012 Russ Allbery <eagle at eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +27,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TAP_STRING_H



More information about the inn-committers mailing list