Relicense to 0BSD, update mail address

I've come to the conclusion that copyright mostly just stands in the way
of software development.  In my jurisdiction I cannot give up my own
copyright and 0BSD seems to be the closest thing to public domain.

The updated mail address, also used in my author/committer lines,
is shorter and looks nicer.  People rarely interact anyway.

12 files changed, 23 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62cea12..1f31156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ endforeach (page)
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental network scanner")
 set (CPACK_PACKAGE_VERSION ${project_VERSION})
 set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
+set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")
diff --git a/LICENSE b/LICENSE
index 2e00614..7e747c0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2014 - 2015, Přemysl Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+purpose with or without fee is hereby granted.
 
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/README.adoc b/README.adoc
index eb9b8f5..60f9434 100644
--- a/README.adoc
+++ b/README.adoc
@@ -66,10 +66,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
 
 License
 -------
-'ponymap' is written by Přemysl Janouch <p.janouch@gmail.com>.
-
-You may use the software under the terms of the ISC license, the text of which
-is included within the package, or, at your option, you may relicense the work
-under the MIT or the Modified BSD License, as listed at the following site:
-
-http://www.gnu.org/licenses/license-list.html
+This software is released under the terms of the 0BSD license, the text of which
+is included within the package along with the list of authors.
diff --git a/plugin-api.h b/plugin-api.h
index 3431e3c..926725b 100644
--- a/plugin-api.h
+++ b/plugin-api.h
@@ -1,11 +1,10 @@
 /*
  * plugin-api.h: plugin API for ponymap
  *
- * Copyright (c) 2014, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/http.c b/plugins/http.c
index a38d154..9ae7d17 100644
--- a/plugins/http.c
+++ b/plugins/http.c
@@ -1,11 +1,10 @@
 /*
  * http.c: HTTP service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/irc.c b/plugins/irc.c
index 661aead..acf2f0b 100644
--- a/plugins/irc.c
+++ b/plugins/irc.c
@@ -1,11 +1,10 @@
 /*
  * http.c: IRC service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/lua-loader.c b/plugins/lua-loader.c
index 725ba06..fdd7ae5 100644
--- a/plugins/lua-loader.c
+++ b/plugins/lua-loader.c
@@ -1,11 +1,10 @@
 /*
  * lua-loader.c: Lua plugin loader plugin
  *
- * Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/mpd.lua b/plugins/mpd.lua
index 2f33f82..7c1333d 100644
--- a/plugins/mpd.lua
+++ b/plugins/mpd.lua
@@ -1,11 +1,10 @@
 --
 -- mpd.lua: Music Player Daemon service detection plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/nut.lua b/plugins/nut.lua
index b85e7d9..c42fa60 100644
--- a/plugins/nut.lua
+++ b/plugins/nut.lua
@@ -1,11 +1,10 @@
 --
 -- nut.lua: Network UPS Tools service detection plugin
 --
--- Copyright (c) 2017, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/socks.lua b/plugins/socks.lua
index 558683c..5d8bda8 100644
--- a/plugins/socks.lua
+++ b/plugins/socks.lua
@@ -1,11 +1,10 @@
 --
 -- socks.lua: SOCKS service detection plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/ssh.c b/plugins/ssh.c
index 11eea1a..8dc1b7c 100644
--- a/plugins/ssh.c
+++ b/plugins/ssh.c
@@ -1,11 +1,10 @@
 /*
  * ssh.c: SSH service detection plugin
  *
- * Copyright (c) 2014, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/ponymap.c b/ponymap.c
index 5ffe501..6b33d2d 100644
--- a/ponymap.c
+++ b/ponymap.c
@@ -1,11 +1,10 @@
 /*
  * ponymap.c: the experimental network scanner
  *
- * Copyright (c) 2014, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF