Hello community,
here is the log from the commit of package audit
checked in at Sat Mar 15 12:00:54 CET 2008.
--------
--- audit/audit.changes 2008-03-06 00:20:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/audit/audit.changes 2007-10-31 07:10:34.000000000 +0100
@@ -2,53 +1,0 @@
-Tue Mar 4 17:58:18 CET 2008 - tonyj@suse.de
-
-- Update from 1.6.2 to 1.6.8. Start building audispd-plugins rpm.
-
- Redhat changelog follows:
-
- * Thu Feb 14 2008 Steve Grubb 1.6.8-1
- - Update for gcc 4.3
- - Cleanup descriptors in audispd before running plugin
- - Fix 'recent' keyword for aureport/search
- - Fix SE Linux policy for zos_remote plugin
- - Add event type for group password authentication attempts
- - Couple of updates to the translation tables
- - Add detection of failed group authentication to audisp-prelude
-
- * Thu Jan 31 2008 Steve Grubb 1.6.7-1
- - In ausearch/report, prefer -if to stdin
- - In ausearch/report, add new command line option --input-logs (#428860)
- - Updated audisp-prelude based on feedback from prelude-devel
- - Added prelude alert for promiscuous socket being opened
- - Added prelude alert for SE Linux policy enforcement changes
- - Added prelude alerts for Forbidden Login Locations and Time
- - Applied patch to auparse fixing error handling of searching by
- interpreted value (Miloslav Trmac)
-
- * Sat Jan 19 2008 Steve Grubb 1.6.6-1
- - Add prelude IDS plugin for IDMEF alerts
- - Add --user option to aulastlog command
- - Use desktop-file-install for system-config-audit
-
- * Mon Jan 07 2008 Steve Grubb 1.6.5-1
- - Add more errno strings for exit codes in auditctl
- - Fix config parser to allow either 0640 or 0600 for audit logs (#427062)
- - Check for audit log being writable by owner in auditd
- - If auditd logging was suspended, it can be resumed with SIGUSR2 (#251639)
- - Updated CAPP, LSPP, and NISPOM rules for new capabilities
- - Added aulastlog utility
-
- * Sat Dec 29 2007 Steve Grubb 1.6.4-1
- - fchmod of log file was on wrong variable (#426934)
- - Allow use of errno strings for exit codes in audit rules
-
- * Thu Dec 27 2007 Steve Grubb 1.6.3-1
- - Add kernel release string to DEAMON_START events
- - Fix keep_logs when num_logs option disabled (#325561)
- - Fix auparse to handle node fields for syscall records
- - Update system-config-audit to version 0.4.5 (Miloslav Trmac)
- - Add keyword week-ago to aureport & ausearch start/end times
- - Fix audit log permissions on rotate. If group is root 0400, otherwise 0440
- - Add RACF zos remote audispd plugin (Klaus Kiwi)
- - Add event queue overflow action to audispd
-
--------------------------------------------------------------------
audit-libs-python.changes: same change
Old:
----
audit-1.6.8.tar.gz
New:
----
audit-1.6.2-bugs.patch
audit-1.6.2.tar.gz
audit-startup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audit-libs-python.spec ++++++
--- /var/tmp/diff_new_pack.u12171/_old 2008-03-15 12:00:44.000000000 +0100
+++ /var/tmp/diff_new_pack.u12171/_new 2008-03-15 12:00:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package audit-libs-python (Version 1.6.8)
+# spec file for package audit-libs-python (Version 1.6.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
Name: audit-libs-python
%define _name audit
-BuildRequires: audit-devel gcc-c++ openldap2-devel pkg-config python-devel swig
+BuildRequires: audit-devel gcc-c++ pkg-config python-devel swig
Summary: Python Bindings for libaudit
-Version: 1.6.8
-Release: 1
+Version: 1.6.2
+Release: 42
License: GPL v2 or later
Group: System/Monitoring
Url: http://people.redhat.com/sgrubb/audit/
@@ -69,8 +69,6 @@
%{_libdir}/python%{py_ver}/site-packages/audit.py*
%changelog
-* Tue Mar 04 2008 tonyj@suse.de
-- Update to version 1.6.8
* Thu Oct 11 2007 tonyj@suse.de
- Upgrade to 1.6.2
* Wed Jul 25 2007 tonyj@suse.de
@@ -87,7 +85,7 @@
- /usr/sbin/audispd now packaged by audit-libs-python
* Sun Nov 05 2006 ro@suse.de
- fix requires
-* Thu Aug 31 2006 tonyj@suse.de
+* Fri Sep 01 2006 tonyj@suse.de
- Upgrade to 1.2.6-1
* Wed Aug 16 2006 cthiel@suse.de
- split off package
++++++ audit.spec ++++++
--- /var/tmp/diff_new_pack.u12171/_old 2008-03-15 12:00:44.000000000 +0100
+++ /var/tmp/diff_new_pack.u12171/_new 2008-03-15 12:00:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package audit (Version 1.6.8)
+# spec file for package audit (Version 1.6.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,10 +12,10 @@
Name: audit
-BuildRequires: gcc-c++ openldap2-devel
+BuildRequires: gcc-c++
Summary: User Space Tools for 2.6 Kernel Auditing
-Version: 1.6.8
-Release: 1
+Version: 1.6.2
+Release: 25
License: GPL v2 or later
Group: System/Monitoring
Url: http://people.redhat.com/sgrubb/audit/
@@ -24,6 +24,8 @@
Source2: auditd.sysconfig
Patch0: audit-no_sca.patch
Patch1: audit-no_python.patch
+Patch2: audit-1.6.2-bugs.patch
+Patch3: audit-startup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-libs = %{version}-%{release}
PreReq: %insserv_prereq %fillup_prereq
@@ -71,36 +73,20 @@
--------
Steve Grubb
-%package -n audit-audispd-plugins
-Summary: Default plugins for the audit dispatcher
-License: GPL v2 or later
-Group: System/Monitoring
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: openldap2
-
-%description -n audit-audispd-plugins
-The audit-audispd-plugins package contains plugin components for the
-audit dispatcher (audispd).
-
-
-
-Authors:
---------
- Steve Grubb
-
%prep
-rm -rf audisp/plugins/zos-remote/policy
-rm -rf audisp/plugins/prelude
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
+#autoreconf -iv --install
aclocal && autoconf && autoheader && automake
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --libexecdir=%{_prefix}/lib/%{name} --with-apparmor
+#./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --libexecdir=%{_libexecdir}
pushd src/mt
make libaudit.h
popd
@@ -109,7 +95,7 @@
%install
mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}}
mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{_includedir}
@@ -132,16 +118,15 @@
ln -s /etc/init.d/auditd $RPM_BUILD_ROOT/sbin/rcauditd
mkdir -p $RPM_BUILD_ROOT/var/log/audit/
touch $RPM_BUILD_ROOT/var/log/audit/audit.log
-# Cleanup plugins
-# audispd-zos-remote uses ldap which is in /usr/lib so move to /usr/sbin
-mv $RPM_BUILD_ROOT/sbin/audispd-zos-remote $RPM_BUILD_ROOT/usr/sbin/audispd-zos-remote
-# we don't package prelude
-rm -f $RPM_BUILD_ROOT/usr/share/man/man8/audisp-prelude.8
-# For %ghost below, so that old location files will still be there when
+# for %ghost below, so that old location files will still be there when
# %post copy runs
touch $RPM_BUILD_ROOT/etc/{auditd.conf,audit.rules}
# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+# Remove the plugin stuff for now
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/au-ids.conf
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/remote.conf
+rm -f $RPM_BUILD_ROOT/sbin/audisp-ids
%clean
rm -rf $RPM_BUILD_ROOT
@@ -177,39 +162,32 @@
%files devel
%defattr(-,root,root)
-%doc contrib/skeleton.c contrib/plugin
%{_libdir}/libaudit.*
%{_libdir}/libauparse.*
%{_includedir}/libaudit.h
%{_includedir}/auparse.h
%{_includedir}/auparse-defs.h
%{_mandir}/man3/*
+%doc contrib/skeleton.c contrib/plugin
%files
%defattr(-,root,root,-)
-%doc README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
-%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
-%attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
-%attr(644,root,root) %{_mandir}/man8/auditd.8.gz
-%attr(644,root,root) %{_mandir}/man8/aureport.8.gz
-%attr(644,root,root) %{_mandir}/man8/ausearch.8.gz
-%attr(644,root,root) %{_mandir}/man8/autrace.8.gz
-%attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
-%attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
-%attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
+%doc README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%{_mandir}/man8/*
+%{_mandir}/man5/*
%attr(750,root,root) /sbin/auditctl
%attr(750,root,root) /sbin/auditd
%attr(755,root,root) /sbin/ausearch
%attr(750,root,root) /sbin/rcauditd
%attr(750,root,root) /sbin/autrace
%attr(750,root,root) /sbin/audispd
-%attr(750,root,root) /sbin/aulastlog
%attr(755,root,root) /sbin/aureport
/etc/init.d/auditd
%dir %attr(750,root,root) /etc/audit
%attr(750,root,root) %dir /etc/audisp
%attr(750,root,root) %dir /etc/audisp/plugins.d
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
%ghost /etc/auditd.conf
%ghost /etc/audit.rules
%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
@@ -219,59 +197,7 @@
%dir %attr(700,root,root) /var/log/audit
%ghost %config(noreplace) /var/log/audit/audit.log
-%files -n audit-audispd-plugins
-%defattr(-,root,root,-)
-%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
-%attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
-%attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
-%attr(750,root,root) /usr/sbin/audispd-zos-remote
-
%changelog
-* Tue Mar 04 2008 tonyj@suse.de
-- Update from 1.6.2 to 1.6.8. Start building audispd-plugins rpm.
- Redhat changelog follows:
- * Thu Feb 14 2008 Steve Grubb 1.6.8-1
- - Update for gcc 4.3
- - Cleanup descriptors in audispd before running plugin
- - Fix 'recent' keyword for aureport/search
- - Fix SE Linux policy for zos_remote plugin
- - Add event type for group password authentication attempts
- - Couple of updates to the translation tables
- - Add detection of failed group authentication to audisp-prelude
- * Thu Jan 31 2008 Steve Grubb 1.6.7-1
- - In ausearch/report, prefer -if to stdin
- - In ausearch/report, add new command line option --input-logs (#428860)
- - Updated audisp-prelude based on feedback from prelude-devel
- - Added prelude alert for promiscuous socket being opened
- - Added prelude alert for SE Linux policy enforcement changes
- - Added prelude alerts for Forbidden Login Locations and Time
- - Applied patch to auparse fixing error handling of searching by
- interpreted value (Miloslav Trmac)
- * Sat Jan 19 2008 Steve Grubb 1.6.6-1
- - Add prelude IDS plugin for IDMEF alerts
- - Add --user option to aulastlog command
- - Use desktop-file-install for system-config-audit
- * Mon Jan 07 2008 Steve Grubb 1.6.5-1
- - Add more errno strings for exit codes in auditctl
- - Fix config parser to allow either 0640 or 0600 for audit logs (#427062)
- - Check for audit log being writable by owner in auditd
- - If auditd logging was suspended, it can be resumed with SIGUSR2 (#251639)
- - Updated CAPP, LSPP, and NISPOM rules for new capabilities
- - Added aulastlog utility
- * Sat Dec 29 2007 Steve Grubb 1.6.4-1
- - fchmod of log file was on wrong variable (#426934)
- - Allow use of errno strings for exit codes in audit rules
- * Thu Dec 27 2007 Steve Grubb 1.6.3-1
- - Add kernel release string to DEAMON_START events
- - Fix keep_logs when num_logs option disabled (#325561)
- - Fix auparse to handle node fields for syscall records
- - Update system-config-audit to version 0.4.5 (Miloslav Trmac)
- - Add keyword week-ago to aureport & ausearch start/end times
- - Fix audit log permissions on rotate. If group is root 0400, otherwise 0440
- - Add RACF zos remote audispd plugin (Klaus Kiwi)
- - Add event queue overflow action to audispd
* Wed Oct 31 2007 tonyj@suse.de
- Incorporate 1 more Redhat fixe post 1.6.2
- Go back to 10.2 behaviour wrt to starting in disabled state.
++++++ audit-1.6.2-bugs.patch ++++++
From: Steve Grubb
Subject: Patches for 1.6.2
Upsteam: yes (in 1.6.3)
Misc patches for 1.6.2 audit (from Steve Grubb)
diff -urp audit-1.6.2.orig/audisp/audispd.c audit-1.6.2/audisp/audispd.c
--- audit-1.6.2.orig/audisp/audispd.c 2007-10-17 13:56:22.000000000 -0400
+++ audit-1.6.2/audisp/audispd.c 2007-10-17 14:13:49.000000000 -0400
@@ -369,7 +369,6 @@ int main(int argc, char *argv[])
conf = plist_get_cur(&plugin_conf);
while (conf) {
free_pconfig(conf->p);
- free(conf->p);
conf = plist_next(&plugin_conf);
}
plist_clear(&plugin_conf);
diff -urp audit-1.6.2.orig/lib/lookup_table.c audit-1.6.2/lib/lookup_table.c
--- audit-1.6.2.orig/lib/lookup_table.c 2007-10-17 13:56:22.000000000 -0400
+++ audit-1.6.2/lib/lookup_table.c 2007-10-17 13:56:49.000000000 -0400
@@ -483,7 +483,7 @@ int audit_name_to_msg_type(const char *m
strncpy(buf, msg_type + 8, len);
errno = 0;
return strtol(buf, NULL, 10);
- } else if (isdigit(msg_type)) {
+ } else if (isdigit(*msg_type)) {
errno = 0;
return strtol(msg_type, NULL, 10);
}
diff -urp audit-1.6.2.orig/lib/msg_typetab.h audit-1.6.2/lib/msg_typetab.h
--- audit-1.6.2.orig/lib/msg_typetab.h 2007-10-17 13:56:22.000000000 -0400
+++ audit-1.6.2/lib/msg_typetab.h 2007-10-17 13:57:27.000000000 -0400
@@ -92,7 +92,7 @@ _S(AUDIT_KERNEL_OTHER, "KE
_S(AUDIT_FD_PAIR, "FD_PAIR" )
_S(AUDIT_OBJ_PID, "OBJ_PID" )
_S(AUDIT_TTY, "TTY" )
-//_S(AUDIT_EOE, "EOE" )
+_S(AUDIT_EOE, "EOE" )
_S(AUDIT_AVC, "AVC" )
_S(AUDIT_SELINUX_ERR, "SELINUX_ERR" )
_S(AUDIT_AVC_PATH, "AVC_PATH" )
diff -urp audit-1.6.2.orig/src/auditd.c audit-1.6.2/src/auditd.c
--- audit-1.6.2.orig/src/auditd.c 2007-10-17 13:56:22.000000000 -0400
+++ audit-1.6.2/src/auditd.c 2007-10-17 13:59:32.000000000 -0400
@@ -127,16 +127,18 @@ static void distribute_event(struct audi
/* End of Event is for realtime interface - skip local logging of it */
if (rep->reply.type != AUDIT_EOE) {
+ int yield = rep->reply.type <= AUDIT_LAST_DAEMON &&
+ rep->reply.type >= AUDIT_FIRST_DAEMON ? 1 : 0;
+
/* Write to local disk */
enqueue_event(rep);
- if (rep->reply.type <= AUDIT_LAST_DAEMON &&
- rep->reply.type >= AUDIT_FIRST_DAEMON)
+ if (yield)
pthread_yield(); /* Let other thread try to log it. */
}
/* Last chance to send...maybe the pipe is empty now. */
- if (attempt)
- dispatch_event(&rep->reply, attempt);
+// if (attempt)
+// dispatch_event(&rep->reply, attempt);
}
/*
++++++ audit-1.6.8.tar.gz -> audit-1.6.2.tar.gz ++++++
++++ 14702 lines of diff (skipped)
++++++ audit-no_python.patch ++++++
--- /var/tmp/diff_new_pack.u12171/_old 2008-03-15 12:00:45.000000000 +0100
+++ /var/tmp/diff_new_pack.u12171/_new 2008-03-15 12:00:45.000000000 +0100
@@ -6,37 +6,35 @@
This is apparantly necessary due to the SuSE build system. Bit of a PITA but
there you have it.
---- audit-1.6.8/configure.ac.old 2008-02-29 22:20:13.248763000 +0100
-+++ audit-1.6.8/configure.ac 2008-02-29 22:23:10.703128000 +0100
-@@ -39,7 +39,6 @@
+--- audit-1.6.1/configure.ac.orig 2007-03-01 01:54:19.977676000 +0100
++++ audit-1.6.1/configure.ac 2007-03-01 02:09:06.032928000 +0100
+@@ -39,7 +39,7 @@
AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
-AM_PATH_PYTHON
++#AM_PATH_PYTHON
echo .
echo Checking for programs
-@@ -124,7 +124,8 @@
- fi
- AM_CONDITIONAL(HAVE_PRELUDE, test x$have_prelude = xyes)
+@@ -105,7 +105,8 @@
+ if test x$use_apparmor != xno ; then
+ AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi
--AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/prelude/Makefile audisp/plugins/remote/Makefile audisp/plugins/zos-remote/Makefile bindings/Makefile bindings/python/Makefile tools/Makefile tools/aulastlog/Makefile)
-+# SuSE: remove swig/Makefile + bindings/Makefile + bindings/python/Makefile
-+AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/prelude/Makefile audisp/plugins/remote/Makefile audisp/plugins/zos-remote/Makefile tools/Makefile tools/aulastlog/Makefile)
+-AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile)
++#AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile)
++AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile)
echo .
echo "
-
---- audit-1.6.8/Makefile.am.old 2008-02-29 22:25:06.872840000 +0100
-+++ audit-1.6.8/Makefile.am 2008-02-29 22:25:40.149532000 +0100
-@@ -21,7 +21,8 @@
+--- audit-1.6.1/Makefile.am.orig 2007-04-05 23:31:18.152428000 +0200
++++ audit-1.6.1/Makefile.am 2007-04-05 23:37:52.670519000 +0200
+@@ -21,7 +21,7 @@
# Rickard E. (Rik) Faith
#
--SUBDIRS = lib auparse src/mt src audisp tools swig bindings init.d \
-+# SuSE: remove swig + bindings
-+SUBDIRS = lib auparse src/mt src audisp tools init.d \
- docs
+-SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs
++SUBDIRS = lib auparse src/mt src audisp init.d docs
EXTRA_DIST = ChangeLog AUTHORS NEWS README README-install audit.spec \
- contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \
-
+ sample.rules contrib/capp.rules contrib/nispom.rules \
+ contrib/lspp.rules contrib/skeleton.c contrib/avc_snap \
++++++ audit-no_sca.patch ++++++
--- /var/tmp/diff_new_pack.u12171/_old 2008-03-15 12:00:45.000000000 +0100
+++ /var/tmp/diff_new_pack.u12171/_new 2008-03-15 12:00:45.000000000 +0100
@@ -4,26 +4,26 @@
Disable system-config-audit. A Yast equivalent would be useful though.
---- audit-1.6.8/configure.ac.old 2007-07-25 02:13:48.399097000 +0200
-+++ audit-1.6.8/configure.ac 2007-07-25 02:14:25.113347000 +0200
+--- audit-1.6.1/configure.ac.old 2007-07-25 02:13:48.399097000 +0200
++++ audit-1.6.1/configure.ac 2007-07-25 02:14:25.113347000 +0200
@@ -108,7 +108,6 @@
- fi
- AM_CONDITIONAL(HAVE_PRELUDE, test x$have_prelude = xyes)
+ if test x$use_apparmor != xno ; then
+ AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi
-AC_CONFIG_SUBDIRS([system-config-audit])
- AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/prelude/Makefile audisp/plugins/remote/Makefile audisp/plugins/zos-remote/Makefile bindings/Makefile bindings/python/Makefile tools/Makefile tools/aulastlog/Makefile)
+ AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile)
echo .
---- audit-1.6.8/Makefile.am.old 2008-02-29 21:53:11.791067000 +0100
-+++ audit-1.6.8/Makefile.am 2008-02-29 21:53:24.682161000 +0100
-@@ -22,7 +22,7 @@
+--- audit-1.6.1/Makefile.am.orig 2007-09-18 02:58:06.195934000 +0200
++++ audit-1.6.1/Makefile.am 2007-09-18 02:58:33.272829000 +0200
+@@ -21,8 +21,7 @@
+ # Rickard E. (Rik) Faith
#
- SUBDIRS = lib auparse src/mt src audisp tools swig bindings init.d \
-- docs system-config-audit
-+ docs
+-SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs \
+- system-config-audit
++SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs
EXTRA_DIST = ChangeLog AUTHORS NEWS README README-install audit.spec \
- contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \
- contrib/skeleton.c contrib/avc_snap contrib/avc_syslog \
-
+ sample.rules contrib/capp.rules contrib/nispom.rules \
+ contrib/lspp.rules contrib/skeleton.c contrib/avc_snap \
++++++ audit-startup.patch ++++++
--- audit-1.6.2.orig/docs/auditd.8
+++ audit-1.6.2/docs/auditd.8
@@ -3,7 +3,7 @@
auditd \- The Linux Audit daemon
.SH SYNOPSIS
.B auditd
-.RB [ \-f ]\ [ \-l ]\ [ \-n ]
+.RB [ \-f ]\ [ \-l ]\ [ \-n ]\ [ \-s\ disable|enable|nochange ]
.SH DESCRIPTION
\fBauditd\fP is the userspace component to the Linux Auditing System. It's responsible for writing audit records to the disk. Viewing the logs is done with the
.B ausearch
@@ -24,6 +24,9 @@
.TP
.B \-n
no fork. This is useful for running off of inittab
+.TP
+.B \-s=\fIENABLE_STATE\fR
+specify when starting if auditd should change the current value for the kernel enabled flag. Valid values for ENABLE_STATE are "disable", "enable" or "nochange". The default is to enable (and disable when auditd terminates). The value of the enabled flag may be changed during the lifetime of auditd using 'auditctl -e'.
.SH SIGNALS
.TP
SIGHUP
--- audit-1.6.2.orig/src/auditd.c
+++ audit-1.6.2/src/auditd.c
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include "libaudit.h"
#include "auditd-config.h"
@@ -65,13 +66,19 @@
static void clean_exit(void);
static int get_reply(int fd, struct audit_reply *rep, int seq);
+enum startup_state {startup_disable=0, startup_enable, startup_nochange, startup_INVALID};
+static const char *startup_states[] = {"disable", "enable", "nochange"};
/*
* Output a usage message
*/
static void usage(void)
{
- puts("Usage: auditd [ -f -l -n ]");
+ fprintf(stderr, "Usage: auditd [-f] [-l] [-n] [-s %s|%s|%s]\n",
+ startup_states[startup_disable],
+ startup_states[startup_enable],
+ startup_states[startup_nochange]);
+
exit(2);
}
@@ -308,26 +315,56 @@
struct rlimit limit;
int hup_info_requested = 0, usr1_info_requested = 0;
int i;
+ int opt_foreground = 0, opt_allow_links = 0;
+ enum startup_state opt_startup = startup_enable;
+ int c;
+ extern char *optarg;
+ extern int optind;
/* Get params && set mode */
- config.daemonize = D_BACKGROUND;
- if (argc > 1) {
- for (i=1; i 0) {
struct audit_reply trep;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org