rpms/NetworkManager/F-8 nm-applet-0.7.0-applet-usb-vendor-fix.patch, NONE, 1.1 NetworkManager.spec, 1.187, 1.188
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Nov 1 11:30:27 UTC 2007
- Previous message (by thread): rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.11, 1.12 initscripts.spec, 1.157, 1.158
- Next message (by thread): rpms/sbcl/devel .cvsignore, 1.31, 1.32 sbcl.spec, 1.78, 1.79 sources, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7505
Modified Files:
NetworkManager.spec
Added Files:
nm-applet-0.7.0-applet-usb-vendor-fix.patch
Log Message:
* Thu Nov 1 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.1.svn3030
- Fix applet crash with USB devices that don't advertise a product or vendor
(rh #337191)
nm-applet-0.7.0-applet-usb-vendor-fix.patch:
--- NEW FILE nm-applet-0.7.0-applet-usb-vendor-fix.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.usb-vendor-fix NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.usb-vendor-fix 2007-11-01 06:49:55.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c 2007-11-01 06:50:57.000000000 -0400
@@ -1515,6 +1515,16 @@ sort_devices (gconstpointer a, gconstpoi
char *bb_desc = nm_device_get_description (bb);
gint ret;
+ if (!aa_desc && bb_desc) {
+ g_free (bb_desc);
+ return -1;
+ } else if (aa_desc && !bb_desc) {
+ g_free (aa_desc);
+ return 1;
+ } else if (!aa_desc && !bb_desc) {
+ return 0;
+ }
+
ret = strcmp (aa_desc, bb_desc);
g_free (aa_desc);
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- NetworkManager.spec 27 Oct 2007 04:57:27 -0000 1.187
+++ NetworkManager.spec 1 Nov 2007 11:29:49 -0000 1.188
@@ -13,7 +13,7 @@
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.7.0
-Release: 0.5.%{snapshot}%{?dist}
+Release: 0.6.1.%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -21,6 +21,7 @@
Source1: nm-applet-%{version}.svn302.tar.gz
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: nm-applet-0.7.0-disable-stuff.patch
+Patch3: nm-applet-0.7.0-applet-usb-vendor-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@@ -126,6 +127,7 @@
tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .disable-stuff
+%patch3 -p1 -b .applet-usb-vendor-fix
%build
# Even though we don't require named, we still build with it
@@ -260,6 +262,10 @@
%changelog
+* Thu Nov 1 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.1.svn3030
+- Fix applet crash with USB devices that don't advertise a product or vendor
+ (rh #337191)
+
* Sat Oct 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.5.svn3030
- Fix crash when getting WPA secrets (rh #355041)
- Previous message (by thread): rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.11, 1.12 initscripts.spec, 1.157, 1.158
- Next message (by thread): rpms/sbcl/devel .cvsignore, 1.31, 1.32 sbcl.spec, 1.78, 1.79 sources, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list