Attachment 143999 Details for Bug 191246 – update to 2.0.2

[patch] update to 2.0.2

rubygem_facter_202.diff (text/plain), 3.15 KB, created by Michael Moll on 2014-06-21 16:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Moll

Created: 2014-06-21 16:20:20 UTC

Size: 3.15 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 358714)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	facter
>-PORTVERSION=	1.7.6
>+PORTVERSION=	2.0.2
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG \
> 		http://downloads.puppetlabs.com/facter/
>@@ -18,8 +18,8 @@
> 
> .include <bsd.port.pre.mk>
> 
>-# Restrict dmidecode dependency to i386 and amd64 systems
>-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
>+# Restrict dmidecode dependency to Intel based systems
>+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
> RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
> .endif
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 358714)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (rubygem/facter-1.7.6.gem) = 592ab025a91011b80a82cdc1a105a3b84e85d17c65154ee97478f02f745da45d
>-SIZE (rubygem/facter-1.7.6.gem) = 203776
>+SHA256 (rubygem/facter-2.0.2.gem) = afa70d9278c98ba2a8bdf762673f418b4028ffa4d4634606719d44ef7b371069
>+SIZE (rubygem/facter-2.0.2.gem) = 198144
>Index: files/patch-lib-facter-processor.rb
>===================================================================
>--- files/patch-lib-facter-processor.rb	(revision 358714)
>+++ 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 358714)
>+++ files/patch-lib-facter-zpool_version.rb	(working copy)
>@@ -2,10 +2,10 @@
> +++ 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?
>+     if Facter::Core::Execution.which('zpool')
>+       zpool_v = Facter::Core::Execution.exec('zpool upgrade -v')
>+-      zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.empty?
>++      zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.empty?
>      end
>    end
>  end
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 358714)
>+++ pkg-descr	(working copy)
>@@ -4,4 +4,4 @@
> especially useful for retrieving things like operating system names, IP
> addresses, MAC addresses, and SSH keys.
> 
>-WWW: https://puppetlabs.com/puppet/related-projects/facter/
>+WWW: https://puppetlabs.com/facter

Actions: View | Diff

Attachments on bug 191246: 143999