From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 13 22:10:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B5205B58 for ; Sat, 13 Jul 2013 22:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 991CF1190 for ; Sat, 13 Jul 2013 22:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r6DMA0oh087971 for ; Sat, 13 Jul 2013 22:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r6DMA0wA087970; Sat, 13 Jul 2013 22:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 13 Jul 2013 22:10:00 GMT Resent-Message-Id: <201307132210.r6DMA0wA087970@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Moll Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8B0739E5 for ; Sat, 13 Jul 2013 22:06:12 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 634281179 for ; Sat, 13 Jul 2013 22:06:12 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r6DM6Blg095703 for ; Sat, 13 Jul 2013 22:06:11 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r6DM6Bvq095695; Sat, 13 Jul 2013 22:06:11 GMT (envelope-from nobody) Message-Id: <201307132206.r6DM6Bvq095695@oldred.freebsd.org> Date: Sat, 13 Jul 2013 22:06:11 GMT From: Michael Moll To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/180545: update sysutils/rubygem-facter to 1.7.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jul 2013 22:10:00 -0000 >Number: 180545 >Category: ports >Synopsis: update sysutils/rubygem-facter to 1.7.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jul 13 22:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Michael Moll >Release: >Organization: >Environment: >Description: See attached patch. The extra patch is taken from https://github.com/puppetlabs/facter/pull/439 and fixes https://projects.puppetlabs.com/issues/20617 on FreeBSD versions with ZFS feature flags. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 322947) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= facter -PORTVERSION= 1.6.18 -PORTREVISION= 2 +PORTVERSION= 1.7.2 CATEGORIES= sysutils rubygems MASTER_SITES= RG \ http://downloads.puppetlabs.com/facter/ Index: distinfo =================================================================== --- distinfo (revision 322947) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (rubygem/facter-1.6.18.gem) = 5760265cbbd684b0c7e3b350b9b983d12a743b2b4818859feb623b4b1bcc5b55 -SIZE (rubygem/facter-1.6.18.gem) = 145920 +SHA256 (rubygem/facter-1.7.2.gem) = e0ebeece898c4302cffeb19d755cd537c907e8ccdb345fb7cb7049089299012d +SIZE (rubygem/facter-1.7.2.gem) = 195072 Index: files/patch-lib-facter-processor.rb =================================================================== --- files/patch-lib-facter-processor.rb (revision 322947) +++ files/patch-lib-facter-processor.rb (working copy) @@ -1,19 +0,0 @@ ---- lib/facter/processor.rb.orig 2013-04-30 19:57:21.000000000 +0400 -+++ lib/facter/processor.rb 2013-04-30 19:58:19.000000000 +0400 -@@ -88,14 +88,14 @@ - end - - Facter.add("Processor") do -- confine :kernel => :openbsd -+ confine :kernel => [ :openbsd, :freebsd ] - setcode do - Facter::Util::Resolution.exec("uname -p") - end - end - - Facter.add("ProcessorCount") do -- confine :kernel => :openbsd -+ confine :kernel => [ :openbsd, :freebsd ] - setcode do - Facter::Util::Resolution.exec("sysctl -n hw.ncpu") - end Index: files/patch-lib-facter-zpool_version.rb =================================================================== --- files/patch-lib-facter-zpool_version.rb (revision 0) +++ files/patch-lib-facter-zpool_version.rb (working copy) @@ -0,0 +1,11 @@ +--- lib/facter/zpool_version.rb.orig ++++ lib/facter/zpool_version.rb +@@ -4,7 +4,7 @@ + setcode do + if Facter::Util::Resolution.which('zpool') + zpool_v = Facter::Util::Resolution.exec('zpool upgrade -v') +- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.nil? ++ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.nil? + end + end + end >Release-Note: >Audit-Trail: >Unformatted: