mirror of https://github.com/oxen-io/lokinet
Revert "fix license", do the CRLF conversion at installer build time
This reverts commit 6fdbf6cb25988845ceef1c8b945a1bc93f6ee7e3.
This commit is contained in:
parent
0ba4ab10a4
commit
37cf2c0bad
46
LICENSE
46
LICENSE
|
@ -1,23 +1,23 @@
|
|||
LokiNET is the reference implementation of LLARP (Low Latency Anonymous
|
||||
Routing Protocol) and is licensed under ZLIB license, however the protocol
|
||||
specifications are placed into the public domian using the CC0 License.
|
||||
|
||||
Copyright (c) 2018-2019 The Loki Project
|
||||
Copyright (c) 2018-2019 Jeff Becker
|
||||
Windows NT port and portions Copyright (c) 2018-2019 Rick V.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
LokiNET is the reference implementation of LLARP (Low Latency Anonymous
|
||||
Routing Protocol) and is licensed under ZLIB license, however the protocol
|
||||
specifications are placed into the public domian using the CC0 License.
|
||||
|
||||
Copyright (c) 2018-2019 The Loki Project
|
||||
Copyright (c) 2018-2019 Jeff Becker
|
||||
Windows NT port and portions Copyright (c) 2018-2019 Rick V.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
|
|
@ -4,4 +4,5 @@ curl*.tar.xz*
|
|||
curl-*/
|
||||
include/
|
||||
lib/
|
||||
*.pem
|
||||
*.pem
|
||||
LICENSE
|
|
@ -32,6 +32,7 @@ curl:
|
|||
lokinet-bootstrap.exe: mbedtls curl
|
||||
cp curl-7.66.0/src/curl.exe $@
|
||||
wget -O rootcerts.pem https://curl.haxx.se/ca/cacert.pem
|
||||
cp ../LICENSE .;unix2dos LICENSE LICENSE
|
||||
else
|
||||
|
||||
all: regdbhelper.dll lokinet-bootstrap.exe
|
||||
|
@ -42,6 +43,7 @@ regdbhelper.dll:
|
|||
lokinet-bootstrap.exe:
|
||||
scp despair@10.10.10.6:loki-network/win32-setup/*.exe .
|
||||
wget -O rootcerts.pem https://curl.haxx.se/ca/cacert.pem
|
||||
cp ../LICENSE .;unix2dos LICENSE LICENSE
|
||||
endif
|
||||
|
||||
clean:
|
||||
|
|
|
@ -90,7 +90,7 @@ Source: "{#DevPath}ui-win32\bin\release\lokinetui.pdb"; DestDir: "{app}"; Flags:
|
|||
; eh, might as well ship the 32-bit port of everything else
|
||||
Source: "{#DevPath}build\testAll.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#DevPath}build\lokinet-rcutil.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#DevPath}LICENSE"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "lokinet-bootstrap.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "rootcerts.pem"; DestDir: "{app}"; Flags: ignoreversion
|
||||
; delet this after finishing setup, we only need it to extract the drivers
|
||||
|
|
Loading…
Reference in New Issue