Skip to content

Commit

Permalink
Merge pull request #54 from Clodo76/master
Browse files Browse the repository at this point in the history
2.12.4
  • Loading branch information
AirVPN authored Mar 16, 2017
2 parents c829b3b + 8e5be48 commit 5649427
Show file tree
Hide file tree
Showing 85 changed files with 33,452 additions and 962 deletions.
4,043 changes: 4,043 additions & 0 deletions deploy/linux_armv7l/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/linux_x64/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/linux_x86/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/macos_x64/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/windows-xp_x64/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/windows-xp_x86/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/windows_x64/cacert.pem

Large diffs are not rendered by default.

4,043 changes: 4,043 additions & 0 deletions deploy/windows_x86/cacert.pem

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion repository/files/readme.txt

This file was deleted.

2 changes: 1 addition & 1 deletion repository/signing/readme.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Here AirVPN Staff put keys files for digital signatures (not available under GitHub).
Here AirVPN Staff put keys files for digital signatures (not available under GitHub).
277 changes: 201 additions & 76 deletions repository/src/Deploy/Program.cs

Large diffs are not rendered by default.

Binary file modified repository/src/Deploy/bin/Release/Deploy.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions resources/debian/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Maintainer: Eddie <[email protected]>
Priority: optional
Architecture: {@architecture}
Installed-Size: 8192
Depends: gksu, mono-runtime, mono-utils, libmono-system-windows-forms4.0-cil, openvpn, stunnel4
Bugs: https://airvpn.org/forum/3-airvpn-client/
Homepage: https://airvpn.org/
Depends: gksu, mono-runtime, mono-utils, libmono-system-core4.0-cil, libmono-system-windows-forms4.0-cil, openvpn, stunnel4, curl
Bugs: https://eddie.website/support/
Homepage: https://eddie.website/
Description: VPN service based on OpenVPN
VPN based on OpenVPN and operated by activists and hacktivists
in defence of net neutrality, privacy and against censorship.
Expand Down
Binary file added resources/macos/diskbase.dmg.tar.bz2
Binary file not shown.
Binary file modified resources/macos/dmg_bg.fw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/macos/dmg_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion resources/rpm/airvpn.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Summary: AirVPN - VPN service based on OpenVPN
Packager: AirVPN Team <[email protected]>
URL: https://airvpn.org
Group: net
Requires: mono-core mono-winforms openvpn libgdiplus-devel
Requires: mono-core mono-winforms openvpn curl libgdiplus-devel
AutoReqProv: no

%define _rpmdir ../
Expand All @@ -24,6 +24,7 @@ in defence of net neutrality, privacy and against censorship.
"/usr/share/doc/airvpn/copyright"
"/usr/share/pixmaps/AirVPN.png"
"/usr/share/man/man8/airvpn.8.gz"
"/usr/share/AirVPN/cacert.pem"
"/usr/bin/airvpn"
%dir "/usr/{@lib}/AirVPN/"
"/usr/{@lib}/AirVPN/Lib.Core.dll"
Expand Down
4 changes: 2 additions & 2 deletions src/CLI.Linux/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ static void Main(string[] args)
{
Platform.Instance = new Eddie.Platforms.Linux();
CommandLine.InitSystem(Environment.CommandLine);

Engine engine = new Engine();
Engine engine = new Engine();

AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);

Expand Down
6 changes: 3 additions & 3 deletions src/CLI.Linux/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany("https://airvpn.org")]
[assembly: AssemblyProduct("Eddie - Windows CLI")]
[assembly: AssemblyCopyright("Copyright © 2011 - 2016")]
[assembly: AssemblyCopyright("Copyright © 2011 - 2017")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("2.11.0.0")]
[assembly: AssemblyFileVersion("2.11.0.0")]
[assembly: AssemblyVersion("2.12.0.0")]
[assembly: AssemblyFileVersion("2.12.0.0")]
[assembly: ComVisible(false)]

