svn commit: r327347 - in head/sysutils/upower: . files

[Joe Marcus Clarke]

Author: marcus
Date: Sun Sep 15 17:13:05 2013
New Revision: 327347
URL: http://svnweb.freebsd.org/changeset/ports/327347

Log:
  Make all non-normal reads from the devd socket a cause to try and reinit
  the connection.  This should avoid high CPU loops when devd is restarted.

Added:
  head/sysutils/upower/files/patch-src_freebsd_up-devd.c   (contents, props changed)
Modified:
  head/sysutils/upower/Makefile

Modified: head/sysutils/upower/Makefile
==============================================================================
--- head/sysutils/upower/Makefile	Sun Sep 15 16:42:41 2013	(r327346)
+++ head/sysutils/upower/Makefile	Sun Sep 15 17:13:05 2013	(r327347)
@@ -4,7 +4,7 @@
 
 PORTNAME=	upower
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 

Added: head/sysutils/upower/files/patch-src_freebsd_up-devd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/upower/files/patch-src_freebsd_up-devd.c	Sun Sep 15 17:13:05 2013	(r327347)
@@ -0,0 +1,11 @@
+--- src/freebsd/up-devd.c.orig	2013-09-15 13:08:35.000000000 -0400
++++ src/freebsd/up-devd.c	2013-09-15 13:10:13.000000000 -0400
+@@ -195,7 +195,7 @@ up_devd_event_cb (GIOChannel *source, GI
+ 		event[terminator] = 0;
+ 		up_devd_process_event(event, user_data);
+ 		g_free(event);
+-	} else if (status == G_IO_STATUS_AGAIN) {
++	} else {
+ 		up_devd_init (UP_BACKEND(user_data));
+ 		if (up_devd_inited) {
+ 			int fd;