Hello community, here is the log from the commit of package audit checked in at Mon Dec 11 01:35:02 CET 2006. -------- --- audit/audit-libs-python.changes 2006-11-05 00:45:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/audit/audit-libs-python.changes 2006-12-07 10:10:36.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 02:47:22 CET 2006 - tonyj@suse.de + +- Upgrade to 1.2.9 (drop several patches which are now upstream) +- /usr/sbin/audispd now packaged by audit-libs-python + +------------------------------------------------------------------- --- audit/audit.changes 2006-08-31 22:59:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/audit.changes 2006-12-07 10:09:30.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 02:46:08 CET 2006 - tonyj@suse.de + +- Upgrade to 1.2.9 (drop several patches which are now upstream) +- Move to using /etc/audit directory for config files + +------------------------------------------------------------------- Old: ---- audit-1.2.6.tar.bz2 audit-move-audisp.patch audit-no_kernelconfig.patch audit-no_kernelconfig2.patch audit-no_syscall_hdr.patch New: ---- audit-1.2.9.tar.bz2 audit-change-paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-libs-python.spec ++++++ --- /var/tmp/diff_new_pack.HEpt8h/_old 2006-12-11 01:34:28.000000000 +0100 +++ /var/tmp/diff_new_pack.HEpt8h/_new 2006-12-11 01:34:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package audit-libs-python (Version 1.2.6) +# spec file for package audit-libs-python (Version 1.2.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,18 +14,15 @@ %define _name audit BuildRequires: audit-devel gcc-c++ python-devel swig Summary: Python bindings for libaudit -Version: 1.2.6 -Release: 17 -License: GNU General Public License (GPL) - all versions +Version: 1.2.9 +Release: 2 +License: GNU General Public License (GPL) Group: System/Monitoring URL: http://people.redhat.com/sgrubb/audit/ Source0: audit-%{version}.tar.bz2 -Patch0: audit-move-audisp.patch +Patch0: audit-change-paths.patch Patch1: audit-disable-syscall-contexts.patch -Patch2: audit-no_kernelconfig.patch -Patch3: audit-no_kernelconfig2.patch -Patch4: audit-no_syscall_hdr.patch -Patch5: audit-auparse_missing_return.patch +Patch2: audit-auparse_missing_return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: audit-libs = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' audit-libs`) PreReq: %insserv_prereq %fillup_prereq @@ -45,15 +42,12 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build autoreconf -fv --install export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" -./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc +./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --with-apparmor pushd src/mt make libaudit.h popd @@ -61,15 +55,36 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -C swig +make DESTDIR=$RPM_BUILD_ROOT install -C audisp LIBDIR=$RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages +mkdir $RPM_BUILD_ROOT/usr/sbin +mv $RPM_BUILD_ROOT/sbin/audispd $RPM_BUILD_ROOT/usr/sbin/audispd +rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/_audit.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/_audit.la %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -f /etc/audit/auditd.conf ]; then + tmp=`mktemp /etc/audit/auditd-post.$$` + 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 + %files %defattr(-,root,root,-) -/%{_libdir}/python%{py_ver}/site-packages/* +%attr(750,root,root) /usr/sbin/audispd +%{_libdir}/python%{py_ver}/site-packages/_audit.so +%{_libdir}/python%{py_ver}/site-packages/audit.py* +%{_libdir}/python%{py_ver}/site-packages/AuditMsg.py* %changelog -n audit-libs-python +* Wed Nov 29 2006 - tonyj@suse.de +- Upgrade to 1.2.9 (drop several patches which are now upstream) +- /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 ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.HEpt8h/_old 2006-12-11 01:34:28.000000000 +0100 +++ /var/tmp/diff_new_pack.HEpt8h/_new 2006-12-11 01:34:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package audit (Version 1.2.6) +# spec file for package audit (Version 1.2.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,21 +13,18 @@ Name: audit BuildRequires: gcc-c++ Summary: User Space Tools for 2.6 Kernel Auditing -Version: 1.2.6 -Release: 14 -License: GNU General Public License (GPL) - all versions +Version: 1.2.9 +Release: 2 +License: GNU General Public License (GPL) Group: System/Monitoring URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.bz2 Source1: auditd.init Source2: auditd.sysconfig -Patch0: audit-move-audisp.patch +Patch0: audit-change-paths.patch Patch1: audit-no_python.patch Patch2: audit-disable-syscall-contexts.patch -Patch3: audit-no_kernelconfig.patch -Patch4: audit-no_kernelconfig2.patch -Patch5: audit-no_syscall_hdr.patch -Patch6: audit-auparse_missing_return.patch +Patch3: audit-auparse_missing_return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-libs = %{version}-%{release} PreReq: %insserv_prereq %fillup_prereq @@ -45,7 +42,7 @@ %package libs Summary: Dynamic library for libaudit -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Monitoring %description libs @@ -81,9 +78,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build autoreconf -fv --install @@ -101,18 +95,23 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security make DESTDIR=$RPM_BUILD_ROOT install -# must move to /usr since libstdc++ is in /usr -mv $RPM_BUILD_ROOT/sbin/audispd $RPM_BUILD_ROOT/usr/sbin/audispd 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 -rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so $RPM_BUILD_ROOT/%{_lib}/libauparse.so +# -- 11/06 -- temp disable libauparse +#rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so $RPM_BUILD_ROOT/%{_lib}/libauparse.so +#ln -sf /%{_lib}/libaudit.so.0 $RPM_BUILD_ROOT%{_libdir}/libaudit.so +#ln -sf /%{_lib}/libauparse.so.0 $RPM_BUILD_ROOT%{_libdir}/libauparse.so +#mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir} +#rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la $RPM_BUILD_ROOT/%{_lib}/libauparse.la +# -- +rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so +# Link points to real /lib not buildroot /lib ln -sf /%{_lib}/libaudit.so.0 $RPM_BUILD_ROOT%{_libdir}/libaudit.so -ln -sf /%{_lib}/libauparse.so.0 $RPM_BUILD_ROOT%{_libdir}/libauparse.so -mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir} -rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la $RPM_BUILD_ROOT/%{_lib}/libauparse.la +mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir} +rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd # delete redhat script, use ours @@ -123,10 +122,9 @@ 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 -# don't use /etc/audit -mv $RPM_BUILD_ROOT/etc/audit/auditd.conf $RPM_BUILD_ROOT/etc/auditd.conf -mv $RPM_BUILD_ROOT/etc/audit/audit.rules $RPM_BUILD_ROOT/etc/audit.rules -rm -rf $RPM_BUILD_ROOT/etc/audit +# 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} %clean rm -rf $RPM_BUILD_ROOT @@ -137,6 +135,15 @@ %post %{fillup_and_insserv -yn auditd auditd} +# Save existing audit files if any (from old location) +if [ -f /etc/auditd.conf ]; then + mv /etc/audit/auditd.conf /etc/audit/auditd.conf.new + mv /etc/auditd.conf /etc/audit/auditd.conf +fi +if [ -f /etc/audit.rules ]; then + mv /etc/audit/audit.rules /etc/audit/audit.rules.new + mv /etc/audit.rules /etc/audit/audit.rules +fi %preun %stop_on_removal auditd @@ -148,13 +155,13 @@ %files libs %defattr(-,root,root) /%{_lib}/libaudit.* -/%{_lib}/libauparse.* +#/%{_lib}/libauparse.* %config(noreplace) %attr(640,root,root) /etc/libaudit.conf %files devel %defattr(-,root,root) %{_libdir}/libaudit.* -%{_libdir}/libauparse.* +#%{_libdir}/libauparse.* %{_includedir}/libaudit.h %{_mandir}/man3/* @@ -162,7 +169,6 @@ %defattr(-,root,root,-) %doc README COPYING ChangeLog sample.rules %{_mandir}/man8/* -%attr(750,root,root) /usr/sbin/audispd %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd %attr(750,root,root) /sbin/ausearch @@ -170,13 +176,19 @@ %attr(750,root,root) /sbin/autrace %attr(750,root,root) /sbin/aureport /etc/init.d/auditd -%config(noreplace) %attr(640,root,root) /etc/auditd.conf -%config(noreplace) %attr(640,root,root) /etc/audit.rules +%dir %attr(750,root,root) /etc/audit +%ghost /etc/auditd.conf +%ghost /etc/audit.rules +%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf +%config(noreplace) %attr(640,root,root) /etc/audit/audit.rules /var/adm/fillup-templates/sysconfig.auditd %dir %attr(700,root,root) /var/log/audit %ghost /var/log/audit/audit.log %changelog -n audit +* Wed Nov 29 2006 - tonyj@suse.de +- Upgrade to 1.2.9 (drop several patches which are now upstream) +- Move to using /etc/audit directory for config files * Thu Aug 31 2006 - tonyj@suse.de - Upgrade to 1.2.6-1 * Sat Aug 26 2006 - olh@suse.de ++++++ audit-1.2.6.tar.bz2 -> audit-1.2.9.tar.bz2 ++++++ ++++ 4487 lines of diff (skipped) ++++++ audit-change-paths.patch ++++++ From: tonyj@suse.de References: unknown Upstream: no Change paths. 1) Since libstdc++ is in /usr, audispd must move also 2) Change location of audit config file to /etc --- audit-1.2.6/init.d/auditd.conf.xx 2006-08-31 18:18:11.000000000 +0200 +++ audit-1.2.6/init.d/auditd.conf 2006-08-31 18:19:00.000000000 +0200 @@ -8,7 +8,7 @@ flush = INCREMENTAL freq = 20 num_logs = 4 -dispatcher = /sbin/audispd +#dispatcher = /usr/sbin/audispd disp_qos = lossy max_log_file = 5 max_log_file_action = ROTATE ++++++ audit-disable-syscall-contexts.patch ++++++ --- /var/tmp/diff_new_pack.HEpt8h/_old 2006-12-11 01:34:28.000000000 +0100 +++ /var/tmp/diff_new_pack.HEpt8h/_new 2006-12-11 01:34:28.000000000 +0100 @@ -68,7 +68,7 @@ /* Enable auditing just in case it was off */ - if (audit_set_enabled(fd, 1) < 0) { + if (audit_set_enabled(fd, opt_enabled) < 0) { - char emsg[128]; + char emsg[DEFAULT_BUF_SZ]; snprintf(emsg, sizeof(emsg), "auditd error halt, auid=%u pid=%d res=failed", @@ -558,6 +569,7 @@ ++++++ audit-no_python.patch ++++++ --- /var/tmp/diff_new_pack.HEpt8h/_old 2006-12-11 01:34:28.000000000 +0100 +++ /var/tmp/diff_new_pack.HEpt8h/_new 2006-12-11 01:34:28.000000000 +0100 @@ -4,26 +4,8 @@ This patch is used by audit.spec to disable use of Python. Necessary Python files are built seperately by audit-libs-python.spec +(make -C swig ; make -C auditsp) ---- audit-1.2.6/audisp/Makefile.xx 2006-08-31 20:53:16.000000000 +0200 -+++ audit-1.2.6/audisp/Makefile 2006-08-31 20:54:23.000000000 +0200 -@@ -1,8 +1,6 @@ - # Installation directories. - PREFIX ?= $(DESTDIR)/usr --LIBDIR ?= $(PREFIX)/lib/python2.4/site-packages - SBINDIR ?= $(DESTDIR)/sbin --LIB=AuditMsg.py - - TARGETS=audispd - -@@ -12,7 +10,6 @@ - -mkdir -p $(SBINDIR) - -mkdir -p $(LIBDIR) - install -m 755 $(TARGETS) $(SBINDIR) -- install -m 644 $(LIB) $(LIBDIR) - distclean: - clean: - --- audit-1.2.6/configure.ac.xx 2006-07-13 23:02:17.000000000 +0200 +++ audit-1.2.6/configure.ac 2006-08-31 20:52:49.000000000 +0200 @@ -39,7 +39,7 @@ @@ -51,9 +33,9 @@ # #SUBDIRS = lib auparse src/mt src audisp audisp/tests swig init.d docs --SUBDIRS = lib auparse src/mt src audisp swig init.d docs -+#SUBDIRS = lib auparse src/mt src audisp swig init.d docs -+SUBDIRS = lib auparse src/mt src audisp init.d docs +-SUBDIRS = lib src/mt src audisp swig init.d docs ++#SUBDIRS = lib src/mt src audisp swig init.d docs ++SUBDIRS = lib src/mt src init.d docs EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules contrib/capp.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/* ++++++ auditd.init ++++++ --- audit/auditd.init 2006-08-31 22:56:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/auditd.init 2006-12-05 21:42:30.000000000 +0100 @@ -104,7 +104,7 @@ ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. startproc $AUDITD_BIN $EXTRAOPTIONS - test -f /etc/audit.rules && /sbin/auditctl -R /etc/audit.rules >/dev/null + test -f /etc/audit/audit.rules && /sbin/auditctl -R /etc/audit/audit.rules >/dev/null # Remember status and be verbose rc_status -v @@ -197,7 +197,7 @@ ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) - test /etc/auditd.conf -nt /var/run/auditd.pid && echo reload + test /etc/audit/auditd.conf -nt /var/run/auditd.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org