rpms/puppet/EL-5 import.log, NONE, 1.1 puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch, NONE, 1.1 puppet-0.25.1-0002-Correct-rundir-permissions.patch, NONE, 1.1 puppet-0.25.1-server-initscript.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 puppet.spec, 1.30, 1.31 sources, 1.26, 1.27 no-lockdir.patch, 1.1, NONE puppet-0.24.8-activerecord-test.patch, 1.1, NONE puppet-0.24.8-condrestart.patch, 1.1, NONE puppet-0.24.8-read-proc-mounts.patch, 1.1, NONE puppet-0.24.8-rundir-perms.patch, 1.1, NONE puppet-0.24.8-status-options.patch, 1.1, NONE puppet-0.24.8-supplementary-groups.patch, 1.1, NONE
Jeroen van Meeuwen
kanarip at fedoraproject.org
Thu Nov 26 07:09:57 UTC 2009
Author: kanarip
Update of /cvs/pkgs/rpms/puppet/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5503/EL-5
Modified Files:
.cvsignore puppet.spec sources
Added Files:
import.log
puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
puppet-0.25.1-0002-Correct-rundir-permissions.patch
puppet-0.25.1-server-initscript.patch
Removed Files:
no-lockdir.patch puppet-0.24.8-activerecord-test.patch
puppet-0.24.8-condrestart.patch
puppet-0.24.8-read-proc-mounts.patch
puppet-0.24.8-rundir-perms.patch
puppet-0.24.8-status-options.patch
puppet-0.24.8-supplementary-groups.patch
Log Message:
0.25.1-1
--- NEW FILE import.log ---
puppet-0_25_1-1_fc12:EL-5:puppet-0.25.1-1.fc12.src.rpm:1259219364
puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch:
util.rb | 5 +++--
util/suidmanager.rb | 13 +++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
--- NEW FILE puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch ---
>From 50952a627a9c96a147c7bcac91f6e2380e483310 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
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 | 12 +++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 6f83c7a..8e2e8a3 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -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
- rescue
- $stderr.puts "could not change to user %s" % user
+ rescue => detail
+ $stderr.puts "could not change to user %s: %s" % [user, detail]
exit(74)
end
end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index c5df0d1..7896945 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
extend Forwardable
to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
- :uid=, :uid, :gid=, :gid ]
+ :uid=, :uid, :gid=, :gid, :groups=, :groups ]
to_delegate_to_process.each do |method|
def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
# We set both because some programs like to drop privs, i.e. bash.
old_uid, old_gid = self.uid, self.gid
old_euid, old_egid = self.euid, self.egid
+ old_groups = self.groups
begin
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
+ self.groups = old_groups
end
end
module_function :asuser
@@ -49,6 +52,13 @@ module Puppet::Util::SUIDManager
end
module_function :convert_xid
+ # Initialize supplementary groups
+ def initgroups(user)
+ require 'etc'
+ 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.5.2
puppet-0.25.1-0002-Correct-rundir-permissions.patch:
defaults.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE puppet-0.25.1-0002-Correct-rundir-permissions.patch ---
>From 1c7130844b241c1cc2d6c97545dcf895b310eec5 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
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 9d992dd..7967877 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -62,7 +62,7 @@ module Puppet
},
:rundir => {
:default => rundir,
- :mode => 01777,
+ :mode => 0755,
:desc => "Where Puppet PID files are kept."
},
:genconfig => [false,
--
1.6.5.2
puppet-0.25.1-server-initscript.patch:
server.init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE puppet-0.25.1-server-initscript.patch ---
>From 8894aae81d26a9564305ae89ac159320c53dca83 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/EL-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 24 Mar 2009 01:04:14 -0000 1.25
+++ .cvsignore 26 Nov 2009 07:09:57 -0000 1.26
@@ -1 +1 @@
-puppet-0.24.8.tgz
+puppet-0.25.1.tar.gz
Index: puppet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/EL-5/puppet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- puppet.spec 8 Aug 2009 15:49:27 -0000 1.30
+++ puppet.spec 26 Nov 2009 07:09:57 -0000 1.31
@@ -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 certif
%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
%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
%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 at 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 at ogd.nl> - 0.25.1-1
+- New upstream version
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Oct 27 2009 Todd Zullinger <tmz at pobox.com> - 0.25.1-0.3
+- Update to 0.25.1
+- Include the pi program and man page (R.I.Pienaar)
+
+* Sat Oct 17 2009 Todd Zullinger <tmz at pobox.com> - 0.25.1-0.2.rc2
+- Update to 0.25.1rc2
+
+* Tue Sep 22 2009 Todd Zullinger <tmz at 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
-* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at 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)
+* Fri Sep 04 2009 Todd Zullinger <tmz at 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)
+- Install ext/ directory in %%{_datadir}/%{name} (/usr/share/puppet)
-* Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
+* Mon May 04 2009 Todd Zullinger <tmz at pobox.com> - 0.25.0-0.1.beta1
+- Update to 0.25.0beta1
- Make Augeas and SELinux requirements build time options
-- Install emacs mode and vim syntax files (#491437)
-- Include ext/ directory in %%doc
* Mon Mar 23 2009 Todd Zullinger <tmz at 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 at lists.fedoraproject.org> - 0.24.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
* Tue Dec 16 2008 Todd Zullinger <tmz at pobox.com> - 0.24.7-4
- Remove redundant useradd from %%pre
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 24 Mar 2009 01:04:14 -0000 1.26
+++ sources 26 Nov 2009 07:09:57 -0000 1.27
@@ -1 +1 @@
-288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz
+55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz
--- no-lockdir.patch DELETED ---
--- puppet-0.24.8-activerecord-test.patch DELETED ---
--- puppet-0.24.8-condrestart.patch DELETED ---
--- puppet-0.24.8-read-proc-mounts.patch DELETED ---
--- puppet-0.24.8-rundir-perms.patch DELETED ---
--- puppet-0.24.8-status-options.patch DELETED ---
--- puppet-0.24.8-supplementary-groups.patch DELETED ---
More information about the fedora-extras-commits
mailing list