Browse Source

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.
Přemysl Janouch 5 months ago
parent
commit
d22959cdd3
Signed by: Přemysl Janouch <p@janouch.name> GPG Key ID: A0420B94F92B9493
12 changed files with 23 additions and 14 deletions
  1. 1
    1
      CMakeLists.txt
  2. 2
    3
      LICENSE
  3. 2
    7
      README.adoc
  4. 2
    3
      hex.c
  5. 2
    0
      plugins/bencode.lua
  6. 2
    0
      plugins/elf.lua
  7. 2
    0
      plugins/gzip.lua
  8. 2
    0
      plugins/pcap.lua
  9. 2
    0
      plugins/pdf.lua
  10. 2
    0
      plugins/vdi.lua
  11. 2
    0
      plugins/zip.lua
  12. 2
    0
      plugins/zlib.lua

+ 1
- 1
CMakeLists.txt View File

@@ -123,7 +123,7 @@ endforeach ()
123 123
 # CPack
124 124
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hex viewer")
125 125
 set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
126
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
126
+set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
127 127
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
128 128
 set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
129 129
 set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})

+ 2
- 3
LICENSE View File

@@ -1,8 +1,7 @@
1
-Copyright (c) 2016 - 2017, Přemysl Janouch <p.janouch@gmail.com>
1
+Copyright (c) 2016 - 2017, Přemysl Janouch <p@janouch.name>
2 2
 
3 3
 Permission to use, copy, modify, and/or distribute this software for any
4
-purpose with or without fee is hereby granted, provided that the above
5
-copyright notice and this permission notice appear in all copies.
4
+purpose with or without fee is hereby granted.
6 5
 
7 6
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 7
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 7
README.adoc View File

@@ -91,10 +91,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
91 91
 
92 92
 License
93 93
 -------
94
-'hex' is written by Přemysl Janouch <p.janouch@gmail.com>.
95
-
96
-You may use the software under the terms of the ISC license, the text of which
97
-is included within the package, or, at your option, you may relicense the work
98
-under the MIT or the Modified BSD License, as listed at the following site:
99
-
100
-http://www.gnu.org/licenses/license-list.html
94
+This software is released under the terms of the 0BSD license, the text of which
95
+is included within the package along with the list of authors.

+ 2
- 3
hex.c View File

@@ -1,11 +1,10 @@
1 1
 /*
2 2
  * hex -- hex viewer
3 3
  *
4
- * Copyright (c) 2016 - 2017, Přemysl Janouch <p.janouch@gmail.com>
4
+ * Copyright (c) 2016 - 2017, Přemysl Janouch <p@janouch.name>
5 5
  *
6 6
  * Permission to use, copy, modify, and/or distribute this software for any
7
- * purpose with or without fee is hereby granted, provided that the above
8
- * copyright notice and this permission notice appear in all copies.
7
+ * purpose with or without fee is hereby granted.
9 8
  *
10 9
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 10
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/bencode.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- bencode.lua: BitTorrent data encoding
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/elf.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- elf.lua: Executable and Linkable Format
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/gzip.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- gzip.lua: GZIP File Format
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/pcap.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- pcap.lua: libpcap file format
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/pdf.lua View File

@@ -5,11 +5,10 @@
5 5
 -- In practice almost useless, I just wanted to learn about the file format.
6 6
 -- FIXME: it's also not very robust and doesn't support all documents.
7 7
 --
8
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
8 9
 --
9 10
 -- Permission to use, copy, modify, and/or distribute this software for any
11
+-- purpose with or without fee is hereby granted.
10 12
 --
11 13
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 14
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/vdi.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- vdi.lua: VirtualBox Disk Image
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/zip.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- zip.lua: ZIP archives
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ 2
- 0
plugins/zlib.lua View File

@@ -1,11 +1,10 @@
1 1
 --
2 2
 -- zlib.lua: ZLIB Compressed Data Format
3 3
 --
4
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
4 5
 --
5 6
 -- Permission to use, copy, modify, and/or distribute this software for any
7
+-- purpose with or without fee is hereby granted.
6 8
 --
7 9
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 10
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

Loading…
Cancel
Save