0.25.1

11 files changed, 95 insertions, 286 deletions

diff --git a/.cvsignore b/.cvsignore
index cd3e227..58fb452 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.24.8.tgz
+puppet-0.25.1.tar.gz
diff --git a/import.log b/import.log
index e622089..4a451c6 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 puppet-0_24_7-1_fc10:HEAD:puppet-0.24.7-1.fc10.src.rpm:1229416939
 puppet-0_24_7-3_fc10:HEAD:puppet-0.24.7-3.fc10.src.rpm:1229418101
 puppet-0_24_8-2_fc11:HEAD:puppet-0.24.8-2.fc11.src.rpm:1245843917
+puppet-0_25_1-1_fc12:HEAD:puppet-0.25.1-1.fc12.src.rpm:1259220140
diff --git a/puppet-0.24.8-activerecord-test.patch b/puppet-0.24.8-activerecord-test.patch
deleted file mode 100644
index fac8473..0000000
--- a/puppet-0.24.8-activerecord-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
-From: Luke Kanies <luke@madstop.com>
-Date: Thu, 23 Apr 2009 18:56:30 -0500
-Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x
-
-Signed-off-by: Luke Kanies <luke@madstop.com>
----
- lib/puppet/feature/rails.rb |   21 ++++-----------------
- 1 files changed, 4 insertions(+), 17 deletions(-)
-
-diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
-index 63e6f00..561863c 100644
---- a/lib/puppet/feature/rails.rb
-+++ b/lib/puppet/feature/rails.rb
-@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
-         end
-     end
- 
--    # If we couldn't find it the normal way, try using a Gem.
--    unless defined? ActiveRecord
--        begin
--            require 'rubygems'
--            require 'rails'
--        rescue LoadError
--            # Nothing
--        end
-+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
-+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
-+        raise "ActiveRecord 2.3 required for StoreConfigs"
-     end
- 
--    # We check a fairly specific class, so that we can be sure that we've
--    # loaded a new enough version of AR that will support the features we
--    # actually use.
--    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
--        require 'puppet/rails'
--        true
--    else
--        false
--    end
-+    true
- end
- 
--- 
-1.6.4
-
diff --git a/puppet-0.24.8-condrestart.patch b/puppet-0.24.8-condrestart.patch
deleted file mode 100644
index 2809c1c..0000000
--- a/puppet-0.24.8-condrestart.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
-From: Todd Zullinger <tmz@pobox.com>
-Date: Fri, 3 Jul 2009 10:22:19 -0400
-Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart
-
-Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
-test for whether to restart the daemons.  This caused condrestart to
-start the daemons even when they were not running, in cases where they
-had died or been killed without cleaning up the $pidfile/$lockfile.
-
-This was reported by Ingvar Hagelund in Red Hat bug #480600.
----
- conf/redhat/client.init |    7 ++++++-
- conf/redhat/server.init |   11 ++++++++---
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/conf/redhat/client.init b/conf/redhat/client.init
-index f40e81d..fda156c 100644
---- a/conf/redhat/client.init
-+++ b/conf/redhat/client.init
-@@ -67,6 +67,10 @@ rh_status() {
-     status $statusopts $puppetd
- }
- 
-+rh_status_q() {
-+        rh_status >/dev/null 2>&1
-+}
-+
- genconfig() {
-   echo -n $"Generate configuration puppet: "
-   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
-@@ -86,7 +90,8 @@ case "$1" in
-         reload
- 	;;
-   condrestart|try-restart)
--	[ -f "$pidfile" ] && restart
-+	rh_status_q || exit 0
-+	restart
- 	;;
-   status)
-         rh_status
-diff --git a/conf/redhat/server.init b/conf/redhat/server.init
-index 6871b9a..74cb52f 100644
---- a/conf/redhat/server.init
-+++ b/conf/redhat/server.init
-@@ -89,7 +89,7 @@ genconfig() {
-   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
- }
- 
--puppetmaster_status() {
-+rh_status() {
-     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
-             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
-@@ -103,6 +103,10 @@ puppetmaster_status() {
-     return $RETVAL
- }
- 
-+rh_status_q() {
-+        rh_status >/dev/null 2>&1
-+}
-+
- case "$1" in
-   start)
- 	start
-@@ -114,10 +118,11 @@ case "$1" in
-         restart
- 	;;
-   condrestart)
--	[ -f "$lockfile" ] && restart
-+	rh_status_q || exit 0
-+	restart
- 	;;
-   status)
--    puppetmaster_status
-+    rh_status
- 	;;
-   genconfig)
- 	genconfig
--- 
-1.6.3.3
-
diff --git a/puppet-0.24.8-read-proc-mounts.patch b/puppet-0.24.8-read-proc-mounts.patch
deleted file mode 100644
index 4c22b79..0000000
--- a/puppet-0.24.8-read-proc-mounts.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
-From: Ricky Zhou <ricky@fedoraproject.org>
-Date: Sat, 11 Jul 2009 01:57:52 -0400
-Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads
-
-This works around a linux kernel bug that causes a select() on
-/proc/mounts to hang.
----
- lib/puppet/util/selinux.rb |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
-index cd3b2ac..dc5daec 100644
---- a/lib/puppet/util/selinux.rb
-+++ b/lib/puppet/util/selinux.rb
-@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
- 
-     # Internal helper function to read and parse /proc/mounts
-     def read_mounts
-+        mounts = ""
-         begin
--            mountfh = File.open("/proc/mounts", NONBLOCK)
--            mounts = mountfh.read
-+            mountfh = File.open("/proc/mounts")
-+            # We use read_nonblock() in a loop rather than read() to work-around
-+            # a linux kernel bug.  See ticket #1963 for details.
-+            while true
-+                mounts += mountfh.read_nonblock(1024)
-+            end
-+        rescue EOFError
-             mountfh.close
-         rescue
-             return nil
--- 
-1.6.3.3
-
diff --git a/puppet-0.24.8-status-options.patch b/puppet-0.24.8-status-options.patch
deleted file mode 100644
index aad9ee5..0000000
--- a/puppet-0.24.8-status-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
-From: Todd Zullinger <tmz@pobox.com>
-Date: Fri, 3 Jul 2009 09:08:17 -0400
-Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL
-
-On RHEL < 5, the status function does not accept a -p option.  Using it
-causes 'service puppet status' to produce erroneous output.  This was
-also reported by Aaron Dummer in Red Hat bug #501577.
----
- conf/redhat/client.init |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/conf/redhat/client.init b/conf/redhat/client.init
-index 44caab1..f40e81d 100644
---- a/conf/redhat/client.init
-+++ b/conf/redhat/client.init
-@@ -62,6 +62,11 @@ restart() {
-     start
- }
- 
-+rh_status() {
-+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
-+    status $statusopts $puppetd
-+}
-+
- genconfig() {
-   echo -n $"Generate configuration puppet: "
-   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
-@@ -84,8 +89,7 @@ case "$1" in
- 	[ -f "$pidfile" ] && restart
- 	;;
-   status)
--        status -p "$pidfile" $puppetd
--        RETVAL=$?
-+        rh_status
- 	;;
-   once)
-         shift
--- 
-1.6.3.3
-
diff --git a/puppet-0.24.8-supplementary-groups.patch b/puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
index 42687da..3cc8c09 100644
--- a/puppet-0.24.8-supplementary-groups.patch
+++ b/puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
@@ -1,24 +1,24 @@
-From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
+From 50952a627a9c96a147c7bcac91f6e2380e483310 Mon Sep 17 00:00:00 2001
 From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Wed, 24 Jun 2009 15:30:19 +0200
-Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)
+Date: Wed, 25 Nov 2009 13:38:52 +0100
+Subject: [PATCH] Initialize supplementary groups (ported patch from 0.24.8 originally from Till Maas)
 
 ---
  lib/puppet/util.rb             |    5 +++--
- lib/puppet/util/suidmanager.rb |   11 ++++++++++-
- 2 files changed, 13 insertions(+), 3 deletions(-)
+ lib/puppet/util/suidmanager.rb |   12 +++++++++++-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
-index f8a8721..51a2a16 100644
+index 6f83c7a..8e2e8a3 100644
 --- a/lib/puppet/util.rb
 +++ b/lib/puppet/util.rb
-@@ -58,10 +58,11 @@ module Util
+@@ -55,10 +55,11 @@ module Util
              end
              unless Puppet::Util::SUIDManager.uid == user
                  begin
 +                    Puppet::Util::SUIDManager.initgroups(user)
-                     Puppet::Util::SUIDManager.uid = user 
-                     Puppet::Util::SUIDManager.euid = user 
+                     Puppet::Util::SUIDManager.uid = user
+                     Puppet::Util::SUIDManager.euid = user
 -                rescue
 -                    $stderr.puts "could not change to user %s" % user
 +                rescue => detail
@@ -27,7 +27,7 @@ index f8a8721..51a2a16 100644
                  end
              end
 diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
-index b071dca..9f6e3b6 100644
+index c5df0d1..7896945 100644
 --- a/lib/puppet/util/suidmanager.rb
 +++ b/lib/puppet/util/suidmanager.rb
 @@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
@@ -48,7 +48,7 @@ index b071dca..9f6e3b6 100644
              self.egid = convert_xid :gid, new_gid if new_gid
 +            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
              self.euid = convert_xid :uid, new_uid if new_uid
-   
+ 
              yield
          ensure
              self.euid, self.egid = old_euid, old_egid
