From d22959cdd3bec6395ffadf860537389100f5b85d Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 24 Jun 2018 04:11:24 +0200 Subject: 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. --- CMakeLists.txt | 2 +- LICENSE | 5 ++--- README.adoc | 9 ++------- hex.c | 5 ++--- plugins/bencode.lua | 5 ++--- plugins/elf.lua | 5 ++--- plugins/gzip.lua | 5 ++--- plugins/pcap.lua | 5 ++--- plugins/pdf.lua | 5 ++--- plugins/vdi.lua | 5 ++--- plugins/zip.lua | 5 ++--- plugins/zlib.lua | 5 ++--- 12 files changed, 23 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c34ca6..f876920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ endforeach () # CPack set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hex viewer") set (CPACK_PACKAGE_VENDOR "Premysl Janouch") -set (CPACK_PACKAGE_CONTACT "Přemysl Janouch ") +set (CPACK_PACKAGE_CONTACT "Přemysl Janouch ") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR}) set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR}) diff --git a/LICENSE b/LICENSE index 7678a10..44aed90 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,7 @@ -Copyright (c) 2016 - 2017, Přemysl Janouch +Copyright (c) 2016 - 2017, Přemysl Janouch 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 8fbef20..8e20a1f 100644 --- a/README.adoc +++ b/README.adoc @@ -91,10 +91,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9 License ------- -'hex' is written by Přemysl Janouch . - -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/hex.c b/hex.c index cef9b64..9ef966e 100644 --- a/hex.c +++ b/hex.c @@ -1,11 +1,10 @@ /* * hex -- hex viewer * - * Copyright (c) 2016 - 2017, Přemysl Janouch + * Copyright (c) 2016 - 2017, Přemysl Janouch * * 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/bencode.lua b/plugins/bencode.lua index 7d2f66e..8a73bdd 100644 --- a/plugins/bencode.lua +++ b/plugins/bencode.lua @@ -1,11 +1,10 @@ -- -- bencode.lua: BitTorrent data encoding -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/elf.lua b/plugins/elf.lua index a9a0d81..2dfb812 100644 --- a/plugins/elf.lua +++ b/plugins/elf.lua @@ -1,11 +1,10 @@ -- -- elf.lua: Executable and Linkable Format -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/gzip.lua b/plugins/gzip.lua index 68b0cd3..7055c2c 100644 --- a/plugins/gzip.lua +++ b/plugins/gzip.lua @@ -1,11 +1,10 @@ -- -- gzip.lua: GZIP File Format -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/pcap.lua b/plugins/pcap.lua index aaa713c..4c5f9b5 100644 --- a/plugins/pcap.lua +++ b/plugins/pcap.lua @@ -1,11 +1,10 @@ -- -- pcap.lua: libpcap file format -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/pdf.lua b/plugins/pdf.lua index 91f8b6b..c8e7bbd 100644 --- a/plugins/pdf.lua +++ b/plugins/pdf.lua @@ -5,11 +5,10 @@ -- In practice almost useless, I just wanted to learn about the file format. -- FIXME: it's also not very robust and doesn't support all documents. -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/vdi.lua b/plugins/vdi.lua index 75bfd78..5f937e5 100644 --- a/plugins/vdi.lua +++ b/plugins/vdi.lua @@ -1,11 +1,10 @@ -- -- vdi.lua: VirtualBox Disk Image -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/zip.lua b/plugins/zip.lua index a1b61de..d82759b 100644 --- a/plugins/zip.lua +++ b/plugins/zip.lua @@ -1,11 +1,10 @@ -- -- zip.lua: ZIP archives -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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/zlib.lua b/plugins/zlib.lua index 69c8734..b9afc9f 100644 --- a/plugins/zlib.lua +++ b/plugins/zlib.lua @@ -1,11 +1,10 @@ -- -- zlib.lua: ZLIB Compressed Data Format -- --- Copyright (c) 2017, Přemysl Janouch +-- Copyright (c) 2017, Přemysl Janouch -- -- 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 -- cgit v1.2.3-70-g09d2