[Pkg-kde-extras] Bug#723092: [solid] [Bug 324954] kded4 leak sockets when wifi connections fail

[Petter Reinholdtsen]

Control: tag -1 patch
Control: reassign -1 libsolid4
Control: found -1 4.8.4-4

[ Lamarque V. Souza in https://bugs.kde.org/show_bug.cgi?id=324954 ]
> Can you test if the patch in
> https://git.reviewboard.kde.org/r/112869/ solves your problem?

As far as I can tell, it fixes the problem.  After rebuilding kde4lib
and installing the new libsolid4 package, the number of open sockets
stay on 6 also when I try using "time nmcli con up uuid
7b9a986e-0b25-4314-9d39-c33a9047a262" to reconnect to the wifi network
that reject my connection.

But I had to adjust the patch slightly, including the <unistd.h>
header with the close() definition:

Index: kde4libs-4.8.4/solid/solid/backends/udev/udevnetworkinterface.cpp
===================================================================
--- kde4libs-4.8.4.orig/solid/solid/backends/udev/udevnetworkinterface.cpp
      2013-09-21 20:22:53.159831857 +0200
+++ kde4libs-4.8.4/solid/solid/backends/udev/udevnetworkinterface.cpp   2013-09-21 20:56:34.033957465 +0200
@@ -24,6 +24,7 @@
 
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <linux/if_arp.h>
 #include <linux/wireless.h>
@@ -67,8 +68,10 @@
         QFileInfo phyDir(m_device->deviceName() + "/phy80211");
         
         if ((ioctl (ioctl_fd, SIOCGIWNAME, &iwr) == 0) || phyDir.isDir()) {
+            close(ioctl_fd);
             return true;
         }
+        close(ioctl_fd);
     }
     return false;
 }

Cc to the Debian bug, letting the maintainers know that a fix is
available.  It would be great if this fix made it into Debian Wheezy.

-- 
Happy hacking
Petter Reinholdtsen