Update to 0.25.4EL-6-start

6 files changed, 24 insertions, 95 deletions

diff --git a/.cvsignore b/.cvsignore
index 1125240..aaf3649 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.25.3.tar.gz
+puppet-0.25.4.tar.gz
diff --git a/0001-Revert-Fix-2845-Cron-entries-using-special-parameter.patch b/0001-Revert-Fix-2845-Cron-entries-using-special-parameter.patch
deleted file mode 100644
index 2191001..0000000
--- a/0001-Revert-Fix-2845-Cron-entries-using-special-parameter.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 441879f7999f4724e8ab344e796015a7ffbfb21b Mon Sep 17 00:00:00 2001
-From: James Turnbull <james@lovedthanlost.net>
-Date: Thu, 14 Jan 2010 14:14:19 +1100
-Subject: [PATCH/puppet] Revert "Fix #2845 Cron entries using "special" parameter lose their title when changed"
-
-This reverts commit c99f394bf8c10d13f3fa7d3ab7ab43ecf454c081.
-
-The fix broke cron jobs in 0.25.3 and was reverted for the 0.25.4 release.
----
- lib/puppet/provider/cron/crontab.rb |   13 +++++++++----
- spec/unit/provider/cron/crontab.rb  |   21 ---------------------
- 2 files changed, 9 insertions(+), 25 deletions(-)
- delete mode 100755 spec/unit/provider/cron/crontab.rb
-
-diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb
-index 28ef059..6dee2e5 100755
---- a/lib/puppet/provider/cron/crontab.rb
-+++ b/lib/puppet/provider/cron/crontab.rb
-@@ -27,13 +27,18 @@ Puppet::Type.type(:cron).provide(:crontab,
- 
-     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 ','.
-diff --git a/spec/unit/provider/cron/crontab.rb b/spec/unit/provider/cron/crontab.rb
-deleted file mode 100755
-index 5904a58..0000000
---- a/spec/unit/provider/cron/crontab.rb
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#!/usr/bin/env ruby
--
--Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
--
--describe Puppet::Type.type(:cron).provider(:crontab) do
--    before :each do
--        @cron_type = Puppet::Type.type(:cron)
--        @provider = @cron_type.provider(:crontab)
--    end
--
--    it "should round-trip the name as a comment for @special events" do
--        parse = @provider.parse <<-CRON
--# Puppet Name: test
--@reboot /bin/echo > /tmp/puppet.txt
--        CRON
--        prefetch = @provider.prefetch_hook(parse)
--
--        @provider.to_line(prefetch[0]).should =~ /Puppet Name: test/
--    end
--
--end
--- 
-1.6.6
-
diff --git a/puppet-0.25.3.tar.gz.sign b/puppet-0.25.3.tar.gz.sign
deleted file mode 100644
index e80597a..0000000
--- a/puppet-0.25.3.tar.gz.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iQIcBAABAgAGBQJLS8k5AAoJEP+shliDR6J/rukP/ArL4G3L27Y1YSMSCJN6uYby
-WxCxnAI2lfkmiAoJtFUClnkbnWecHMSaambT+cabqng8fZWrBORpX3QNk9cZ8vEq
-3pSFCNoUkMqCPDzXin1i7ykJW7l18NS3tPvHR7+w5ErvYopuvvQT+hUbo1GM1res
-tRsfJz2PR5BVzK2qAS9rgER/c5A1OIz+6WlcS/VnsOaPMfxqWUnRRSozQpnUlX0N
-ijuAn39VTbgnaK2D7TmDpDboTz+G3WHGONTQ9uAAoHJqV6uOFkekCgeD7N99uMkR
-v5ZpdEUAkczw91H46qKMA4J+Cp0/WTHwDJTQ/BMtqRD6Ch37Gv4Xkcwes01m2jS+
-YCGcJzBFijl2Z/C8/DKFTtlyEY2qTeAs6BiSmMl9mQB8xmD4TDfenhdIq1QejKFz
-Oq8kUyvfJ/JVX0TC1GLAqb5RzHihxO2y0I1O1XL+nq+cL8Vm9Zes8wvOwewkyubE
-dCR7dDk46Mj163X/Nu/JNMkrESXn7iopVHbKh4X/0bV4QQ6ESBREmPMKG8wIu12I
-kEIWUxJ4GAFeHio2jx0sRyZrr7mN56Ve2vwfxEsxlwGJ4zgpP5AB6hEaR92uDyMH
-Abmc6oWgKVJQHxB7jGMQXPQ9iLPb7u2sYU2EbbPGpB1dw/+A2TGgaNndjJm+tbL3
-5lfnigur13poRtgMYvjz
-=liWb
------END PGP SIGNATURE-----
diff --git a/puppet-0.25.4.tar.gz.sign b/puppet-0.25.4.tar.gz.sign
new file mode 100644
index 0000000..0929784
--- /dev/null
+++ b/puppet-0.25.4.tar.gz.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iQIcBAABAgAGBQJLYokwAAoJEP+shliDR6J/Q2YP/Rz7MNMThLBwMlP7rb8AhLub
+0IuOIPeeaJRJIM3Rp/H/CuLaQSg2jOU/NDfhDgMsNLbPdIE748hZ4BLuCAeUoDaa
+LqXGuMLxyTGZF2Y8Jf74+78fcYMyyOoSaVixZl/eE9r3I8P9K7m/ANh/UBstdfFe
+Ai64MHIaXLnNpvkE4JHoa+CKcihNgyk+MYUFBz/KK8QCdpFPDwuaTOo08a22WHhc
+LtnPWOShms26FI9mDg3/wrnorbiJ2r2tCfokXB49F7GP0yHIPyJ8B8A8LrEJFtDt
+00thP7eL6kwK/n3GvpgxTgkSDO6PrYkep+mMy73VeCTdmg/3YwjFld67O16qki97
+y+k9rwKW5QyYbLFs+V2itK/AFBRMv4iKDu/KGKGTF1liTwnGQM8GCa7WuwgrcMV7
+kv4FseJaCFR6YAt3Z6z/l5RknxIgfxym0UQ6n5qKjZ1/PJqFZz0Eq+CmNqFiz11X
+Aqq2WFt0mVn8a6nOw9MCcCQ3mxI7ZVGobqI3C+M3xJDmLTZaTDHp+sIj/kR0szhS
+bSTu0+MhLXxvSXCBMxUkGvSNfxO9Lz9Z988NrLdcyfAzPc9w/ENyvgwu8lhtvuRu
+NIuwnQViiam5cBX4SFC2VjNL0XCfsjVWhxQTIibY8mWViybWenvSwyyyajJuC9SU
+BjCta1BL09L6fJv5Rh/g
+=H0bT
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index 59db0dc..b499a75 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,8 +5,8 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.3
-Release:        2%{?dist}
+Version:        0.25.4
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
@@ -14,8 +14,6 @@ Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar
 Source1:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz.sign
 # https://bugzilla.redhat.com/495096
 Patch0:         puppet-0.25.1-0002-Correct-rundir-permissions.patch
-# http://projects.reductivelabs.com/issues/show/2845
-Patch1:         0001-Revert-Fix-2845-Cron-entries-using-special-parameter.patch
 
 Group:          System Environment/Base
 
@@ -71,7 +69,6 @@ The server can also function as a certificate authority and file server.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Fix some rpmlint complaints
@@ -226,6 +223,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Jan 29 2010 Todd Zullinger <tmz@pobox.com> - 0.25.4-1
+- Update to 0.25.4
+
 * Tue Jan 19 2010 Todd Zullinger <tmz@pobox.com> - 0.25.3-2
 - Apply upstream patch to fix cron resources (upstream #2845)
 
diff --git a/sources b/sources
index 7390943..90c1c17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44bd7408e01d985992fa8b318f4e227e  puppet-0.25.3.tar.gz
+69c97019fda5620f9f45f6ad64407e3b  puppet-0.25.4.tar.gz