[arch-commits] CVS update of extra/daemons/networkmanager (4 files)

Jan de Groot jgc at archlinux.org
Thu Apr 26 13:18:51 EDT 2007


    Date: Thursday, April 26, 2007 @ 13:18:51
  Author: jgc
    Path: /home/cvs-extra/extra/daemons/networkmanager

Modified: NetworkManager.conf (1.1 -> 1.2) PKGBUILD (1.9 -> 1.10)
 Removed: networkmanager-0.6.4-dbus-close.patch (1.1)
          wpa_supplicant-nodebug.patch (1.1)

upgpkg: networkmanager 0.6.5-1
Update to new version. Move away some includefiles, fix configuration file, patch initscript


---------------------------------------+
 NetworkManager.conf                   |    8 +-----
 PKGBUILD                              |   40 ++++++++++++++++----------------
 networkmanager-0.6.4-dbus-close.patch |   21 ----------------
 wpa_supplicant-nodebug.patch          |   24 -------------------
 4 files changed, 22 insertions(+), 71 deletions(-)


Index: extra/daemons/networkmanager/NetworkManager.conf
diff -u extra/daemons/networkmanager/NetworkManager.conf:1.1 extra/daemons/networkmanager/NetworkManager.conf:1.2
--- extra/daemons/networkmanager/NetworkManager.conf:1.1	Sun Aug 13 08:33:11 2006
+++ extra/daemons/networkmanager/NetworkManager.conf	Thu Apr 26 13:18:50 2007
@@ -8,11 +8,7 @@
                 <allow send_destination="org.freedesktop.NetworkManager"/>
                 <allow send_interface="org.freedesktop.NetworkManager"/>
         </policy>
-        <policy group="users">
-                <allow send_destination="org.freedesktop.NetworkManager"/>
-                <allow send_interface="org.freedesktop.NetworkManager"/>
-        </policy>
-        <policy user="hal">
+        <policy group="network">
                 <allow send_destination="org.freedesktop.NetworkManager"/>
                 <allow send_interface="org.freedesktop.NetworkManager"/>
         </policy>
@@ -21,5 +17,5 @@
                 <deny send_destination="org.freedesktop.NetworkManager"/>
                 <deny send_interface="org.freedesktop.NetworkManager"/>
         </policy>
+        <limit name="max_replies_per_connection">512</limit>
 </busconfig>
-
Index: extra/daemons/networkmanager/PKGBUILD
diff -u extra/daemons/networkmanager/PKGBUILD:1.9 extra/daemons/networkmanager/PKGBUILD:1.10
--- extra/daemons/networkmanager/PKGBUILD:1.9	Mon Oct 30 14:57:50 2006
+++ extra/daemons/networkmanager/PKGBUILD	Thu Apr 26 13:18:50 2007
@@ -1,41 +1,41 @@
-# $Id: PKGBUILD,v 1.9 2006/10/30 19:57:50 andyrtr Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinxu.org>
+# $Id: PKGBUILD,v 1.10 2007/04/26 17:18:50 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>
 # Contributor: Will Rea <sillywilly at gmail.com>
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
 pkgname=networkmanager
