Pullup ticket #4619 - requested by taca

sysutils/ruby-facter: security update

Revisions pulled up:
- sysutils/ruby-facter/ALTERNATIVES                             1.1
- sysutils/ruby-facter/Makefile                                 1.23
- sysutils/ruby-facter/PLIST                                    1.23
- sysutils/ruby-facter/distinfo                                 1.22

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Feb 13 13:55:58 UTC 2015

   Modified Files:
   	pkgsrc/sysutils/ruby-facter: Makefile PLIST distinfo
   Added Files:
   	pkgsrc/sysutils/ruby-facter: ALTERNATIVES

   Log Message:
   Update ruby-facter to 2.4.1.

   pkgsrc change: reduce conflict with adding pkg_alternatives support.

   Changes from 1.7.5 are too many to write here, but version 2.4.1 fixes
   CVE-2015-1426 security problem.

4 files changed, 142 insertions, 25 deletions

diff --git a/sysutils/ruby-facter/ALTERNATIVES b/sysutils/ruby-facter/ALTERNATIVES
new file mode 100644
index 00000000000..0d75cfd9241
--- /dev/null
+++ b/sysutils/ruby-facter/ALTERNATIVES
@@ -0,0 +1 @@
+bin/facter @PREFIX@/bin/bin/facter@RUBY_SUFFIX@
diff --git a/sysutils/ruby-facter/Makefile b/sysutils/ruby-facter/Makefile
index 4af5f011d99..1c59ba6b2a6 100644
--- a/sysutils/ruby-facter/Makefile
+++ b/sysutils/ruby-facter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2014/03/14 18:04:25 taca Exp $
+# $NetBSD: Makefile,v 1.22.8.1 2015/02/20 20:07:12 tron Exp $
 
