[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD config)

[Jan Steffens]

    Date: Friday, July 4, 2014 @ 22:16:40
  Author: heftig
Revision: 216509

Disable CONFIG_ELOOP_EPOLL again

It's broken horribly, at least with the DBus interface (required by NM).

wpa_supplicant tries to add the DBus socket to the epoll twice; the second call fails:

epoll_ctl(3, EPOLL_CTL_ADD, 4, {EPOLLERR|EPOLLHUP, {u32=4, u64=4}}) = 0
epoll_ctl(3, EPOLL_CTL_ADD, 4, {EPOLLIN, {u32=4, u64=4}}) = -1 EEXIST (File exists)

Error message: eloop_sock_table_add_sock: epoll_ctl(ADD) for fd=4 failed. File exists

Afterwards, it enters a CPU-burning loop of epoll_wait(3, {}, 2, 0) = 0. It never
answers any DBus messages because the EPOLLIN events are not delivered.

The second epoll_ctl call would need to use EPOLL_CTL_MOD to work.

Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/config

----------+
 PKGBUILD |    4 ++--
 config   |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-04 19:12:59 UTC (rev 216508)
+++ PKGBUILD	2014-07-04 20:16:40 UTC (rev 216509)
@@ -3,7 +3,7 @@
 
 pkgname=wpa_supplicant
 pkgver=2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
 	config)
 sha256sums=('e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed'
-            '3ad2d74d0273ec22cea9000773a773e3b87eef714fa6c2cd4ed37ebe46a10221')
+            '15be07f0d8003a2239dfba008f09602f1203bbf143004d8979ff4d863153c817')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}/"

Modified: config
===================================================================
--- config	2014-07-04 19:12:59 UTC (rev 216508)
+++ config	2014-07-04 20:16:40 UTC (rev 216509)
@@ -267,9 +267,6 @@
 # Should we use poll instead of select? Select is used by default.
 #CONFIG_ELOOP_POLL=y
 
-# Should we use epoll instead of select? Select is used by default.
-CONFIG_ELOOP_EPOLL=y
-
 # Select layer 2 packet implementation
 # linux = Linux packet socket (default)
 # pcap = libpcap/libdnet/WinPcap