Merge pull request #1845 from majestrate/make-github-see-we-are-gpl3-2022-01-28

make it so github sees the repo is gpl3

LICENSE

@@ -1,16 +1,3 @@
-LokiNET is the reference implementation of LLARP (Low Latency Anonymous 
-Routing Protocol).
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Copyright (c) 2018-2020 The Loki Project
-Copyright (c) 2018-2020 Jeff Becker
-Windows NT port and portions Copyright (c) 2018-2020 Rick V.
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -684,4 +671,4 @@ 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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

cmake/installer.cmake

@@ -1,7 +1,7 @@
 set(CPACK_PACKAGE_VENDOR "lokinet.org")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://lokinet.org/")
 set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/contrib/readme-installer.txt")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 if(WIN32)
   include(cmake/win32_installer_deps.cmake)

contrib/mac.sh

@@ -9,7 +9,7 @@
 
 set -e
 set +x
-if ! [ -f LICENSE.txt ] || ! [ -d llarp ]; then
+if ! [ -f LICENSE ] || ! [ -d llarp ]; then
     echo "You need to run this as ./contrib/mac.sh from the top-level lokinet project directory"
 fi
 

readme.md

@@ -110,7 +110,7 @@ When running from debian package the following steps are not needed as it is alr
 ready to use.  You can stop/start/restart it using `systemctl start lokinet`, `systemctl stop
 lokinet`, etc.
 
-## Running on Linux (without debs)
+### Running on Linux (without debs)
 
 **DO NOT RUN AS ROOT**, run as normal user. 
 
@@ -127,3 +127,18 @@ This requires the binary to have the proper capabilities which is usually set by
 
     $ sudo setcap cap_net_admin,cap_net_bind_service=+eip /usr/local/bin/lokinet
 
+
+----
+
+# License
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+```
+Copyright © 2018-2022 The Oxen Project
+Copyright © 2018-2022 Jeff Becker
+Copyright © 2018-2020 Rick V. (Historical Windows NT port and portions)
+```