From 96cd6c807c759c0aa9a42d4b8a2c4e65e9465c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 29 Sep 2013 15:07:49 +0200 Subject: Refresh patches for kvpnc on Debian and Ubuntu This resolves Bug 1531 --- .../kvpnc/debian/patches/13_add_kuser_issuperuser.diff | 12 ++++++------ debian/lenny/applications/kvpnc/debian/patches/series | 2 +- .../kvpnc/debian/patches/13_add_kuser_issuperuser.diff | 12 ++++++------ debian/squeeze/applications/kvpnc/debian/patches/series | 2 +- .../kvpnc/debian/patches/13_add_kuser_issuperuser.diff | 12 ++++++------ debian/wheezy/applications/kvpnc/debian/patches/series | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("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); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/lenny/applications/kvpnc/debian/patches/series b/debian/lenny/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/series +++ b/debian/lenny/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("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); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/squeeze/applications/kvpnc/debian/patches/series b/debian/squeeze/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/series +++ b/debian/squeeze/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("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); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/wheezy/applications/kvpnc/debian/patches/series b/debian/wheezy/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/series +++ b/debian/wheezy/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff -- cgit v1.2.1