From renchap@tionne.renchap.com  Wed Oct 30 11:34:31 2013
Return-Path: <renchap@tionne.renchap.com>
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 ESMTP id 6359EED9
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 11:34:31 +0000 (UTC)
	(envelope-from renchap@tionne.renchap.com)
Received: from tionne.renchap.com (tionne.renchap.com [IPv6:2001:41d0:a:2a09::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 30EEC28F0
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 11:34:30 +0000 (UTC)
Received: by tionne.renchap.com (Postfix, from userid 1001)
	id E8066338F2; Wed, 30 Oct 2013 12:34:22 +0100 (CET)
Message-Id: <20131030113422.E8066338F2@tionne.renchap.com>
Date: Wed, 30 Oct 2013 12:34:22 +0100 (CET)
From: Renaud Chaput <renchap@cocoa-x.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] sysutils/rubygem-ohai: update to 6.18.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183476
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/rubygem-ohai: update to 6.18.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 11:40:00 UTC 2013
>Closed-Date:    Thu Nov 14 03:08:48 UTC 2013
>Last-Modified:  Thu Nov 14 03:10:00 UTC 2013
>Originator:     Renaud Chaput
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD tionne.renchap.com 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC
>Description:
- Update to 6.18.0
- Fix the patch for ipaddress

Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- rubygem-ohai-6.18.0.patch begins here ---
diff -ruN /usr/ports/sysutils/rubygem-ohai/Makefile ./Makefile
--- /usr/ports/sysutils/rubygem-ohai/Makefile	2013-10-29 00:50:44.000000000 +0100
+++ ./Makefile	2013-10-30 12:07:58.587251706 +0100
@@ -2,8 +2,7 @@
 # $FreeBSD: sysutils/rubygem-ohai/Makefile 331910 2013-10-28 23:50:44Z swills $
 
 PORTNAME=	ohai
-PORTVERSION=	6.16.0
-PORTREVISION=	1
+PORTVERSION=	6.18.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
diff -ruN /usr/ports/sysutils/rubygem-ohai/distinfo ./distinfo
--- /usr/ports/sysutils/rubygem-ohai/distinfo	2013-07-19 19:09:44.000000000 +0200
+++ ./distinfo	2013-10-30 12:20:42.002251266 +0100
@@ -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
diff -ruN /usr/ports/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb ./files/patch-lib__ohai__plugins__network.rb
--- /usr/ports/sysutils/rubygem-ohai/files/patch-lib__ohai__plugins__network.rb	2013-10-29 00:50:44.000000000 +0100
+++ ./files/patch-lib__ohai__plugins__network.rb	2013-10-30 12:07:16.302251923 +0100
@@ -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 <<  {
+
--- rubygem-ohai-6.18.0.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ruby 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Oct 30 11:40:07 UTC 2013 
Responsible-Changed-Why:  
ruby@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183476 
Responsible-Changed-From-To: ruby->swills 
Responsible-Changed-By: swills 
Responsible-Changed-When: Wed Nov 13 17:03:52 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183476 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Thu Nov 14 03:08:48 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183476 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183476: commit references a PR
Date: Thu, 14 Nov 2013 03:08:44 +0000 (UTC)

 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@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 <<  {
 +
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
