Skip to content

Commit

Permalink
2.14.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AirVPN committed Jun 4, 2018
1 parent c66f636 commit 170a519
Show file tree
Hide file tree
Showing 42 changed files with 152 additions and 109 deletions.
Binary file added common/tray.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 added common/tray_gray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file modified repository/Deploy.exe
Binary file not shown.
17 changes: 9 additions & 8 deletions repository/src/Deploy/Engine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ Build packages list
CopyAll(pathDeploy, pathTemp);
CopyAll(pathCommon, pathTemp + "/res");

RemoveFile(pathTemp + "/eddie_tray");
RemoveFile(pathTemp + "/eddie-tray");
RemoveFile(pathTemp + "/libgdiplus.so.0");
RemoveFile(pathTemp + "/libappindicator.so.1");

Expand Down Expand Up @@ -467,7 +467,7 @@ Build packages list

Shell("chmod 755 \"" + pathTemp + "/openvpn\"");
Shell("chmod 755 \"" + pathTemp + "/stunnel\"");
Shell("chmod 755 \"" + pathTemp + "/eddie_tray\"");
Shell("chmod 755 \"" + pathTemp + "/eddie-tray\"");
Shell("chmod 644 \"" + pathTemp + "/libLib.Platform.Linux.Native.so\"");

RemoveFile(pathTemp + "/libgdiplus.so.0");
Expand All @@ -491,7 +491,7 @@ Build packages list
Shell("chmod 755 \"" + pathTemp + "/stunnel\"");
if (ui == "cli")
{
RemoveFile(pathTemp + "/eddie_tray");
RemoveFile(pathTemp + "/eddie-tray");
RemoveFile(pathTemp + "/libgdiplus.so.0");
RemoveFile(pathTemp + "/libappindicator.so.1");
}
Expand Down Expand Up @@ -599,7 +599,7 @@ Build packages list
Shell("chmod 755 \"" + pathTemp + "/openvpn\"");
Shell("chmod 755 \"" + pathTemp + "/stunnel\"");
if (ui == "ui")
Shell("chmod 755 \"" + pathTemp + "/eddie_tray\"");
Shell("chmod 755 \"" + pathTemp + "/eddie-tray\"");
Shell("chmod 644 \"" + pathTemp + "/libLib.Platform.Linux.Native.so\"");

CreateDirectory(pathTemp + "/" + fileName);
Expand Down Expand Up @@ -663,10 +663,10 @@ Build packages list
Shell("chmod 644 \"" + pathTemp + "/usr/lib/eddie-ui/Lib.Forms.dll\"");
Shell("chmod 644 \"" + pathTemp + "/usr/lib/eddie-ui/Lib.Platform.Linux.dll\"");
Shell("chmod 644 \"" + pathTemp + "/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so\"");
Shell("chmod 755 \"" + pathTemp + "/usr/lib/eddie-ui/eddie_tray\"");
Shell("chmod 755 \"" + pathTemp + "/usr/lib/eddie-ui/eddie-tray\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/pixmaps/eddie-ui.png\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/applications/eddie-ui.desktop\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/polkit-1/actions/com.eddie.linux.ui.policy\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy\"");

Shell("chmod 644 \"" + pathTemp + "/usr/share/doc/eddie-ui/copyright\"");
Shell("chmod 644 " + pathTemp + "/usr/share/eddie-ui/*"); // Note: wildchar don't works if quoted
Expand Down Expand Up @@ -730,9 +730,10 @@ Build packages list
Shell("chmod 644 \"" + pathTemp + "/usr/" + libSubPath + "/eddie-ui/Lib.Forms.dll\"");
Shell("chmod 644 \"" + pathTemp + "/usr/" + libSubPath + "/eddie-ui/Lib.Platform.Linux.dll\"");
Shell("chmod 644 \"" + pathTemp + "/usr/" + libSubPath + "/eddie-ui/libLib.Platform.Linux.Native.so\"");
Shell("chmod 755 \"" + pathTemp + "/usr/" + libSubPath + "/eddie-ui/eddie_tray\"");
Shell("chmod 755 \"" + pathTemp + "/usr/" + libSubPath + "/eddie-ui/eddie-tray\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/pixmaps/eddie-ui.png\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/applications/eddie-ui.desktop\"");
Shell("chmod 644 \"" + pathTemp + "/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy\"");
Shell("chmod 644 " + pathTemp + "/usr/share/eddie-ui/*"); // Note: wildchar don't works if quoted

Shell("chown -R root:root " + pathTemp);
Expand Down Expand Up @@ -913,7 +914,7 @@ Build packages list
SignFile(platform, format, pathTemp + "/Applications/Eddie.app");