// The following attributes are used to specify the signing key for the assembly,
Expand Down
11 changes: 1 addition & 10 deletions src/CLI.Osx/CLI.Osx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>CLI.Osx</RootNamespace>
<AssemblyName>CLI.Osx</AssemblyName>
<ReleaseVersion>2.11</ReleaseVersion>
<ReleaseVersion>2.12</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand All @@ -32,15 +32,6 @@
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
<CustomCommands>
<CustomCommands>
<Command>
<type>AfterBuild</type>
<command>${ProjectDir}/postbuild.sh</command>
<workingdir>${ProjectDir}/bin/Release</workingdir>
</Command>
</CustomCommands>
</CustomCommands>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
23 changes: 0 additions & 23 deletions src/CLI.Osx/postbuild.sh

This file was deleted.

4 changes: 2 additions & 2 deletions src/CLI.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Program
static void Main(string[] args)
{
Platform.Instance = new Eddie.Platforms.Windows();

CommandLine.InitSystem(Environment.CommandLine);

Core.Engine engine = new Core.Engine();
Expand All @@ -39,7 +39,7 @@ static void Main(string[] args)

if (engine.Initialization(true))
{
engine.ConsoleStart();
engine.ConsoleStart();
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/CLI.Windows/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("https://airvpn.org")]
[assembly: AssemblyProduct("Eddie - Windows CLI")]
[assembly: AssemblyCopyright("Copyright © 2011 - 2016")]
[assembly: AssemblyCopyright("Copyright © 2011 - 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -33,6 +33,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.11.0.0")]
[assembly: AssemblyFileVersion("2.11.0.0")]
[assembly: AssemblyVersion("2.12.0.0")]
[assembly: AssemblyFileVersion("2.12.0.0")]
[assembly: NeutralResourcesLanguageAttribute("")]
6 changes: 3 additions & 3 deletions src/Core/AirExchange.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static XmlDocument FetchUrl(string authPublicKey, string url, Dictionary<

// 'POST' Edition - >= 2.9
// Debug with an url direct to backend service client debugging page
byte[] fetchResponse = Engine.Instance.FetchUrlEx(url, "", fetchParameters, "", Engine.Instance.IsConnected());
byte[] fetchResponse = Engine.Instance.FetchUrlEx(url, fetchParameters, "", false, "");

// Decrypt answer
MemoryStream aesDecryptStream = new MemoryStream();
Expand Down Expand Up @@ -129,7 +129,7 @@ public static XmlDocument FetchUrls(string title, string authPublicKey, List<str

try
{
RouteScope routeScope = new RouteScope(host);
RouteScope routeScope = new RouteScope(host);
XmlDocument xmlDoc = AirExchange.FetchUrl(authPublicKey, url, parameters);
routeScope.End();
if (xmlDoc == null)
Expand All @@ -146,7 +146,7 @@ public static XmlDocument FetchUrls(string title, string authPublicKey, List<str
string proxyMode = Engine.Instance.Storage.Get("proxy.mode").ToLowerInvariant();
string proxyAuth = Engine.Instance.Storage.Get("proxy.auth").ToLowerInvariant();
if (proxyMode != "none")
info += ", with '" + proxyMode + "' proxy and '" + proxyAuth + "' auth";
info += " - with '" + proxyMode + "' proxy and '" + proxyAuth + "' auth";

if (Engine.Instance.Storage.GetBool("advanced.expert"))
Engine.Instance.Logs.Log(LogType.Verbose, MessagesFormatter.Format(Messages.ExchangeTryFailed, title, hostN.ToString(), info));
Expand Down
16 changes: 16 additions & 0 deletions src/Core/CompatibilityManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,22 @@ public static void FixOption(ref string name, ref string value)
{
name = "batch";
}
else if (name == "executables.openvpn")
{
name = "tools.openvpn.path";
}
else if (name == "executables.ssh")
{
name = "tools.ssh.path";
}
else if (name == "executables.ssl")
{
name = "tools.ssl.path";
}
else if (name == "executables.curl")
{
name = "tools.curl.path";
}

#if (EDDIE3)
if (name == "dns.check") // < 3.0
Expand Down
Loading

0 comments on commit 5649427

Please sign in to comment.