Răsfoiți Sursa

v4.27-9668-beta

dnobori 7 ani în urmă
părinte
comite
c5d56e666e

+ 24 - 10
src/BuildUtil/UnixBuildSoftwares.cs

@@ -648,11 +648,33 @@ namespace BuildUtil
 				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$(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
+
+			if (try_no_pie == false)
+			{
+				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$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
+			if (try_no_pie == false)
+			{
+				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)
 			{
@@ -958,14 +980,6 @@ namespace BuildUtil
 				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");
 			if (this.NoPThreadOption == false)
 			{

+ 5 - 5
src/Cedar/Cedar.h

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

+ 2 - 2
src/CurrentBuild.txt

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

BIN
src/bin/vpnweb.cab


BIN
src/bin/vpnweb.ocx


+ 1 - 1
src/vpnweb/vpnweb.h

@@ -4,7 +4,7 @@
 
 
  /* 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:
     Oicf, W1, Zp8, env=Win32 (32b run)

+ 1 - 1
src/vpnweb/vpnweb_i.c

@@ -6,7 +6,7 @@
 
 
  /* 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:
     Oicf, W1, Zp8, env=Win32 (32b run)

+ 1 - 1
src/vpnweb/vpnweb_p.c

@@ -4,7 +4,7 @@
 
 
  /* 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:
     Oicf, W1, Zp8, env=Win32 (32b run)