string command2 = "pkgbuild";
command2 += " --identifier com.eddie.client";
command2 += " --identifier org.airvpn.eddie.ui";
command2 += " --version " + versionString3;
command2 += " --root \"" + pathTemp + "\"";
//command2 += " --component \"" + pathRelease + "Eddie.app\"";
Expand Down
3 changes: 3 additions & 0 deletions resources/arch/usr/bin/eddie-ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
mono /usr/lib/eddie-ui/Eddie-UI.exe --path=$HOME/.airvpn --path.resources=/usr/share/eddie-ui --path.exec="$0" "$@" &

9 changes: 9 additions & 0 deletions resources/arch/usr/share/applications/eddie-ui.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[Desktop Entry]
Name=Eddie - OpenVPN UI
Comment=OpenVPN UI with additional user-friendly features
Exec=/usr/bin/eddie-ui
Icon=/usr/share/pixmaps/eddie-ui.png
Terminal=false
Type=Application
Categories=GNOME;Network

28 changes: 28 additions & 0 deletions resources/arch/usr/share/doc/eddie-ui/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: airvpn
Source: <https://github.com/AirVPN/airvpn-client>

Files: *
Copyright: 2014 AirVPN Team <[email protected]>
License: GPL-3.0+

Files: debian/*
Copyright: 2014 AirVPN Team <[email protected]>
License: GPL-3.0+

License: GPL-3.0+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<vendor>Eddie.website and AirVPN community</vendor>
<vendor_url>https://eddie.website</vendor_url>

<action id="com.eddie.linux.ui.policy">
<action id="org.airvpn.eddie.ui.policy">
<message>Authentication is required to run the Eddie - OpenVPN UI</message>
<description>Run Eddie as root</description>
<defaults>
Expand Down
4 changes: 2 additions & 2 deletions resources/debian/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Maintainer: Eddie <[email protected]>
Priority: optional
Architecture: {@architecture}
Installed-Size: 8192
Depends: libc6 (>= 2.3.2), libappindicator1, libnotify-bin, mono-runtime, mono-utils, libmono-system-core4.0-cil, libmono-system-windows-forms4.0-cil, openvpn, stunnel4, curl
Depends: libc6 (>= 2.3.2), sudo, libappindicator1, libnotify-bin, mono-runtime, mono-utils, libmono-system-core4.0-cil, libmono-system-windows-forms4.0-cil, openvpn, stunnel4, curl
Break: airvpn (<< 2.14.4)
Replaces: airvpn (<< 2.14.4)
Bugs: https://eddie.website/support/
Homepage: https://eddie.website/
Description: Eddie - OpenVPN UI
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, Developed by AirVPN
Open-Source, GPLv3, Developed by AirVPN


Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<vendor>Eddie.website and AirVPN community</vendor>
<vendor_url>https://eddie.website</vendor_url>

<action id="com.eddie.linux.ui.policy">
<action id="org.airvpn.eddie.ui.policy">
<message>Authentication is required to run the Eddie - OpenVPN UI</message>
<description>Run Eddie as root</description>
<defaults>
Expand Down
10 changes: 6 additions & 4 deletions resources/fedora/eddie-ui.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Summary: Eddie - OpenVPN UI
Packager: Eddie.website <[email protected]>
URL: https://eddie.website
Group: net
Requires: mono-core mono-winforms openvpn curl libgdiplus-devel libnotify libappindicator stunnel
Requires: mono-core mono-winforms sudo openvpn curl libgdiplus-devel libnotify libappindicator stunnel
AutoReqProv: no
Obsoletes: airvpn < 2.14.4

Expand All @@ -17,18 +17,20 @@ Obsoletes: airvpn < 2.14.4

%description
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, Developed by AirVPN
Open-Source, GPLv3, Developed by AirVPN

%files
"/usr/share/applications/eddie-ui.desktop"
%dir "/usr/share/doc/eddie-ui/"
"/usr/share/doc/eddie-ui/copyright"
"/usr/share/pixmaps/eddie-ui.png"
"/usr/share/polkit-1/actions/com.eddie.linux.ui.policy"
"/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy"
"/usr/share/man/man8/eddie-ui.8.gz"
"/usr/share/eddie-ui/cacert.pem"
"/usr/share/eddie-ui/icon.png"
"/usr/share/eddie-ui/icon_gray.png"
"/usr/share/eddie-ui/tray.png"
"/usr/share/eddie-ui/tray_gray.png"
"/usr/bin/eddie-ui"
%dir "/usr/{@lib}/eddie-ui/"
"/usr/{@lib}/eddie-ui/Lib.Core.dll"
Expand All @@ -38,4 +40,4 @@ Open-Source, GPL3, Developed by AirVPN
"/usr/{@lib}/eddie-ui/libLib.Platform.Linux.Native.so"
"/usr/{@lib}/eddie-ui/update-resolv-conf"
"/usr/{@lib}/eddie-ui/Eddie-UI.exe"
"/usr/{@lib}/eddie-ui/eddie_tray"
"/usr/{@lib}/eddie-ui/eddie-tray"
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<vendor>Eddie.website and AirVPN community</vendor>
<vendor_url>https://eddie.website</vendor_url>

<action id="com.eddie.linux.ui.policy">
<action id="org.airvpn.eddie.ui.policy">
<message>Authentication is required to run the Eddie - OpenVPN UI</message>
<description>Run Eddie as root</description>
<defaults>
Expand Down
10 changes: 6 additions & 4 deletions resources/opensuse/eddie-ui.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Summary: Eddie - OpenVPN UI
Packager: Eddie.website <[email protected]>
URL: https://eddie.website
Group: net
Requires: mono-core mono-winforms openvpn curl libgdiplus-devel libnotify libappindicator1 stunnel
Requires: mono-core mono-winforms sudo openvpn curl libgdiplus-devel libnotify libappindicator1 stunnel
AutoReqProv: no
Obsoletes: airvpn < 2.14.4

Expand All @@ -17,18 +17,20 @@ Obsoletes: airvpn < 2.14.4

%description
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, Developed by AirVPN
Open-Source, GPLv3, Developed by AirVPN

%files
"/usr/share/applications/eddie-ui.desktop"
%dir "/usr/share/doc/eddie-ui/"
"/usr/share/doc/eddie-ui/copyright"
"/usr/share/pixmaps/eddie-ui.png"
"/usr/share/polkit-1/actions/com.eddie.linux.ui.policy"
"/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy"
"/usr/share/man/man8/eddie-ui.8.gz"
"/usr/share/eddie-ui/cacert.pem"
"/usr/share/eddie-ui/icon.png"
"/usr/share/eddie-ui/icon_gray.png"
"/usr/share/eddie-ui/tray.png"
"/usr/share/eddie-ui/tray_gray.png"
"/usr/bin/eddie-ui"
%dir "/usr/{@lib}/eddie-ui/"
"/usr/{@lib}/eddie-ui/Lib.Core.dll"
Expand All @@ -38,4 +40,4 @@ Open-Source, GPL3, Developed by AirVPN
"/usr/{@lib}/eddie-ui/libLib.Platform.Linux.Native.so"
"/usr/{@lib}/eddie-ui/update-resolv-conf"
"/usr/{@lib}/eddie-ui/Eddie-UI.exe"
"/usr/{@lib}/eddie-ui/eddie_tray"
"/usr/{@lib}/eddie-ui/eddie-tray"
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>

<vendor>Eddie.website and AirVPN community</vendor>
<vendor_url>https://eddie.website</vendor_url>

<action id="org.airvpn.eddie.ui.policy">
<message>Authentication is required to run the Eddie - OpenVPN UI</message>
<description>Run Eddie as root</description>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/eddie-ui</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>

</policyconfig>
2 changes: 1 addition & 1 deletion src/App.Forms.Linux/Tray.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void OnRun ()
string controlWritePath = Path.GetTempPath() + "eddie_tray_w.tmp";

string pathRes = Core.Engine.Instance.GetPathResources();
string pathExe = Core.Engine.Instance.GetPathTools() + "/eddie_tray";
string pathExe = Core.Engine.Instance.GetPathTools() + "/eddie-tray";

if (Core.Platform.Instance.FileExists(pathExe) == false)
return;
Expand Down
6 changes: 3 additions & 3 deletions src/Lib.Common/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public static class Constants
public static string Name = "Eddie";
public static string NameCompatibility = "AirVPN";
public static string AppID = "ed8efc06d5263733167fbbed49230843397c3701";
public static string Thanks = "Clodo;PJ;Berserker;zhang888;LZ1;giganerd;Uncle Hunto;go558a83nk;sheivoko;NaDre;pfSense_fan;x0wllaar";
public static int VersionInt = 246;
public static string VersionDesc = "2.14.4";
public static string Thanks = "Clodo;PJ;Berserker;promind;zhang888;LZ1;giganerd;Uncle Hunto;go558a83nk;sheivoko;NaDre;pfSense_fan;x0wllaar";
public static int VersionInt = 247;
public static string VersionDesc = "2.14.5";
public static bool AlphaFeatures = false;
public static bool FeatureIPv6ControlOptions = true;
public static bool FeatureAlwaysBypassOpenvpnRoute = true; // Default for Eddie 2.14
Expand Down
11 changes: 8 additions & 3 deletions src/Lib.Core/Providers/Manifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,14 @@ public List<string> GetBootstrapUrls()
foreach (string url in Engine.Instance.Storage.Get("bootstrap.urls").Split(';'))
{
string sUrl = url.Trim();
string host = UtilsCore.HostFromUrl(url);
if (host != "")
urls.Add(sUrl);
if (sUrl != "")
{
if (IpAddress.IsIP(sUrl))
sUrl = "http://" + sUrl;
string host = UtilsCore.HostFromUrl(sUrl);
if (host != "")
urls.Add(sUrl);
}
}

// Manifest Urls
Expand Down
1 change: 1 addition & 0 deletions src/Lib.Core/Storage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ public void EnsureDefaults()

// Linux only
SetDefaultBool("linux.xhost", false, NotInMan);
SetDefaultBool("linux.dbus", false, NotInMan);

// General UI
SetDefault("ui.unit", "text", "", Messages.ManOptionUiUnit);
Expand Down
18 changes: 9 additions & 9 deletions src/Lib.Forms/Forms/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -874,15 +874,15 @@ private void mnuDevelopersManText_Click(object sender, EventArgs e)
Forms.TextViewer Dlg = new TextViewer();
Dlg.Title = "Man";
Dlg.Body = Engine.Instance.Storage.GetMan("text");
Dlg.ShowDialog();
Dlg.ShowDialog(this);
}

private void mnuDevelopersManBBCode_Click(object sender, EventArgs e)
{
Forms.TextViewer Dlg = new TextViewer();
Dlg.Title = "Man";
Dlg.Body = Engine.Instance.Storage.GetMan("bbc");
Dlg.ShowDialog();
Dlg.ShowDialog(this);
}

private void mnuDevelopersReset_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -917,7 +917,7 @@ private void lstProviders_DoubleClick(object sender, EventArgs e)
private void cmdProviderAdd_Click(object sender, EventArgs e)
{
WindowProviderAdd dlg = new WindowProviderAdd();
if (dlg.ShowDialog() == DialogResult.OK)
if (dlg.ShowDialog(this) == DialogResult.OK)
{
Core.Provider provider = Engine.Instance.ProvidersManager.AddProvider(dlg.Provider, null);
Engine.Instance.ProvidersManager.Refresh();
Expand Down Expand Up @@ -972,7 +972,7 @@ private void cmdProviderEdit_Click(object sender, EventArgs e)
}
if (form != null)
{
if (form.ShowDialog() == System.Windows.Forms.DialogResult.OK)
if (form.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{
item.Update();

Expand Down Expand Up @@ -1054,7 +1054,7 @@ private void mnuServersMore_Click(object sender, EventArgs e)
ListViewItemServer item = m_listViewServers.SelectedItems[0] as ListViewItemServer;
WindowConnection dlg = new WindowConnection();
dlg.Connection = item.Info;
dlg.ShowDialog();
dlg.ShowDialog(this);
}
}

Expand Down Expand Up @@ -1256,7 +1256,7 @@ private void cmdLogsSupport_Click(object sender, EventArgs e)
private void cmdLogsCommand_Click(object sender, EventArgs e)
{
WindowCommand Dlg = new WindowCommand();
if (Dlg.ShowDialog() == DialogResult.OK)
if (Dlg.ShowDialog(this) == DialogResult.OK)
{
Core.UI.App.RunCommandString(Dlg.Command);
}
Expand Down Expand Up @@ -1869,7 +1869,7 @@ public void OnProviderManifestFailed(Eddie.Core.Provider provider)
{
WindowProviderNoBootstrap dlg = new WindowProviderNoBootstrap();
dlg.Provider = provider as Core.Providers.Service;
dlg.ShowDialog();
dlg.ShowDialog(this);
}
}

Expand Down Expand Up @@ -2194,7 +2194,7 @@ public bool TermsOfServiceCheck(bool force)
if (show)
{
Forms.Tos Dlg = new Forms.Tos();
if (Dlg.ShowDialog() == DialogResult.OK)
if (Dlg.ShowDialog(this) == DialogResult.OK)
{
Engine.Storage.SetBool("gui.tos", true);
return true;
Expand Down Expand Up @@ -2253,7 +2253,7 @@ private void LogsDoSave(bool selectedOnly)
sd.FileName = Engine.Logs.GetLogSuggestedFileName();
sd.Filter = Messages.FilterTextFiles;

if (sd.ShowDialog() == DialogResult.OK)
if (sd.ShowDialog(this) == DialogResult.OK)
{
using (StreamWriter sw = new StreamWriter(sd.FileName))
{
Expand Down
3 changes: 1 addition & 2 deletions src/Lib.Mobile/Lib.Mobile.shproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>ac2be46c-5d49-44f0-85f6-2fbfce6c7f8c</ProjectGuid>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 170a519

Please sign in to comment.