rpms/audit/F-7 audit-1.6-python.patch, NONE, 1.1 s-c-audit-0.4.3.patch, NONE, 1.1 audit.spec, 1.136, 1.137 audit-1.3.1-python.patch, 1.3, NONE

Steve Grubb (sgrubb) fedora-extras-commits at redhat.com
Mon Sep 3 15:33:48 UTC 2007


Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554

Modified Files:
	audit.spec 
Added Files:
	audit-1.6-python.patch s-c-audit-0.4.3.patch 
Removed Files:
	audit-1.3.1-python.patch 
Log Message:
* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
- Update s-c-audit to version 0.4.3
- Fix reference counting in auparse python bindings (#263961) 


audit-1.6-python.patch:

--- NEW FILE audit-1.6-python.patch ---
diff -ur /home/mitr/a/audit-1.6/bindings/python/auparse_python.c audit-1.6/bindings/python/auparse_python.c
--- /home/mitr/a/audit-1.6/bindings/python/auparse_python.c	2007-05-30 22:37:40.000000000 +0200
+++ audit-1.6/bindings/python/auparse_python.c	2007-08-29 18:03:35.000000000 +0200
@@ -57,8 +57,8 @@
 {
     if (self->sec == NULL) {
         if ((self->sec = PyInt_FromLong(self->event.sec)) == NULL) return NULL;
-        Py_INCREF(self->sec);
     }
+    Py_INCREF(self->sec);
     return self->sec;
 }
 
@@ -67,8 +67,8 @@
 {
     if (self->milli == NULL) {
         if ((self->milli = PyInt_FromLong(self->event.milli)) == NULL) return NULL;
-        Py_INCREF(self->milli);
     }
+    Py_INCREF(self->milli);
     return self->milli;
 }
 
@@ -77,8 +77,8 @@
 {
     if (self->serial == NULL) {
         if ((self->serial = PyInt_FromLong(self->event.serial)) == NULL) return NULL;
-        Py_INCREF(self->serial);
     }
+    Py_INCREF(self->serial);
     return self->serial;
 }
 
@@ -88,7 +88,9 @@
     if (self->event.host == NULL) {
         Py_RETURN_NONE;
     } else {
-        if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	if (self->host == NULL) {
+	    if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	}
         Py_INCREF(self->host);
         return self->host;
     }

s-c-audit-0.4.3.patch:

--- NEW FILE s-c-audit-0.4.3.patch ---
diff -ur audit-1.5.6.orig/system-config-audit/ChangeLog audit-1.5.6/system-config-audit/ChangeLog
--- audit-1.5.6.orig/system-config-audit/ChangeLog	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/ChangeLog	2007-08-28 14:20:16.000000000 -0400
@@ -1,3 +1,21 @@
+2007-08-28  Miloslav Trmač  <mitr at redhat.com>
+
+	* configure.ac: Release 0.4.3.
+	* NEWS: Update.
+
+	* src/audit_rules.py (Field.option_text): New parameter rule.  Use
+	-p only in rules with -w, -F perm= otherwise.
+	(Rule.command_text): Add -k only after -S.
+
+2007-08-02  Miloslav Trmač  <mitr at redhat.com>
+
+	* src/main_window.py (N_): Remove useless definition.
+
+2007-07-23  Miloslav Trmač  <mitr at redhat.com>
+
+	* src/watch_list_dialog.py (_WatchTable._validate_rule): Fix a
+	crash when the rule has no AUDIT_WATCH or AUDIT_PERM field.
+
 2007-07-17  Miloslav Trmač  <mitr at redhat.com>
 
 	* system-config-audit.desktop.in (Categories): Add System, to move the
diff -ur audit-1.5.6.orig/system-config-audit/configure.ac audit-1.5.6/system-config-audit/configure.ac
--- audit-1.5.6.orig/system-config-audit/configure.ac	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/configure.ac	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([system-config-audit], [0.4.2], [mitr at redhat.com])
+AC_INIT([system-config-audit], [0.4.3], [mitr at redhat.com])
 AC_COPYRIGHT(
 [Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
 
diff -ur audit-1.5.6.orig/system-config-audit/NEWS audit-1.5.6/system-config-audit/NEWS
--- audit-1.5.6.orig/system-config-audit/NEWS	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/NEWS	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,10 @@
+Changes in release 0.4.3:
+* Fix order of -k and -S, and using -p without -w, in audit rules
+* Fix a crash validating a non-watch rule
+* Move the menu entry to the Administration submenu in GNOME
+
 Changes in release 0.4.2:
-* Modify to run on RHEL 5.
+* Modify to run on RHEL 5
 
 Changes in release 0.4.1:
 * Add an install-fedora Makefile target
diff -ur audit-1.5.6.orig/system-config-audit/src/audit_rules.py audit-1.5.6/system-config-audit/src/audit_rules.py
--- audit-1.5.6.orig/system-config-audit/src/audit_rules.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/audit_rules.py	2007-08-28 14:08:59.000000000 -0400
@@ -347,13 +347,18 @@
         self.op = self.OP_EQ
         self.value = self.get_field_type(self.var).parse_value(string, self.op)
 
-    def option_text(self):
-        '''Return a string representing this field as an auditctl option.'''
+    def option_text(self, rule):
+        '''Return a string representing this field as an auditctl option.
+
+        Use rule to determine the correct syntax.
+
+        '''
         val = self._value_text()
         if self.var == audit.AUDIT_FILTERKEY:
             assert self.op == self.OP_EQ
             return '-k %s' % val
-        elif self.var == audit.AUDIT_PERM:
+        elif (self.var == audit.AUDIT_PERM and
+              len([f for f in rule.fields if f.var == audit.AUDIT_WATCH]) == 1):
             assert self.op == self.OP_EQ
             return '-p %s' % val
         else:
@@ -443,16 +448,21 @@
             o.append('-w %s' % watches[0].value)
             watch_used = True
         # Add fields before syscalls because -F arch=... may change the meaning
-        # of syscall names
+        # of syscall names.  But add AUDIT_FILTERKEY only after -S, auditctl
+        # stubbornly insists on that order.
         for f in self.fields:
-            if f.var != audit.AUDIT_WATCH or not watch_used:
-                o.append(f.option_text())
+            if (f.var != audit.AUDIT_FILTERKEY and
+                (f.var != audit.AUDIT_WATCH or not watch_used)):
+                o.append(f.option_text(self))
         if list is not rules.exclude_rules:
             for s in self.syscalls:
                 if s == self.SYSCALLS_ALL:
                     o.append('-S all')
                 else:
                     o.append('-S %s' % util.syscall_string(s, self.machine))
+        for f in self.fields:
+            if f.var == audit.AUDIT_FILTERKEY:
+                o.append(f.option_text(self))
         return ' '.join(o)
 
     def __eq__(self, rule):
diff -ur audit-1.5.6.orig/system-config-audit/src/main_window.py audit-1.5.6/system-config-audit/src/main_window.py
--- audit-1.5.6.orig/system-config-audit/src/main_window.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/main_window.py	2007-08-28 14:08:59.000000000 -0400
@@ -32,8 +32,6 @@
 import settings
 import util
 
-def N_(s): return s
-
 def exit_watch_rules(rules):
     '''Split exit rules to lists for WatchListDialog and RuleListDialog.
 
diff -ur audit-1.5.6.orig/system-config-audit/src/server.c audit-1.5.6/system-config-audit/src/server.c
--- audit-1.5.6.orig/system-config-audit/src/server.c	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/server.c	2007-08-28 14:08:59.000000000 -0400
@@ -200,7 +200,7 @@
       err = errno;
       goto err_fd;
     }
-  if (st.st_size > SIZE_MAX)
+  if (st.st_size > (off_t)SIZE_MAX)
     {
       err = EFBIG;
       goto err_fd;


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-7/audit.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- audit.spec	28 Aug 2007 13:25:30 -0000	1.136
+++ audit.spec	3 Sep 2007 15:33:16 -0000	1.137
@@ -1,14 +1,17 @@
-%define sca_version 0.4.2
+%define sca_version 0.4.3
+%define sca_release 1
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.5.7-updates.patch
+Patch2: s-c-audit-0.4.3.patch
+Patch3: audit-1.6-python.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -55,17 +58,10 @@
 The audit-libs-python package contains the bindings so that libaudit
 and libauparse can be used by python.
 
-%package audispd-plugins
-Summary: Default plugins for the audit dispatcher
-License: LGPL
-Group: System Environment/Daemons
-
-%description audispd-plugins
-The audispd-plugins package contains plugins for the audit dispatcher.
-
 %package -n system-config-audit
 Summary: Utility for editing audit configuration
 Version: %{sca_version}
+Release: %{sca_release}%{?dist}
 License: GPL
 Group: Applications/System
 Requires: pygtk2-libglade usermode usermode-gtk
@@ -76,8 +72,11 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+(cd system-config-audit; ./autogen.sh)
 aclocal && autoconf && autoheader && automake
 %configure --sbindir=/sbin --libdir=/%{_lib}
 make
@@ -162,6 +161,7 @@
 
 %files libs-devel
 %defattr(-,root,root)
+%doc contrib/skeleton.c
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
@@ -179,7 +179,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -214,6 +214,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
+- Update s-c-audit to version 0.4.3
+- Fix reference counting in auparse python bindings (#263961) 
+
 * Tue Aug 28 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-1
 - New upstream version
 


--- audit-1.3.1-python.patch DELETED ---




More information about the fedora-extras-commits mailing list