Skip to content

Commit

Permalink
2.14.4
Browse files Browse the repository at this point in the history
  • Loading branch information
AirVPN committed May 20, 2018
1 parent 6e63c0d commit c66f636
Show file tree
Hide file tree
Showing 89 changed files with 65,142 additions and 64,699 deletions.
Binary file modified repository/Deploy.exe
Binary file not shown.
228 changes: 121 additions & 107 deletions repository/src/Deploy/Engine.cs

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions resources/debian/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
Package: airvpn
Package: eddie-ui
Version: {@version}
Section: net
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
Break: airvpn (<< 2.14.4)
Replaces: airvpn (<< 2.14.4)
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.
Description: Eddie - OpenVPN UI
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, Developed by AirVPN


3 changes: 0 additions & 3 deletions resources/debian/usr/bin/airvpn

This file was deleted.

3 changes: 3 additions & 0 deletions resources/debian/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: 0 additions & 9 deletions resources/debian/usr/share/applications/AirVPN.desktop

This file was deleted.

9 changes: 9 additions & 0 deletions resources/debian/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/debian/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: eddie
Source: <https://github.com/AirVPN/Eddie>

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

Files: debian/*
Copyright: 2014-2018 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".
Binary file removed resources/debian/usr/share/pixmaps/AirVPN.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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="com.eddie.linux.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>
41 changes: 41 additions & 0 deletions resources/fedora/eddie-ui.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Name: eddie-ui
Version: {@version}
Release: 0

License: see /usr/share/doc/eddie-ui/copyright
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
AutoReqProv: no
Obsoletes: airvpn < 2.14.4

%define _rpmdir ../
%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
%define _unpackaged_files_terminate_build 0

%description
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, 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/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/bin/eddie-ui"
%dir "/usr/{@lib}/eddie-ui/"
"/usr/{@lib}/eddie-ui/Lib.Core.dll"
"/usr/{@lib}/eddie-ui/Lib.Common.dll"
"/usr/{@lib}/eddie-ui/Lib.Forms.dll"
"/usr/{@lib}/eddie-ui/Lib.Platform.Linux.dll"
"/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"
3 changes: 3 additions & 0 deletions resources/fedora/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 --linux.xhost --path=$HOME/.airvpn --path.resources=/usr/share/eddie-ui --path.exec="$0" "$@" &

9 changes: 9 additions & 0 deletions resources/fedora/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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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="com.eddie.linux.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>
3 changes: 3 additions & 0 deletions resources/linux_portable/eddie-cli.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
mono Eddie-CLI.exe "$@"

3 changes: 3 additions & 0 deletions resources/linux_portable/eddie-ui.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
mono Eddie-UI.exe "$@"

29 changes: 22 additions & 7 deletions resources/nsis/Eddie-UI.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
SetCompressor /SOLID /FINAL lzma

;Name and file
Name "AirVPN"
Name "Eddie - OpenVPN UI"
OutFile "{@out}"

; Adds an XP manifest to the installer
Expand Down Expand Up @@ -219,20 +219,30 @@
SectionIn RO
SetOutPath "$INSTDIR"

;Compatibility Clean
Delete "$SMPROGRAMS\$STARTMENU_FOLDER\AirVPN.lnk"
Delete "$INSTDIR\CLI.exe"
Delete "$INSTDIR\AirVPN.exe"
Delete "$INSTDIR\ssleay32.dll"
Delete "$INSTDIR\libeay32.dll"

; Basic (required) Eddie files...
{@files_add}

; Restore base path
SetOutPath "$INSTDIR"

;Store installation folder
WriteRegStr HKLM "Software\AirVPN" "" $INSTDIR

; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "DisplayName" "AirVPN"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "DisplayName" "Eddie - OpenVPN UI"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "URLInfoAbout" "https://airvpn.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "HelpLink" "https://airvpn.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "URLInfoAbout" "https://eddie.website"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "HelpLink" "https://eddie.website"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "Publisher" "AirVPN - https://airvpn.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "RegCompany" "AirVPN - https://airvpn.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "DisplayIcon" '"$INSTDIR\AirVPN.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "DisplayIcon" '"$INSTDIR\Eddie-UI.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "SupportUpgrade" "yes"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AirVPN" "NoRepair" 1
Expand All @@ -244,10 +254,15 @@

;Create shortcuts
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\AirVPN.lnk" "$INSTDIR\AirVPN.exe" -path=home
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Eddie-UI.lnk" "$INSTDIR\Eddie-UI.exe" -path=home
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Website.lnk" "https://airvpn.org"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"






!insertmacro MUI_STARTMENU_WRITE_END

SectionEnd
Expand Down Expand Up @@ -283,7 +298,7 @@ Section "Uninstall"

!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP

Delete "$SMPROGRAMS\$MUI_TEMP\AirVPN.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\Eddie-UI.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"


Expand Down
Binary file modified resources/nsis/splash.bmp
Binary file not shown.
Binary file modified resources/nsis/splash.fw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions resources/opensuse/eddie-ui.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Name: eddie-ui
Version: {@version}
Release: 0

License: see /usr/share/doc/eddie-ui/copyright
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
AutoReqProv: no
Obsoletes: airvpn < 2.14.4

%define _rpmdir ../
%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
%define _unpackaged_files_terminate_build 0

%description
OpenVPN UI with additional user-friendly features
Open-Source, GPL3, 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/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/bin/eddie-ui"
%dir "/usr/{@lib}/eddie-ui/"
"/usr/{@lib}/eddie-ui/Lib.Core.dll"
"/usr/{@lib}/eddie-ui/Lib.Common.dll"
"/usr/{@lib}/eddie-ui/Lib.Forms.dll"
"/usr/{@lib}/eddie-ui/Lib.Platform.Linux.dll"
"/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"
3 changes: 3 additions & 0 deletions resources/opensuse/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/opensuse/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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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="com.eddie.linux.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>
41 changes: 0 additions & 41 deletions resources/rpm/airvpn.spec

This file was deleted.

3 changes: 0 additions & 3 deletions resources/rpm/usr/bin/airvpn

This file was deleted.

9 changes: 0 additions & 9 deletions resources/rpm/usr/share/applications/AirVPN.desktop

This file was deleted.

Binary file removed resources/rpm/usr/share/pixmaps/AirVPN.png
Binary file not shown.
Binary file modified src/App.CLI.Linux/Resources/icon.ico
Binary file not shown.
Binary file modified src/App.CLI.Windows/Resources/icon.ico
Binary file not shown.
Loading

0 comments on commit c66f636

Please sign in to comment.