diff -urN puppet.orig/Makefile puppet/Makefile --- puppet.orig/Makefile 2010-04-02 13:26:28.000000000 -0700 +++ puppet/Makefile 2010-04-02 13:31:27.000000000 -0700 @@ -2,14 +2,13 @@ # Date created: 2007-03-03 # Whom: Tomoyuki Sakurai <cherry@trombik.mine.nu> # -# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.12 2010/02/01 17:29:09 pgollucci Exp $ +# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.11 2010/01/18 11:25:44 garga Exp $ # PORTNAME= puppet -PORTVERSION= 0.25.3 -PORTREVISION= 1 +PORTVERSION= 0.25.4 CATEGORIES= sysutils -MASTER_SITES= http://www.reductivelabs.com/downloads/puppet/ +MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ MAINTAINER= raj@csub.edu COMMENT= A configuration management framework written in Ruby diff -urN puppet.orig/distinfo puppet/distinfo --- puppet.orig/distinfo 2010-04-02 13:26:28.000000000 -0700 +++ puppet/distinfo 2010-04-02 13:27:32.000000000 -0700 @@ -1,3 +1,3 @@ -MD5 (puppet-0.25.3.tar.gz) = 44bd7408e01d985992fa8b318f4e227e -SHA256 (puppet-0.25.3.tar.gz) = a187019264c2b2d1cad6e103765f616f6e0afa7cc3fbad37fec318ab00e859fe -SIZE (puppet-0.25.3.tar.gz) = 1424590 +MD5 (puppet-0.25.4.tar.gz) = 69c97019fda5620f9f45f6ad64407e3b +SHA256 (puppet-0.25.4.tar.gz) = c2dd640a31d1e57ad09929001f90247cd83908485f1f737abca352eb1866fbf3 +SIZE (puppet-0.25.4.tar.gz) = 1424240 diff -urN puppet.orig/files/patch-lib-puppet-provider-cron-crontab.rb puppet/files/patch-lib-puppet-provider-cron-crontab.rb --- puppet.orig/files/patch-lib-puppet-provider-cron-crontab.rb 2010-04-02 13:26:28.000000000 -0700 +++ puppet/files/patch-lib-puppet-provider-cron-crontab.rb 1969-12-31 16:00:00.000000000 -0800 @@ -1,25 +0,0 @@ ---- lib/puppet/provider/cron/crontab.rb.orig 2010-01-11 23:55:13.000000000 +0000 -+++ lib/puppet/provider/cron/crontab.rb 2010-01-19 02:49:58.000000000 +0000 -@@ -27,13 +27,18 @@ - - text_line :environment, :match => %r{^\w+=} - -- crontab = record_line :crontab, :fields => %w{special minute hour monthday month weekday command}, -- :match => %r{^\s*(?:@(\w+)|(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+))\s+(.+)$}, -- :optional => %w{special minute hour weekday month monthday}, :absent => "*" -+ record_line :freebsd_special, :fields => %w{special command}, -+ :match => %r{^@(\w+)\s+(.+)$}, :pre_gen => proc { |record| -+ record[:special] = "@" + record[:special] -+ } -+ -+ crontab = record_line :crontab, :fields => %w{minute hour monthday month weekday command}, -+ :match => %r{^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$}, -+ :optional => %w{minute hour weekday month monthday}, :absent => "*" - - class << crontab - def numeric_fields -- fields - [:command, :special] -+ fields - [:command] - end - # Do some post-processing of the parsed record. Basically just - # split the numeric fields on ','. deleted puppet/files/patch-lib-puppet-provider-cron-crontab.rb
Responsible Changed From-To: freebsd-ports-bugs->sylvio I'll take it.
sylvio 2010-04-05 23:04:14 UTC FreeBSD ports repository Modified files: sysutils/puppet Makefile distinfo Removed files: sysutils/puppet/files patch-lib-puppet-provider-cron-crontab.rb Log: - Update to 0.25.4 PR: ports/145304 Submitted by: Russell Jackson <raj@csub.edu> (maintainer) Approved by: itetcu (mentor, implicit) Revision Changes Path 1.13 +2 -3 ports/sysutils/puppet/Makefile 1.8 +3 -3 ports/sysutils/puppet/distinfo 1.2 +0 -25 ports/sysutils/puppet/files/patch-lib-puppet-provider-cron-crontab.rb (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"
State Changed From-To: open->closed Committed. Thanks!