From 02dc85a95b228b7242b0d11ea35619faad96db03 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 10 Sep 2012 16:16:32 -0500
Subject: Split precise from maverick

---
 .../kvpnc/debian/patches/10_su-to-root_usage.diff  | 11 ++++++++
 .../debian/patches/13_add_kuser_issuperuser.diff   | 29 ++++++++++++++++++++++
 .../applications/kvpnc/debian/patches/series       |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 ubuntu/precise/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
 create mode 100644 ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
 create mode 100644 ubuntu/precise/applications/kvpnc/debian/patches/series

(limited to 'ubuntu/precise/applications/kvpnc/debian/patches')

diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/precise/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
new file mode 100644
index 000000000..711bbff74
--- /dev/null
+++ b/ubuntu/precise/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;TDE;Qt
+-Exec=kvpnc
++Exec=su-to-root -X -c /opt/trinity/bin/kvpnc
+ X-TDE-SubstituteUID=true
+ Icon=kvpnc
+ Type=Application
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
new file mode 100644
index 000000000..70fd0192e
--- /dev/null
+++ b/ubuntu/precise/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/precise/applications/kvpnc/debian/patches/series b/ubuntu/precise/applications/kvpnc/debian/patches/series
new file mode 100644
index 000000000..09040ada9
--- /dev/null
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/series
@@ -0,0 +1,2 @@
+10_su-to-root_usage.diff
+13_add_kuser_issuperuser.diff
-- 
cgit v1.2.1