From c1c8031682ced3b6ee2e5cd113ca88f7ac2fd23c Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Wed, 16 Mar 2011 10:20:24 -0400
Subject: [PATCH] Update to 2.6.6

---
 .gitignore                |  6 +++++-
 puppet-0.25.5.tar.gz.sign | 17 -----------------
 puppet-2.6.6.tar.gz.sign  | 17 +++++++++++++++++
 puppet.spec               | 13 ++++++++-----
 sources                   |  2 +-
 5 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 puppet-0.25.5.tar.gz.sign
 create mode 100644 puppet-2.6.6.tar.gz.sign

diff --git a/.gitignore b/.gitignore
index 725e4bc..310dfe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-puppet-0.25.5.tar.gz
+*~
+*.rpm
+*.tar.gz
+/.build*.log
+/puppet-*/
diff --git a/puppet-0.25.5.tar.gz.sign b/puppet-0.25.5.tar.gz.sign
deleted file mode 100644
index 8cb537d..0000000
--- a/puppet-0.25.5.tar.gz.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iQIcBAABAgAGBQJL8eKBAAoJEP+shliDR6J/INUP/1ge+BehyMcruFXKNyISr8Df
-ZrWVYWs0keUqK2pxx34zeO/MUGbhGMwArxsH2eWcagXgujVZmW104B1EiFjw75Ok
-3+pEjskUSWYoBJ4CpwZ0iJzr2D4L73A27xlzaDahGBd/sjLBwYjv69gs8EWdtBug
-bvWIfJ2nbcMzipCY77JxECAcbqhVzEi/6hkrUs4bisXN4atiiPihEbBWdlCwS+Pw
-nBTxZVqrTC/y7e+nxRtEvX0O3LZTAibfzE89SJX3YWVPSoUiR90jB/DWhPVaJEzr
-0X1V3D79IE2gs2EO+S7JsoQfnWgVYGBYQmUGi9a3ZfDppo7aa4dDRTdQWHsF4bac
-jHXkVFB1RV+nVF6O19YTbgrXcG5b/YcUEVqGXB+NvSDSrrF+aRoahFS4x+0HqK+h
-DbnCv2ykPoCE/q7obbrYgx71pfskU4GEtL+rwtuynxMItq3E1lW0ZpQWt30+LwDW
-tjMPrtsjuk/h48d79AbEWl3PPme5SZUfReQUcAs+yt0Y1yxjmvmAKzu0HQgJDtZL
-io5JJ38zdMqtL7FLvnr6cK/rLDWz10yuvouwV922rghGh2qSFq0RZtt04RTjzcAJ
-W/VVkUeL0BCccTzGX67DgkvRi7DEIGtZuw73M8kCkF/+TqlanHN8vSwRAKCmp3GU
-UqZuvCGmazIIj4JH38/t
-=1DPy
------END PGP SIGNATURE-----
diff --git a/puppet-2.6.6.tar.gz.sign b/puppet-2.6.6.tar.gz.sign
new file mode 100644
index 0000000..9ff429a
--- /dev/null
+++ b/puppet-2.6.6.tar.gz.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iQIcBAABAgAGBQJNeAIeAAoJEBBUt6JL1uwwLqMP/A7L+ikXqLTc3X4gaPuiJcuI
+dJW9fmzbOaeU1Bit4CaoA8e3gS2u+GybaxpW8eYhwAVGwws6NeKfoLXk7xXAl0X7
+pke5LMWl87vGw7orzeA/ck5QO4Gxel+OsDCXO18kRpnPswX/4FnaH8sF8u+y5kUU
+2NuDabKPkMiDLjyC5TdXFP397hj0bRLmJjd2WtYo41nbjBJR6l3JOXWo5LlxGx6+
+8fzkqDXiNe/vERXm9As42SCehZ0QybRGEW8SgaXjLt4eXO4YJSpRhShRHP2f9d5C
+3pUUnUHVuoQUWuNNA0W7wzS8CSKkmDVHyW5hWsMiyyE0u5THvOHBV8UvQ10QAF90
+mvcxiqwJYlxvPhuLGyEqGF+XpMqu4cS+f7ikNWtbacOdTY+uFLg5qSk25RwFGld7
+ASvlMP+H/Dp8uaxorCZt3dCTETmGbFWFiBgRrHRef6GR2H6gKqzDaRPoW30MNrVM
+RAmb7xHHYeBoDf4msi5TJE546S3xfUwB/XjCNrQ8myuzg6engCgEmKB122BLq/DN
+MmTZQx8DViYH+oPNQnOBkuFr3FeGNii+sZzC5VHyir3/8ksSQ4dSnKWbS8p8mGnP
+5yR/WrUguN1HCdimKANWyGGfiKmNgADrDlOT3iUhjZs09ZR3IR2mTWVCLFcyu/Ft
+ukGK0gYzxjK/2FF6uHoR
+=/iZd
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index 3366343..74743ac 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,8 +5,8 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.5
-Release:        2%{?dist}
+Version:        2.6.6
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppetlabs.com
@@ -66,7 +66,8 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-patch -p1 < conf/redhat/rundir-perms.patch
+patch -s -p1 < conf/redhat/rundir-perms.patch
+
 
 %build
 # Fix some rpmlint complaints
@@ -100,7 +101,6 @@ install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/syscon
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-install -Dp -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 # We need something for these ghosted files, otherwise rpmbuild
@@ -214,13 +214,16 @@ fi
 
 %postun server
 if [ "$1" -ge 1 ]; then
-  /sbin/service puppetmaster condrestart > /dev/null 2>&1 || :
+  /sbin/service puppetmaster condrestart >/dev/null 2>&1 || :
 fi
 
 %clean
 rm -rf %{buildroot}
 
 %changelog
+* Wed Mar 16 2011 Todd Zullinger <tmz@pobox.com> - 2.6.6-1
+- Update to 2.6.6
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.25.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 592fef7..4396540 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2988385801c967f7262cdf08640c9e07  puppet-0.25.5.tar.gz
+58315e94ff00aedc4a19177877c3e865  puppet-2.6.6.tar.gz