From owner-freebsd-ports@FreeBSD.ORG Sun Jul 21 19:22:48 2013 Return-Path: Delivered-To: ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 792F8D4; Sun, 21 Jul 2013 19:22:48 +0000 (UTC) (envelope-from douglas@douglasthrift.net) Received: from slowhand.douglasthrift.net (slowhand.douglasthrift.net [69.55.236.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5BF0EE6F; Sun, 21 Jul 2013 19:22:48 +0000 (UTC) Received: from [192.168.3.128] (laguna.douglasthrift.net [98.171.162.82]) (authenticated bits=0) by slowhand.douglasthrift.net (8.14.7/8.14.7) with ESMTP id r6LJMVCZ008517 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NOT); Sun, 21 Jul 2013 12:22:37 -0700 (PDT) (envelope-from douglas@douglasthrift.net) DomainKey-Signature: a=rsa-sha1; s=dt-2007050501; d=douglasthrift.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:cc:subject: x-enigmail-version:content-type; b=a436AJ8WU5Uyf09fpYhqvs87eguAjZTLS9IwPiP8E57UdnOCvBg9SkcEiNWJzn/aY ycHksmNBT5xjiRaG9Wp3w== X-Authentication-Warning: slowhand.douglasthrift.net: Host laguna.douglasthrift.net [98.171.162.82] claimed to be [192.168.3.128] Message-ID: <51EC34F8.70609@douglasthrift.net> Date: Sun, 21 Jul 2013 12:22:32 -0700 From: Douglas Thrift User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: renchap@cocoa-x.com Subject: FreeBSD Port: rubygem-ohai-6.16.0 X-Enigmail-Version: 1.5.1 Content-Type: multipart/mixed; boundary="------------020607020206010000040108" Cc: ports@FreeBSD.org, ruby@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jul 2013 19:22:48 -0000 This is a multi-part message in MIME format. --------------020607020206010000040108 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello, I have attached a patch for Ohai which fixes IP address detection when there is an interface with no addresses such as ipfw0. I have already submitted the patch upstream: https://tickets.opscode.com/browse/OHAI-492. Thanks! -- Douglas William Thrift --------------020607020206010000040108 Content-Type: text/plain; charset=windows-1252; name="patch-lib__ohai__plugins__network.rb" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-lib__ohai__plugins__network.rb" --- ./lib/ohai/plugins/network.rb.orig 2013-07-20 23:51:57.000000000 -0700 +++ ./lib/ohai/plugins/network.rb 2013-07-20 23:52:07.000000000 -0700 @@ -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 << { --------------020607020206010000040108--