From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 15 17:13:06 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4126BF87;
 Sun, 15 Sep 2013 17:13:06 +0000 (UTC)
 (envelope-from marcus@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E52A2B94;
 Sun, 15 Sep 2013 17:13:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FHD6SD027277;
 Sun, 15 Sep 2013 17:13:06 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FHD5Mp027261;
 Sun, 15 Sep 2013 17:13:05 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201309151713.r8FHD5Mp027261@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sun, 15 Sep 2013 17:13:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327347 - in head/sysutils/upower: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 17:13:06 -0000

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;