rpms/NetworkManager/devel NetworkManager-0.6.4-fc5-specialcase-madwifi.patch, NONE, 1.1 NetworkManager-0.6.4-old-dbus.patch, NONE, 1.1 NetworkManager-0.6.4-startup-dhcdbd.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 NetworkManager.spec, 1.120, 1.121 sources, 1.55, 1.56 NetworkManager-0.7.0-dbus-deprecated.patch, 1.1, NONE NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch, 1.2, NONE NetworkManager-0.7.0-shhh.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 30 14:57:04 UTC 2006


Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9513

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	NetworkManager-0.6.4-fc5-specialcase-madwifi.patch 
	NetworkManager-0.6.4-old-dbus.patch 
	NetworkManager-0.6.4-startup-dhcdbd.patch 
Removed Files:
	NetworkManager-0.7.0-dbus-deprecated.patch 
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch 
	NetworkManager-0.7.0-shhh.patch 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
- Revert FC6 to latest stable NM
- Update to stable snapshot
- Remove bind/caching-nameserver hard requirement



NetworkManager-0.6.4-fc5-specialcase-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE NetworkManager-0.6.4-fc5-specialcase-madwifi.patch ---
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.madwifi	2006-07-13 12:42:13.000000000 -0400
+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-07-14 15:28:21.000000000 -0400
@@ -2497,6 +2497,8 @@
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
 	int				tries = 0;
+ 	const char *		dev_driver;
+ 	char *			wpa_driver = "wext";
 
 	/* Try to open wpa_supplicant's global control socket */
 	for (tries = 0; tries < WPA_SUPPLICANT_NUM_RETRIES && !ctrl; tries++)
@@ -2511,9 +2513,16 @@
 		goto exit;
 	}
 
+ 	/* Special-case madwifi for now.  madwifi needs to get their
+ 	 * act in gear and support WEXT too.
+ 	 */
+ 	dev_driver = nm_device_get_driver (NM_DEVICE (self));
+ 	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
+ 		wpa_driver = "madwifi";
+ 
 	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))
+			"INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, wpa_driver))
 		goto exit;
 	wpa_ctrl_close (ctrl);
 

NetworkManager-0.6.4-old-dbus.patch:
 libnm_glib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.6.4-old-dbus.patch ---
--- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c.old-dbus	2006-08-30 10:38:44.000000000 -0400
+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-08-30 10:38:57.000000000 -0400
@@ -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_close (ctx->dbus_con);
+		dbus_connection_disconnect (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_close (ctx->dbus_con);
+		dbus_connection_disconnect (ctx->dbus_con);
 
 	if (ctx->callbacks_lock)
 		g_mutex_free (ctx->callbacks_lock);

NetworkManager-0.6.4-startup-dhcdbd.patch:
 NetworkManager.in |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE NetworkManager-0.6.4-startup-dhcdbd.patch ---
--- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd	2006-03-30 12:42:28.000000000 -0500
+++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in	2006-03-30 12:43:25.000000000 -0500
@@ -36,6 +36,11 @@
 {
 	echo $"Setting network parameters... "
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+
+	if [ ! -e /var/lock/subsys/dhcdbd ]; then
+		service dhcdbd start
+	fi
+
 	echo -n $"Starting NetworkManager daemon: "
 	daemon --check $servicename $processname --pid-file=$pidfile
 	RETVAL=$?


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	29 May 2006 05:03:30 -0000	1.37
+++ .cvsignore	30 Aug 2006 14:57:02 -0000	1.38
@@ -1,3 +1,4 @@
 NetworkManager-0.6.1.tar.bz2
 NetworkManager-0.7.0.cvs20060521.tar.gz
 NetworkManager-0.7.0.cvs20060529.tar.gz
+NetworkManager-0.6.4.cvs20060829.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- NetworkManager.spec	29 Aug 2006 23:52:13 -0000	1.120
+++ NetworkManager.spec	30 Aug 2006 14:57:02 -0000	1.121
@@ -1,29 +1,32 @@
 ExcludeArch: s390 s390x
 
-%define cvs_snapshot 1
-
 %define hal_version	0.5.0
+
+%if "%fedora" == "5"
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
+%endif
+
+%if "%fedora" == "6"
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%endif
+
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
-%define bind_version 24:9.3.1-20
-
-%if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060529
-%endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
-Version: 0.7.0
-Release: 0%{?nm_cvs_version}.7
+Epoch: 1
+Version: 0.6.4
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
-Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
-Patch1: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
-Patch2: NetworkManager-0.7.0-shhh.patch
+Source: %{name}-%{version}.cvs20060829.tar.gz
+Patch0: NetworkManager-0.6.4-old-dbus.patch
+Patch1: NetworkManager-0.6.4-fc5-specialcase-madwifi.patch
+Patch2: NetworkManager-0.6.4-startup-dhcdbd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -32,10 +35,8 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
-Requires: caching-nameserver
 Requires: dhcdbd
 Requires: dhclient >= 3.0.2-12
-Requires: bind >= %{bind_version}
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -120,11 +121,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus-deprecated
-%patch1 -p1 -b .dont-choose-inactive-wired-device
-%patch2 -p1 -b .shhhh
+%if "%fedora" == "5"
+%patch0 -p1 -b .old-dbus
+# Preserve compat with older FC5 versions of NM
+%patch1 -p1 -b .specialcase-madwifi
+%endif
+%patch2 -p1 -b .startup-dhcdbd
 
 %build
+# Even though we don't require named, we still build with it
+# so that if the user installs it, NM will use it automatically
 %configure \
 	--disable-static \
 	--enable-notify=yes \
@@ -221,6 +227,11 @@
 
 
 %changelog
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
+- Revert FC6 to latest stable NM
+- Update to stable snapshot
+- Remove bind/caching-nameserver hard requirement
+
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
 - BuildRequire wireless-tools-devel and perl-XML-Parser
 - Update the BuildRoot tag


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	29 May 2006 05:03:36 -0000	1.55
+++ sources	30 Aug 2006 14:57:02 -0000	1.56
@@ -1 +1 @@
-09a17cf1a7fe275238e96098fc2f3cb9  NetworkManager-0.7.0.cvs20060529.tar.gz
+a5bb1966ec56b76eee31a05e4e14d13c  NetworkManager-0.6.4.cvs20060829.tar.gz


--- NetworkManager-0.7.0-dbus-deprecated.patch DELETED ---


--- NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch DELETED ---


--- NetworkManager-0.7.0-shhh.patch DELETED ---




More information about the fedora-cvs-commits mailing list