diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
| commit | 0b0d138bbc895c01e392bf3fd6c4e916a86935a5 (patch) | |
| tree | 3bd01a9b7276d77c891e2f1d061c121599f00a7f /ubuntu/maverick/applications/kvpnc/debian/patches | |
| parent | 4368359c6192aaff174d4ec6fde1a8ae0682defa (diff) | |
| parent | 947e6baf2df5b3171900c9acd928f06e0da77ac9 (diff) | |
| download | tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.tar.gz tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kvpnc/debian/patches')
3 files changed, 42 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff new file mode 100644 index 000000000..9630fd3f8 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff @@ -0,0 +1,11 @@ +--- a/src/kvpnc.desktop ++++ b/src/kvpnc.desktop +@@ -18,7 +18,7 @@ + GenericName[xx]=xxVPN Client GUIxx + + Categories=Network;RemoteAccess;KDE;Qt +-Exec=kvpnc ++Exec=su-to-root -X -c /opt/trinity/bin/kvpnc + X-KDE-SubstituteUID=true + Icon=kvpnc + Type=Application diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff new file mode 100644 index 000000000..70fd0192e --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -0,0 +1,29 @@ +diff --git a/src/main.cpp b/src/main.cpp +index 7c45fcf..b933832 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -24,6 +24,7 @@ + #include <kmessagebox.h> + #include <kmainwindow.h> + #include <kapp.h> ++#include <kuser.h> + + #include <klocale.h> + #include <dcopclient.h> +@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] ) + } + else + { +-// if (getenv("USER") != "root") +-// { +-// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); +-// exit(0); +-// } ++ if (getenv("USER") != "root") ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } + + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series new file mode 100644 index 000000000..09040ada9 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series @@ -0,0 +1,2 @@ +10_su-to-root_usage.diff +13_add_kuser_issuperuser.diff |