fedora-cvs-commits@redhat.com
[Top] [All Lists]

rpms/NetworkManager/FC-5 NetworkManager-0.6.4-fc5-specialcase-madwifi.pa

Subject: rpms/NetworkManager/FC-5 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 NetworkManager.spec, 1.108, 1.109 sources, 1.55, 1.56 service-startup.patch, 1.1, NONE special-case-madwifi.patch, 1.2, NONE
From:
Date: Wed, 30 Aug 2006 11:05:02 -0400
Author: dcbw

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

Modified Files:
        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:
        service-startup.patch special-case-madwifi.patch 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw@xxxxxxxxxx> - 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: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- NetworkManager.spec 14 Jul 2006 19:32:13 -0000      1.108
+++ NetworkManager.spec 30 Aug 2006 15:05:00 -0000      1.109
@@ -1,45 +1,48 @@
 ExcludeArch: s390 s390x
 
-%define cvs_snapshot 0
+%define hal_version    0.5.0
 
-%define hal_version            0.5.0
-%define dbus_version   0.60
-%define gtk2_version   2.6.0
-%define wireless_tools_version 1:28-0pre9
-%define bind_version 24:9.3.1-20
+%if "%fedora" == "5"
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
+%endif
 
-%if %{cvs_snapshot}
-%define nm_cvs_version .cvs20060302
+%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
+
 Name: NetworkManager
 Summary: Network connection manager and user applications
+Epoch: 1
 Version: 0.6.4
-Release: 1%{?nm_cvs_version}%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Patch0: special-case-madwifi.patch
-Patch1: service-startup.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
 Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+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}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: hal-devel >= %{hal_version}
-BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -53,6 +56,7 @@
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: libnotify-devel >= 0.3
+BuildRequires: perl-XML-Parser
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -69,7 +73,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
@@ -85,7 +89,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description devel
 This package contains various headers accessing some NetworkManager 
functionality
@@ -95,9 +99,8 @@
 %package glib
 Summary: Libraries for adding NetworkManager support to applications that use 
glib.
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description glib
 This package contains the libraries that make it easier to use some 
NetworkManager
@@ -118,11 +121,22 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .madwifi
-%patch1 -p1 -b .service-startup
+%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
-%configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data 
--with-named-user=named --enable-notify=yes
+# 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 \
+       --with-named=/usr/sbin/named \
+       --with-named-dir=/var/named/data \
+       --with-named-user=named
 make
 
 
@@ -130,11 +144,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/NMLoadModules
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.la
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.a
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.la
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.a
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
@@ -156,6 +166,9 @@
     /sbin/chkconfig --del NetworkManagerDispatcher
 fi
 
+%post   glib -p /sbin/ldconfig
+%postun glib -p /sbin/ldconfig
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -214,14 +227,58 @@
 
 
 %changelog
-* Fri Jul 14 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.6.4-1
-- Update to 0.6.4 release
+* Wed Aug 30 2006 Dan Williams <dcbw@xxxxxxxxxx> - 1:0.6.4-2
+- Revert FC6 to latest stable NM
+- Update to stable snapshot
+- Remove bind/caching-nameserver hard requirement
 
-* Thu Jun  8 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.6.3-1
-- Update to 0.6.3 release
+* Tue Aug 29 2006 Christopher Aillon <caillon@xxxxxxxxxx> - 
0.7.0-0.cvs20060529.7
+- BuildRequire wireless-tools-devel and perl-XML-Parser
+- Update the BuildRoot tag
+
+* Wed Aug 16 2006 Ray Strode <rstrode@xxxxxxxxxx> - 0.7.0-0.cvs20060529.6
+- add patch to make networkmanager less verbose (bug 202832)
+
+* Wed Aug  9 2006 Ray Strode <rstrode@xxxxxxxxxx> - 0.7.0-0.cvs20060529.5
+- actually make the patch in 0.7.0-0.cvs20060529.4 apply
+
+* Fri Aug  4 2006 Ray Strode <rstrode@xxxxxxxxxx> - 0.7.0-0.cvs20060529.4
+- Don't ever elect inactive wired devices (bug 194124).
+
+* Wed Jul 19 2006 John (J5) Palmieri <johnp@xxxxxxxxxx> - 0.7.0-0.cvs20060529.3
+- Add patch to fix deprecated dbus functions
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp@xxxxxxxxxx> - 0.7.0-0.cvs20060529.2
+- Add BR for dbus-glib-devel
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@xxxxxxxxxx> - 0.7.0-0.cvs20060529.1.1
+- rebuild
+
+* Mon May 29 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.7.0-0.cvs20060529
+- Update to latest CVS
+       o Gnome.org #333420: dialog do not have window icons
+       o Gnome.org #336913: HIG tweaks for vpn properties pages
+       o Gnome.org #336846: HIG tweaks for nm-vpn-properties
+       o Gnome.org #336847: some bugs in nm-vpn-properties args parsing
+       o Gnome.org #341306: nm-vpn-properties crashes on startup
+       o Gnome.org #341263: Version 0.6.2-0ubuntu5 crashes on 
nm_device_802_11_wireless_get_type
+       o Gnome.org #341297: displays repeated keyring dialogs on resume from 
suspend
+       o Gnome.org #342400: Building libnm-util --without-gcrypt results in 
linker error
+       o Gnome.org #342398: Eleminate Gnome dependency for NetworkManager
+       o Gnome.org #336532: declaration of 'link' shadows a global declaration
+- Specfile fixes (#rh187489#)
+
+* Sun May 21 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.7.0-0.cvs20060521
+- Update to latest CVS
+- Drop special-case-madwifi.patch, since WEXT code is in madwifi-ng trunk now
 
-* Wed May  3 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.6.2-2
-- Update to latest 0.6.2 stable
+* Fri May 19 2006 Bill Nottingham <notting@xxxxxxxxxx> - 0.6.2-3.fc6
+- use the same 0.6.2 tarball as FC5, so we have the same VPN interface
+  (did he fire ten args, or only nine?)
+
+* Thu Apr 27 2006 Jeremy Katz <katzj@xxxxxxxxxx> - 0.6.2-2.fc6
+- use the hal device type instead of poking via ioctl so that wireless 
+  devices are properly detected even if the kill switch has been used
 
 * Thu Mar 30 2006 Dan Williams <dcbw@xxxxxxxxxx> - 0.6.2-1
 - Update to 0.6.2:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources     14 Jul 2006 20:06:24 -0000      1.55
+++ sources     30 Aug 2006 15:05:00 -0000      1.56
@@ -1 +1 @@
-fcf8bcbc08a26176e8f8943eedf7b670  NetworkManager-0.6.4.tar.gz
+a5bb1966ec56b76eee31a05e4e14d13c  NetworkManager-0.6.4.cvs20060829.tar.gz


--- service-startup.patch DELETED ---


--- special-case-madwifi.patch DELETED ---

-- 
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits

<Prev in Thread] Current Thread [Next in Thread>
  • rpms/NetworkManager/FC-5 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 NetworkManager.spec, 1.108, 1.109 sources, 1.55, 1.56 service-startup.patch, 1.1, NONE special-case-madwifi.patch, 1.2, NONE, fedora-cvs-commits <=