[puppet/f19] Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792)

[Sam Kottler]

commit 4f6ba3aa322c8e990a36576a52de0b9b6b1b6086
Author: Sam Kottler <shk at redhat.com>
Date:   Tue Jan 14 06:13:16 2014 -0500

    Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792)

 puppet.spec |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index a79e60b..94eb070 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -21,7 +21,7 @@
 %global confdir         ext/redhat
 
 Name:           puppet
-Version:        3.3.1
+Version:        3.4.2
 Release:        1%{?dist}
 Group:          System Environment/Base
 Summary:        A network tool for managing many disparate systems
@@ -109,17 +109,6 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-
-# Fix some rpmlint complaints
-for f in mac_automount.pp  mcx_dock_absent.pp  mcx_dock_default.pp \
-    mcx_dock_full.pp mcx_dock_invalid.pp mcx_nogroup.pp \
-    mcx_notexists_absent.pp; do
-    sed -i -e'1d' examples/$f
-    chmod a-x examples/$f
-done
-for f in external/nagios.rb relationship.rb; do
-    sed -i -e '1d' lib/puppet/$f
-done
 chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb
 
 # Fixes BZ#952955
@@ -140,7 +129,8 @@ install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 
 %if 0%{?_with_systemd}
 %{__install} -d -m0755  %{buildroot}%{_unitdir}
-install -Dp -m0644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/puppetagent.service
+install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service
+ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service
 install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service
 %else
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
@@ -202,6 +192,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
 %if 0%{?_with_systemd}
+%{_unitdir}/puppet.service
 %{_unitdir}/puppetagent.service
 %else
 %{_initrddir}/puppet
@@ -307,8 +298,8 @@ exit 0
 %preun
 %if 0%{?_with_systemd}
 if [ "$1" -eq 0 ] ; then
-  /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 || :
-  /bin/systemctl stop puppetagent.service > /dev/null 2>&1 || :
+  /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 || :
+  /bin/systemctl stop puppet.service > /dev/null 2>&1 || :
   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 %else
@@ -335,7 +326,7 @@ fi
 %postun
 %if 0%{?_with_systemd}
 if [ $1 -ge 1 ] ; then
-  /bin/systemctl try-restart puppetagent.service >/dev/null 2>&1 || :
+  /bin/systemctl try-restart puppet.service >/dev/null 2>&1 || :
 fi
 %else
 if [ "$1" -ge 1 ]; then
@@ -358,9 +349,21 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 14 2014 Sam Kottler <skottler at fedoraproject.org> - 3.4.2-1
+- Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792)
+
 * Fri Oct 25 2013 Sam Kottler <skottler at fedoraproject.org> - 3.3.1-1
 - Update to 3.3.1 (BZ# 1023527)
 
+* Fri Sep 13 2013 Sam Kottler <skottler at fedoraproject.org> - 3.3.0-1
+- Update to 3.3.0 and remove the rundir-perms patch since it's no longer needed
+
+* Fri Aug 30 2013 Sam Kottler <skottler at fedoraproject.org> - 3.2.4-1
+- Update to 3.2.4 to fix CVE-2013-4761 and CVE-2013-4956
+
+* Thu Aug 29 2013 Sam Kottler <skottler at fedoraproject.org> - 3.2.2-1
+- Update to 3.2.2
+
 * Wed Aug 7 2013 Sam Kottler <skottler at fedoraproject.org> - 3.1.1-6
 - Add tar as an installation requirement