Attachment 121610 Details for Bug 164634 – puppet-2.7.10.patch

[patch] puppet-2.7.10.patch

puppet-2.7.10.patch (text/plain), 3.57 KB, created by Tim Bishop on 2012-01-30 13:30:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Bishop

Created: 2012-01-30 13:30:06 UTC

Size: 3.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /u1/freebsd/cvs/ports/sysutils/puppet/Makefile,v
>retrieving revision 1.32
>diff -u -r1.32 Makefile
>--- Makefile	30 Dec 2011 19:35:45 -0000	1.32
>+++ Makefile	26 Jan 2012 09:48:38 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	puppet
>-PORTVERSION=	2.7.9
>+PORTVERSION=	2.7.10
> CATEGORIES=	sysutils
> MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
> 
>@@ -16,8 +16,6 @@
> RUN_DEPENDS=	facter>=0:${PORTSDIR}/sysutils/facter \
> 		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
> 
>-CONFLICTS=	puppet-devel-[0-9]*
>-
> NO_BUILD=	yes
> USE_RUBY=	yes
> USE_RUBY_FEATURES=	iconv
>Index: distinfo
>===================================================================
>RCS file: /u1/freebsd/cvs/ports/sysutils/puppet/distinfo,v
>retrieving revision 1.21
>diff -u -r1.21 distinfo
>--- distinfo	30 Dec 2011 19:35:45 -0000	1.21
>+++ distinfo	26 Jan 2012 09:48:51 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (puppet-2.7.9.tar.gz) = b15a2031e39c8eb8768efcc2d24030258abc9e33efd9c5212ab0fd9b983e2b94
>-SIZE (puppet-2.7.9.tar.gz) = 1778208
>+SHA256 (puppet-2.7.10.tar.gz) = 0d0452ed2a22acb60f9fd4ebaeb6d04bb73ab5299f59003bf7b53d6391dc1127
>+SIZE (puppet-2.7.10.tar.gz) = 1843484
>Index: files/patch-fix_password_provider
>===================================================================
>RCS file: files/patch-fix_password_provider
>diff -N files/patch-fix_password_provider
>--- files/patch-fix_password_provider	13 Nov 2011 13:18:28 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,55 +0,0 @@
>---- lib/puppet/provider/user/pw.rb
>-+++ lib/puppet/provider/user/pw.rb
>-@@ -1,10 +1,11 @@
>- require 'puppet/provider/nameservice/pw'
>-+require 'open3'
>- 
>- Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::PW do
>-   desc "User management via `pw` on FreeBSD."
>- 
>-   commands :pw => "pw"
>--  has_features :manages_homedir, :allows_duplicates
>-+  has_features :manages_homedir, :allows_duplicates, :manages_passwords
>- 
>-   defaultfor :operatingsystem => :freebsd
>- 
>-@@ -23,7 +24,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
>-   def addcmd
>-     cmd = [command(:pw), "useradd", @resource[:name]]
>-     @resource.class.validproperties.each do |property|
>--      next if property == :ensure
>-+      next if property == :ensure or property == :password
>-       # the value needs to be quoted, mostly because -c might
>-       # have spaces in it
>-       if value = @resource.should(property) and value != ""
>-@@ -37,5 +38,30 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
>- 
>-     cmd
>-   end
>-+
>-+  def create
>-+    super
>-+
>-+    # Set the password after create if given
>-+    self.password = @resource[:password] if @resource[:password]
>-+  end
>-+
>-+  # use pw to update password hash
>-+  def password=(cryptopw)
>-+    Puppet.debug "change password for user '#{@resource[:name]}' method called with hash '#{cryptopw}'"
>-+    stdin, stdout, stderr = Open3.popen3("pw user mod #{@resource[:name]} -H 0")
>-+    stdin.puts(cryptopw)
>-+    stdin.close
>-+    Puppet.debug "finished password for user '#{@resource[:name]}' method called with hash '#{cryptopw}'"
>-+  end
>-+
>-+  # get password from /etc/master.passwd
>-+  def password
>-+    Puppet.debug "checking password for user '#{@resource[:name]}' method called"
>-+    current_passline = `getent passwd #{@resource[:name]}`
>-+    current_password = current_passline.chomp.split(':')[1] if current_passline
>-+    Puppet.debug "finished password for user '#{@resource[:name]}' method called : '#{current_password}'"
>-+    current_password
>-+  end
>- end
>-

Actions: View | Diff

Attachments on bug 164634: 121610