ports/180545: update sysutils/rubygem-facter to 1.7.2

Michael Moll kvedulv at kvedulv.de
Sat Jul 13 22:10:00 UTC 2013


>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:


More information about the freebsd-ports-bugs mailing list