Skip to content

Commit 92837bc

Browse files
committed
v4.29-9680-rtm
1 parent 553978c commit 92837bc

File tree

280 files changed

+12595
-14438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+12595
-14438
lines changed

THIRD_PARTY.TXT

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,34 @@ Issue Date: Aug 6, 2010
724724

725725
-------------------
726726

727+
libmincrypt:
728+
729+
Copyright 2013 The Android Open Source Project
730+
731+
Redistribution and use in source and binary forms, with or without
732+
modification, are permitted provided that the following conditions are met:
733+
* Redistributions of source code must retain the above copyright
734+
notice, this list of conditions and the following disclaimer.
735+
* Redistributions in binary form must reproduce the above copyright
736+
notice, this list of conditions and the following disclaimer in the
737+
documentation and/or other materials provided with the distribution.
738+
* Neither the name of Google Inc. nor the names of its contributors may
739+
be used to endorse or promote products derived from this software
740+
without specific prior written permission.
741+
742+
THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR
743+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
744+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
745+
EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
746+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
747+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
748+
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
749+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
750+
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
751+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
752+
753+
-------------------
754+
727755
NOTES WRITTEN BY SOFTETHER CORPORATION
728756

729757
Note for users of non-Windows version of PacketiX VPN: The enumerated bundle

centos/SOURCES/linux_32bit.mak

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# SoftEther VPN Source Code
22
#
3-
# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.
4-
# Copyright (c) Daiyuu Nobori.
5-
# All Rights Reserved.
3+
# Copyright (c) Daiyuu Nobori.
4+
# Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
5+
# Copyright (c) SoftEther Corporation.
6+
# Copyright (c) all contributors on SoftEther VPN project in GitHub.
67
#
78
# http://www.softether.org/
89
#
9-
# This program is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU General Public License
11-
# version 2 as published by the Free Software Foundation.
12-
#
13-
# This program is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU General Public License version 2
19-
# along with this program; if not, write to the Free Software
20-
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
10+
# License: The Apache License, Version 2.0
11+
# https://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
# SOFTWARE.
2120
#
2221
# Platform: os=Linux, bits=32bit
2322

centos/SOURCES/linux_64bit.mak

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# SoftEther VPN Source Code
22
#
3-
# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.
4-
# Copyright (c) Daiyuu Nobori.
5-
# All Rights Reserved.
3+
# Copyright (c) Daiyuu Nobori.
4+
# Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
5+
# Copyright (c) SoftEther Corporation.
6+
# Copyright (c) all contributors on SoftEther VPN project in GitHub.
67
#
78
# http://www.softether.org/
89
#
9-
# This program is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU General Public License
11-
# version 2 as published by the Free Software Foundation.
12-
#
13-
# This program is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU General Public License version 2
19-
# along with this program; if not, write to the Free Software
20-
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
10+
# License: The Apache License, Version 2.0
11+
# https://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
# SOFTWARE.
2120
#
2221
# Platform: os=Linux, bits=64bit
2322

configure

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
echo '---------------------------------------------------------------------'
44
echo 'SoftEther VPN for Unix'
55
echo
6-
echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'
7-
echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'
6+
echo 'Copyright (c) Daiyuu Nobori.'
7+
echo 'Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.'
8+
echo 'Copyright (c) SoftEther Corporation.'
9+
echo 'Copyright (c) all contributors on SoftEther VPN project in GitHub.'
810
echo
9-
echo 'This program is free software; you can redistribute it and/or'
10-
echo 'modify it under the terms of the GNU General Public License'
11-
echo 'version 2 as published by the Free Software Foundation.'
11+
echo 'License: The Apache License, Version 2.0'
1212
echo
1313
echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'
1414
echo '---------------------------------------------------------------------'

