Import of pkgsrc-2014Q1

sysutils/puppet/Makefile

@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2013/04/25 12:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2014/03/26 14:27:22 taca Exp $
 
 DISTNAME=		puppet-3.1.1
+PKGREVISION=		1
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://puppetlabs.com/downloads/puppet/
 
 MAINTAINER=		tonnerre@NetBSD.org
 HOMEPAGE=		http://www.puppetlabs.com/
 COMMENT=		Configuration management framework written in Ruby
-LICENSE=		gnu-gpl-v2
+LICENSE=		apache-2.0
 
 DEPENDS+=		${RUBY_PKGPREFIX}-facter>=1.6.18:../../sysutils/ruby-facter
 DEPENDS+=		${RUBY_PKGPREFIX}-hiera>=1.0.0:../../databases/ruby-hiera
@@ -16,7 +17,7 @@ DEPENDS+=		${RUBY_PKGPREFIX}-json-pure>=0:../../textproc/ruby-json-pure
 DEPENDS+=		${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest
 DEPENDS+=		${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow
 
-RUBY_VERSION_SUPPORTED=	193
+RUBY_VERSION_SUPPORTED=	200 193 21
 
 CONFLICTS+=		ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]*
 

sysutils/puppet/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/04/10 21:10:54 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/03/11 14:05:16 jperkin Exp $
 bin/puppet
 ${PLIST.sunos}lib/svc/method/svc-puppetd
 ${PLIST.sunos}lib/svc/method/svc-puppetmasterd
@@ -1747,8 +1747,6 @@ ${GEM_LIBDIR}/spec/watchr.rb
 ${GEM_LIBDIR}/tasks/manpages.rake
 ${GEM_LIBDIR}/tasks/parser.rake
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
-share/examples/rc.d/puppetd
-share/examples/rc.d/puppetmasterd
 ${PLIST.sunos}${EGDIR}/svc/puppetd.xml
 ${PLIST.sunos}${EGDIR}/svc/puppetmasterd.xml
 ${RUBY_EG}-puppet/puppet.conf

sysutils/puppet/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2013/04/10 21:10:54 tonnerre Exp $
+$NetBSD: distinfo,v 1.10 2014/01/02 01:41:48 tonnerre Exp $
 
 SHA1 (puppet-3.1.1.gem) = 4f6adf79ab3ff5204178102375e79ca9e486042d
 RMD160 (puppet-3.1.1.gem) = 59cb6269f5cf0bcb89f643cb9ed211ab1640ff1d
@@ -6,4 +6,5 @@ Size (puppet-3.1.1.gem) = 1590272 bytes
 SHA1 (patch-aa) = 153dcff431d6c642872d3aa2118bc2505c996e94
 SHA1 (patch-ab) = bc90687cd03181211b6fe3d6f056e653334d96a9
 SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249
-SHA1 (patch-ad) = 7feaab50c3c8ce2ed350dac3222fdf1bd2b34191
+SHA1 (patch-ad) = ea451b25483cf371307566b7d4e3110730ffa145
+SHA1 (patch-ae) = 2bd3354b9cf0ccc2366e66a6022c341c6a8472de

sysutils/puppet/patches/patch-ad

@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2013/04/10 21:10:55 tonnerre Exp $
+$NetBSD: patch-ad,v 1.4 2014/01/02 01:41:48 tonnerre Exp $
 
 Add NetBSD and update support to the pkgin provider.
 
@@ -12,7 +12,7 @@ Add NetBSD and update support to the pkgin provider.
 +  defaultfor :operatingsystem => [:dragonfly, :netbsd]
  
 -  has_feature :installable, :uninstallable
-+  has_feature :installable, :uninstallable, :versionable, :upgradeable
++  has_feature :installable, :uninstallable, :upgradeable
  
    def self.parse_pkgin_line(package, force_status=nil)
  

sysutils/puppet/patches/patch-ae

@@ -0,0 +1,29 @@
+$NetBSD: patch-ae,v 1.3 2014/01/01 23:46:38 tonnerre Exp $
+
+Fix detection of useradd user management under NetBSD.
+
+NetBSD doesn't have chage but can use the -e and -f flags to passwd to
+achieve the same.
+
+--- lib/puppet/provider/user/useradd.rb.orig	2014-01-01 23:22:45.000000000 +0000
++++ lib/puppet/provider/user/useradd.rb
+@@ -5,13 +5,16 @@ Puppet::Type.type(:user).provide :userad
+     install Ruby's shadow password library (often known as `ruby-libshadow`)
+     if you wish to manage user passwords."
+ 
+-  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage"
++  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage" unless %w{NetBSD}.include? Facter.value(:operatingsystem)
++  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "passwd" if %w{NetBSD}.include? Facter.value(:operatingsystem)
+ 
+   options :home, :flag => "-d", :method => :dir
+   options :comment, :method => :gecos
+   options :groups, :flag => "-G"
+-  options :password_min_age, :flag => "-m"
+-  options :password_max_age, :flag => "-M"
++  options :password_min_age, :flag => "-m" unless %w{NetBSD}.include? Facter.value(:operatingsystem)
++  options :password_max_age, :flag => "-M" unless %w{NetBSD}.include? Facter.value(:operatingsystem)
++  options :password_min_age, :flag => "-e" if %w{NetBSD}.include? Facter.value(:operatingsystem)
++  options :password_max_age, :flag => "-f" if %w{NetBSD}.include? Facter.value(:operatingsystem)
+ 
+   verify :gid, "GID must be an integer" do |value|
+     value.is_a? Integer