rpms/audit/devel audit-setroubleshoot.patch, 1.3, 1.4 audit.spec, 1.102, 1.103

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4475

Modified Files:
	audit-setroubleshoot.patch audit.spec 
Log Message:
Update to fix 64 bit platform

audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 audispd     |   46 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 86 insertions(+), 23 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- audit-setroubleshoot.patch	21 Jul 2006 13:27:22 -0000	1.3
+++ audit-setroubleshoot.patch	27 Jul 2006 20:56:59 -0000	1.4
@@ -1,6 +1,6 @@
 --- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-07-21 09:18:48.000000000 -0400
-@@ -1,9 +1,9 @@
++++ audit-1.2.5/audisp/audispd	2006-07-27 16:56:12.000000000 -0400
+@@ -1,22 +1,25 @@
  #! /usr/bin/env python
  import os, string, select, syslog
 -import audit, avc, traceback
@@ -8,11 +8,19 @@
  import AuditMsg
  import subprocess, signal
 -PLUGIN_DIRS = ['/etc/audisp.d', "/usr/lib/audit", "/usr/lib32/audit"]
-+PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib32/audit"]
++PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib64/audit"]
  import glob
  
  HUP=False
-@@ -15,8 +15,7 @@
+ def huphandler(signum, frame):
+     global HUP
+     HUP=True
++
++def childhandler(signum, frame):
++    syslog.syslog("Child Died %d %d " % os.wait() )
++    return
+     
+ class Plugin:
      def __init__(self, cmd):
          self.cmd = cmd
          self.sub_process = None
@@ -22,7 +30,7 @@
      def run(self):
          self.sub_process = subprocess.Popen(self.cmd, \
              stdin=subprocess.PIPE, stdout=None, stderr=None, \
-@@ -27,6 +26,19 @@
+@@ -27,6 +30,19 @@
      def stop(self):
          self.stdin.close()
  
@@ -42,7 +50,7 @@
  class audit_dispatcher:
      def __init__(self):
          self.data = []
-@@ -50,6 +62,8 @@
+@@ -50,6 +66,8 @@
                      self.plugins.append(p)
                  except OSError, e:
                      syslog.syslog("plugin %s failed to start: %s" % (plugin, e))
@@ -51,7 +59,7 @@
  
          for p in self.plugins:
              if p.cmd not in new_plugins:
-@@ -68,9 +82,14 @@
+@@ -68,9 +86,14 @@
      def process(self):
          if len(self.data) > 0:
              msg=self.data.pop(0)
@@ -69,7 +77,7 @@
              return 0
          else:
              return 500
-@@ -86,6 +105,7 @@
+@@ -86,6 +109,7 @@
                      if not msg.read_from_fd(0):
                          syslog.syslog("Connection closing")
                          return
@@ -77,7 +85,7 @@
                      self.add(msg)
                      sleep=0
                  else:
-@@ -98,11 +118,11 @@
+@@ -98,22 +122,24 @@
                          self.load_plugins()
                          HUP=False
                  else:
@@ -91,7 +99,11 @@
                  syslog.syslog(traceback.format_exc())
  
  try:
-@@ -113,7 +133,8 @@
+     syslog.openlog("audispd")
+     syslog.syslog("starting audispd")
+     signal.signal(signal.SIGHUP, huphandler)
++    signal.signal(signal.SIGCHLD, childhandler)
+     dispatcher=audit_dispatcher()
      dispatcher.run()
  
  except IOError,e:


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- audit.spec	21 Jul 2006 13:27:22 -0000	1.102
+++ audit.spec	27 Jul 2006 20:56:59 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -68,7 +68,7 @@
 mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,rc.d/init.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
-mkdir -p $RPM_BUILD_ROOT/usr/{lib,lib32}/audit
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -161,13 +161,16 @@
 %attr(755,root,root) /etc/rc.d/init.d/auditd
 %attr(750,root,root) %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit
-%attr(750,root,root) %dir /usr/lib/audit
-%attr(750,root,root) %dir /usr/lib32/audit
+%attr(750,root,root) %dir %{_libdir}/audit
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
+- Fix dispatcher to handle sigchld
+- Fix library location for 64 bit
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
 - Eliminate avc package from audisp