@@ -56,7 +56,7 @@ index b071dca..9f6e3b6 100644
          end
      end
      module_function :asuser
-@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
+@@ -49,6 +52,13 @@ module Puppet::Util::SUIDManager
      end
      module_function :convert_xid
  
@@ -66,9 +66,10 @@ index b071dca..9f6e3b6 100644
 +        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
 +    end
 +    module_function :initgroups
++
  
      def run_and_capture(command, new_uid=nil, new_gid=nil)
          output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
 -- 
-1.6.3.3
+1.6.5.2
 
diff --git a/puppet-0.24.8-rundir-perms.patch b/puppet-0.25.1-0002-Correct-rundir-permissions.patch
index d7205fe..0463dbe 100644
--- a/puppet-0.24.8-rundir-perms.patch
+++ b/puppet-0.25.1-0002-Correct-rundir-permissions.patch
@@ -1,19 +1,19 @@
-From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
+From 1c7130844b241c1cc2d6c97545dcf895b310eec5 Mon Sep 17 00:00:00 2001
 From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Wed, 24 Jun 2009 15:19:01 +0200
-Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.
+Date: Wed, 25 Nov 2009 13:42:59 +0100
+Subject: [PATCH 2/2] Correct rundir permissions
 
 ---
  lib/puppet/defaults.rb |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index e36dd70..077faab 100644
+index 9d992dd..7967877 100644
 --- a/lib/puppet/defaults.rb
 +++ b/lib/puppet/defaults.rb
-@@ -68,7 +68,7 @@ module Puppet
+@@ -62,7 +62,7 @@ module Puppet
          },
