cmogstored dev/user discussion/issues/patches/etc
 help / color / mirror / code / Atom feed
* [PATCH] update copyrights for 2018 and use SPDX for "GPL-3.0+"
@ 2018-11-28  2:06 Eric Wong
  2018-11-28  2:16 ` Eric Wong
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Wong @ 2018-11-28  2:06 UTC (permalink / raw)
  To: cmogstored-public

cf. https://spdx.org/
---
 COPYING                  |  8 +++----
 accept.c                 |  4 ++--
 accept_loop.c            |  4 ++--
 activeq.h                |  4 ++--
 addrinfo.c               |  4 ++--
 alloc.c                  |  4 ++--
 bind_listen.c            |  4 ++--
 build-aux/txt2pre        |  4 ++--
 canonpath.c              |  4 ++--
 cfg.c                    |  4 ++--
 cfg.h                    |  4 ++--
 cfg_parser.rl            |  4 ++--
 cfg_validate.c           |  4 ++--
 check.h                  |  4 ++--
 chunk_parser.rl          |  4 ++--
 cloexec_detect.c         |  4 ++--
 cloexec_from.c           |  4 ++--
 close.c                  |  4 ++--
 cmogstored.c             |  4 ++--
 cmogstored.h             |  4 ++--
 cmogstored.x             |  4 ++--
 compat_accept.h          |  4 ++--
 compat_epoll_pwait.h     |  4 ++--
 compat_memstream.h       |  4 ++--
 compat_sendfile.h        |  4 ++--
 configure.ac             |  6 +++---
 defaults.h               |  4 ++--
 dev.c                    |  4 ++--
 digest.c                 |  4 ++--
 digest.h                 |  4 ++--
 exit.c                   |  4 ++--
 fadvise.h                |  4 ++--
 fdmap.c                  |  4 ++--
 fdmap.h                  |  4 ++--
 file.c                   |  4 ++--
 fs.c                     |  4 ++--
 fs.h                     |  4 ++--
 gcc.h                    |  4 ++--
 http.c                   |  4 ++--
 http.h                   |  4 ++--
 http_common.rl           |  4 ++--
 http_date.c              |  4 ++--
 http_dav.c               |  4 ++--
 http_get.c               |  4 ++--
 http_parser.rl           |  4 ++--
 http_put.c               |  4 ++--
 http_util.h              |  4 ++--
 inherit.c                |  4 ++--
 ioprio.h                 |  4 ++--
 ioq.c                    |  4 ++--
 iostat.c                 |  4 ++--
 iostat.h                 |  4 ++--
 iostat_parser.rl         |  4 ++--
 iostat_process.c         |  4 ++--
 ioutil.c                 |  4 ++--
 iov_str.h                |  4 ++--
 listen_parser.h          |  4 ++--
 listen_parser.rl         |  4 ++--
 listen_parser_common.rl  |  4 ++--
 listen_parser_internal.c |  4 ++--
 m4/.gitignore            |  8 ++++++-
 m4/gnulib-cache.m4       | 45 +++++++++++++++++++++++++++++++++++++++-
 maxconns.c               |  4 ++--
 mgmt.c                   |  4 ++--
 mgmt.h                   |  4 ++--
 mgmt_fn.c                |  4 ++--
 mgmt_parser.rl           |  4 ++--
 mkpath_for.c             |  4 ++--
 mnt.c                    |  4 ++--
 mnt.h                    |  4 ++--
 mnt_usable.c             |  4 ++--
 nameinfo.c               |  4 ++--
 notify.c                 |  4 ++--
 notify.h                 |  4 ++--
 packaddr.h               |  4 ++--
 path_parser.h            |  4 ++--
 path_parser.rl           |  4 ++--
 pidfile.c                |  4 ++--
 process.c                |  4 ++--
 queue_common.c           |  4 ++--
 queue_epoll.c            |  4 ++--
 queue_epoll.h            |  4 ++--
 queue_kqueue.c           |  4 ++--
 queue_kqueue.h           |  4 ++--
 queue_loop.c             |  4 ++--
 queue_step.c             |  4 ++--
 selfwake.c               |  4 ++--
 selfwake.h               |  4 ++--
 sig.c                    |  4 ++--
 svc.c                    |  4 ++--
 svc_dev.c                |  4 ++--
 test/cfg-parser-1.c      |  4 ++--
 test/chunk-parser-1.c    |  4 ++--
 test/epoll-wrap.c        |  4 ++--
 test/epoll_enospc.rb     |  4 ++--
 test/fdmap-1.c           |  4 ++--
 test/gen-slow.sh         |  4 ++--
 test/graceful_quit.rb    |  4 ++--
 test/http-parser-1.c     |  4 ++--
 test/http.rb             |  4 ++--
 test/http_chunked_put.rb |  4 ++--
 test/http_dav.rb         |  4 ++--
 test/http_getonly.rb     |  4 ++--
 test/http_idle_expire.rb |  4 ++--
 test/http_put.rb         |  4 ++--
 test/http_put6_fail.rb   |  4 ++--
 test/http_put_slow.rb    |  4 ++--
 test/http_range.rb       |  4 ++--
 test/inherit.rb          |  4 ++--
 test/iostat-mock.rb      |  4 ++--
 test/ioutil-1.c          |  4 ++--
 test/mgmt-iostat.rb      |  4 ++--
 test/mgmt-usage.rb       |  4 ++--
 test/mgmt.rb             |  4 ++--
 test/mgmt_auto_adjust.rb |  4 ++--
 test/pwrite-wrap.c       |  4 ++--
 test/pwrite_wrap.rb      |  4 ++--
 test/queue-idle-1.c      |  4 ++--
 test/test_helper.rb      |  4 ++--
 test/thrpool-1.c         |  4 ++--
 test/trywrite-1.c        |  4 ++--
 test/upgrade.rb          |  4 ++--
 test/valid-path-1.c      |  4 ++--
 thrpool.c                |  4 ++--
 trace.h                  |  4 ++--
 trywrite.c               |  4 ++--
 upgrade.c                |  4 ++--
 util.h                   |  4 ++--
 valid_path.rl            |  4 ++--
 valid_put_path.rl        |  4 ++--
 yield.c                  |  4 ++--
 131 files changed, 312 insertions(+), 263 deletions(-)

diff --git a/COPYING b/COPYING
index 94a9ed0..e600086 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/accept.c b/accept.c
index 0567cd4..55ef311 100644
--- a/accept.c
+++ b/accept.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/accept_loop.c b/accept_loop.c
index b8c6254..dd0f4c3 100644
--- a/accept_loop.c
+++ b/accept_loop.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "compat_accept.h"
diff --git a/activeq.h b/activeq.h
index 75983ab..2830df4 100644
--- a/activeq.h
+++ b/activeq.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 static inline void mog_activeq_add(struct mog_queue *q, struct mog_fd *mfd)
diff --git a/addrinfo.c b/addrinfo.c
index 68a602c..2165837 100644
--- a/addrinfo.c
+++ b/addrinfo.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/alloc.c b/alloc.c
index aae9202..fa619cc 100644
--- a/alloc.c
+++ b/alloc.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  *
  * We use thread-local buffers as much as possible.  mog_rbuf may
  * be detached from the thread-local pointer (and grown) if we have
diff --git a/bind_listen.c b/bind_listen.c
index 0be9ddf..7fb1cc4 100644
--- a/bind_listen.c
+++ b/bind_listen.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/build-aux/txt2pre b/build-aux/txt2pre
index aeba5d0..b033484 100755
--- a/build-aux/txt2pre
+++ b/build-aux/txt2pre
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
-# Copyright (C) 2015-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 #
 # Stupid script to make HTML from preformatted, utf-8 text versions,
 # only generating links for http(s).  Markdown does too much
diff --git a/canonpath.c b/canonpath.c
index 6bbd19c..e2ce948 100644
--- a/canonpath.c
+++ b/canonpath.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/cfg.c b/cfg.c
index 1b78f6e..12770b2 100644
--- a/cfg.c
+++ b/cfg.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "cfg.h"
diff --git a/cfg.h b/cfg.h
index 8b5d40d..27b5738 100644
--- a/cfg.h
+++ b/cfg.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 struct mog_svc;
 struct mog_cfg {
diff --git a/cfg_parser.rl b/cfg_parser.rl
index fd496db..2e0b263 100644
--- a/cfg_parser.rl
+++ b/cfg_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * parses config files used by the original (Perl) mogstored
diff --git a/cfg_validate.c b/cfg_validate.c
index b095819..b96da13 100644
--- a/cfg_validate.c
+++ b/cfg_validate.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "cfg.h"
diff --git a/check.h b/check.h
index a29a0eb..027e0af 100644
--- a/check.h
+++ b/check.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 /* This header is only used by C test programs */
diff --git a/chunk_parser.rl b/chunk_parser.rl
index ee577af..29ecc43 100644
--- a/chunk_parser.rl
+++ b/chunk_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "http_util.h"
diff --git a/cloexec_detect.c b/cloexec_detect.c
index 9abb1db..365124b 100644
--- a/cloexec_detect.c
+++ b/cloexec_detect.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 bool mog_cloexec_atomic;
diff --git a/cloexec_from.c b/cloexec_from.c
index 8aa6a92..76b55cd 100644
--- a/cloexec_from.c
+++ b/cloexec_from.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/close.c b/close.c
index f82e0ba..7a59b3b 100644
--- a/close.c
+++ b/close.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 void mog_close(int fd)
diff --git a/cmogstored.c b/cmogstored.c
index 2e57def..dc41820 100644
--- a/cmogstored.c
+++ b/cmogstored.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "cfg.h"
diff --git a/cmogstored.h b/cmogstored.h
index 61a7ffc..2013f9f 100644
--- a/cmogstored.h
+++ b/cmogstored.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * common headers, macros, and static inline functions for the entire project
diff --git a/cmogstored.x b/cmogstored.x
index 5de0392..7ffd912 100644
--- a/cmogstored.x
+++ b/cmogstored.x
@@ -50,8 +50,8 @@ Please email to either the public cmogstored mailing list
 <mogile@googlegroups.com>.
 
 [COPYRIGHT]
-Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-License: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>.
+Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>.
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/compat_accept.h b/compat_accept.h
index 9a21dfc..9a8b5ba 100644
--- a/compat_accept.h
+++ b/compat_accept.h
@@ -5,8 +5,8 @@
  * and any emulation would not be thread-safe.  So we'll handle
  * accept4()-compatibility for ourselves.
  *
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 #if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
diff --git a/compat_epoll_pwait.h b/compat_epoll_pwait.h
index 01be78d..185336f 100644
--- a/compat_epoll_pwait.h
+++ b/compat_epoll_pwait.h
@@ -2,8 +2,8 @@
  * fake epoll_pwait() implemented using ppoll + epoll_wait.
  * This is only for Linux 2.6.18 / glibc 2.5 systems (Enterprise distros :P)
  *
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 #if !defined(HAVE_EPOLL_PWAIT) \
diff --git a/compat_memstream.h b/compat_memstream.h
index 7a60e9b..04bf0c1 100644
--- a/compat_memstream.h
+++ b/compat_memstream.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #ifdef HAVE_OPEN_MEMSTREAM
 # define my_memstream_close(fp,dst,bytes) fclose((fp))
diff --git a/compat_sendfile.h b/compat_sendfile.h
index c1cc9e4..ff00d10 100644
--- a/compat_sendfile.h
+++ b/compat_sendfile.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #ifndef HAVE_SENDFILE
 static ssize_t compat_sendfile(int sockfd, int filefd, off_t *off, size_t count)
diff --git a/configure.ac b/configure.ac
index 22f6d9c..1e5a550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 AC_INIT([cmogstored],
  m4_esyscmd([build-aux/git-version-gen .tarball-version]),
  [cmogstored-public@bogomips.org])
@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([cmogstored.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign silent-rules parallel-tests subdir-objects])
 AM_SILENT_RULES([yes])
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/defaults.h b/defaults.h
index 1d2e1b4..66ec0e5 100644
--- a/defaults.h
+++ b/defaults.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #define MOG_DEFAULT_MAXCONNS 10000
 #define MOG_DEFAULT_HTTPLISTEN "0.0.0.0:7500"
diff --git a/dev.c b/dev.c
index 3b52023..81a2307 100644
--- a/dev.c
+++ b/dev.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/digest.c b/digest.c
index 66891f7..9321b0c 100644
--- a/digest.c
+++ b/digest.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "digest.h"
diff --git a/digest.h b/digest.h
index 8b43ca9..a580dc1 100644
--- a/digest.h
+++ b/digest.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 enum mog_digest_next {
 	MOG_DIGEST_CONTINUE = 0,
diff --git a/exit.c b/exit.c
index 9c34261..d5c3aa2 100644
--- a/exit.c
+++ b/exit.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "nostd/setproctitle.h"
diff --git a/fadvise.h b/fadvise.h
index f1d0772..194613d 100644
--- a/fadvise.h
+++ b/fadvise.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #if defined(HAVE_POSIX_FADVISE)
 static inline void mog_fadv_sequential(int fd, off_t offset, off_t len)
diff --git a/fdmap.c b/fdmap.c
index 2c5af4d..23f4bdd 100644
--- a/fdmap.c
+++ b/fdmap.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  *
  * File descriptor-based memory allocation.  We have a fixed slot of
  * 128 bytes for every file descriptor.  Once a file descriptor is
diff --git a/fdmap.h b/fdmap.h
index 519dec1..d163b7f 100644
--- a/fdmap.h
+++ b/fdmap.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 static inline struct mog_fd * mog_fd_of(void *as_obj)
diff --git a/file.c b/file.c
index fe3feec..15bf19c 100644
--- a/file.c
+++ b/file.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "digest.h"
diff --git a/fs.c b/fs.c
index a0f1147..1cd572e 100644
--- a/fs.c
+++ b/fs.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  *
  * All path operations we support are relative to mog_svc.docroot.
  * Absolute path lookups are sometimes more expensive, especially
diff --git a/fs.h b/fs.h
index 63e16e8..be352ae 100644
--- a/fs.h
+++ b/fs.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #ifdef HAVE_FSTATAT
 static inline int
diff --git a/gcc.h b/gcc.h
index 85f0c57..67632cc 100644
--- a/gcc.h
+++ b/gcc.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #define MOG_PRINTF __attribute__((format(printf,1,2)))
 #define MOG_LIKELY(x) (__builtin_expect((x), 1))
diff --git a/http.c b/http.c
index e685273..c897e2f 100644
--- a/http.c
+++ b/http.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "http.h"
diff --git a/http.h b/http.h
index 7dcc154..1f04828 100644
--- a/http.h
+++ b/http.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "iov_str.h"
 void mog_http_resp0(struct mog_fd *, struct iovec *status, bool alive);
diff --git a/http_common.rl b/http_common.rl
index 4dee06e..ef021cf 100644
--- a/http_common.rl
+++ b/http_common.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 %%{
 	machine http_common;
diff --git a/http_date.c b/http_date.c
index 61b0320..052c7ca 100644
--- a/http_date.c
+++ b/http_date.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/http_dav.c b/http_dav.c
index 39056a3..15761a9 100644
--- a/http_dav.c
+++ b/http_dav.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  *
  * TODO: ensure compliance with relevant RFCs.
  *       This is only enough to work with MogileFS.
diff --git a/http_get.c b/http_get.c
index 1af4fd2..4709f8e 100644
--- a/http_get.c
+++ b/http_get.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 #include "cmogstored.h"
diff --git a/http_parser.rl b/http_parser.rl
index ae4217a..4ecb97a 100644
--- a/http_parser.rl
+++ b/http_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "http_util.h"
diff --git a/http_put.c b/http_put.c
index 5084090..62f018f 100644
--- a/http_put.c
+++ b/http_put.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "http.h"
diff --git a/http_util.h b/http_util.h
index adc947f..35b481d 100644
--- a/http_util.h
+++ b/http_util.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 static inline uint8_t to_u8(size_t len)
 {
diff --git a/inherit.c b/inherit.c
index 43c9785..a2a8861 100644
--- a/inherit.c
+++ b/inherit.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 static Hash_table *listeners; /* yes, we'll scale to 10K listen sockets, L10K! */
diff --git a/ioprio.h b/ioprio.h
index a4fc2ca..1baca89 100644
--- a/ioprio.h
+++ b/ioprio.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 #include <sys/syscall.h>
diff --git a/ioq.c b/ioq.c
index 9408786..9f834ad 100644
--- a/ioq.c
+++ b/ioq.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 /*
diff --git a/iostat.c b/iostat.c
index 55af99b..36534b2 100644
--- a/iostat.c
+++ b/iostat.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 /*
diff --git a/iostat.h b/iostat.h
index d8a4b3c..42923be 100644
--- a/iostat.h
+++ b/iostat.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 struct mog_queue;
 struct mog_fd;
diff --git a/iostat_parser.rl b/iostat_parser.rl
index cd6c9b6..bd744ed 100644
--- a/iostat_parser.rl
+++ b/iostat_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/iostat_process.c b/iostat_process.c
index 9f98077..1a94528 100644
--- a/iostat_process.c
+++ b/iostat_process.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * process management for iostat(1)
diff --git a/ioutil.c b/ioutil.c
index 09cde7e..4716978 100644
--- a/ioutil.c
+++ b/ioutil.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/iov_str.h b/iov_str.h
index 18fcd58..50c3b71 100644
--- a/iov_str.h
+++ b/iov_str.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 static void iov_str(struct iovec *iov, const char *str, size_t len)
 {
diff --git a/listen_parser.h b/listen_parser.h
index 04ff42b..50c4215 100644
--- a/listen_parser.h
+++ b/listen_parser.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 struct mog_addrinfo *
 mog_listen_parse_internal(char *, size_t, char *, size_t, sa_family_t);
diff --git a/listen_parser.rl b/listen_parser.rl
index a006355..3df9ad5 100644
--- a/listen_parser.rl
+++ b/listen_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "listen_parser.h"
diff --git a/listen_parser_common.rl b/listen_parser_common.rl
index 97c4fe5..716f5d3 100644
--- a/listen_parser_common.rl
+++ b/listen_parser_common.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 %%{
 	machine listen_parser_common;
diff --git a/listen_parser_internal.c b/listen_parser_internal.c
index 3fcd437..f2a06d5 100644
--- a/listen_parser_internal.c
+++ b/listen_parser_internal.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "listen_parser.h"
diff --git a/m4/.gitignore b/m4/.gitignore
index 8fe1b05..1fe2e96 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -128,7 +128,6 @@
 /xgetcwd.m4
 /xstrndup.m4
 /accept4.m4
-/onceonly.m4
 /socketlib.m4
 /base64.m4
 /minmax.m4
@@ -210,3 +209,10 @@
 /threadlib.m4
 /ungetc.m4
 /yield.m4
+/__inline.m4
+/byteswap.m4
+/fflush.m4
+/fpurge.m4
+/freading.m4
+/sh-filename.m4
+/std-gnu11.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index e105bc5..7ec6e77 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,50 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --avoid=accept --avoid=accept4 --avoid=alloca --avoid=fstatat --avoid=getcwd --avoid=ioctl --avoid=openat --avoid=read --avoid=sleep --avoid=write --no-conditional-dependencies --no-libtool --macro-prefix=gl argp base64 canonicalize crypto/gc-md5 crypto/gc-sha1 dprintf environ error findprog gettime git-version-gen hash mempcpy minmax mountlist nonblocking nproc pipe2 progname random_r verify warnings xvasprintf
+# gnulib-tool --import \
+#  --lib=libgnu \
+#  --source-base=lib \
+#  --m4-base=m4 \
+#  --doc-base=doc \
+#  --tests-base=tests \
+#  --aux-dir=build-aux \
+#  --with-tests \
+#  --no-conditional-dependencies \
+#  --no-libtool \
+#  --macro-prefix=gl \
+#  --avoid=accept \
+#  --avoid=accept4 \
+#  --avoid=alloca \
+#  --avoid=fstatat \
+#  --avoid=getcwd \
+#  --avoid=ioctl \
+#  --avoid=openat \
+#  --avoid=read \
+#  --avoid=sleep \
+#  --avoid=write \
+#  argp \
+#  base64 \
+#  canonicalize \
+#  crypto/gc-md5 \
+#  crypto/gc-sha1 \
+#  dprintf \
+#  environ \
+#  error \
+#  findprog \
+#  gettime \
+#  git-version-gen \
+#  hash \
+#  mempcpy \
+#  minmax \
+#  mountlist \
+#  nonblocking \
+#  nproc \
+#  pipe2 \
+#  progname \
+#  random_r \
+#  verify \
+#  warnings \
+#  xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
diff --git a/maxconns.c b/maxconns.c
index 3e48e67..7119cfd 100644
--- a/maxconns.c
+++ b/maxconns.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include <sys/time.h>
diff --git a/mgmt.c b/mgmt.c
index 7754efd..f60c196 100644
--- a/mgmt.c
+++ b/mgmt.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "mgmt.h"
diff --git a/mgmt.h b/mgmt.h
index a8734e2..a0e7a0e 100644
--- a/mgmt.h
+++ b/mgmt.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 struct mog_svc;
 struct mog_wbuf;
diff --git a/mgmt_fn.c b/mgmt_fn.c
index dce48e1..7eca20c 100644
--- a/mgmt_fn.c
+++ b/mgmt_fn.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "mgmt.h"
diff --git a/mgmt_parser.rl b/mgmt_parser.rl
index f5881c1..b4051cc 100644
--- a/mgmt_parser.rl
+++ b/mgmt_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "mgmt.h"
diff --git a/mkpath_for.c b/mkpath_for.c
index 07a6563..d2955a2 100644
--- a/mkpath_for.c
+++ b/mkpath_for.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/mnt.c b/mnt.c
index e3bd12f..bcd7996 100644
--- a/mnt.c
+++ b/mnt.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * Uses the mountlist library in gnulib to map system device IDs and
diff --git a/mnt.h b/mnt.h
index 61097d7..4471aef 100644
--- a/mnt.h
+++ b/mnt.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 void mog_mnt_refresh(void);
 const struct mount_entry * mog_mnt_acquire(dev_t);
diff --git a/mnt_usable.c b/mnt_usable.c
index e336d64..8b9777f 100644
--- a/mnt_usable.c
+++ b/mnt_usable.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/nameinfo.c b/nameinfo.c
index ec06e3c..cbe8b30 100644
--- a/nameinfo.c
+++ b/nameinfo.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include <arpa/inet.h>
diff --git a/notify.c b/notify.c
index 23bbe96..73e772a 100644
--- a/notify.c
+++ b/notify.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/notify.h b/notify.h
index 1e65cd8..6c365e0 100644
--- a/notify.h
+++ b/notify.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 enum mog_notification {
 	MOG_NOTIFY_SIGNAL = -1,
diff --git a/packaddr.h b/packaddr.h
index 393b6a8..96b9046 100644
--- a/packaddr.h
+++ b/packaddr.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 union mog_sockaddr {
diff --git a/path_parser.h b/path_parser.h
index 8c80d74..92314bf 100644
--- a/path_parser.h
+++ b/path_parser.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "config.h"
 #include <stdint.h>
diff --git a/path_parser.rl b/path_parser.rl
index bf57b9f..4f0b3ec 100644
--- a/path_parser.rl
+++ b/path_parser.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 /*
diff --git a/pidfile.c b/pidfile.c
index 41da90b..9afb58f 100644
--- a/pidfile.c
+++ b/pidfile.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 static const char *pidfile;
diff --git a/process.c b/process.c
index 8dfa10a..89b1fa3 100644
--- a/process.c
+++ b/process.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 static Hash_table *processes;
diff --git a/queue_common.c b/queue_common.c
index a55080e..5716b15 100644
--- a/queue_common.c
+++ b/queue_common.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/queue_epoll.c b/queue_epoll.c
index f3f0d49..82c3c04 100644
--- a/queue_epoll.c
+++ b/queue_epoll.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 /* epoll-specific parts see queue_common.c and activeq.c for the rest */
diff --git a/queue_epoll.h b/queue_epoll.h
index 8848a97..b9dff79 100644
--- a/queue_epoll.h
+++ b/queue_epoll.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #if defined(HAVE_EPOLL_WAIT) && ! MOG_LIBKQUEUE
 #include <sys/epoll.h>
diff --git a/queue_kqueue.c b/queue_kqueue.c
index 40b6a49..3cb6604 100644
--- a/queue_kqueue.c
+++ b/queue_kqueue.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 /*
diff --git a/queue_kqueue.h b/queue_kqueue.h
index 40a7857..1d59314 100644
--- a/queue_kqueue.h
+++ b/queue_kqueue.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #ifdef HAVE_KQUEUE
 #include <sys/types.h>
diff --git a/queue_loop.c b/queue_loop.c
index d998ca5..532cafc 100644
--- a/queue_loop.c
+++ b/queue_loop.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/queue_step.c b/queue_step.c
index 1a91bb6..b12bac8 100644
--- a/queue_step.c
+++ b/queue_step.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/selfwake.c b/selfwake.c
index a2dee6a..024c77b 100644
--- a/selfwake.c
+++ b/selfwake.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/selfwake.h b/selfwake.h
index c147ccb..972176a 100644
--- a/selfwake.h
+++ b/selfwake.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #if (defined(HAVE_EPOLL_WAIT) && defined(HAVE_PPOLL)) \
     || defined(HAVE_EPOLL_PWAIT)
diff --git a/sig.c b/sig.c
index ed923e2..5acaba0 100644
--- a/sig.c
+++ b/sig.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/svc.c b/svc.c
index 43bc356..8db7c07 100644
--- a/svc.c
+++ b/svc.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 #define _GNU_SOURCE 1 /* needed for _ATFILE_SOURCE on glibc 2.5 - 2.9 */
diff --git a/svc_dev.c b/svc_dev.c
index b12e44f..49518fd 100644
--- a/svc_dev.c
+++ b/svc_dev.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "compat_memstream.h"
diff --git a/test/cfg-parser-1.c b/test/cfg-parser-1.c
index c4293f0..fd4aa10 100644
--- a/test/cfg-parser-1.c
+++ b/test/cfg-parser-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 #include "cfg.h"
diff --git a/test/chunk-parser-1.c b/test/chunk-parser-1.c
index 53f7e59..079b7ee 100644
--- a/test/chunk-parser-1.c
+++ b/test/chunk-parser-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 
diff --git a/test/epoll-wrap.c b/test/epoll-wrap.c
index c7bbdb9..eec5e5f 100644
--- a/test/epoll-wrap.c
+++ b/test/epoll-wrap.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * fault injection wrapper for epoll
diff --git a/test/epoll_enospc.rb b/test/epoll_enospc.rb
index 8b1d290..32d9765 100644
--- a/test/epoll_enospc.rb
+++ b/test/epoll_enospc.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 
 TEST_PROG = 'test/epoll-wrap'
diff --git a/test/fdmap-1.c b/test/fdmap-1.c
index 17d104b..cecb364 100644
--- a/test/fdmap-1.c
+++ b/test/fdmap-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 
diff --git a/test/gen-slow.sh b/test/gen-slow.sh
index f024948..3f7f61e 100755
--- a/test/gen-slow.sh
+++ b/test/gen-slow.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 #
 # Splits out individual Test::Unit test cases to be standalone Ruby
 # test files.  This requires Ruby test files to be properly
diff --git a/test/graceful_quit.rb b/test/graceful_quit.rb
index 1fff323..623d417 100644
--- a/test/graceful_quit.rb
+++ b/test/graceful_quit.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 
diff --git a/test/http-parser-1.c b/test/http-parser-1.c
index f699611..9865ccf 100644
--- a/test/http-parser-1.c
+++ b/test/http-parser-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 static struct mog_svc svc = { .persist_client = 1 };
diff --git a/test/http.rb b/test/http.rb
index 110d29d..13dfb2e 100644
--- a/test/http.rb
+++ b/test/http.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'digest/md5'
 require 'net/http'
diff --git a/test/http_chunked_put.rb b/test/http_chunked_put.rb
index 96215da..313cb9b 100644
--- a/test/http_chunked_put.rb
+++ b/test/http_chunked_put.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'digest/md5'
 require 'net/http'
diff --git a/test/http_dav.rb b/test/http_dav.rb
index 4272410..5631263 100644
--- a/test/http_dav.rb
+++ b/test/http_dav.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 $stderr.sync = $stdout.sync = Thread.abort_on_exception = true
diff --git a/test/http_getonly.rb b/test/http_getonly.rb
index 94fe33b..fc972af 100644
--- a/test/http_getonly.rb
+++ b/test/http_getonly.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 require 'stringio'
diff --git a/test/http_idle_expire.rb b/test/http_idle_expire.rb
index 603b1ee..cb93587 100644
--- a/test/http_idle_expire.rb
+++ b/test/http_idle_expire.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'io/wait'
 require 'io/nonblock'
diff --git a/test/http_put.rb b/test/http_put.rb
index 7743e00..9a12db2 100644
--- a/test/http_put.rb
+++ b/test/http_put.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'digest/md5'
 require 'net/http'
diff --git a/test/http_put6_fail.rb b/test/http_put6_fail.rb
index a69c252..bc416ca 100644
--- a/test/http_put6_fail.rb
+++ b/test/http_put6_fail.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 require 'stringio'
diff --git a/test/http_put_slow.rb b/test/http_put_slow.rb
index cd1348c..6e85ea6 100644
--- a/test/http_put_slow.rb
+++ b/test/http_put_slow.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'digest/md5'
 require 'net/http'
diff --git a/test/http_range.rb b/test/http_range.rb
index 9d15ebd..a2f0054 100644
--- a/test/http_range.rb
+++ b/test/http_range.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 require 'time'
diff --git a/test/inherit.rb b/test/inherit.rb
index 365f4b7..1a9f630 100644
--- a/test/inherit.rb
+++ b/test/inherit.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 
diff --git a/test/iostat-mock.rb b/test/iostat-mock.rb
index 03af527..aed2cfa 100755
--- a/test/iostat-mock.rb
+++ b/test/iostat-mock.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 usage = "Usage: #$0 PIDFILE (fast|slow)"
 $stdout.binmode
 $stdout.sync = $stderr.sync = true
diff --git a/test/ioutil-1.c b/test/ioutil-1.c
index 43a7a56..ad5e490 100644
--- a/test/ioutil-1.c
+++ b/test/ioutil-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 
diff --git a/test/mgmt-iostat.rb b/test/mgmt-iostat.rb
index 39b774b..d30ccb2 100644
--- a/test/mgmt-iostat.rb
+++ b/test/mgmt-iostat.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'timeout'
 
diff --git a/test/mgmt-usage.rb b/test/mgmt-usage.rb
index 837d601..da4b4c0 100644
--- a/test/mgmt-usage.rb
+++ b/test/mgmt-usage.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 
 class TestCmogstoredUsage < Test::Unit::TestCase
diff --git a/test/mgmt.rb b/test/mgmt.rb
index 28ef255..018607e 100644
--- a/test/mgmt.rb
+++ b/test/mgmt.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'digest/md5'
 
diff --git a/test/mgmt_auto_adjust.rb b/test/mgmt_auto_adjust.rb
index 01c5d1f..8ec725f 100644
--- a/test/mgmt_auto_adjust.rb
+++ b/test/mgmt_auto_adjust.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 
 class TestMgmtAutoAdjust < Test::Unit::TestCase
diff --git a/test/pwrite-wrap.c b/test/pwrite-wrap.c
index 30eb6fd..34e9fb7 100644
--- a/test/pwrite-wrap.c
+++ b/test/pwrite-wrap.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /*
  * fault injection wrapper for pwrite
diff --git a/test/pwrite_wrap.rb b/test/pwrite_wrap.rb
index b9a79a8..2f9ae66 100644
--- a/test/pwrite_wrap.rb
+++ b/test/pwrite_wrap.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'timeout'
 
diff --git a/test/queue-idle-1.c b/test/queue-idle-1.c
index 16707e3..c7984e8 100644
--- a/test/queue-idle-1.c
+++ b/test/queue-idle-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 static int fds[2];
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9909e4a..8cc9ac5 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 ARGV << "-v"
 require 'test/unit'
 require 'tmpdir'
diff --git a/test/thrpool-1.c b/test/thrpool-1.c
index 57970b4..23faae2 100644
--- a/test/thrpool-1.c
+++ b/test/thrpool-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 /* ensure we can start and stop thread pools properly */
 #include "check.h"
diff --git a/test/trywrite-1.c b/test/trywrite-1.c
index 2f1abf5..c95c635 100644
--- a/test/trywrite-1.c
+++ b/test/trywrite-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 #include "iov_str.h"
diff --git a/test/upgrade.rb b/test/upgrade.rb
index 39df765..4f0a420 100644
--- a/test/upgrade.rb
+++ b/test/upgrade.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
-# Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
-# License: GPLv3 or later (see COPYING for details)
+# Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'test/test_helper'
 require 'net/http'
 require 'timeout'
diff --git a/test/valid-path-1.c b/test/valid-path-1.c
index b3029a7..9755908 100644
--- a/test/valid-path-1.c
+++ b/test/valid-path-1.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "check.h"
 #define VP(path) mog_valid_path((path), sizeof(path) - 1)
diff --git a/thrpool.c b/thrpool.c
index 5eef760..0010ba3 100644
--- a/thrpool.c
+++ b/thrpool.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/trace.h b/trace.h
index a4139bd..f3a850f 100644
--- a/trace.h
+++ b/trace.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #ifdef HAVE_SYSTEMTAP
 #  include "probes.h"
diff --git a/trywrite.c b/trywrite.c
index 79eef38..39df01d 100644
--- a/trywrite.c
+++ b/trywrite.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/upgrade.c b/upgrade.c
index b01b514..7d7c7f1 100644
--- a/upgrade.c
+++ b/upgrade.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #include "compat_memstream.h"
diff --git a/util.h b/util.h
index 152f5d5..0b1e4bb 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 
 /* stringify +s+ */
diff --git a/valid_path.rl b/valid_path.rl
index 6a93bad..16d77c6 100644
--- a/valid_path.rl
+++ b/valid_path.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/valid_put_path.rl b/valid_put_path.rl
index 45f4373..4f65d59 100644
--- a/valid_put_path.rl
+++ b/valid_put_path.rl
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 
diff --git a/yield.c b/yield.c
index d817625..00d64c3 100644
--- a/yield.c
+++ b/yield.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2016 all contributors <cmogstored-public@bogomips.org>
- * License: GPLv3 or later (see COPYING for details)
+ * Copyright (C) 2012-2018 all contributors <cmogstored-public@bogomips.org>
+ * License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  */
 #include "cmogstored.h"
 #ifndef HAVE_PTHREAD_YIELD

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] update copyrights for 2018 and use SPDX for "GPL-3.0+"
  2018-11-28  2:06 [PATCH] update copyrights for 2018 and use SPDX for "GPL-3.0+" Eric Wong
@ 2018-11-28  2:16 ` Eric Wong
  0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2018-11-28  2:16 UTC (permalink / raw)
  To: cmogstored-public

With a real commit message:

    update copyrights for 2018 and use SPDX for "GPL-3.0+"

    copyrights updated by "update-copyright" in gnulib:

            git ls-files | UPDATE_COPYRIGHT_HOLDER='all contributors' \
              UPDATE_COPYRIGHT_USE_INTERVALS=2 \
              xargs /path/to/gnulib/build-aux/update-copyright

    While we're at it, SPDX seems to be the accepted way to identify
    licenses nowadays, so lets use it.

      git ls-files | xargs perl -i -p -e \
        's,GPLv3 or later.*,GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>,g'

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-11-28  2:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-28  2:06 [PATCH] update copyrights for 2018 and use SPDX for "GPL-3.0+" Eric Wong
2018-11-28  2:16 ` Eric Wong

Code repositories for project(s) associated with this public inbox

	https://yhbt.net/cmogstored.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).