From tdb@pendennis.kent.ac.uk  Mon Jan 30 13:27:01 2012
Return-Path: <tdb@pendennis.kent.ac.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01FE310657C4;
	Mon, 30 Jan 2012 13:27:01 +0000 (UTC)
	(envelope-from tdb@pendennis.kent.ac.uk)
Received: from mx6.kent.ac.uk (mx6.kent.ac.uk [129.12.21.37])
	by mx1.freebsd.org (Postfix) with ESMTP id B77388FC13;
	Mon, 30 Jan 2012 13:27:00 +0000 (UTC)
Received: from hathor.ukc.ac.uk ([129.12.4.12])
	by mx6.kent.ac.uk with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.72)
	(envelope-from <tdb@pendennis.kent.ac.uk>)
	id 1RrqmA-0004RS-KE; Mon, 30 Jan 2012 12:56:02 +0000
Received: from pendennis.kent.ac.uk ([129.12.3.232])
	by hathor.ukc.ac.uk with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.76)
	(envelope-from <tdb@pendennis.kent.ac.uk>)
	id 1RrqmA-0007is-DP; Mon, 30 Jan 2012 12:56:02 +0000
Received: from pendennis.kent.ac.uk (localhost [127.0.0.1])
	by pendennis.kent.ac.uk (8.14.5/8.14.5) with ESMTP id q0UCu2Ov040880;
	Mon, 30 Jan 2012 12:56:02 GMT
	(envelope-from tdb@pendennis.kent.ac.uk)
Received: (from tdb@localhost)
	by pendennis.kent.ac.uk (8.14.5/8.14.5/Submit) id q0UCu2tf040879;
	Mon, 30 Jan 2012 12:56:02 GMT
	(envelope-from tdb)
Message-Id: <201201301256.q0UCu2tf040879@pendennis.kent.ac.uk>
Date: Mon, 30 Jan 2012 12:56:02 GMT
From: Tim Bishop <tdb@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: swills@freebsd.org
Subject: [PATCH] sysutils/puppet: update to 2.7.10
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         164634
>Category:       ports
>Synopsis:       [PATCH] sysutils/puppet: update to 2.7.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 30 13:30:06 UTC 2012
>Closed-Date:    Sat Feb 04 19:46:43 UTC 2012
>Last-Modified:  Sat Feb  4 19:50:08 UTC 2012
>Originator:     Tim Bishop
>Release:        FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD pendennis.kent.ac.uk 9.0-STABLE FreeBSD 9.0-STABLE #3: Tue Jan 10 18:13:10 GMT 2012
>Description:
- Update to 2.7.10
- No longer need CONFLICTS with non-existent puppet-devel port
- patch-fix_password_provider is integrated upstream in 2.7.10 release

Removed file(s):
- files/patch-fix_password_provider

Port maintainer (swills@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- puppet-2.7.10.patch begins here ---
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
- 
--- puppet-2.7.10.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 30 13:30:17 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164634 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Sat Feb 4 19:46:41 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164634 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164634: commit references a PR
Date: Sat,  4 Feb 2012 19:46:35 +0000 (UTC)

 swills      2012-02-04 19:46:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/puppet      Makefile distinfo 
   Removed files:
     sysutils/puppet/files patch-fix_password_provider 
   Log:
   - Update to 2.7.10
   - No longer need CONFLICTS with non-existent puppet-devel port
   - patch-fix_password_provider is integrated upstream in 2.7.10 release
   
   PR:             ports/164634
   Submitted by:   tdb
   
   Revision  Changes    Path
   1.33      +1 -3      ports/sysutils/puppet/Makefile
   1.22      +2 -2      ports/sysutils/puppet/distinfo
   1.3       +0 -55     ports/sysutils/puppet/files/patch-fix_password_provider (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
