Fix policy to allow ck-based policy; bug #268223

(Portage version: 2.2_rc31/cvs/Linux x86_64)

3 files changed, 93 insertions, 7 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 8ac46905bd9f..06f6c81dd509 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.25 2009/04/24 12:28:16 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.26 2009/05/02 18:57:48 dang Exp $
+
+*nm-applet-0.7.1-r1 (02 May 2009)
+
+  02 May 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +nm-applet-0.7.1-r1.ebuild, files/nm-applet-0.7.1-confchanges.patch:
+  Fix policy to allow ck-based policy; bug #268223
 
   24 Apr 2009; Robert Buchholz <rbu@gentoo.org> +nm-applet-0.6.5.ebuild:
   Readd NM 0.6.5 for ppc.
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch b/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch
index 05ed6a4fca09..9322f1965093 100644
--- a/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch
+++ b/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch
@@ -1,21 +1,41 @@
---- nm-applet-dbus-126.conf~	2009-03-31 17:10:19.000000000 +0100
-+++ nm-applet-dbus-126.conf	2009-04-21 16:27:51.000000000 +0100
-@@ -23,7 +23,7 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN network-manager-applet-0.7.1.orig/nm-applet-dbus-126.conf network-manager-applet-0.7.1/nm-applet-dbus-126.conf
+--- network-manager-applet-0.7.1.orig/nm-applet-dbus-126.conf	2009-03-31 12:10:19.000000000 -0400
++++ network-manager-applet-0.7.1/nm-applet-dbus-126.conf	2009-05-01 19:53:29.000000000 -0400
+@@ -23,7 +23,16 @@
                  <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
                         send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
          </policy>
 -        <policy at_console="true">
++	<policy at_console="true">
++                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
++
++                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++                       send_interface="org.freedesktop.NetworkManagerSettings"/>
++
++                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++                       send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
++        </policy>
 +        <policy group="plugdev">
                  <allow own="org.freedesktop.NetworkManagerUserSettings"/>
  
                  <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
---- nm-applet-pre-dbus-126.conf~	2009-03-31 17:10:20.000000000 +0100
-+++ nm-applet-pre-dbus-126.conf	2009-04-21 16:28:20.000000000 +0100
-@@ -11,7 +11,7 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN network-manager-applet-0.7.1.orig/nm-applet-pre-dbus-126.conf network-manager-applet-0.7.1/nm-applet-pre-dbus-126.conf
+--- network-manager-applet-0.7.1.orig/nm-applet-pre-dbus-126.conf	2009-03-31 12:10:20.000000000 -0400
++++ network-manager-applet-0.7.1/nm-applet-pre-dbus-126.conf	2009-05-01 19:53:37.000000000 -0400
+@@ -11,7 +11,16 @@
  		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
  		       send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
          </policy>
 -        <policy at_console="true">
++	<policy at_console="true">
++                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
++
++                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
++
++                <!-- Only root can get secrets -->
++                <deny send_destination="org.freedesktop.NetworkManagerUserSettings"
++                      send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
++        </policy>
 +        <policy group="plugdev">
                  <allow own="org.freedesktop.NetworkManagerUserSettings"/>
  
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..0f7b4efb37b4
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild,v 1.1 2009/05/02 18:57:48 dang Exp $
+
+EAPI=2
+inherit gnome2 eutils versionator
+
+MY_P="${P/nm-applet/network-manager-applet}"
+MYPV_MINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="Gnome applet for NetworkManager."
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="mirror://gnome/sources/network-manager-applet/0.7/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=sys-apps/hal-0.5.9
+	>=dev-libs/libnl-1.1
+	=net-misc/networkmanager-${MYPV_MINOR}*
+	>=net-wireless/wireless-tools-28_pre9
+	>=net-wireless/wpa_supplicant-0.5.7
+	>=dev-libs/glib-2.16
+	>=x11-libs/libnotify-0.4.3
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-keyring-2.20
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
+	>=gnome-base/gconf-2.20
+	>=gnome-extra/policykit-gnome-0.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+# USE_DESTDIR="1"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup () {
+	G2CONF="${G2CONF} \
+		--disable-more-warnings \
+		--localstatedir=/var \
+		--with-dbus-sys=/etc/dbus-1/system.d"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-confchanges.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "Your user needs to be in the plugdev group in order to use this"
+	elog "package.  If it doesn't start in Gnome for you automatically after"
+	elog 'you log back in, simply run "nm-applet --sm-disable"'
+	elog "You also need the notification area applet on your panel for"
+	elog "this to show up."
+}