Hello community, here is the log from the commit of package puppet for openSUSE:Factory checked in at 2012-11-20 20:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/puppet (Old) and /work/SRC/openSUSE:Factory/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "puppet", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2012-09-14 12:34:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2012-11-20 20:18:18.000000000 +0100 @@ -1,0 +2,38 @@ +Mon Nov 12 13:37:33 UTC 2012 - [email protected] + +- revert back from ruby-shadow to rubygem-ruby-shadow as required + by openSUSE ruby packaging policies + +------------------------------------------------------------------- +Wed Oct 31 20:23:56 UTC 2012 - [email protected] + +- changed requirement of package back from rubygem-ruby-shadow to + more common named ruby-shadow + +------------------------------------------------------------------- +Wed Oct 24 18:03:28 UTC 2012 - [email protected] + +- Updated requirements for package puppet to include rubygem-ruby-shadow + This is needed to make puppet modules to change passwd file + +------------------------------------------------------------------- +Tue Oct 23 21:01:38 UTC 2012 - [email protected] + +- Updated to 3.0.1 +- Updated puppet-3.0.1-init.diff so it functions with client.init from ext/suse/client.init +- Fixed puppet.conf not in /ext/suse/ so got puppet.conf from + ext/redhat/puppet.conf + + http://projects.puppetlabs.com/projects/1/wiki/Release_Notes#3.0.1 + - Bug #15717: puppet kick returns "Error: Could not find indirection 'run' / testip.example.com finished with exit code 2" + - Bug #16585: Remove dead "ldapnodes" setting + - Bug #16698: external node classifier script is not being called when storedconfigs is on + - bug #16757: user cannot control loading of rubygems + - Bug #16769: Apache "SSLOptions +ExportCertData" causes "header too long" error + - Bug #16801: Puppet 3 debian init script has code using removed --servertype=mongrel option + - Bug #16922: Could not intern from b64_zlib_yaml when fact value ends with a colon + - Bug #17000: Puppet acceptance suite will get caught in a loop if agent fails to terminate for kick test + - Refactor #16643: sample-module has hyphen in name which is only unofficially supported + + +------------------------------------------------------------------- Old: ---- puppet-2.7.16-init.diff puppet-2.7.19.tar.gz New: ---- puppet-3.0.1-init.diff puppet-3.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.U2VwG7/_old 2012-11-20 20:18:20.000000000 +0100 +++ /var/tmp/diff_new_pack.U2VwG7/_new 2012-11-20 20:18:20.000000000 +0100 @@ -22,7 +22,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: puppet -Version: 2.7.19 +Version: 3.0.1 Release: 0 Summary: A network tool for managing many disparate systems License: Apache-2.0 @@ -36,16 +36,26 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-2.6.6-yumconf.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: %{name}-2.7.16-init.diff -BuildRequires: facter >= 1.5.1 -BuildRequires: fdupes -BuildRequires: ruby >= 1.8.1 +Patch1: %{name}-3.0.1-init.diff +# Included in upstream package as of 3.x series +Obsoletes: hiera-puppet < 1.0.0 +Provides: hiera-puppet >= 1.0.0 Requires: facter >= 1.5.1 -Requires: ruby >= 1.8.1 +Requires: rubygem-hiera >= 1.0.0 +Requires: ruby >= 1.8.7 +Requires: rubygem-ruby-shadow >= 2.1.4 +BuildRequires: facter >= 1.6.11 +BuildRequires: fdupes +BuildRequires: ruby >= 1.8.7 +BuildRequires: rubygem-hiera >= 1.0.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq -Requires(pre): pwdutils +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif %description Puppet lets you centrally manage every important aspect of your system @@ -56,7 +66,6 @@ %package server Summary: A network tool for managing many disparate systems -License: GPL-2.0 Group: Productivity/Networking/System Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq @@ -80,25 +89,32 @@ ruby install.rb install --destdir=%{buildroot} --sitelibdir=%{_libdir}/ruby/vendor_ruby/%{rb_ver} mkdir -p %{buildroot}%{_sysconfdir}/puppet mkdir -p %{buildroot}%{_sysconfdir}/init.d -mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/puppet mkdir -p %{buildroot}%{_localstatedir}/log/puppet mkdir -p %{buildroot}/%{_fwdefdir} -install -m0644 conf/redhat/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf +%if 0%{?suse_version} >= 1210 +mkdir -p %{buildroot}/lib/systemd/system +%endif +install -m0644 ext/redhat/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf install -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf -install -m0755 conf/suse/client.init %{buildroot}%{_initddir}/puppet -install -m0755 conf/suse/server.init %{buildroot}%{_initddir}/puppetmasterd +install -m0755 ext/suse/client.init %{buildroot}%{_initddir}/puppet +install -m0755 ext/suse/server.init %{buildroot}%{_initddir}/puppetmasterd ln -sf ../../etc/init.d/puppet %{buildroot}/%{_sbindir}/rcpuppet ln -sf ../../etc/init.d/puppetmasterd %{buildroot}/%{_sbindir}/rcpuppetmasterd install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/puppetmasterd install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/puppet +%if 0%{?suse_version} >= 1210 +install -m 644 ext/systemd/puppetagent.service %{buildroot}/lib/systemd/system/puppetagent.service +install -m 644 ext/systemd/puppetmaster.service %{buildroot}/lib/systemd/system/puppetmaster.service +%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppet cp %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd %fdupes -s %{buildroot}/%{_mandir} %pre -getent group puppet >/dev/null || /usr/sbin/groupadd -o -r puppet +getent group puppet >/dev/null || /usr/sbin/groupadd -r puppet getent passwd puppet >/dev/null || /usr/sbin/useradd -r -g puppet -d /var/lib/puppet -s /bin/false -c "Puppet daemon" puppet %preun @@ -123,14 +139,12 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE README.* -%{_bindir}/filebucket +%doc LICENSE README.* %{_bindir}/puppet -%{_bindir}/ralsh -%{_bindir}/pi -%{_bindir}/puppetdoc -%{_sbindir}/puppetca +%{_bindir}/extlookup2hiera %{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet/ +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/hiera/ +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/hiera_puppet.rb %{_libdir}/ruby/vendor_ruby/%{rb_ver}/puppet.rb %{_libdir}/ruby/vendor_ruby/%{rb_ver}/semver.rb %dir %{_sysconfdir}/puppet @@ -141,19 +155,21 @@ %{_mandir}/man?/* %{_sysconfdir}/init.d/puppet %{_sbindir}/rcpuppet -%{_sbindir}/puppetd %config %{_fwdefdir}/puppet %{_localstatedir}/adm/fillup-templates/sysconfig.puppet +%if 0%{?suse_version} >= 1210 +/lib/systemd/system/puppetagent.service +%endif %files server %defattr(-, root, root, 0755) %dir %attr(755,root,root) -%{_sbindir}/puppetmasterd -%{_sbindir}/puppetrun -%{_sbindir}/puppetqd %{_sbindir}/rcpuppetmasterd %{_sysconfdir}/init.d/puppetmasterd %config %{_fwdefdir}/puppetmasterd %{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd +%if 0%{?suse_version} >= 1210 +/lib/systemd/system/puppetmaster.service +%endif %changelog ++++++ puppet-2.7.16-init.diff -> puppet-3.0.1-init.diff ++++++ --- /work/SRC/openSUSE:Factory/puppet/puppet-2.7.16-init.diff 2012-06-26 17:21:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet-3.0.1-init.diff 2012-11-20 20:18:18.000000000 +0100 @@ -1,7 +1,7 @@ -Index: conf/suse/client.init +Index: ext/suse/client.init =================================================================== ---- conf/suse/client.init.orig 2012-05-23 19:01:10.000000000 +0200 -+++ conf/suse/client.init 2012-06-19 14:24:37.232819359 +0200 +--- ext/suse/client.init.orig 2012-10-21 22:55:28.825958522 +0200 ++++ ext/suse/client.init 2012-10-21 22:55:35.031974940 +0200 @@ -17,7 +17,7 @@ # Should-Start: puppet # Required-Stop: $local_fs $remote_fs $network $syslog @@ -11,22 +11,22 @@ # Default-Stop: 0 1 2 6 # Short-Description: puppet # Description: Enables periodic system configuration checks through puppet. -@@ -33,14 +33,19 @@ +@@ -33,15 +33,19 @@ # rc_exit exit appropriate to overall rc status [ -f /etc/rc.status ] && . /etc/rc.status [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet -lockfile=${LOCKFILE-/var/lock/subsys/puppet} --pidfile=${PIDFILE-/var/run/puppet.pid} --puppetd=${PUPPETD-/usr/sbin/puppetd} -- --PUPPET_OPTS="" --[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}" --[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}" --[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}" +-pidfile=${PIDFILE-/var/run/puppet/agent.pid} +-puppetd=${PUPPETD-/usr/bin/puppet} +-RETVAL=0 +lockfile=/var/run/lock/puppet +pidfile=/var/run/puppet.pid +puppetd=/usr/sbin/puppetd -+ + +-PUPPET_OPTS="agent" +-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}" +-[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}" +-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}" +[ -z "$PUPPET_LOG" ] && PUPPET_LOG="/var/log/puppet/puppet.log" +[ -z "$PUPPET_SERVER" ] && PUPPET_SERVER="puppet" +[ -z "$PUPPET_PORT" ] && PUPPET_PORT="8140" @@ -39,7 +39,7 @@ # First reset status of this service rc_reset -@@ -65,6 +70,8 @@ case "$1" in +@@ -66,9 +70,11 @@ case "$1" in ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. @@ -47,63 +47,50 @@ + mkdir -p $(dirname ${lockfile}) # startproc should return 0, even if service is # already running to match LSB spec. - startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile} -@@ -76,7 +83,7 @@ case "$1" in +- startproc -p ${pidfile} $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile} ++ startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile} + # Remember status and be verbose + rc_status -v + ;; +@@ -77,7 +83,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. -- killproc -QUIT $puppetd && rm -f ${lockfile} ${pidfile} +- killproc -QUIT -p ${pidfile} $puppetd && rm -f ${lockfile} ${pidfile} + killproc $puppetd && rm -f ${lockfile} ${pidfile} # Remember status and be verbose rc_status -v -Index: conf/suse/server.init -=================================================================== ---- conf/suse/server.init.orig 2012-05-23 19:01:10.000000000 +0200 -+++ conf/suse/server.init 2012-06-19 14:27:35.409806171 +0200 -@@ -15,7 +15,7 @@ - # Should-Start: puppetmaster - # Required-Stop: $local_fs $remote_fs $network $syslog - # Should-Stop: puppetmaster --# Default-Start: 3 4 5 -+# Default-Start: 3 5 - # Default-Stop: 0 1 2 6 - # Short-Description: puppetmaster - # Description: Server for the puppet system management tool. -@@ -30,14 +30,14 @@ - # rc_reset clear local rc status (overall remains) - # rc_exit exit appropriate to overall rc status - --lockfile=/var/lock/subsys/puppetmaster -+lockfile=/var/run/lock/puppetmasterd - pidfile=/var/run/puppet/puppetmasterd.pid +@@ -106,7 +112,7 @@ case "$1" in - # Source function library. - [ -f /etc/rc.status ] && . /etc/rc.status - --if [ -f /etc/sysconfig/puppetmaster ]; then -- . /etc/sysconfig/puppetmaster -+if [ -f /etc/sysconfig/puppetmasterd ]; then -+ . /etc/sysconfig/puppetmasterd - fi - - PUPPETMASTER_OPTS="" -@@ -83,6 +83,9 @@ case "$1" in - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - -+ # create lockfile location on tmpfs -+ mkdir -p $(dirname ${lockfile}) -+ - # startproc should return 0, even if service is - # already running to match LSB spec. - # Confirm the manifest exists -@@ -100,7 +103,7 @@ case "$1" in - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - -- killproc -QUIT $PUPPETMASTER && rm -f ${lockfile} ${pidfile} -+ killproc $PUPPETMASTER && rm -f ${lockfile} ${pidfile} - - # Remember status and be verbose + echo -n "Reload service puppet" + ## if it supports it: +- killproc -HUP -p ${pidfile} $puppetd ++ killproc -HUP $puppetd + rc_status -v + ;; + reload) +@@ -115,7 +121,7 @@ case "$1" in + + # If it supports signalling: + echo -n "Reload puppet services." +- killproc -HUP -p ${pidfile} $puppetd ++ killproc -HUP $puppetd + rc_status -v + ;; + status) +@@ -130,12 +136,12 @@ case "$1" in + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. +- checkproc -p ${pidfile} $puppetd ++ checkproc $puppetd rc_status -v + ;; + once) + shift +- $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@ ++ $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@ + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|once}" ++++++ puppet-2.7.19.tar.gz -> puppet-3.0.1.tar.gz ++++++ ++++ 145183 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
