[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.3-1-7-g4c88b74

[Micah Anderson]

The following commit has been merged in the master branch:
commit 4160243fa2e1759806fb478f7eb7ab15d56ae506
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Nov 29 11:41:56 2010 -0500

    add patch to fix puppet-master logcheck rule, fixes part of #602336

diff --git a/debian/changelog b/debian/changelog
index 49428f6..7b9897f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 puppet (2.6.3-2) UNRELEASED; urgency=low
 
   * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
+  * Patch ext/logcheck/puppet to handle new puppet-master 
+    Compiled log lines (Closes: #602336)
 
  -- Micah Anderson <micah at debian.org>  Mon, 29 Nov 2010 11:11:02 -0500
 
diff --git a/debian/patches/fix_logcheck b/debian/patches/fix_logcheck
new file mode 100644
index 0000000..f7b3c53
--- /dev/null
+++ b/debian/patches/fix_logcheck
@@ -0,0 +1,10 @@
+--- a/ext/logcheck/puppet
++++ b/ext/logcheck/puppet
+@@ -1,6 +1,6 @@
+ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for (host|resources|resource params and tags) in) [0-9.]+ seconds
+ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Starting Puppet server version [.0-9]+$
+-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
++^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in environment [._[:alnum:]-]+ in [.[:digit:]]+ seconds$
+ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Caught TERM; shutting down$
+ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Shutting down$
+ ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting Puppet client version [.0-9]+$
diff --git a/debian/patches/series b/debian/patches/series
index a0e7e5e..8c9c9bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_logcheck
 debianize_apache2.conf

-- 
Puppet packaging for Debian