From 5317f53f4c2b2cb39ed5e21688b595c0745a7e3a Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 22 Oct 2012 08:13:43 +0200
Subject: [PATCH] Add secure-userhelper patch: Fix misparsing userhelper log
 entries (rhbz#867290)

---
 logwatch-secure-userhelper.patch | 17 +++++++++++++++++
 logwatch.spec                    |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 logwatch-secure-userhelper.patch

diff --git a/logwatch-secure-userhelper.patch b/logwatch-secure-userhelper.patch
new file mode 100644
index 0000000..801cb51
--- /dev/null
+++ b/logwatch-secure-userhelper.patch
@@ -0,0 +1,17 @@
+--- logwatch-svn110/scripts/services/secure.orig	2012-10-18 11:13:33.000000000 +0200
++++ logwatch-svn110/scripts/services/secure	2012-10-18 11:31:08.987571713 +0200
+@@ -843,8 +843,13 @@ if (keys %Executed_app) {
+    print "\nUserhelper executed applications:\n";
+    foreach (keys %Executed_app) {
+      ($longapp,$asuser,$user) = split ",";
++     $longapp_orig = $longapp;
++     $i = index($longapp, " ");
++     if ($i > 0) {
++        $longapp = substr($longapp, 0, $i);
++     }
+      $app = substr($longapp,rindex($longapp,"/")+1);
+-     print "   $user -> $app as $asuser:  ".$Executed_app{"$longapp,$asuser,$user"}." Time(s)\n";
++     print "   $user -> $app as $asuser:  ".$Executed_app{"$longapp_orig,$asuser,$user"}." Time(s)\n";
+    }
+ }
+ 
diff --git a/logwatch.spec b/logwatch.spec
index c8959ad..66cf116 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.4.0
-Release: 17.20120619svn110%{?dist}
+Release: 18.20120619svn110%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -32,6 +32,7 @@ Patch12: logwatch-pluto.patch
 Patch13: logwatch-xvc.patch
 Patch14: logwatch-secure.patch
 Patch15: logwatch-pam_unix.patch
+Patch16: logwatch-secure-userhelper.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 Requires: perl(Sys::CPU)
@@ -61,6 +62,7 @@ of the package on many systems.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -151,6 +153,10 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 %{_mandir}/man*/*
 
 %changelog
+* Mon Oct 22 2012 Jan Synáček <jsynacek@redhat.com> - 7.4.0-18.20120619svn110
+- Add secure-userhelper patch: Fix misparsing userhelper log entries
+  (rhbz#867290)
+
 * Thu Sep 27 2012 Jan Synáček <jsynacek@redhat.com> - 7.4.0-17.20120619svn110
 - Add secure patch (rhbz#836189)
 - Add pam_unix patch (rhbz#836183, rhbz#846725)