svn commit: r333736 - in head/sysutils/rubygem-ohai: . files

[Steve Wills]

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 <renchap at cocoa-x.com> (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 <<  {
+