-
-pkgver=0.6.4
-pkgrel=3
-pkgdesc="A Network Manager"
-arch=(i686 x86_64)
+pkgver=0.6.5
+pkgrel=1
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=('wireless_tools' 'iproute' 'dhcdbd' 'hal>=0.5.8.1-2' 'libnl'
+depends=('wireless_tools' 'iproute' 'dhcdbd' 'hal>=0.5.9' 'libnl'
 	 'wpa_supplicant>=0.5.0' "libnetworkmanager>=${pkgver}")
-makedepends=('pkgconfig' 'intltool')
-options=('NOLIBTOOL')
+makedepends=('pkgconfig' 'perlxml')
+options=('nolibtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${pkgver}.tar.bz2 
-	wpa_supplicant-nodebug.patch
-	NetworkManager.conf networkmanager-0.6.4-dbus-close.patch
-	ntpdate netfs)
-md5sums=('7d22b8df56d65d7c966cb28e0772d305' '83049858565242035489a5fcb09b5264'\
-         '9b4ee1069ae4af734b25c26774d2fe00' 'b55119d225f8d784ac49eb52288259b6'\
-         '9a3b8da1efac158d91bb9fc699736b03' 'ee592ee567faf683e7aecf651bd15937')
-		  
+	networkmanager-initscript.patch
+	NetworkManager.conf
+	ntpdate
+	netfs)
+md5sums=('b827d300eb28458f6588eb843cba418d' 'beb3738b1bd05d171f0e06f8a3306b56'
+	 '0a010bd3f35344325a7dbf3bfa697bfe' '9a3b8da1efac158d91bb9fc699736b03'
+         'ee592ee567faf683e7aecf651bd15937')
+
 
 build() {
   cd ${startdir}/src/NetworkManager-${pkgver}
-  patch -Np1 -i ${startdir}/src/networkmanager-0.6.4-dbus-close.patch || return 1  
-  patch -Np1 -i ${startdir}/src/wpa_supplicant-nodebug.patch || return 1  
+  patch -Np0 -i ${startdir}/src/networkmanager-initscript.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-distro=arch --localstatedir=/var \
       --without-gnome
   
   make || return 1
-  sed -i -e '/\slibnm-util\s/d' -e '/\sgnome\s/d' Makefile
+  sed -i -e '/\slibnm-util\s/d' -e '/\sinclude/d' -e '/\sgnome\s/d' Makefile
   make DESTDIR=${startdir}/pkg install
   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
Index: extra/daemons/networkmanager/networkmanager-0.6.4-dbus-close.patch
diff -u extra/daemons/networkmanager/networkmanager-0.6.4-dbus-close.patch:1.1 extra/daemons/networkmanager/networkmanager-0.6.4-dbus-close.patch:removed
--- extra/daemons/networkmanager/networkmanager-0.6.4-dbus-close.patch:1.1	Sat Sep 30 08:19:30 2006
+++ extra/daemons/networkmanager/networkmanager-0.6.4-dbus-close.patch	Thu Apr 26 13:18:51 2007
@@ -1,21 +0,0 @@
-diff -ruN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c
---- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c	2006-07-28 19:27:51.000000000 -0500
-+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-07-28 19:28:50.000000000 -0500
-@@ -230,7 +230,7 @@
- 	{
- 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
- 		ctx->nm_state = LIBNM_NO_DBUS;
--		dbus_connection_disconnect (ctx->dbus_con);
-+		dbus_connection_close (ctx->dbus_con);
- 		libnm_glib_schedule_dbus_watcher (ctx);
- 	}
- 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-@@ -444,7 +444,7 @@
- 		g_main_loop_unref (ctx->g_main_loop);
- 
- 	if (ctx->dbus_con)
--		dbus_connection_disconnect (ctx->dbus_con);
-+		dbus_connection_close (ctx->dbus_con);
- 
- 	if (ctx->callbacks_lock)
- 		g_mutex_free (ctx->callbacks_lock);
Index: extra/daemons/networkmanager/wpa_supplicant-nodebug.patch
diff -u extra/daemons/networkmanager/wpa_supplicant-nodebug.patch:1.1 extra/daemons/networkmanager/wpa_supplicant-nodebug.patch:removed
--- extra/daemons/networkmanager/wpa_supplicant-nodebug.patch:1.1	Thu Jun 29 03:32:25 2006
+++ extra/daemons/networkmanager/wpa_supplicant-nodebug.patch	Thu Apr 26 13:18:51 2007
@@ -1,24 +0,0 @@
-diff -urN NetworkManager-0.6.3-orig/src/nm-device-802-11-wireless.c NetworkManager-0.6.3/src/nm-device-802-11-wireless.c
---- NetworkManager-0.6.3-orig/src/nm-device-802-11-wireless.c	2006-06-07 23:30:25.000000000 +0600
-+++ NetworkManager-0.6.3/src/nm-device-802-11-wireless.c	2006-06-09 20:05:21.000000000 +0600
-@@ -2424,16 +2424,15 @@
- supplicant_exec (NMDevice80211Wireless *self)
- {
- 	gboolean	success = FALSE;
--	char *	argv[5];
-+	char *	argv[4];
- 	GError *	error = NULL;
- 	GPid		pid = -1;
- 	int		sup_stdout;
- 
- 	argv[0] = WPA_SUPPLICANT_BIN;
--	argv[1] = "-dd";
--	argv[2] = "-g";
--	argv[3] = WPA_SUPPLICANT_GLOBAL_SOCKET;
--	argv[4] = NULL;
-+	argv[1] = "-g";
-+	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
-+	argv[3] = NULL;
- 
- 	success = g_spawn_async_with_pipes ("/", argv, NULL, 0, NULL, NULL,
- 	                    &pid, NULL, &sup_stdout, NULL, &error);




More information about the arch-commits mailing list