Commit 6191783a authored by Alf Gaida's avatar Alf Gaida

Added some patches

* Added dbus-policy.patch (already applied upstream)
* Added keywords.patch (already applied upstream
* Added surpress-vpn-warning.patch, pending upstream
  (Closes: #842444)
parent dbca0394
cmst (2016.10.03-2) unstable; urgency=medium
* Added dbus-policy.patch (already applied upstream)
* Added keywords.patch (already applied upstream
* Added surpress-vpn-warning.patch, pending upstream
(Closes: #842444)
-- Alf Gaida <agaida@siduction.org> Sun, 30 Oct 2016 14:53:49 +0100
cmst (2016.10.03-1) unstable; urgency=medium
* Cherry-picking upstream version 2016.10.03.
......
Description: Dbus policy
Add missing send_destination to roothelper dbus policy file
Author: Kristian Klausen <klausenbusk@hotmail.com>
--- a/apps/rootapp/system/distro/arch/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/arch/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
<policy group="network">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
--- a/apps/rootapp/system/distro/debian/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/debian/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
- <policy group="netdev">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <policy group="network">
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
--- a/apps/rootapp/system/distro/slackware/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/slackware/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
- <policy group="netdev">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <policy group="network">
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
Description: Keywords
Add some keywords to the desktop file
Author: Kristian Klausen <klausenbusk@hotmail.com>
--- a/misc/desktop/cmst-autostart.desktop
+++ b/misc/desktop/cmst-autostart.desktop
@@ -10,6 +10,7 @@ Exec=cmst -w5
Terminal=false
StartupNotify=false
X-GNOME-Autostart-enabled=true
+Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Bluetooth;vpn;DNS;
Name[de]=Netzwerk-Konfiguration
diff --git a/misc/desktop/cmst.desktop b/misc/desktop/cmst.desktop
index 2837117..6d5ade3 100644
--- a/misc/desktop/cmst.desktop
+++ b/misc/desktop/cmst.desktop
@@ -10,6 +10,7 @@ Terminal=false
Exec=cmst
StartupNotify=false
X-GNOME-Autostart-enabled=true
+Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Bluetooth;vpn;DNS;
Name[de]=Netzwerk-Konfiguration
dbus-policy.patch
desktop.patch
keywords.patch
surpress-vpn-warning.patch
Description: Surpress vpn warning
Surpress annoying vpn warning if connman-vpn is not installed
Author: Kristian Klausen <klausenbusk@hotmail.com>
--- a/apps/cmstapp/code/control_box/controlbox.cpp
+++ b/apps/cmstapp/code/control_box/controlbox.cpp
@@ -2765,8 +2765,6 @@ void ControlBox::logErrors(const quint8& err)
break;
case CMST::Err_Invalid_VPN_Iface:
syslog(LOG_ERR, "%s",tr("Could not create an interface to connman-vpn on the system bus").toUtf8().constData());
- QMessageBox::critical(this, tr("%1 - Critical Error").arg(TranslateStrings::cmtr("cmst")),
- tr("Unable to create an interface to connman-vpn on the system bus.<br><br>%1 will not be able to communicate with the connman vpn daemon.").arg(TranslateStrings::cmtr("cmst")) );
break;
default:
break;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment