From 998d9a10d91bc558ba91c3f35c1c9e19ef788c63 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 19 Mar 2014 23:12:28 +0000 Subject: [PATCH] Amended configuration to ensure openvpn can be executed as root, using a setuid wrapper for openvpn. --- OpenVPNUI.pro | 9 ++++++++- OpenVPNUI.pro.user | 6 +++--- bin/ovpnpermit | Bin 0 -> 15491 bytes rpm/OpenVPNUI.spec | 2 ++ rpm/OpenVPNUI.yaml | 2 ++ src/vpncontrol.cpp | 2 +- 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100755 bin/ovpnpermit diff --git a/OpenVPNUI.pro b/OpenVPNUI.pro index 6457ec7..b0eed47 100644 --- a/OpenVPNUI.pro +++ b/OpenVPNUI.pro @@ -69,7 +69,8 @@ OTHER_FILES += qml/OpenVPNUI.qml \ qml/filebrowse/components/DoubleMenuItem.qml \ qml/filebrowse/components/DirPopup.qml \ qml/filebrowse/components/CenteredField.qml \ - qml/components/ValueButtonAlignRight.qml + qml/components/ValueButtonAlignRight.qml \ + bin/ovpnpermit HEADERS += \ src/vpncontrol.h \ @@ -82,3 +83,9 @@ HEADERS += \ src/filebrowse/engine.h INCLUDEPATH += src/filebrowse + +bin.files = bin +bin.path = /usr/share/$${TARGET} + +INSTALLS += bin + diff --git a/OpenVPNUI.pro.user b/OpenVPNUI.pro.user index 3f36955..864be9f 100644 --- a/OpenVPNUI.pro.user +++ b/OpenVPNUI.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -268,7 +268,7 @@ OpenVPNUI (on Remote Device) - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/OpenVPNUI/OpenVPNUI.pro + Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro OpenVPNUI.pro @@ -498,7 +498,7 @@ OpenVPNUI (on Remote Device) - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/OpenVPNUI/OpenVPNUI.pro + Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro OpenVPNUI.pro diff --git a/bin/ovpnpermit b/bin/ovpnpermit new file mode 100755 index 0000000000000000000000000000000000000000..2edc8488fb66bc54b08f86210f6ecee4d489f11d GIT binary patch literal 15491 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::StandardOutput); connect(vpnProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(readError(QProcess::ProcessError))); -- 2.25.1