[arch-commits] CVS update of extra/daemons/networkmanager (3 files)
Jan de Groot
jgc at archlinux.org
Sun Aug 19 12:38:16 UTC 2007
Date: Sunday, August 19, 2007 @ 08:38:16
Author: jgc
Path: /home/cvs-extra/extra/daemons/networkmanager
Modified: NetworkManager.conf (1.2 -> 1.3) PKGBUILD (1.11 -> 1.12)
networkmanager-initscript.patch (1.1 -> 1.2)
Fix FS #7795: move files from /usr/libexec to /usr/lib/networkmanager
Fix FS #7266: Include configuration for client applications in main networkmanager dbus config.
Fix FS #7396: Include nm-tool binary (we already ship the manpage)
Fix FS #7685: Add sleep/wake commands to initscript.
Add dbus and dhcp dependency to initscript (it is a common mistake to forget about the dhcp daemon)
---------------------------------+
NetworkManager.conf | 12 +++++++
PKGBUILD | 14 ++++----
networkmanager-initscript.patch | 65 ++++++++++++++++++++++++++++----------
3 files changed, 68 insertions(+), 23 deletions(-)
Index: extra/daemons/networkmanager/NetworkManager.conf
diff -u extra/daemons/networkmanager/NetworkManager.conf:1.2 extra/daemons/networkmanager/NetworkManager.conf:1.3
--- extra/daemons/networkmanager/NetworkManager.conf:1.2 Thu Apr 26 13:18:50 2007
+++ extra/daemons/networkmanager/NetworkManager.conf Sun Aug 19 08:38:16 2007
@@ -7,15 +7,27 @@
<allow send_destination="org.freedesktop.NetworkManager"/>
<allow send_interface="org.freedesktop.NetworkManager"/>
+ <allow own="org.freedesktop.NetworkManagerInfo"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+ <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
</policy>
<policy group="network">
<allow send_destination="org.freedesktop.NetworkManager"/>
<allow send_interface="org.freedesktop.NetworkManager"/>
+ <allow own="org.freedesktop.NetworkManagerInfo"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+ <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
</policy>
<policy context="default">
<deny own="org.freedesktop.NetworkManager"/>
<deny send_destination="org.freedesktop.NetworkManager"/>
<deny send_interface="org.freedesktop.NetworkManager"/>
+ <deny own="org.freedesktop.NetworkManagerInfo"/>
+
+ <deny send_destination="org.freedesktop.NetworkManagerInfo"/>
+ <deny send_interface="org.freedesktop.NetworkManagerInfo"/>
</policy>
<limit name="max_replies_per_connection">512</limit>
</busconfig>
Index: extra/daemons/networkmanager/PKGBUILD
diff -u extra/daemons/networkmanager/PKGBUILD:1.11 extra/daemons/networkmanager/PKGBUILD:1.12
--- extra/daemons/networkmanager/PKGBUILD:1.11 Wed Jul 25 14:05:47 2007
+++ extra/daemons/networkmanager/PKGBUILD Sun Aug 19 08:38:16 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.11 2007/07/25 18:05:47 jgc Exp $
+# $Id: PKGBUILD,v 1.12 2007/08/19 12:38:16 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinxu.org>
# Contri-butor: Wael Nasreddine <gandalf at siemens-mobiles.org>
# Contributor: Tor Krill <tor at krill.nu>
@@ -7,7 +7,7 @@
pkgname=networkmanager
pkgver=0.6.5
-pkgrel=2
+pkgrel=3
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -22,18 +22,16 @@
dont-tear-down-upped-interfaces.patch
dont-up-notwired-interfaces.patch
fix-ethernet-link-detection-races.patch
- networkmanager-initscript.patch
NetworkManager.conf
ntpdate
netfs)
md5sums=('b827d300eb28458f6588eb843cba418d'
- 'beb3738b1bd05d171f0e06f8a3306b56'
+ '730a3ebd470986a9f61deaf52cac0cb0'
'2f208e80adcd558ccbcb57344f842691'
'a6af8522d2fdd59ba7a0e4b04c19a405'
'4e88282faf2b41d757f9aca72c1a249f'
'de72f700fdfec464d05d6296822d0e6c'
- 'beb3738b1bd05d171f0e06f8a3306b56'
- '0a010bd3f35344325a7dbf3bfa697bfe'
+ 'fbdcffdc2cc7740f99c6ef5047f35160'
'9a3b8da1efac158d91bb9fc699736b03'
'ee592ee567faf683e7aecf651bd15937')
@@ -47,11 +45,13 @@
./configure --prefix=/usr --sysconfdir=/etc \
--with-distro=arch --localstatedir=/var \
- --without-gnome
+ --without-gnome --libexecdir=/usr/lib/networkmanager
make || return 1
sed -i -e '/\slibnm-util\s/d' -e '/\sinclude/d' -e '/\sgnome\s/d' Makefile
make DESTDIR=${startdir}/pkg install
+ install -d -m755 ${startdir}/pkg/usr/bin
+ install -m755 test/nm-tool ${startdir}/pkg/usr/bin/nm-tool
install -m644 ${startdir}/src/NetworkManager.conf ${startdir}/pkg/etc/dbus-1/system.d/NetworkManager.conf
install -m755 ${startdir}/src/ntpdate ${startdir}/pkg/etc/NetworkManager/dispatcher.d/ntpdate
install -m755 ${startdir}/src/netfs ${startdir}/pkg/etc/NetworkManager/dispatcher.d/netfs
Index: extra/daemons/networkmanager/networkmanager-initscript.patch
diff -u extra/daemons/networkmanager/networkmanager-initscript.patch:1.1 extra/daemons/networkmanager/networkmanager-initscript.patch:1.2
--- extra/daemons/networkmanager/networkmanager-initscript.patch:1.1 Sat Apr 14 10:56:37 2007
+++ extra/daemons/networkmanager/networkmanager-initscript.patch Sun Aug 19 08:38:16 2007
@@ -1,40 +1,73 @@
---- initscript/Arch/networkmanager.in 2006-07-13 16:02:54.000000000 +0200
-+++ initscript/Arch/networkmanager.new 2007-03-04 10:43:46.000000000 +0100
-@@ -26,7 +26,7 @@
+--- initscript/Arch/networkmanager-dispatcher.in 2007-04-18 18:13:08.000000000 +0000
++++ initscript/Arch/networkmanager-dispatcher.in 2007-08-19 12:22:50.000000000 +0000
+@@ -25,7 +25,7 @@
if [ ! -z "$PID" -o $? -gt 0 ]; then
stat_fail
else
-- add_daemon NetworkManager
-+ add_daemon networkmanager
+- add_daemon NetworkManagerDispatcher
++ add_daemon networkmanager-dispatcher
stat_done
fi
;;
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
if [ $? -gt 0 ]; then
stat_fail
else
-- rm_daemon NetworkManager
-+ rm_daemon networkmanager
+- rm_daemon NetworkManagerDispatcher
++ rm_daemon networkmanager-dispatcher
stat_done
fi
;;
---- initscript/Arch/networkmanager-dispatcher.in 2006-07-13 16:02:54.000000000 +0200
-+++ initscript/Arch/networkmanager-dispatcher.new 2007-03-04 10:44:16.000000000 +0100
-@@ -25,7 +25,7 @@
+--- initscript/Arch/networkmanager.in 2007-04-18 18:13:08.000000000 +0000
++++ initscript/Arch/networkmanager.in 2007-08-19 12:24:56.000000000 +0000
+@@ -19,6 +19,8 @@
+ PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
+ case "$1" in
+ start)
++ ck_daemon dbus && /etc/rc.d/dbus start
++ ck_daemon dhcdbd && /etc/rc.d/dhcdbd start
+ stat_busy "Starting NetworkManager"
+ if [ -z "$PID" ]; then
+ $NETWORKMANAGER_BIN
+@@ -26,7 +28,7 @@
if [ ! -z "$PID" -o $? -gt 0 ]; then
stat_fail
else
-- add_daemon NetworkManagerDispatcher
-+ add_daemon networkmanager-dispatcher
+- add_daemon NetworkManager
++ add_daemon networkmanager
stat_done
fi
;;
-@@ -35,7 +35,7 @@
+@@ -36,7 +38,7 @@
if [ $? -gt 0 ]; then
stat_fail
else
-- rm_daemon NetworkManagerDispatcher
-+ rm_daemon networkmanager-dispatcher
+- rm_daemon NetworkManager
++ rm_daemon networkmanager
stat_done
fi
;;
+@@ -45,8 +47,22 @@
+ sleep 1
+ $0 start
+ ;;
++ sleep)
++ /usr/bin/dbus-send --system \
++ --dest=org.freedesktop.NetworkManager \
++ --type=method_call \
++ /org/freedesktop/NetworkManager \
++ org.freedesktop.NetworkManager.sleep
++ ;;
++ wake)
++ /usr/bin/dbus-send --system \
++ --dest=org.freedesktop.NetworkManager \
++ --type=method_call \
++ /org/freedesktop/NetworkManager \
++ org.freedesktop.NetworkManager.wake
++ ;;
+ *)
+- echo "usage: $0 {start|stop|restart}"
++ echo "usage: $0 {start|stop|restart|sleep|wake}"
+ ;;
+ esac
+ exit 0
More information about the arch-commits
mailing list