From 0665d2d40bd02846f4afa7e467d9f4e78187f3bd Mon Sep 17 00:00:00 2001 From: robert Date: Sat, 5 May 2012 19:29:49 +0000 Subject: [PATCH] update to 1.6.8 --- sysutils/ruby-facter/Makefile | 7 +- sysutils/ruby-facter/distinfo | 10 +- .../patches/patch-lib_facter_memory_rb | 16 +- ...patch-lib_facter_physicalprocessorcount_rb | 10 +- .../patches/patch-lib_facter_virtual_rb | 30 ++-- sysutils/ruby-facter/pkg/PLIST | 151 +++++++++--------- 6 files changed, 116 insertions(+), 108 deletions(-) diff --git a/sysutils/ruby-facter/Makefile b/sysutils/ruby-facter/Makefile index 2fb8f2ab9ab..bb77e1667c2 100644 --- a/sysutils/ruby-facter/Makefile +++ b/sysutils/ruby-facter/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.21 2011/12/06 14:39:01 robert Exp $ +# $OpenBSD: Makefile,v 1.22 2012/05/05 19:29:49 robert Exp $ SHARED_ONLY= Yes COMMENT= Ruby library for retrieving facts from operating systems -VERSION= 1.6.0 +VERSION= 1.6.8 DISTNAME= facter-${VERSION} PKGNAME= ruby-${DISTNAME} -REVISION= 1 CATEGORIES= sysutils HOMEPAGE= http://reductivelabs.com/projects/facter/ @@ -32,7 +31,7 @@ do-install: ${INSTALL_DATA_DIR} ${MODRUBY_EXAMPLEDIR}/facter @cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb ${INSTALL_DATA} ${WRKSRC}/etc/facter.conf \ - ${MODRUBY_EXAMPLEDIR}/facter + ${MODRUBY_EXAMPLEDIR}/facter MODRUBY_REGRESS = rake rspec2 diff --git a/sysutils/ruby-facter/distinfo b/sysutils/ruby-facter/distinfo index 80aeefbee4f..6616a2d9930 100644 --- a/sysutils/ruby-facter/distinfo +++ b/sysutils/ruby-facter/distinfo @@ -1,5 +1,5 @@ -MD5 (facter-1.6.0.tar.gz) = v344S/JHk16XPP179Vkt/g== -RMD160 (facter-1.6.0.tar.gz) = 5q4O6qRKqEu+WXYUqowgwmH2gwE= -SHA1 (facter-1.6.0.tar.gz) = /DGhZl3dxSWbC8Hyp4mGbCocg7M= -SHA256 (facter-1.6.0.tar.gz) = VGr1VqdOFVODr+nW1uqz9RHhT84MutTBXk/xwG6uPcM= -SIZE (facter-1.6.0.tar.gz) = 87314 +MD5 (facter-1.6.8.tar.gz) = 0XJImcAmI9zVvze61I2Ykg== +RMD160 (facter-1.6.8.tar.gz) = GrNgjeCUkVC+GnpLCo1A/ZxRjiE= +SHA1 (facter-1.6.8.tar.gz) = M1qeh23ey4ngQdKdJH/lb4bEPkM= +SHA256 (facter-1.6.8.tar.gz) = eeF44ZH/wy9uWwgSwHJWgCr8NQbiqoyFOHc2RsOkYzU= +SIZE (facter-1.6.8.tar.gz) = 119323 diff --git a/sysutils/ruby-facter/patches/patch-lib_facter_memory_rb b/sysutils/ruby-facter/patches/patch-lib_facter_memory_rb index 34289d9449d..f2615d40b47 100644 --- a/sysutils/ruby-facter/patches/patch-lib_facter_memory_rb +++ b/sysutils/ruby-facter/patches/patch-lib_facter_memory_rb @@ -1,12 +1,12 @@ -$OpenBSD: patch-lib_facter_memory_rb,v 1.2 2011/12/06 14:39:01 robert Exp $ ---- lib/facter/memory.rb.orig Thu Jun 16 20:24:42 2011 -+++ lib/facter/memory.rb Tue Dec 6 15:34:17 2011 +$OpenBSD: patch-lib_facter_memory_rb,v 1.3 2012/05/05 19:29:49 robert Exp $ +--- lib/facter/memory.rb.orig Sat May 5 21:25:21 2012 ++++ lib/facter/memory.rb Sat May 5 21:25:35 2012 @@ -93,7 +93,7 @@ if Facter.value(:kernel) == "AIX" and Facter.value(:id end if Facter.value(:kernel) == "OpenBSD" -- swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d') -+ swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d') || "" - swapfree, swaptotal = 0, 0 - swap.each do |dev| - if dev =~ /^\S+\s+(\S+)\s+\S+\s+(\S+)\s+.*$/ +- swap = Facter::Util::Resolution.exec('swapctl -s') ++ swap = Facter::Util::Resolution.exec('swapctl -s') || "" + swapfree, swaptotal = 0, 0 + if swap =~ /^total: (\d+)k bytes allocated = \d+k used, (\d+)k available$/ + swaptotal = $1.to_i diff --git a/sysutils/ruby-facter/patches/patch-lib_facter_physicalprocessorcount_rb b/sysutils/ruby-facter/patches/patch-lib_facter_physicalprocessorcount_rb index 72276072ec8..570a7d9329e 100644 --- a/sysutils/ruby-facter/patches/patch-lib_facter_physicalprocessorcount_rb +++ b/sysutils/ruby-facter/patches/patch-lib_facter_physicalprocessorcount_rb @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_facter_physicalprocessorcount_rb,v 1.1 2011/12/06 14:39:33 robert Exp $ ---- lib/facter/physicalprocessorcount.rb.orig Tue Dec 6 15:34:30 2011 -+++ lib/facter/physicalprocessorcount.rb Tue Dec 6 15:34:35 2011 -@@ -9,48 +9,60 @@ +$OpenBSD: patch-lib_facter_physicalprocessorcount_rb,v 1.2 2012/05/05 19:29:49 robert Exp $ +--- lib/facter/physicalprocessorcount.rb.orig Wed Apr 11 18:37:43 2012 ++++ lib/facter/physicalprocessorcount.rb Sat May 5 21:24:32 2012 +@@ -9,50 +9,62 @@ # # Caveats: # @@ -99,3 +99,5 @@ $OpenBSD: patch-lib_facter_physicalprocessorcount_rb,v 1.1 2011/12/06 14:39:33 r + end + end end + + Facter.add('physicalprocessorcount') do diff --git a/sysutils/ruby-facter/patches/patch-lib_facter_virtual_rb b/sysutils/ruby-facter/patches/patch-lib_facter_virtual_rb index 2b6676a84dd..79bd38f1f50 100644 --- a/sysutils/ruby-facter/patches/patch-lib_facter_virtual_rb +++ b/sysutils/ruby-facter/patches/patch-lib_facter_virtual_rb @@ -1,16 +1,16 @@ -$OpenBSD: patch-lib_facter_virtual_rb,v 1.2 2011/12/06 14:39:01 robert Exp $ ---- lib/facter/virtual.rb.orig Thu Jun 16 20:24:42 2011 -+++ lib/facter/virtual.rb Tue Dec 6 15:34:17 2011 -@@ -98,7 +98,11 @@ Facter.add("virtual") do - end +$OpenBSD: patch-lib_facter_virtual_rb,v 1.3 2012/05/05 19:29:49 robert Exp $ +--- lib/facter/virtual.rb.orig Sat May 5 21:25:43 2012 ++++ lib/facter/virtual.rb Sat May 5 21:26:54 2012 +@@ -89,7 +89,11 @@ Facter.add("virtual") do + end - if result == "physical" -- output = Facter::Util::Resolution.exec('lspci') -+ if Facter.value(:kernel) == "OpenBSD" -+ output = Facter::Util::Resolution.exec('pcidump') -+ else -+ output = Facter::Util::Resolution.exec('lspci') -+ end - if not output.nil? - output.each_line do |p| - # --- look for the vmware video card to determine if it is virtual => vmware. + if result == "physical" +- output = Facter::Util::Resolution.exec('lspci 2>/dev/null') ++ if Facter.value(:kernel) == "OpenBSD" ++ output = Facter::Util::Resolution.exec('pcidump 2>/dev/null') ++ else ++ output = Facter::Util::Resolution.exec('lspci 2>/dev/null') ++ end + if not output.nil? + output.each_line do |p| + # --- look for the vmware video card to determine if it is virtual => vmware. diff --git a/sysutils/ruby-facter/pkg/PLIST b/sysutils/ruby-facter/pkg/PLIST index 6c90ddbece3..f8133044906 100644 --- a/sysutils/ruby-facter/pkg/PLIST +++ b/sysutils/ruby-facter/pkg/PLIST @@ -1,76 +1,83 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/07/28 08:37:43 robert Exp $ +@comment $OpenBSD: PLIST,v 1.7 2012/05/05 19:29:49 robert Exp $ bin/facter -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/Cfkey.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/application.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/architecture.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/arp.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/domain.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ec2.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/facterversion.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/fqdn.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hardwareisa.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hardwaremodel.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hostname.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/id.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/interfaces.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ipaddress.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ipaddress6.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/iphostnumber.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernel.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelmajversion.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelrelease.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelversion.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/lsb.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/lsbmajdistrelease.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/macaddress.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/macosx.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/manufacturer.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/memory.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/netmask.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/network.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/operatingsystem.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/operatingsystemrelease.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/path.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/physicalprocessorcount.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/processor.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ps.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/puppetversion.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/rubysitedir.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/rubyversion.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/selinux.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ssh.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/timezone.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uniqueid.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_days.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_hours.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_seconds.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/ -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/collection.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/confine.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/fact.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/ip.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/loader.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/macaddress.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/macosx.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/manufacturer.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/memory.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/netmask.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/ -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/generator.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/parser.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/resolution.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/uptime.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/values.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/virtual.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/vlans.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/xendomains.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/virtual.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/vlans.rb -lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/xendomains.rb +${MODRUBY_SITEDIR}/facter/ +${MODRUBY_SITEDIR}/facter.rb +${MODRUBY_SITEDIR}/facter/Cfkey.rb +${MODRUBY_SITEDIR}/facter/application.rb +${MODRUBY_SITEDIR}/facter/architecture.rb +${MODRUBY_SITEDIR}/facter/arp.rb +${MODRUBY_SITEDIR}/facter/augeasversion.rb +${MODRUBY_SITEDIR}/facter/domain.rb +${MODRUBY_SITEDIR}/facter/ec2.rb +${MODRUBY_SITEDIR}/facter/facterversion.rb +${MODRUBY_SITEDIR}/facter/fqdn.rb +${MODRUBY_SITEDIR}/facter/hardwareisa.rb +${MODRUBY_SITEDIR}/facter/hardwaremodel.rb +${MODRUBY_SITEDIR}/facter/hostname.rb +${MODRUBY_SITEDIR}/facter/id.rb +${MODRUBY_SITEDIR}/facter/interfaces.rb +${MODRUBY_SITEDIR}/facter/ipaddress.rb +${MODRUBY_SITEDIR}/facter/ipaddress6.rb +${MODRUBY_SITEDIR}/facter/iphostnumber.rb +${MODRUBY_SITEDIR}/facter/kernel.rb +${MODRUBY_SITEDIR}/facter/kernelmajversion.rb +${MODRUBY_SITEDIR}/facter/kernelrelease.rb +${MODRUBY_SITEDIR}/facter/kernelversion.rb +${MODRUBY_SITEDIR}/facter/lsb.rb +${MODRUBY_SITEDIR}/facter/lsbmajdistrelease.rb +${MODRUBY_SITEDIR}/facter/macaddress.rb +${MODRUBY_SITEDIR}/facter/macosx.rb +${MODRUBY_SITEDIR}/facter/manufacturer.rb +${MODRUBY_SITEDIR}/facter/memory.rb +${MODRUBY_SITEDIR}/facter/netmask.rb +${MODRUBY_SITEDIR}/facter/network.rb +${MODRUBY_SITEDIR}/facter/operatingsystem.rb +${MODRUBY_SITEDIR}/facter/operatingsystemrelease.rb +${MODRUBY_SITEDIR}/facter/osfamily.rb +${MODRUBY_SITEDIR}/facter/path.rb +${MODRUBY_SITEDIR}/facter/physicalprocessorcount.rb +${MODRUBY_SITEDIR}/facter/processor.rb +${MODRUBY_SITEDIR}/facter/ps.rb +${MODRUBY_SITEDIR}/facter/puppetversion.rb +${MODRUBY_SITEDIR}/facter/rubysitedir.rb +${MODRUBY_SITEDIR}/facter/rubyversion.rb +${MODRUBY_SITEDIR}/facter/selinux.rb +${MODRUBY_SITEDIR}/facter/ssh.rb +${MODRUBY_SITEDIR}/facter/timezone.rb +${MODRUBY_SITEDIR}/facter/uniqueid.rb +${MODRUBY_SITEDIR}/facter/uptime.rb +${MODRUBY_SITEDIR}/facter/uptime_days.rb +${MODRUBY_SITEDIR}/facter/uptime_hours.rb +${MODRUBY_SITEDIR}/facter/uptime_seconds.rb +${MODRUBY_SITEDIR}/facter/util/ +${MODRUBY_SITEDIR}/facter/util/collection.rb +${MODRUBY_SITEDIR}/facter/util/config.rb +${MODRUBY_SITEDIR}/facter/util/confine.rb +${MODRUBY_SITEDIR}/facter/util/ec2.rb +${MODRUBY_SITEDIR}/facter/util/fact.rb +${MODRUBY_SITEDIR}/facter/util/ip.rb +${MODRUBY_SITEDIR}/facter/util/loader.rb +${MODRUBY_SITEDIR}/facter/util/macaddress.rb +${MODRUBY_SITEDIR}/facter/util/macosx.rb +${MODRUBY_SITEDIR}/facter/util/manufacturer.rb +${MODRUBY_SITEDIR}/facter/util/memory.rb +${MODRUBY_SITEDIR}/facter/util/monkey_patches.rb +${MODRUBY_SITEDIR}/facter/util/netmask.rb +${MODRUBY_SITEDIR}/facter/util/plist/ +${MODRUBY_SITEDIR}/facter/util/plist.rb +${MODRUBY_SITEDIR}/facter/util/plist/generator.rb +${MODRUBY_SITEDIR}/facter/util/plist/parser.rb +${MODRUBY_SITEDIR}/facter/util/processor.rb +${MODRUBY_SITEDIR}/facter/util/resolution.rb +${MODRUBY_SITEDIR}/facter/util/uptime.rb +${MODRUBY_SITEDIR}/facter/util/values.rb +${MODRUBY_SITEDIR}/facter/util/virtual.rb +${MODRUBY_SITEDIR}/facter/util/vlans.rb +${MODRUBY_SITEDIR}/facter/util/wmi.rb +${MODRUBY_SITEDIR}/facter/util/xendomains.rb +${MODRUBY_SITEDIR}/facter/virtual.rb +${MODRUBY_SITEDIR}/facter/vlans.rb +${MODRUBY_SITEDIR}/facter/xendomains.rb ${MODRUBY_RELEXAMPLEDIR}/ ${MODRUBY_RELEXAMPLEDIR}/facter/ ${MODRUBY_RELEXAMPLEDIR}/facter/facter.conf