Merge pull request #3495 from sandboxie-plus/refs

Fix old references
This commit is contained in:
DavidXanatos 2023-12-15 21:18:19 +01:00 committed by GitHub
commit e265419b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 72 deletions

View File

@ -28,9 +28,9 @@ ArchitecturesAllowed={#MyAppArch}
ArchitecturesInstallIn64BitMode=x64 arm64
AllowNoIcons=yes
AlwaysRestart=no
LicenseFile=.\license.txt
LicenseFile=..\LICENSE.Plus
UsedUserAreasWarning=no
VersionInfoCopyright=Copyright (C) 2020-2022 by David Xanatos (xanasoft.com)
VersionInfoCopyright=Copyright (C) 2020-2023 by David Xanatos (xanasoft.com)
VersionInfoVersion={#MyAppVersion}
SetupIconFile=SandManInstall.ico

View File

@ -5,7 +5,7 @@ mkdir %~dp0\Assets
mkdir %~dp0\Assets\Plus
copy %~dp0\Languages.iss %~dp0\Assets\Plus\
copy %~dp0\license.txt %~dp0\Assets\Plus\
copy %~dp0..\LICENSE.Plus %~dp0\Assets\Plus\
copy %~dp0\Sandboxie.ini %~dp0\Assets\Plus\
copy %~dp0\Sandboxie-Plus.ini %~dp0\Assets\Plus\
copy %~dp0\Sandboxie-Plus.iss %~dp0\Assets\Plus\

View File

@ -16,6 +16,32 @@ Sandboxie-Plus can be used under the following restrictions and obligations:
3. It is permitted to redistribute the original unmodified
binaries free of charge.
Usage of the source code:
1. Whomever obtains a copy of the source code is allowed to modify,
compile and redistribute the source code, as well as use the
compiled binaries for private, i.e. noncommercial use.
2. This copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
3. Public distribution of self-compiled binaries is only permitted
under the following conditions:
i) The entire source code with all modifications must be made
publicly available, such that all improvements may be back
ported to the official distribution.
ii) The softwares name may not be changed, and no authorship or
copyright informations displayed by the software are
allowed to be removed.
iii) The original author of this software reserves the right to
prohibit any distribution of unofficial binaries on his own
discretion.
4. Using self-compiled binaries for commercial use is only permitted
when an appropriate commercial use certificate has been obtained.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@ -25,8 +51,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Further licensing information
======================================

View File

@ -1,6 +1,6 @@
# Sandboxie Plus / Classic
[![Plus license](https://img.shields.io/badge/Plus%20license-Custom%20-blue.svg)](./Installer/license.txt) [![Classic license](https://img.shields.io/github/license/Sandboxie-Plus/Sandboxie?label=Classic%20license&color=blue)](./LICENSE) [![GitHub Release](https://img.shields.io/github/release/sandboxie-plus/Sandboxie.svg)](https://github.com/sandboxie-plus/Sandboxie/releases/latest) [![GitHub Pre-Release](https://img.shields.io/github/release/sandboxie-plus/Sandboxie/all.svg?label=pre-release)](https://github.com/sandboxie-plus/Sandboxie/releases) [![GitHub Build Status](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/main.yml/badge.svg)](https://github.com/sandboxie-plus/Sandboxie/actions) [![GitHub Codespell Status](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/codespell.yml/badge.svg)](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/codespell.yml)
[![Plus license](https://img.shields.io/badge/Plus%20license-Custom%20-blue.svg)](./LICENSE.Plus) [![Classic license](https://img.shields.io/github/license/Sandboxie-Plus/Sandboxie?label=Classic%20license&color=blue)](./LICENSE.Classic) [![GitHub Release](https://img.shields.io/github/release/sandboxie-plus/Sandboxie.svg)](https://github.com/sandboxie-plus/Sandboxie/releases/latest) [![GitHub Pre-Release](https://img.shields.io/github/release/sandboxie-plus/Sandboxie/all.svg?label=pre-release)](https://github.com/sandboxie-plus/Sandboxie/releases) [![GitHub Build Status](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/main.yml/badge.svg)](https://github.com/sandboxie-plus/Sandboxie/actions) [![GitHub Codespell Status](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/codespell.yml/badge.svg)](https://github.com/sandboxie-plus/Sandboxie/actions/workflows/codespell.yml)
**Note: This is a community fork that took place after the release of the Sandboxie source code and not the official continuation of the previous development (see the [project history](./README.md#-project-history)).**

View File

@ -1,57 +0,0 @@
Copyright 2020 - 2022 David Xanatos (xanasoft.com)
Permission is hereby granted to any person obtaining a copy
of this software and associated documentation files, to use the
Software under the following restrictions and obligations:
Usage of the official binary distribution:
1. Whomever obtains a copy of the software is permitted
to use it in any noncommercial setting to the full
extend the software permits; however certain functionality
is only available with a support certificate which
can be obtained from xanasoft.com
2. To use the software commercially a business certificate
must be obtained from xanasoft.com; however it is permitted to
use the software commercially for a limited period of time
on no more than 3 machines for evaluation purposes.
3. It is permitted to redistribute the original unmodified
binaries free of charge.
Usage of the source code:
1. Whomever obtains a copy of the source code is allowed to modify,
compile and redistribute the source code, as well as use the
compiled binaries for private, i.e. noncommercial use.
2. This copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
3. Public distribution of self-compiled binaries is only permitted
under the following conditions:
i) The entire source code with all modifications must be made
publicly available, such that all improvements may be back
ported to the official distribution.
ii) The softwares name may not be changed, and no authorship or
copyright informations displayed by the software are
allowed to be removed.
iii) The original author of this software reserves the right to
prohibit any distribution of unofficial binaries on his own
discretion.
4. Using self-compiled binaries for commercial use is only permitted
when an appropriate commercial use certificate has been obtained.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -0,0 +1 @@
../LICENSE.Plus