src/BuildUtil/BuildUtilCommands.cs

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,64 @@
66
// Copyright (c) Daiyuu Nobori.
77
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
88
// Copyright (c) SoftEther Corporation.
9-
Copyright (c) all contributors on SoftEther VPN project in GitHub.
9+
// Copyright (c) all contributors on SoftEther VPN project in GitHub.
1010
//
1111
// All Rights Reserved.
1212
//
1313
// http://www.softether.org/
1414
//
1515
// This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
1616
// Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
17-
// This program is free software; you can redistribute it and/or
18-
// modify it under the terms of the GNU General Public License
19-
// version 2 as published by the Free Software Foundation.
2017
//
21-
// This program is distributed in the hope that it will be useful,
22-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
23-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24-
// GNU General Public License for more details.
18+
// License: The Apache License, Version 2.0
19+
// https://www.apache.org/licenses/LICENSE-2.0
2520
//
26-
// You should have received a copy of the GNU General Public License version 2
27-
// along with this program; if not, write to the Free Software
28-
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21+
// DISCLAIMER
22+
// ==========
2923
//
30-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
31-
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
32-
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
33-
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
34-
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
35-
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
36-
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30+
// SOFTWARE.
3731
//
38-
// THE LICENSE AGREEMENT IS ATTACHED ON THE SOURCE-CODE PACKAGE
39-
// AS "LICENSE.TXT" FILE. READ THE TEXT FILE IN ADVANCE TO USE THE SOFTWARE.
32+
// THIS SOFTWARE IS DEVELOPED IN JAPAN, AND DISTRIBUTED FROM JAPAN, UNDER
33+
// JAPANESE LAWS. YOU MUST AGREE IN ADVANCE TO USE, COPY, MODIFY, MERGE, PUBLISH,
34+
// DISTRIBUTE, SUBLICENSE, AND/OR SELL COPIES OF THIS SOFTWARE, THAT ANY
35+
// JURIDICAL DISPUTES WHICH ARE CONCERNED TO THIS SOFTWARE OR ITS CONTENTS,
36+
// AGAINST US (SOFTETHER PROJECT, SOFTETHER CORPORATION, DAIYUU NOBORI OR OTHER
37+
// SUPPLIERS), OR ANY JURIDICAL DISPUTES AGAINST US WHICH ARE CAUSED BY ANY KIND
38+
// OF USING, COPYING, MODIFYING, MERGING, PUBLISHING, DISTRIBUTING, SUBLICENSING,
39+
// AND/OR SELLING COPIES OF THIS SOFTWARE SHALL BE REGARDED AS BE CONSTRUED AND
40+
// CONTROLLED BY JAPANESE LAWS, AND YOU MUST FURTHER CONSENT TO EXCLUSIVE
41+
// JURISDICTION AND VENUE IN THE COURTS SITTING IN TOKYO, JAPAN. YOU MUST WAIVE
42+
// ALL DEFENSES OF LACK OF PERSONAL JURISDICTION AND FORUM NON CONVENIENS.
43+
// PROCESS MAY BE SERVED ON EITHER PARTY IN THE MANNER AUTHORIZED BY APPLICABLE
44+
// LAW OR COURT RULE.
4045
//
46+
// USE ONLY IN JAPAN. DO NOT USE THIS SOFTWARE IN ANOTHER COUNTRY UNLESS YOU HAVE
47+
// A CONFIRMATION THAT THIS SOFTWARE DOES NOT VIOLATE ANY CRIMINAL LAWS OR CIVIL
48+
// RIGHTS IN THAT PARTICULAR COUNTRY. USING THIS SOFTWARE IN OTHER COUNTRIES IS
49+
// COMPLETELY AT YOUR OWN RISK. THE SOFTETHER VPN PROJECT HAS DEVELOPED AND
50+
// DISTRIBUTED THIS SOFTWARE TO COMPLY ONLY WITH THE JAPANESE LAWS AND EXISTING
51+
// CIVIL RIGHTS INCLUDING PATENTS WHICH ARE SUBJECTS APPLY IN JAPAN. OTHER
52+
// COUNTRIES' LAWS OR CIVIL RIGHTS ARE NONE OF OUR CONCERNS NOR RESPONSIBILITIES.
53+
// WE HAVE NEVER INVESTIGATED ANY CRIMINAL REGULATIONS, CIVIL LAWS OR
54+
// INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENTS IN ANY OF OTHER 200+ COUNTRIES
55+
// AND TERRITORIES. BY NATURE, THERE ARE 200+ REGIONS IN THE WORLD, WITH
56+
// DIFFERENT LAWS. IT IS IMPOSSIBLE TO VERIFY EVERY COUNTRIES' LAWS, REGULATIONS
57+
// AND CIVIL RIGHTS TO MAKE THE SOFTWARE COMPLY WITH ALL COUNTRIES' LAWS BY THE
58+
// PROJECT. EVEN IF YOU WILL BE SUED BY A PRIVATE ENTITY OR BE DAMAGED BY A
59+
// PUBLIC SERVANT IN YOUR COUNTRY, THE DEVELOPERS OF THIS SOFTWARE WILL NEVER BE
60+
// LIABLE TO RECOVER OR COMPENSATE SUCH DAMAGES, CRIMINAL OR CIVIL
61+
// RESPONSIBILITIES. NOTE THAT THIS LINE IS NOT LICENSE RESTRICTION BUT JUST A
62+
// STATEMENT FOR WARNING AND DISCLAIMER.
4163
//
42-
// THIS SOFTWARE IS DEVELOPED IN JAPAN, AND DISTRIBUTED FROM JAPAN,
43-
// UNDER JAPANESE LAWS. YOU MUST AGREE IN ADVANCE TO USE, COPY, MODIFY,
44-
// MERGE, PUBLISH, DISTRIBUTE, SUBLICENSE, AND/OR SELL COPIES OF THIS
45-
// SOFTWARE, THAT ANY JURIDICAL DISPUTES WHICH ARE CONCERNED TO THIS
46-
// SOFTWARE OR ITS CONTENTS, AGAINST US (SOFTETHER PROJECT, SOFTETHER
47-
// CORPORATION, DAIYUU NOBORI OR OTHER SUPPLIERS), OR ANY JURIDICAL
48-
// DISPUTES AGAINST US WHICH ARE CAUSED BY ANY KIND OF USING, COPYING,
49-
// MODIFYING, MERGING, PUBLISHING, DISTRIBUTING, SUBLICENSING, AND/OR
50-
// SELLING COPIES OF THIS SOFTWARE SHALL BE REGARDED AS BE CONSTRUED AND
51-
// CONTROLLED BY JAPANESE LAWS, AND YOU MUST FURTHER CONSENT TO
52-
// EXCLUSIVE JURISDICTION AND VENUE IN THE COURTS SITTING IN TOKYO,
53-
// JAPAN. YOU MUST WAIVE ALL DEFENSES OF LACK OF PERSONAL JURISDICTION
54-
// AND FORUM NON CONVENIENS. PROCESS MAY BE SERVED ON EITHER PARTY IN
55-
// THE MANNER AUTHORIZED BY APPLICABLE LAW OR COURT RULE.
56-
//
57-
// USE ONLY IN JAPAN. DO NOT USE THIS SOFTWARE IN ANOTHER COUNTRY UNLESS
58-
// YOU HAVE A CONFIRMATION THAT THIS SOFTWARE DOES NOT VIOLATE ANY
59-
// CRIMINAL LAWS OR CIVIL RIGHTS IN THAT PARTICULAR COUNTRY. USING THIS
60-
// SOFTWARE IN OTHER COUNTRIES IS COMPLETELY AT YOUR OWN RISK. THE
61-
// SOFTETHER VPN PROJECT HAS DEVELOPED AND DISTRIBUTED THIS SOFTWARE TO
62-
// COMPLY ONLY WITH THE JAPANESE LAWS AND EXISTING CIVIL RIGHTS INCLUDING
63-
// PATENTS WHICH ARE SUBJECTS APPLY IN JAPAN. OTHER COUNTRIES' LAWS OR
64-
// CIVIL RIGHTS ARE NONE OF OUR CONCERNS NOR RESPONSIBILITIES. WE HAVE
65-
// NEVER INVESTIGATED ANY CRIMINAL REGULATIONS, CIVIL LAWS OR
66-
// INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENTS IN ANY OF OTHER 200+
67-
// COUNTRIES AND TERRITORIES. BY NATURE, THERE ARE 200+ REGIONS IN THE
68-
// WORLD, WITH DIFFERENT LAWS. IT IS IMPOSSIBLE TO VERIFY EVERY
69-
// COUNTRIES' LAWS, REGULATIONS AND CIVIL RIGHTS TO MAKE THE SOFTWARE
70-
// COMPLY WITH ALL COUNTRIES' LAWS BY THE PROJECT. EVEN IF YOU WILL BE
71-
// SUED BY A PRIVATE ENTITY OR BE DAMAGED BY A PUBLIC SERVANT IN YOUR
72-
// COUNTRY, THE DEVELOPERS OF THIS SOFTWARE WILL NEVER BE LIABLE TO
73-
// RECOVER OR COMPENSATE SUCH DAMAGES, CRIMINAL OR CIVIL
74-
// RESPONSIBILITIES. NOTE THAT THIS LINE IS NOT LICENSE RESTRICTION BUT
75-
// JUST A STATEMENT FOR WARNING AND DISCLAIMER.
64+
// READ AND UNDERSTAND THE 'WARNING.TXT' FILE BEFORE USING THIS SOFTWARE.
65+
// SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH
66+
// LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'THIRD_PARTY.TXT' FILE.
7667
//
7768
//
7869
// SOURCE CODE CONTRIBUTION

0 commit comments

Comments
 (0)