rpms/audit/FC-5 .cvsignore, 1.58, 1.59 audit.spec, 1.84, 1.85 sources, 1.66, 1.67
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 18 23:46:53 UTC 2006
Author: sgrubb
Update of /cvs/dist/rpms/audit/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30836
Modified Files:
.cvsignore audit.spec sources
Log Message:
* Mon Sep 18 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-1
- Update to new version that is designed for 2.6.18 kernel
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-5/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore 6 Mar 2006 22:18:21 -0000 1.58
+++ .cvsignore 18 Sep 2006 23:46:51 -0000 1.59
@@ -55,3 +55,4 @@
audit-1.1.3.tar.gz
audit-1.1.4.tar.gz
audit-1.1.5.tar.gz
+audit-1.2.7.tar.gz
Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-5/audit.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- audit.spec 6 Mar 2006 22:18:21 -0000 1.84
+++ audit.spec 18 Sep 2006 23:46:51 -0000 1.85
@@ -1,19 +1,19 @@
-Summary: User space tools for 2.6 kernel auditing.
+Summary: User space tools for 2.6 kernel auditing
Name: audit
-Version: 1.1.5
+Version: 1.2.7
Release: 1
License: GPL
Group: System Environment/Daemons
URL: http://people.redhat.com/sgrubb/audit/
Source0: %{name}-%{version}.tar.gz
-Patch1: audit-1.1.3-initscript-disabled.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libtool swig
-BuildRequires: glibc-kernheaders >= 2.4-9.1.95
+BuildRequires: libtool swig python-devel
+BuildRequires: glibc-kernheaders >= 3.0-5
BuildRequires: automake >= 1.9
BuildRequires: autoconf >= 2.59
Requires: %{name}-libs = %{version}-%{release}
Requires: chkconfig
+Prereq: coreutils
%description
The audit package contains the user space utilities for
@@ -34,7 +34,7 @@
License: LGPL
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: glibc-kernheaders >= 3.0-5
%description libs-devel
The audit-libs-devel package contains the static libraries and header
@@ -46,7 +46,7 @@
License: LGPL
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: glibc-kernheaders >= 3.0-5
%description libs-python
The audit-libs-python package contains the bindings so that libaudit
@@ -54,8 +54,6 @@
%prep
%setup -q
-# When in production, uncomment this so the patch is applied
-#%patch1 -p1
%build
autoreconf -fv --install
@@ -68,27 +66,28 @@
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/%{_libdir}/audit
mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-# We manually install this since Makefile doesn't
-install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir}
# This winds up in the wrong place when libtool is involved
mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
curdir=`pwd`
cd $RPM_BUILD_ROOT/%{_libdir}
LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.*.*.*\``
ln -s ../../%{_lib}/$LIBNAME libaudit.so
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*\``
+ln -s ../../%{_lib}/$LIBNAME libauparse.so
cd $curdir
# Remove these items so they don't get picked up.
rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so
rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.la
-# Temp remove this file
-rm -f $RPM_BUILD_ROOT/sbin/audispd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,6 +96,20 @@
%post
/sbin/chkconfig --add auditd
+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
+if [ -f /etc/audit/auditd.conf ]; 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
%preun
if [ $1 -eq 0 ]; then
@@ -115,18 +128,24 @@
%files libs
%defattr(-,root,root)
%attr(755,root,root) /%{_lib}/libaudit.*
+%attr(755,root,root) /%{_lib}/libauparse.*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
%files libs-devel
%defattr(-,root,root)
%{_libdir}/libaudit.a
+%{_libdir}/libauparse.a
%{_libdir}/libaudit.so
+%{_libdir}/libauparse.so
%{_includedir}/libaudit.h
%{_mandir}/man3/*
%files libs-python
%defattr(-,root,root)
-%{_libdir}/python2.4/site-packages/_audit.so
-/usr/lib/python2.4/site-packages/audit.py*
+%attr(750,root,root) /sbin/audispd
+%{_libdir}/python*/site-packages/_audit.so
+/usr/lib/python*/site-packages/audit.py*
+/usr/lib/python*/site-packages/AuditMsg.py*
%files
%defattr(-,root,root,-)
@@ -137,7 +156,6 @@
%attr(750,root,root) /sbin/ausearch
%attr(750,root,root) /sbin/aureport
%attr(750,root,root) /sbin/autrace
-#%attr(750,root,root) /sbin/audispd
%attr(755,root,root) /etc/rc.d/init.d/auditd
%attr(750,root,root) %{_var}/log/audit
%config(noreplace) %attr(640,root,root) /etc/auditd.conf
@@ -146,6 +164,9 @@
%changelog
+* Mon Sep 18 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-1
+- Update to new version that is designed for 2.6.18 kernel
+
* Wed Mar 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.5-1
- Changed audit_log_semanage_message to take new params
- In aureport, add class between syscall and permission in avc report
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-5/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources 6 Mar 2006 22:18:51 -0000 1.66
+++ sources 18 Sep 2006 23:46:51 -0000 1.67
@@ -1 +1 @@
-78d71a75ac2677cb77be3dc788119d2c audit-1.1.5.tar.gz
+8e018c2fc20c204bc30c459f30bab2a5 audit-1.2.7.tar.gz
More information about the fedora-cvs-commits
mailing list