Import of pkgsrc-2014Q1

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