From 6bef755f7d79ccd2a8467ea9eea0db4d8532a41c Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Mon, 24 Mar 2014 23:24:02 +0000 Subject: [PATCH] Added status message on close of openvpn. Udated the yaml file to set the correct permissions on ovpnpermit. --- OpenVPNUI.pro.user | 240 +-------------------------------------------- bin/ovpnpermit | Bin 15491 -> 5891 bytes rpm/OpenVPNUI.spec | 24 ++--- rpm/OpenVPNUI.yaml | 24 ++--- src/vpncontrol.cpp | 1 + 5 files changed, 30 insertions(+), 259 deletions(-) diff --git a/OpenVPNUI.pro.user b/OpenVPNUI.pro.user index 864be9f..c471047 100644 --- a/OpenVPNUI.pro.user +++ b/OpenVPNUI.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -53,7 +53,7 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl - {d509da11-0d11-4fad-8b14-f7a950fad5bf} + {d2cef3cf-98e6-437c-a097-b7f269d12d9c} 0 2 0 @@ -268,7 +268,7 @@ OpenVPNUI (on Remote Device) - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro + Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/openvpnui/OpenVPNUI.pro OpenVPNUI.pro @@ -284,243 +284,13 @@ 1 - - ProjectExplorer.Project.Target.1 - - MerSDK-SailfishOS-i486-x86 - MerSDK-SailfishOS-i486-x86 - {afe67e8f-9b68-41c9-a78e-976c32346149} - 0 - 0 - 0 - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/flypig/Documents/Development/SailfishOS/build-OpenVPNUI-MerSDK_SailfishOS_i486_x86-Debug - true - - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/flypig/Documents/Development/SailfishOS/build-OpenVPNUI-MerSDK_SailfishOS_i486_x86-Release - true - - 2 - - - - true - Start Emulator - - Qt4ProjectManager.MerEmulatorStartStep - - - true - Rsync - - Qt4ProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - Qt4ProjectManager.MerRSyncDeployConfiguration - - - - - true - Start Emulator - - Qt4ProjectManager.MerEmulatorStartStep - - - true - Rpm - - Qt4ProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - Qt4ProjectManager.MerRpmDeployConfiguration - - 2 - - - true - - false - false - false - false - true - 0.01 - 10 - true - 25 - - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - -1 - - OpenVPNUI (on Remote Device) - - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro - - OpenVPNUI.pro - - false - - 3768 - false - true - false - false - true - - 1 - - ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.EnvironmentId - {551e7bc8-ec93-459f-bb3a-08a2bffda2a5} + {345860fb-8510-4b40-bec6-87a56aacf929} ProjectExplorer.Project.Updater.FileVersion diff --git a/bin/ovpnpermit b/bin/ovpnpermit index 2edc8488fb66bc54b08f86210f6ecee4d489f11d..5f570706de295693b7b78d37275541e419a14a47 100755 GIT binary patch literal 5891 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 tQT|&TYtQ~bIS_Q literal 15491 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 gO_Z+K+`fKU($f-=*ECC1XfF)Y`WxQ*_YG= 0.10.9 -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) BuildRequires: desktop-file-utils %description @@ -63,15 +63,15 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -%{_bindir} -%{_datadir}/%{name}/qml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/%{name}/bin -%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit -/usr/bin -/usr/share/OpenVPNUI -/usr/share/applications /usr/share/icons/hicolor/86x86/apps +/usr/share/applications +/usr/share/OpenVPNUI +/usr/bin +%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit +%{_datadir}/%{name}/bin +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/qml +%{_bindir} # >> files # << files diff --git a/rpm/OpenVPNUI.yaml b/rpm/OpenVPNUI.yaml index 80d30b6..e899975 100644 --- a/rpm/OpenVPNUI.yaml +++ b/rpm/OpenVPNUI.yaml @@ -12,21 +12,21 @@ Description: | Configure: none Builder: qtc5 PkgConfigBR: -- Qt5Quick -- Qt5Qml -- Qt5Core - sailfishapp >= 0.0.10 +- Qt5Core +- Qt5Qml +- Qt5Quick Requires: - sailfishsilica-qt5 >= 0.10.9 Files: -- '%{_bindir}' -- '%{_datadir}/%{name}/qml' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/%{name}/bin' -- '%attr(2755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' -- /usr/bin -- /usr/share/OpenVPNUI -- /usr/share/applications - /usr/share/icons/hicolor/86x86/apps +- /usr/share/applications +- /usr/share/OpenVPNUI +- /usr/bin +- '%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' +- '%{_datadir}/%{name}/bin' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/%{name}/qml' +- '%{_bindir}' PkgBR: [] diff --git a/src/vpncontrol.cpp b/src/vpncontrol.cpp index d0d411b..3f80913 100644 --- a/src/vpncontrol.cpp +++ b/src/vpncontrol.cpp @@ -319,6 +319,7 @@ void VPNControl::finished(int code) { //delete vpnProcess; vpnProcess = NULL; } + logAppend("Finished with code " + QString::number(code)); setStatus(VPNSTATUS_UNINITIALISED); } -- 2.25.1