From 1435038fdb3044b248ca04b2b5a6918aa165d6eb Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Mon, 28 Jan 2008 11:19:50 +0000
Subject: [PATCH] - resolves: #429933 fix postfix script thanks Benjamin Gordon

---
 logwatch-7.3.6-postfix.patch | 12 ++++++++++++
 logwatch.spec                |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 logwatch-7.3.6-postfix.patch

diff --git a/logwatch-7.3.6-postfix.patch b/logwatch-7.3.6-postfix.patch
new file mode 100644
index 0000000..ea092ea
--- /dev/null
+++ b/logwatch-7.3.6-postfix.patch
@@ -0,0 +1,12 @@
+diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
+--- logwatch-7.3.6/scripts/services/postfix.pom	2007-05-14 19:27:27.000000000 +0200
++++ logwatch-7.3.6/scripts/services/postfix	2008-01-28 11:50:51.000000000 +0100
+@@ -2163,7 +2163,7 @@ sub cleanhostreply($ $ $ $) {
+    #print "HOSTREPLY: \"$hostreply\"\n";
+    if (($host,$r1) = ($hostreply =~ /host (\S+) said: $re_DSN[\- ]"?(.*)"?$/o)) {
+       # Strip recipient address from host's reply - we already have it in $recip.
+-      $r1 =~ s/[<(]?$recip[>)]?\W*//ig;
++      $r1 =~ s/[<(]?\Q$recip\E[>)]?\W*//ig;
+ 
+       # Strip and capture "in reply to XYZ command" from host's reply
+       if ($r1 =~ s/\s*[(]?(in reply to .* command)[)]?//) {
diff --git a/logwatch.spec b/logwatch.spec
index 5081ff3..8c5d1a3 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -35,6 +35,7 @@ Patch28: logwatch-7.3.6-usage.patch
 Patch29: logwatch-7.3.6-maillog.patch
 Patch30: logwatch-7.3.6-amavis2.patch
 Patch31: logwatch-7.3.6-openvpn.patch
+Patch32: logwatch-7.3.6-postfix.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -78,6 +79,7 @@ of the package on many systems.
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -191,6 +193,10 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Mon Jan 28 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-18
+-  resolves: #429933 fix postfix script
+   thanks Benjamin Gordon
+
 * Mon Jan 21 2008 Ivana Varekova <varekova@redhat.com> 7.3.6-17
 - Resolves: #427734
   fix amavis script