-         :rundir => { 
+         :rundir => {
              :default => rundir,
 -            :mode => 01777,
 +            :mode => 0755,
@@ -21,5 +21,5 @@ index e36dd70..077faab 100644
          },
          :genconfig => [false,
 -- 
-1.6.3.3
+1.6.5.2
 
diff --git a/puppet-0.25.1-server-initscript.patch b/puppet-0.25.1-server-initscript.patch
new file mode 100644
index 0000000..69bbfac
--- /dev/null
+++ b/puppet-0.25.1-server-initscript.patch
@@ -0,0 +1,27 @@
+From 8894aae81d26a9564305ae89ac159320c53dca83 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger <tmz@pobox.com>
+Date: Tue, 27 Oct 2009 10:30:08 -0400
+Subject: [PATCH/puppet] conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
+
+Mattias Saou ran into a serious bug cause by 9dff71 (Use -p option to
+killproc).  The puppetmaster init script lacked a pidfile variable,
+which ended up with /usr/sbin/puppetmasterd being removed.
+---
+ conf/redhat/server.init |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/conf/redhat/server.init b/conf/redhat/server.init
+index 5505058..4f44206 100644
+--- a/conf/redhat/server.init
++++ b/conf/redhat/server.init
+@@ -13,6 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
+ export PATH
+ 
+ lockfile=/var/lock/subsys/puppetmaster
++pidfile=/var/run/puppet/puppetmasterd.pid
+ 
+ # Source function library.
+ . /etc/rc.d/init.d/functions
+-- 
+1.6.5.2
+
diff --git a/puppet.spec b/puppet.spec
index d2cc5f7..0e8a7a0 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,25 +5,18 @@
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.24.8
-Release:        4%{?dist}
+Version:        0.25.1
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
-Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
-
-# https://bugzilla.redhat.com/495096
-Patch0:         puppet-0.24.8-rundir-perms.patch
+Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+# Brown paper bag fix for my killproc blunder (tmz)
+Patch0:         puppet-0.25.1-server-initscript.patch
 # https://bugzilla.redhat.com/475201
-Patch1:         puppet-0.24.8-supplementary-groups.patch
-# http://projects.reductivelabs.com/issues/1963
-Patch2:         puppet-0.24.8-read-proc-mounts.patch
-# https://bugzilla.redhat.com/501577
-Patch3:         puppet-0.24.8-status-options.patch
-# https://bugzilla.redhat.com/480600
-Patch4:         puppet-0.24.8-condrestart.patch
-# https://bugzilla.redhat.com/515728
-Patch5:         puppet-0.24.8-activerecord-test.patch
+Patch1:         puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
+# https://bugzilla.redhat.com/495096
+Patch2:         puppet-0.25.1-0002-Correct-rundir-permissions.patch
 
 Group:          System Environment/Base
 
@@ -78,24 +71,14 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%if 0%{?fedora} >= 11
-%patch5 -p1
-%endif
-
-# Move puppetca, puppetd, and puppetmasterd to sbin
-mkdir sbin
-mv bin/puppet{ca,d,masterd} sbin/
 
 %build
 # Fix some rpmlint complaints
 for f in mac_dscl.pp mac_dscl_revert.pp \
-         mac_netinfo.pp mac_pkgdmg.pp ; do
+         mac_pkgdmg.pp ; do
   sed -i -e'1d' examples/$f
   chmod a-x examples/$f
 done
@@ -149,17 +132,19 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGELOG COPYING LICENSE README examples
+%{_bindir}/pi
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
 %{_bindir}/puppetdoc
-%exclude %{_mandir}/man8/pi.8.gz
+%{_sbindir}/puppetca
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # We don't want to require emacs or vim, so we need to own these dirs
@@ -171,27 +156,27 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
-%doc %{_mandir}/man8/puppet.8.gz
-%doc %{_mandir}/man8/puppet.conf.8.gz
-%doc %{_mandir}/man8/puppetd.8.gz
-%doc %{_mandir}/man8/ralsh.8.gz
-%doc %{_mandir}/man8/puppetdoc.8.gz
+%{_mandir}/man8/pi.8.gz
+%{_mandir}/man8/puppet.8.gz
+%{_mandir}/man8/puppet.conf.8.gz
+%{_mandir}/man8/puppetca.8.gz
+%{_mandir}/man8/puppetd.8.gz
+%{_mandir}/man8/ralsh.8.gz
+%{_mandir}/man8/puppetdoc.8.gz
 
 %files server
 %defattr(-, root, root, 0755)
 %{_sbindir}/puppetmasterd
-%{_bindir}/puppetrun
+%{_sbindir}/puppetrun
+%{_sbindir}/puppetqd
 %{_initrddir}/puppetmaster
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
-%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
-%{_sbindir}/puppetca
-%doc %{_mandir}/man8/filebucket.8.gz
-%doc %{_mandir}/man8/puppetca.8.gz
-%doc %{_mandir}/man8/puppetmasterd.8.gz
-%doc %{_mandir}/man8/puppetrun.8.gz
+%{_mandir}/man8/filebucket.8.gz
+%{_mandir}/man8/puppetmasterd.8.gz
+%{_mandir}/man8/puppetrun.8.gz
 
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
 # and 471919 (RHEL-4)
@@ -237,27 +222,30 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Fri Aug 07 2009 Todd Zullinger <tmz@pobox.com> - 0.24.8-4
-- Fix status -p handling on older RHEL (#501577)
-- Fix condrestart when daemon's aren't running (#480600)
-- Fix timeout reading /proc/mounts (upstream #1963)
-- Fix permissions on /var/log/puppet (#495096)
-- Fix rails test for activerecord-2.3 (#515728)
+* Wed Nov 25 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.25.1-1
+- New upstream version
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Oct 27 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.3
+- Update to 0.25.1
+- Include the pi program and man page (R.I.Pienaar)
 
-* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip@kanarip.com>
-- Fix permissions on /var/run/puppet/ (#495096)
-- Support initializing supplementary groups (#1806, #475201, Till Maas)
-- Own the correct vim directory
-- Move ext/ outside of doc datadir (rpmlint)
-- Require ruby(selinux) rather then libselinux-ruby (#507848)
+* Sat Oct 17 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.2.rc2
+- Update to 0.25.1rc2
 
-* Fri May 29 2009 Todd Zullinger <tmz@pobox.com> - 0.24.8-2
-- Make Augeas and SELinux requirements build time options
+* Tue Sep 22 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.1.rc1
+- Update to 0.25.1rc1
+- Move puppetca to puppet package, it has uses on client systems
+- Drop redundant %%doc from manpage %%file listings
+
+* Fri Sep 04 2009 Todd Zullinger <tmz@pobox.com> - 0.25.0-1
+- Update to 0.25.0
+- Fix permissions on /var/log/puppet (#495096)
 - Install emacs mode and vim syntax files (#491437)
-- Include ext/ directory in %%doc
+- Install ext/ directory in %%{_datadir}/%{name} (/usr/share/puppet)
+
+* Mon May 04 2009 Todd Zullinger <tmz@pobox.com> - 0.25.0-0.1.beta1
+- Update to 0.25.0beta1
+- Make Augeas and SELinux requirements build time options
 
 * Mon Mar 23 2009 Todd Zullinger <tmz@pobox.com> - 0.24.8-1
 - Update to 0.24.8
@@ -265,9 +253,6 @@ rm -rf %{buildroot}
 - Use upstream install script
 - Increase required facter version to >= 1.5
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Tue Dec 16 2008 Todd Zullinger <tmz@pobox.com> - 0.24.7-4
 - Remove redundant useradd from %%pre
 
diff --git a/sources b/sources
index cc908de..a00c1fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-288d46dee00acad64d0f3ecc6d8ba6fa  puppet-0.24.8.tgz
+55ced6102fe6ad8b2ecb2b1384008167  puppet-0.25.1.tar.gz