rpms/gnome-netstatus/devel iface.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 gnome-netstatus.spec, 1.44, 1.45 sources, 1.15, 1.16

[Vivek Shah]

Author: bonii

Update of /cvs/pkgs/rpms/gnome-netstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv412

Modified Files:
	.cvsignore gnome-netstatus.spec sources 
Added Files:
	iface.patch 
Log Message:
Updated to 2.26.0

iface.patch:

--- NEW FILE iface.patch ---
--- gnome-netstatus-2.12.2/src/netstatus-iface.c.iface	2007-02-13 09:39:19.000000000 +0000
+++ gnome-netstatus-2.12.2/src/netstatus-iface.c	2008-07-30 09:31:12.000000000 +0100
@@ -1121,12 +1121,6 @@
   return TRUE;
 }
 
-#if !defined(HAVE_SOCKADDR_SA_LEN)
-#define NETSTATUS_SA_LEN(saddr) (sizeof (struct sockaddr))
-#else
-#define NETSTATUS_SA_LEN(saddr) (MAX ((saddr)->sa_len, sizeof (struct sockaddr)))
-#endif /* HAVE_SOCKADDR_SA_LEN */
-
 /* Taken From R. Stevens Unix Network Programming Vol. 1.
  *
  * SIOCGIFCONF does not return an error on all systems if
@@ -1220,7 +1214,12 @@
       struct ifreq *if_req = (struct ifreq *) p;
       gboolean      loopback = FALSE;
 
-      p += sizeof (if_req->ifr_name) + NETSTATUS_SA_LEN (&if_req->ifr_addr);
+#ifdef HAVE_SOCKADDR_SA_LEN
+      if (if_req->ifr_addr.sa_len > sizeof(if_req->ifr_ifru))
+        p += offsetof(struct ifreq, ifr_ifru) + if_req->ifr_addr.sa_len;
+      else
+#endif /* HAVE_SOCKADDR_SA_LEN */
+        p += sizeof (*if_req);
 
       if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
 	{


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	23 Sep 2008 04:24:14 -0000	1.15
+++ .cvsignore	25 Jun 2009 17:47:23 -0000	1.16
@@ -1 +1 @@
-gnome-netstatus-2.12.2.tar.bz2
+gnome-netstatus-2.26.0.tar.bz2


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-netstatus.spec	24 Feb 2009 23:09:32 -0000	1.44
+++ gnome-netstatus.spec	25 Jun 2009 17:47:23 -0000	1.45
@@ -6,12 +6,13 @@
 
 Summary: Network status applet
 Name: gnome-netstatus
-Version: 2.12.2
-Release: 3%{?dist}
+Version: 2.26.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.12/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.26/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
+Patch1: iface.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): GConf2 >= %{gconf2_version}
@@ -36,6 +37,7 @@ network interface on your panel.
 
 %prep
 %setup -q
+%patch1 -p1 -b .iface  
 
 %build
 %configure --disable-scrollkeeper
@@ -106,6 +108,10 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Jun 20 2009 Vivek Shah <boni.vivek at gmail.com> - 2.26.0-1
+- Updated to new version 2.26
+- Fixes bugs 318411 and 506448
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	23 Sep 2008 04:24:14 -0000	1.15
+++ sources	25 Jun 2009 17:47:23 -0000	1.16
@@ -1 +1 @@
-f1f9e18b48d46adb32c9002e4325f80e  gnome-netstatus-2.12.2.tar.bz2
+f116157535ec185f0ea7503fafc5edd6  gnome-netstatus-2.26.0.tar.bz2