-DISTNAME=	facter-1.7.5
+DISTNAME=	facter-2.4.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils
 
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.puppetlabs.com/puppet/related-projects/facter/
 COMMENT=	Cross-platform Ruby library for retrieving facts from OS
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	ruby[1-9][0-9][0-9]-facter-[0-9]*
+RUBYGEM_OPTIONS+=	--format-executable
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ruby-facter/PLIST b/sysutils/ruby-facter/PLIST
index a629d2c4089..774f2911c9d 100644
--- a/sysutils/ruby-facter/PLIST
+++ b/sysutils/ruby-facter/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.22 2014/03/14 18:04:25 taca Exp $
-bin/facter
+@comment $NetBSD: PLIST,v 1.22.8.1 2015/02/20 20:07:12 tron Exp $
+bin/facter${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/COMMITTERS.md
 ${GEM_LIBDIR}/CONTRIBUTING.md
 ${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/LICENSE
@@ -34,11 +35,25 @@ ${GEM_LIBDIR}/lib/facter/application.rb
 ${GEM_LIBDIR}/lib/facter/architecture.rb
 ${GEM_LIBDIR}/lib/facter/augeasversion.rb
 ${GEM_LIBDIR}/lib/facter/blockdevices.rb
+${GEM_LIBDIR}/lib/facter/core/aggregate.rb
+${GEM_LIBDIR}/lib/facter/core/directed_graph.rb
+${GEM_LIBDIR}/lib/facter/core/execution.rb
+${GEM_LIBDIR}/lib/facter/core/execution/base.rb
+${GEM_LIBDIR}/lib/facter/core/execution/posix.rb
+${GEM_LIBDIR}/lib/facter/core/execution/windows.rb
+${GEM_LIBDIR}/lib/facter/core/logging.rb
+${GEM_LIBDIR}/lib/facter/core/resolvable.rb
+${GEM_LIBDIR}/lib/facter/core/suitable.rb
+${GEM_LIBDIR}/lib/facter/dhcp_servers.rb
 ${GEM_LIBDIR}/lib/facter/domain.rb
 ${GEM_LIBDIR}/lib/facter/ec2.rb
+${GEM_LIBDIR}/lib/facter/ec2/rest.rb
 ${GEM_LIBDIR}/lib/facter/facterversion.rb
 ${GEM_LIBDIR}/lib/facter/filesystems.rb
 ${GEM_LIBDIR}/lib/facter/fqdn.rb
+${GEM_LIBDIR}/lib/facter/gce.rb
+${GEM_LIBDIR}/lib/facter/gce/metadata.rb
+${GEM_LIBDIR}/lib/facter/gid.rb
 ${GEM_LIBDIR}/lib/facter/hardwareisa.rb
 ${GEM_LIBDIR}/lib/facter/hardwaremodel.rb
 ${GEM_LIBDIR}/lib/facter/hostname.rb
@@ -57,6 +72,7 @@ ${GEM_LIBDIR}/lib/facter/lsbdistdescription.rb
 ${GEM_LIBDIR}/lib/facter/lsbdistid.rb
 ${GEM_LIBDIR}/lib/facter/lsbdistrelease.rb
 ${GEM_LIBDIR}/lib/facter/lsbmajdistrelease.rb
+${GEM_LIBDIR}/lib/facter/lsbminordistrelease.rb
 ${GEM_LIBDIR}/lib/facter/lsbrelease.rb
 ${GEM_LIBDIR}/lib/facter/macaddress.rb
 ${GEM_LIBDIR}/lib/facter/macosx.rb
@@ -65,18 +81,33 @@ ${GEM_LIBDIR}/lib/facter/memory.rb
 ${GEM_LIBDIR}/lib/facter/netmask.rb
 ${GEM_LIBDIR}/lib/facter/network.rb
 ${GEM_LIBDIR}/lib/facter/operatingsystem.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/base.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/cumuluslinux.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/implementation.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/linux.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/sunos.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/vmkernel.rb
+${GEM_LIBDIR}/lib/facter/operatingsystem/windows.rb
 ${GEM_LIBDIR}/lib/facter/operatingsystemmajrelease.rb
 ${GEM_LIBDIR}/lib/facter/operatingsystemrelease.rb
+${GEM_LIBDIR}/lib/facter/os.rb
 ${GEM_LIBDIR}/lib/facter/osfamily.rb
+${GEM_LIBDIR}/lib/facter/partitions.rb
 ${GEM_LIBDIR}/lib/facter/path.rb
 ${GEM_LIBDIR}/lib/facter/physicalprocessorcount.rb
 ${GEM_LIBDIR}/lib/facter/processor.rb
+${GEM_LIBDIR}/lib/facter/processors.rb
+${GEM_LIBDIR}/lib/facter/processors/os.rb
 ${GEM_LIBDIR}/lib/facter/ps.rb
 ${GEM_LIBDIR}/lib/facter/puppetversion.rb
+${GEM_LIBDIR}/lib/facter/rackspace.rb
+${GEM_LIBDIR}/lib/facter/rubyplatform.rb
 ${GEM_LIBDIR}/lib/facter/rubysitedir.rb
 ${GEM_LIBDIR}/lib/facter/rubyversion.rb
 ${GEM_LIBDIR}/lib/facter/selinux.rb
 ${GEM_LIBDIR}/lib/facter/ssh.rb
+${GEM_LIBDIR}/lib/facter/system32.rb
+${GEM_LIBDIR}/lib/facter/system_uptime.rb
 ${GEM_LIBDIR}/lib/facter/timezone.rb
 ${GEM_LIBDIR}/lib/facter/uniqueid.rb
 ${GEM_LIBDIR}/lib/facter/uptime.rb
@@ -84,27 +115,16 @@ ${GEM_LIBDIR}/lib/facter/uptime_days.rb
 ${GEM_LIBDIR}/lib/facter/uptime_hours.rb
 ${GEM_LIBDIR}/lib/facter/uptime_seconds.rb
 ${GEM_LIBDIR}/lib/facter/util/architecture.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/LICENSE
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/README
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/Rakefile
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/THANKS
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/cfpropertylist.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbBinaryCFPropertyList.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbCFPlistError.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbCFPropertyList.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbCFTypes.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbLibXMLParser.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbNokogiriParser.rb
-${GEM_LIBDIR}/lib/facter/util/cfpropertylist/lib/rbREXMLParser.rb
 ${GEM_LIBDIR}/lib/facter/util/collection.rb
 ${GEM_LIBDIR}/lib/facter/util/composite_loader.rb
 ${GEM_LIBDIR}/lib/facter/util/config.rb
 ${GEM_LIBDIR}/lib/facter/util/confine.rb
+${GEM_LIBDIR}/lib/facter/util/dhcp_servers.rb
 ${GEM_LIBDIR}/lib/facter/util/directory_loader.rb
 ${GEM_LIBDIR}/lib/facter/util/ec2.rb
 ${GEM_LIBDIR}/lib/facter/util/fact.rb
 ${GEM_LIBDIR}/lib/facter/util/file_read.rb
+${GEM_LIBDIR}/lib/facter/util/formatter.rb
 ${GEM_LIBDIR}/lib/facter/util/ip.rb
 ${GEM_LIBDIR}/lib/facter/util/ip/windows.rb
 ${GEM_LIBDIR}/lib/facter/util/loader.rb
@@ -112,13 +132,18 @@ ${GEM_LIBDIR}/lib/facter/util/macaddress.rb
 ${GEM_LIBDIR}/lib/facter/util/macosx.rb
 ${GEM_LIBDIR}/lib/facter/util/manufacturer.rb
 ${GEM_LIBDIR}/lib/facter/util/memory.rb
-${GEM_LIBDIR}/lib/facter/util/monkey_patches.rb
 ${GEM_LIBDIR}/lib/facter/util/netmask.rb
+${GEM_LIBDIR}/lib/facter/util/normalization.rb
 ${GEM_LIBDIR}/lib/facter/util/nothing_loader.rb
+${GEM_LIBDIR}/lib/facter/util/operatingsystem.rb
 ${GEM_LIBDIR}/lib/facter/util/parser.rb
+${GEM_LIBDIR}/lib/facter/util/partitions.rb
+${GEM_LIBDIR}/lib/facter/util/partitions/linux.rb
+${GEM_LIBDIR}/lib/facter/util/partitions/openbsd.rb
 ${GEM_LIBDIR}/lib/facter/util/plist.rb
 ${GEM_LIBDIR}/lib/facter/util/plist/generator.rb
 ${GEM_LIBDIR}/lib/facter/util/plist/parser.rb
+${GEM_LIBDIR}/lib/facter/util/posix.rb
 ${GEM_LIBDIR}/lib/facter/util/processor.rb
 ${GEM_LIBDIR}/lib/facter/util/registry.rb
 ${GEM_LIBDIR}/lib/facter/util/resolution.rb
@@ -140,15 +165,19 @@ ${GEM_LIBDIR}/lib/facter/zonename.rb
 ${GEM_LIBDIR}/lib/facter/zones.rb
 ${GEM_LIBDIR}/lib/facter/zpool_version.rb
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64dual
+${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64dual-grep
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64quad
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64solo
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64tri
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64twentyfour
+${GEM_LIBDIR}/spec/fixtures/cpuinfo/amd64twentyfour-grep
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/bbg3-armel
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/beaglexm-armel
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/panda-armel
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/ppc64
 ${GEM_LIBDIR}/spec/fixtures/cpuinfo/sparc
+${GEM_LIBDIR}/spec/fixtures/cpuinfo/two_multicore-grep
+${GEM_LIBDIR}/spec/fixtures/cpuinfo/two_singlecore-grep
 ${GEM_LIBDIR}/spec/fixtures/hpux/machinfo/hppa-rp4440
 ${GEM_LIBDIR}/spec/fixtures/hpux/machinfo/ia64-rx2620
 ${GEM_LIBDIR}/spec/fixtures/hpux/machinfo/ia64-rx6600
@@ -179,11 +208,14 @@ ${GEM_LIBDIR}/spec/fixtures/ifconfig/freebsd_6_0
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/ifconfig_net_tools_1.60.txt
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/ifconfig_ubuntu_1204.txt
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces
+${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces_and_fe80
+${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces_and_no_public_ipv6
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_no_addr
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_no_mac
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/linux_ifconfig_venet
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/open_solaris_10
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/open_solaris_b132
+${GEM_LIBDIR}/spec/fixtures/ifconfig/openbsd_bridge_rules
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/sunos_ifconfig_all_with_multiple_interfaces
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/ubuntu_7_04
 ${GEM_LIBDIR}/spec/fixtures/ifconfig/ubuntu_7_04_eth0
@@ -200,7 +232,17 @@ ${GEM_LIBDIR}/spec/fixtures/netstat/ubuntu_7_04
 ${GEM_LIBDIR}/spec/fixtures/processorcount/solaris-psrinfo
 ${GEM_LIBDIR}/spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
 ${GEM_LIBDIR}/spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_devices
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_devices_disconnected
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_eth0_dhcp
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_eth0_static
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_wlan0_dhcp
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/nmcli_wlan0_static
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/route
+${GEM_LIBDIR}/spec/fixtures/unit/dhcp_servers/route_nogw
+${GEM_LIBDIR}/spec/fixtures/unit/ec2/rest/meta-data/root
 ${GEM_LIBDIR}/spec/fixtures/unit/filesystems/linux
+${GEM_LIBDIR}/spec/fixtures/unit/gce/metadata/metadata.json
 ${GEM_LIBDIR}/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.em1
 ${GEM_LIBDIR}/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.lo
@@ -208,9 +250,30 @@ ${GEM_LIBDIR}/spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/ipaddress/ifconfig_non_english_locale.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
+${GEM_LIBDIR}/spec/fixtures/unit/kernelrelease/openbsd-5.3
+${GEM_LIBDIR}/spec/fixtures/unit/kernelrelease/openbsd-5.3-current
+${GEM_LIBDIR}/spec/fixtures/unit/memory/aix-svmon
+${GEM_LIBDIR}/spec/fixtures/unit/memory/aix-swap_l
+${GEM_LIBDIR}/spec/fixtures/unit/memory/darwin-swapinfo-multiple
+${GEM_LIBDIR}/spec/fixtures/unit/memory/darwin-swapinfo-single
+${GEM_LIBDIR}/spec/fixtures/unit/memory/darwin-vm_stat
+${GEM_LIBDIR}/spec/fixtures/unit/memory/dragonfly-vmstat
+${GEM_LIBDIR}/spec/fixtures/unit/memory/freebsd-vmstat
+${GEM_LIBDIR}/spec/fixtures/unit/memory/linux-proc_meminfo
+${GEM_LIBDIR}/spec/fixtures/unit/memory/openbsd-vmstat
+${GEM_LIBDIR}/spec/fixtures/unit/memory/smartos_zone_swap_l-single
+${GEM_LIBDIR}/spec/fixtures/unit/memory/solaris-prtconf
+${GEM_LIBDIR}/spec/fixtures/unit/memory/solaris-swap_l-multiple
+${GEM_LIBDIR}/spec/fixtures/unit/memory/solaris-swap_l-single
+${GEM_LIBDIR}/spec/fixtures/unit/memory/solaris-vmstat
+${GEM_LIBDIR}/spec/fixtures/unit/netmask/darwin_10_8_5.txt
+${GEM_LIBDIR}/spec/fixtures/unit/netmask/ifconfig_aix_7.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
 ${GEM_LIBDIR}/spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
+${GEM_LIBDIR}/spec/fixtures/unit/processors/os/darwin-system-profiler
 ${GEM_LIBDIR}/spec/fixtures/unit/selinux/selinux_sestatus
+${GEM_LIBDIR}/spec/fixtures/unit/util/dhcp_servers/route
+${GEM_LIBDIR}/spec/fixtures/unit/util/dhcp_servers/route_nogw
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ec2/linux-arp-ec2.out
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out
@@ -254,13 +317,18 @@ ${GEM_LIBDIR}/spec/fixtures/unit/util/ip/solaris_ifconfig_single_interface
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ip/windows_netsh_all_interfaces
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ip/windows_netsh_single_interface
 ${GEM_LIBDIR}/spec/fixtures/unit/util/ip/windows_netsh_single_interface6
-${GEM_LIBDIR}/spec/fixtures/unit/util/loader/nosuchfact.rb
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/freebsd_dmidecode
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/intel_linux_dmidecode
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/linux_dmidecode_with_spaces
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/opensolaris_smbios
+${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/smartos_smbios
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag
 ${GEM_LIBDIR}/spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag
+${GEM_LIBDIR}/spec/fixtures/unit/util/operatingsystem/cumuluslinux.txt
+${GEM_LIBDIR}/spec/fixtures/unit/util/operatingsystem/redhat-7.txt
+${GEM_LIBDIR}/spec/fixtures/unit/util/operatingsystem/sabayon.txt
+${GEM_LIBDIR}/spec/fixtures/unit/util/operatingsystem/wheezy.txt
+${GEM_LIBDIR}/spec/fixtures/unit/util/partitions/partitions/mount
 ${GEM_LIBDIR}/spec/fixtures/unit/util/processor/solaris-i86pc
 ${GEM_LIBDIR}/spec/fixtures/unit/util/processor/solaris-sun4u
 ${GEM_LIBDIR}/spec/fixtures/unit/util/processor/x86-pentium2
@@ -270,6 +338,7 @@ ${GEM_LIBDIR}/spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
 ${GEM_LIBDIR}/spec/fixtures/unit/util/uptime/ubuntu_proc_uptime
 ${GEM_LIBDIR}/spec/fixtures/unit/util/virtual/invalid_unicode_dmi_entries
 ${GEM_LIBDIR}/spec/fixtures/unit/util/virtual/solaris10_proc_self_status1
+${GEM_LIBDIR}/spec/fixtures/unit/util/vlans/centos-5-no-vlans
 ${GEM_LIBDIR}/spec/fixtures/unit/util/vlans/linux_vlan_config
 ${GEM_LIBDIR}/spec/fixtures/unit/util/xendomains/xendomains
 ${GEM_LIBDIR}/spec/fixtures/unit/virtual/sysfs_dmi_entries_raw.txt
@@ -278,11 +347,18 @@ ${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/freebsd_9.0
 ${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/linux-fuse_0.6.9
 ${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/solaris_10
 ${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/solaris_11
+${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/zfs_new
+${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/zfs_old
+${GEM_LIBDIR}/spec/fixtures/unit/zfs_version/zfsonlinux_0.6.1
 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/freebsd_8.2
 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/freebsd_9.0
 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/linux-fuse_0.6.9
 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/solaris_10
 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/solaris_11
+${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/zfsonlinux_0.6.1
+${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/in_a_container
+${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container
+${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/not_in_a_container
 ${GEM_LIBDIR}/spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
 ${GEM_LIBDIR}/spec/fixtures/virtual/proc_self_status/vserver_2_1/host
 ${GEM_LIBDIR}/spec/fixtures/virtual/proc_self_status/vserver_2_3/guest
@@ -295,16 +371,32 @@ ${GEM_LIBDIR}/spec/puppetlabs_spec/fixtures.rb
 ${GEM_LIBDIR}/spec/puppetlabs_spec/matchers.rb
 ${GEM_LIBDIR}/spec/puppetlabs_spec/verbose.rb
 ${GEM_LIBDIR}/spec/puppetlabs_spec_helper.rb
+${GEM_LIBDIR}/spec/schema/validate_facter_schema.rb
 ${GEM_LIBDIR}/spec/shared_contexts/platform.rb
 ${GEM_LIBDIR}/spec/shared_formats/parses.rb
 ${GEM_LIBDIR}/spec/spec_helper.rb
 ${GEM_LIBDIR}/spec/unit/application_spec.rb
 ${GEM_LIBDIR}/spec/unit/architecture_spec.rb
 ${GEM_LIBDIR}/spec/unit/blockdevices_spec.rb
+${GEM_LIBDIR}/spec/unit/core/aggregate_spec.rb
+${GEM_LIBDIR}/spec/unit/core/directed_graph_spec.rb
+${GEM_LIBDIR}/spec/unit/core/execution/base_spec.rb
+${GEM_LIBDIR}/spec/unit/core/execution/posix_spec.rb
+${GEM_LIBDIR}/spec/unit/core/execution/windows_spec.rb
+${GEM_LIBDIR}/spec/unit/core/execution_spec.rb
+${GEM_LIBDIR}/spec/unit/core/logging_spec.rb
+${GEM_LIBDIR}/spec/unit/core/resolvable_spec.rb
+${GEM_LIBDIR}/spec/unit/core/suitable_spec.rb
+${GEM_LIBDIR}/spec/unit/dhcp_servers_spec.rb
 ${GEM_LIBDIR}/spec/unit/domain_spec.rb
+${GEM_LIBDIR}/spec/unit/ec2/rest_spec.rb
 ${GEM_LIBDIR}/spec/unit/ec2_spec.rb
 ${GEM_LIBDIR}/spec/unit/facter_spec.rb
 ${GEM_LIBDIR}/spec/unit/filesystems_spec.rb
+${GEM_LIBDIR}/spec/unit/fqdn_spec.rb
+${GEM_LIBDIR}/spec/unit/gce/metadata_spec.rb
+${GEM_LIBDIR}/spec/unit/gce_spec.rb
+${GEM_LIBDIR}/spec/unit/gid_spec.rb
 ${GEM_LIBDIR}/spec/unit/hardwareisa_spec.rb
 ${GEM_LIBDIR}/spec/unit/hardwaremodel_spec.rb
 ${GEM_LIBDIR}/spec/unit/hostname_spec.rb
@@ -322,41 +414,65 @@ ${GEM_LIBDIR}/spec/unit/lsbdistdescription_spec.rb
 ${GEM_LIBDIR}/spec/unit/lsbdistid_spec.rb
 ${GEM_LIBDIR}/spec/unit/lsbdistrelease_spec.rb
 ${GEM_LIBDIR}/spec/unit/lsbmajdistrelease_spec.rb
+${GEM_LIBDIR}/spec/unit/lsbminordistrelease_spec.rb
 ${GEM_LIBDIR}/spec/unit/lsbrelease_spec.rb
 ${GEM_LIBDIR}/spec/unit/macaddress_spec.rb
 ${GEM_LIBDIR}/spec/unit/manufacturer_spec.rb
 ${GEM_LIBDIR}/spec/unit/memory_spec.rb
 ${GEM_LIBDIR}/spec/unit/netmask_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/base_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/cumuluslinux_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/implementation_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/linux_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/sunos_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/vmkernel_spec.rb
+${GEM_LIBDIR}/spec/unit/operatingsystem/windows_spec.rb
 ${GEM_LIBDIR}/spec/unit/operatingsystem_spec.rb
 ${GEM_LIBDIR}/spec/unit/operatingsystemmajrelease_spec.rb
 ${GEM_LIBDIR}/spec/unit/operatingsystemrelease_spec.rb
+${GEM_LIBDIR}/spec/unit/os_spec.rb
+${GEM_LIBDIR}/spec/unit/osfamily_spec.rb
+${GEM_LIBDIR}/spec/unit/partitions_spec.rb
 ${GEM_LIBDIR}/spec/unit/physicalprocessorcount_spec.rb
 ${GEM_LIBDIR}/spec/unit/processor_spec.rb
+${GEM_LIBDIR}/spec/unit/processors/os_spec.rb
+${GEM_LIBDIR}/spec/unit/processors_spec.rb
 ${GEM_LIBDIR}/spec/unit/ps_spec.rb
+${GEM_LIBDIR}/spec/unit/rackspace_spec.rb
+${GEM_LIBDIR}/spec/unit/rubyplatform_spec.rb
 ${GEM_LIBDIR}/spec/unit/selinux_spec.rb
 ${GEM_LIBDIR}/spec/unit/ssh_spec.rb
+${GEM_LIBDIR}/spec/unit/system32_spec.rb
+${GEM_LIBDIR}/spec/unit/system_uptime_spec.rb
 ${GEM_LIBDIR}/spec/unit/uniqueid_spec.rb
 ${GEM_LIBDIR}/spec/unit/uptime_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/collection_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/config_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/confine_spec.rb
+${GEM_LIBDIR}/spec/unit/util/dhcp_servers_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/directory_loader_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/ec2_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/fact_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/file_read_spec.rb
+${GEM_LIBDIR}/spec/unit/util/formatter_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/ip/windows_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/ip_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/loader_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/macaddress_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/macosx_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/manufacturer_spec.rb
-${GEM_LIBDIR}/spec/unit/util/monkey_patches_spec.rb
+${GEM_LIBDIR}/spec/unit/util/normalization_spec.rb
+${GEM_LIBDIR}/spec/unit/util/operatingsystem_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/parser_spec.rb
+${GEM_LIBDIR}/spec/unit/util/partitions/partitions_spec.rb
+${GEM_LIBDIR}/spec/unit/util/partitions_spec.rb
+${GEM_LIBDIR}/spec/unit/util/posix_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/processor_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/registry_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/resolution_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/solaris_zones_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/uptime_spec.rb
+${GEM_LIBDIR}/spec/unit/util/values_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/virtual_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/vlans_spec.rb
 ${GEM_LIBDIR}/spec/unit/util/wmi_spec.rb
diff --git a/sysutils/ruby-facter/distinfo b/sysutils/ruby-facter/distinfo
index 46335b70a18..d6f5f2f0a02 100644
--- a/sysutils/ruby-facter/distinfo
+++ b/sysutils/ruby-facter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2014/03/14 18:04:25 taca Exp $
+$NetBSD: distinfo,v 1.21.8.1 2015/02/20 20:07:12 tron Exp $
 
-SHA1 (facter-1.7.5.gem) = 415b8ce1fdac30172d9378f7475fe0cabf9fe018
-RMD160 (facter-1.7.5.gem) = 5050a801b88d4af4e6e6000d723615ad1d70a6a9
-Size (facter-1.7.5.gem) = 197632 bytes
+SHA1 (facter-2.4.1.gem) = 59b7b0e51f03252c6aafc0eca57a08e0534e8d27
+RMD160 (facter-2.4.1.gem) = 2c2a720cec110a6a93106ff30d1669c9eb076df4
+Size (facter-2.4.1.gem) = 236544 bytes