networkmanager 0.9.0-1 suppression patch inutile + correction dep

4 files changed, 1 insertions, 77 deletions

diff --git a/networkmanager/.md5sum.i686 b/networkmanager/.md5sum.i686
index 457b13c..52a2067 100644
--- a/networkmanager/.md5sum.i686
+++ b/networkmanager/.md5sum.i686
@@ -1,5 +1,4 @@
 658f1faa6dd42a0f9a81bdff43667ab8  NetworkManager-0.9.0.tar.xz
 df9adee779186c7c278e77e22ba094ee  NuTyX.patch
-f7e8e2d095d7bc331c5de91232eb23eb  discover_mac_address.patch
 3239c07546bcce51e4903edb2dfc31e8  network.conf
 b8de5af0abf3b2292f0f9e1aa429fb9f  network.rc
diff --git a/networkmanager/.md5sum.x86_64 b/networkmanager/.md5sum.x86_64
index 457b13c..52a2067 100644
--- a/networkmanager/.md5sum.x86_64
+++ b/networkmanager/.md5sum.x86_64
@@ -1,5 +1,4 @@
 658f1faa6dd42a0f9a81bdff43667ab8  NetworkManager-0.9.0.tar.xz
 df9adee779186c7c278e77e22ba094ee  NuTyX.patch
-f7e8e2d095d7bc331c5de91232eb23eb  discover_mac_address.patch
 3239c07546bcce51e4903edb2dfc31e8  network.conf
 b8de5af0abf3b2292f0f9e1aa429fb9f  network.rc
diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile
index 4bd85ee..6606e86 100644
--- a/networkmanager/Pkgfile
+++ b/networkmanager/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/projects/NetworkManager/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: dbus-glib, iproute2, libnl, nss, polkit, wireless_tools, wpa_supplicant, ppp, iptables, intltool, bluez, gobject-introspection
+# Depends on: gtk-doc, dbus-glib, iproute2, libnl, nss, polkit, wireless_tools, wpa_supplicant, ppp, iptables, intltool, bluez, gobject-introspection
 # Run on: dbus-glib,iproute2,libnl,nss,polkit,wireless_tools,wpa_supplicant,ppp,iptables,bluez
 
 
@@ -11,14 +11,12 @@ version=0.9.0
 release=1
 _name=NetworkManager
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_name/${version%.*}/$_name-$version.tar.xz
-	discover_mac_address.patch
 	NuTyX.patch
 	network.rc
 	network.conf)
 
 build() {
 	cd ${_name}-$version
-	patch -p1 < ../discover_mac_address.patch
 	patch -p1 < ../NuTyX.patch
 	aclocal
 	autoconf
diff --git a/networkmanager/discover_mac_address.patch b/networkmanager/discover_mac_address.patch
deleted file mode 100644
index c73921f..0000000
--- a/networkmanager/discover_mac_address.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/reader.c.hwaddr NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/reader.c
---- NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/reader.c.hwaddr	2011-05-27 16:38:29.000000000 +0200
-+++ NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/reader.c	2011-07-31 20:40:11.459089519 +0200
-@@ -157,6 +157,46 @@ make_connection_setting (const char *fil
- }
- 
- static gboolean
-+discover_mac_address(shvarFile *ifcfg, GByteArray **array, GError **error)
-+{
-+	int fd, ret;
-+	struct ifreq ifr;
-+	char *device;
-+
-+	device = svGetValue (ifcfg, "DEVICE", FALSE);
-+
-+	g_return_val_if_fail (device != NULL, FALSE);
-+	g_return_val_if_fail (array != NULL, FALSE);
-+	g_return_val_if_fail (*array == NULL, FALSE);
-+	g_return_val_if_fail (error != NULL, FALSE);
-+	g_return_val_if_fail (*error == NULL, FALSE);
-+
-+	fd = socket(AF_INET, SOCK_DGRAM, 0);
-+	if (fd < 0) {
-+		g_set_error(error, IFCFG_PLUGIN_ERROR, errno,
-+				"Unable to discover MAC address: socket error");
-+		g_free (device);
-+		return FALSE;
-+	}
-+
-+	ifr.ifr_addr.sa_family = AF_INET;
-+	strncpy(ifr.ifr_name, device, IFNAMSIZ-1);
-+
-+	ret = ioctl(fd, SIOCGIFHWADDR, &ifr);
-+	g_free (device);
-+	if (ret < 0) {
-+		g_set_error(error, IFCFG_PLUGIN_ERROR, errno,
-+				"Unable to discover MAC address: ioctl error");
-+		return FALSE;
-+	}
-+	close(fd);
-+
-+	*array = g_byte_array_sized_new (ETH_ALEN);
-+	g_byte_array_append (*array, (guint8 *) ifr.ifr_hwaddr.sa_data, ETH_ALEN);
-+	return TRUE;
-+}
-+
-+static gboolean
- read_mac_address (shvarFile *ifcfg, const char *key, GByteArray **array, GError **error)
- {
- 	char *value = NULL;
-@@ -2750,6 +2790,10 @@ make_wireless_setting (shvarFile *ifcfg,
- 	s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ());
- 
- 	if (read_mac_address (ifcfg, "HWADDR", &array, error)) {
-+		/* if we don't have a HWADDR saved in ifcfg file, try to discover it manually */
-+		if (!array) {
-+			discover_mac_address(ifcfg, &array, error);
-+		}
- 		if (array) {
- 			g_object_set (s_wireless, NM_SETTING_WIRELESS_MAC_ADDRESS, array, NULL);
- 
-@@ -3083,6 +3127,10 @@ make_wired_setting (shvarFile *ifcfg,
- 	}
- 
- 	if (read_mac_address (ifcfg, "HWADDR", &mac, error)) {
-+		/* if we don't have a HWADDR saved in ifcfg file, try to discover it manually */
-+		if (!mac) {
-+			discover_mac_address(ifcfg, &mac, error);
-+		}
- 		if (mac) {
- 			g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
-