From owner-svn-ports-all@FreeBSD.ORG Thu Nov 14 03:08:37 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74F56A0; Thu, 14 Nov 2013 03:08:37 +0000 (UTC) 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 4ABE12720; Thu, 14 Nov 2013 03:08:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE38bPD018084; Thu, 14 Nov 2013 03:08:37 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE38asb018078; Thu, 14 Nov 2013 03:08:36 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201311140308.rAE38asb018078@svn.freebsd.org> From: Steve Wills Date: Thu, 14 Nov 2013 03:08:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333736 - in head/sysutils/rubygem-ohai: . 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-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 03:08:37 -0000 Author: swills Date: Thu Nov 14 03:08:36 2013 New Revision: 333736 URL: http://svnweb.freebsd.org/changeset/ports/333736 Log: - Update to 6.18.0 - Fix the patch for ipaddress PR: ports/183476 Submitted by: Renaud Chaput (maintainer) Modified: head/sysutils/rubygem-ohai/Makefile head/sysutils/rubygem-ohai/distinfo head/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb Modified: head/sysutils/rubygem-ohai/Makefile ============================================================================== --- head/sysutils/rubygem-ohai/Makefile Thu Nov 14 01:23:48 2013 (r333735) +++ head/sysutils/rubygem-ohai/Makefile Thu Nov 14 03:08:36 2013 (r333736) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ohai -PORTVERSION= 6.16.0 -PORTREVISION= 1 +PORTVERSION= 6.18.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG Modified: head/sysutils/rubygem-ohai/distinfo ============================================================================== --- head/sysutils/rubygem-ohai/distinfo Thu Nov 14 01:23:48 2013 (r333735) +++ head/sysutils/rubygem-ohai/distinfo Thu Nov 14 03:08:36 2013 (r333736) @@ -1,2 +1,2 @@ -SHA256 (rubygem/ohai-6.16.0.gem) = 795e87b94bdf3a095d718b6e6720c69ab1dedf73641d6e01900f7198fe990d0a -SIZE (rubygem/ohai-6.16.0.gem) = 372224 +SHA256 (rubygem/ohai-6.18.0.gem) = 887c06fa1608d495a284bc7bcca08bd1fb0f897147b0e8a93b4d85c7b61b60f6 +SIZE (rubygem/ohai-6.18.0.gem) = 368640 Modified: head/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb ============================================================================== --- head/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb Thu Nov 14 01:23:48 2013 (r333735) +++ head/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb Thu Nov 14 03:08:36 2013 (r333736) @@ -1,10 +1,11 @@ ---- lib/ohai/plugins/network.rb.orig 2013-10-28 22:14:54.275284113 +0000 -+++ lib/ohai/plugins/network.rb 2013-10-28 22:15:30.024281591 +0000 -@@ -39,6 +39,7 @@ - # going to use that later to sort by scope - scope_prio = [ "global", "site", "link", "host", "node", nil ] - -+ next if iface_v.nil? or not iface_v.has_key? 'addresses' +--- lib/ohai/plugins/network.rb.orig 2013-10-30 11:59:28.417251343 +0100 ++++ lib/ohai/plugins/network.rb 2013-10-30 11:59:24.993251926 +0100 +@@ -42,6 +42,7 @@ ipaddresses = [] # ipaddresses going to hold #{family} ipaddresses and their scope Mash[network['interfaces']].each do |iface, iface_v| ++ next if iface_v.nil? or not iface_v.has_key? 'addresses' + iface_v['addresses'].each do |addr, addr_v| + next if addr_v.nil? or not addr_v.has_key? "family" or addr_v['family'] != family + ipaddresses << { +