rpms/audit/devel audit-1.7.9-time.patch, NONE, 1.1 audit.spec, 1.192, 1.193
Steve Grubb
sgrubb at fedoraproject.org
Mon Oct 27 17:41:31 UTC 2008
- Previous message: rpms/tomboy/devel tomboy-fix-no-panel-devel.patch, 1.1, 1.2 tomboy.spec, 1.89, 1.90
- Next message: rpms/gnome-sharp/devel .cvsignore, 1.5, 1.6 gnome-sharp.spec, 1.15, 1.16 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sgrubb
Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5097
Modified Files:
audit.spec
Added Files:
audit-1.7.9-time.patch
Log Message:
* Mon Oct 27 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-5
- Fix ausearch/report recent and now time keyword lookups (#468668)
audit-1.7.9-time.patch:
--- NEW FILE audit-1.7.9-time.patch ---
diff -urp audit-1.7.9.orig/src/ausearch-time.c audit-1.7.9/src/ausearch-time.c
--- audit-1.7.9.orig/src/ausearch-time.c 2008-10-25 08:25:39.000000000 -0400
+++ audit-1.7.9/src/ausearch-time.c 2008-10-27 08:11:49.000000000 -0400
@@ -282,7 +282,7 @@ int ausearch_time_start(const char *da,
} else {
int keyword=lookup_time(da);
if (keyword == T_RECENT || keyword == T_NOW) {
- if (ti == NULL)
+ if (ti == NULL || strcmp(ti, "00:00:00") == 0)
goto set_it;
}
}
@@ -352,13 +352,13 @@ int ausearch_time_end(const char *da, co
} else {
int keyword=lookup_time(da);
if (keyword == T_RECENT || keyword == T_NOW) {
- if (ti == NULL)
+ if (ti == NULL || strcmp(ti, "00:00:00") == 0)
goto set_it;
}
// Special case today
if (keyword == T_TODAY) {
set_tm_now(&d);
- if (ti == NULL)
+ if (ti == NULL || strcmp(ti, "00:00:00") == 0)
goto set_it;
}
}
Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- audit.spec 25 Oct 2008 14:25:47 -0000 1.192
+++ audit.spec 27 Oct 2008 17:41:01 -0000 1.193
@@ -1,11 +1,13 @@
+%define audit_version 1.7.8
+%define audit_release 5
%define sca_version 0.4.8
-%define sca_release 8
+%define sca_release 9
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: User space tools for 2.6 kernel auditing
Name: audit
-Version: 1.7.8
-Release: 4%{?dist}
+Version: %{audit_version}
+Release: %{audit_release}%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://people.redhat.com/sgrubb/audit/
@@ -13,6 +15,7 @@
Patch1: audit-1.7.9-bugs.patch
Patch2: audit-1.7.9-i386.patch
Patch3: audit-1.7.9-startup.patch
+Patch4: audit-1.7.9-time.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext-devel intltool libtool swig python-devel
BuildRequires: tcp_wrappers-devel
@@ -83,7 +86,7 @@
Group: Applications/System
BuildRequires: desktop-file-utils
Requires: pygtk2-libglade usermode usermode-gtk
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{audit_version}-%{audit_release}
%description -n system-config-audit
A graphical utility for editing audit configuration.
@@ -93,6 +96,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
(cd system-config-audit; ./autogen.sh)
@@ -154,25 +158,6 @@
%post
/sbin/chkconfig --add auditd
-# This is to migrate users from audit-1.0.x installations
-if [ -f /etc/auditd.conf ]; then
- mv /etc/auditd.conf /etc/audit/auditd.conf
-fi
-if [ -f /etc/audit.rules ]; then
- mv /etc/audit.rules /etc/audit/audit.rules
-fi
-# This is to enable the dispatcher option which was commented out
-if [ -f /etc/audit/auditd.conf ]; then
- grep '^dispatcher' /etc/audit/auditd.conf >/dev/null
- if [ $? -eq 1 ] ; then
- tmp=`mktemp /etc/audit/auditd-post.XXXXXX`
- if [ -n $tmp ]; then
- sed 's|^#dispatcher|dispatcher|g' /etc/audit/auditd.conf > $tmp && \
- cat $tmp > /etc/audit/auditd.conf
- rm -f $tmp
- fi
- fi
-fi
%preun
if [ $1 -eq 0 ]; then
@@ -281,6 +266,9 @@
%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
%changelog
+* Mon Oct 27 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-5
+- Fix ausearch/report recent and now time keyword lookups (#468668)
+
* Sat Oct 25 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-4
- If kernel is in immutable mode, auditd should not send enable command
- Previous message: rpms/tomboy/devel tomboy-fix-no-panel-devel.patch, 1.1, 1.2 tomboy.spec, 1.89, 1.90
- Next message: rpms/gnome-sharp/devel .cvsignore, 1.5, 1.6 gnome-sharp.spec, 1.15, 1.16 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list