From 9c59da5b8df0d8ff8e313b6f5462c5f90bbd9f7b Mon Sep 17 00:00:00 2001
From: "Lamarque V. Souza" <lamarque@kde.org>
Date: Thu, 15 Dec 2011 22:24:20 -0200
Subject: [PATCH 19/26] This file is not necessary for Plasma NM >= 0.8.80.
 (cherry picked from commit
 66ea06807a23c8703e922ff0e64b5ad4b56e7bd3)

---
 CMakeLists.txt           |    6 ------
 NetworkManager-kde4.conf |   42 ------------------------------------------
 2 files changed, 0 insertions(+), 48 deletions(-)
 delete mode 100644 NetworkManager-kde4.conf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 308414e..0c55a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,12 +58,6 @@ if (NETWORKMANAGER_FOUND)
         #add_subdirectory(monolithic)
 
         install( FILES networkmanagement.notifyrc DESTINATION ${DATA_INSTALL_DIR}/networkmanagement )
-
-        if (DBUS_SYSTEM_POLICY_DIR)
-            install( FILES NetworkManager-kde4.conf DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
-        else (DBUS_SYSTEM_POLICY_DIR)
-            message(STATUS "It is necessary to specify the directory where the client policy file for NetworkManager-kde4 is installed as DBUS_SYSTEM_POLICY_DIR.  Normally this is /etc/dbus-1/system.d on a Linux system")
-        endif (DBUS_SYSTEM_POLICY_DIR)
     else()
         message(FATAL_ERROR "ERROR: NetworkManager version '${NETWORKMANAGER_VERSION}' does not match minimum required (${MINIMUM_NM_VERSION_REQUIRED})")
     endif()
diff --git a/NetworkManager-kde4.conf b/NetworkManager-kde4.conf
deleted file mode 100644
index 402f548..0000000
--- a/NetworkManager-kde4.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<!--
-	     WARNING: if running any D-Bus version prior to 1.2.6, you may be
-	     vulnerable to information leakage via the NM D-Bus interface.
-	     Previous D-Bus versions did not deny-by-default, and this permissions
-	     config file assumes that D-Bus will deny rules by default unless
-	     explicitly over-ridden with an <allow /> tag.
-	 -->
-
-        <policy user="root">
-                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManager.Settings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
-
-                <!-- Only root can get secrets -->
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManager.Settings.Connection.Secrets"/>
-        </policy>
-        <policy at_console="true">
-                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManager.Settings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
-        </policy>
-        <policy context="default">
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-        </policy>
-
-        <limit name="max_replies_per_connection">512</limit>
-</busconfig>
-
-- 
1.7.7.5