AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 20:05:08 +03:00
Code Releases Activity

v4.27-9668-beta

Browse Source
This commit is contained in:
dnobori 2018-05-30 00:50:54 +09:00
parent c6d5ebdda1
commit c5d56e666e
8 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BuildUtil/UnixBuildSoftwares.cs
View File

@ -648,11 +648,33 @@ namespace BuildUtil
sr.WriteLine("\t-ranlib lib/{0}", Path.GetFileName(filename)); sr.WriteLine("\t-ranlib lib/{0}", Path.GetFileName(filename));
} }
bool try_no_pie = false;
if (this.Os == OSList.Linux && (this.Cpu == CpuList.x86 || this.Cpu == CpuList.x64 || this.Cpu == CpuList.intel))
{
try_no_pie = true;
}
sr.WriteLine("\t-ranlib code/{0}.a", this.Software.ToString()); sr.WriteLine("\t-ranlib code/{0}.a", this.Software.ToString());
if (try_no_pie == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString()); sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
}
else
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
}
sr.WriteLine("\t-ranlib code/{0}.a", "vpncmd"); sr.WriteLine("\t-ranlib code/{0}.a", "vpncmd");
if (try_no_pie == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd"); sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
}
else
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
}
if (this.Software == Software.vpnserver_vpnbridge || this.Software == Software.vpnbridge || this.Software == Software.vpnserver) if (this.Software == Software.vpnserver_vpnbridge || this.Software == Software.vpnbridge || this.Software == Software.vpnserver)
{ {
@ -958,14 +980,6 @@ namespace BuildUtil
options.Add("-O2"); options.Add("-O2");
} }
if (this.Os == OSList.Linux)
{
if (this.Cpu == CpuList.x64 || this.Cpu == CpuList.x86 || this.Cpu == CpuList.intel)
{
options.Add("-no-pie");
}
}
options.Add("-fsigned-char"); options.Add("-fsigned-char");
if (this.NoPThreadOption == false) if (this.NoPThreadOption == false)
{ {

10
src/Cedar/Cedar.h
View File

@ -138,7 +138,7 @@
#define CEDAR_VER 427 #define CEDAR_VER 427
// Build Number // Build Number
#define CEDAR_BUILD 9667 #define CEDAR_BUILD 9668
// Beta number // Beta number
//#define BETA_NUMBER 3 //#define BETA_NUMBER 3
@ -159,10 +159,10 @@
// Specifies the build date // Specifies the build date
#define BUILD_DATE_Y 2018 #define BUILD_DATE_Y 2018
#define BUILD_DATE_M 5 #define BUILD_DATE_M 5
#define BUILD_DATE_D 26 #define BUILD_DATE_D 29
#define BUILD_DATE_HO 8 #define BUILD_DATE_HO 21
#define BUILD_DATE_MI 20 #define BUILD_DATE_MI 19
#define BUILD_DATE_SE 23 #define BUILD_DATE_SE 40
// Tolerable time difference // Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000) #define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)

4
src/CurrentBuild.txt
View File

@ -1,4 +1,4 @@
BUILD_NUMBER 9667 BUILD_NUMBER 9668
VERSION 427 VERSION 427
BUILD_NAME beta BUILD_NAME beta
BUILD_DATE 20180526_082023 BUILD_DATE 20180529_211940

BIN
src/bin/vpnweb.cab
View File

Binary file not shown.

BIN
src/bin/vpnweb.ocx
View File

Binary file not shown.

2
src/vpnweb/vpnweb.h
View File

@ -4,7 +4,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* File created by MIDL compiler version 7.00.0500 */
/* at Sat May 26 08:20:42 2018 /* at Tue May 29 21:19:59 2018
*/ */
/* Compiler settings for .\vpnweb.idl: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)

2
src/vpnweb/vpnweb_i.c
View File

@ -6,7 +6,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* File created by MIDL compiler version 7.00.0500 */
/* at Sat May 26 08:20:42 2018 /* at Tue May 29 21:19:59 2018
*/ */
/* Compiler settings for .\vpnweb.idl: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)

2
src/vpnweb/vpnweb_p.c
View File

@ -4,7 +4,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* File created by MIDL compiler version 7.00.0500 */
/* at Sat May 26 08:20:42 2018 /* at Tue May 29 21:19:59 2018
*/ */
/* Compiler settings for .\vpnweb.idl: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)