Hello community,
here is the log from the commit of package audit
checked in at Sun May 6 17:10:41 CEST 2007.
--------
--- audit/audit.changes 2006-12-07 10:09:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/audit/audit.changes 2007-05-02 19:10:15.283374000 +0200
@@ -1,0 +2,5 @@
+Wed May 2 19:08:53 CEST 2007 - tonyj@suse.de
+
+- Upgrade to 1.5.3. Drop AUDITD_DISABLE_CONTEXTS from audit sysconfig
+
+-------------------------------------------------------------------
--- audit/audit-libs-python.changes 2006-12-07 10:10:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/audit/audit-libs-python.changes 2007-05-02 19:10:33.207439000 +0200
@@ -1,0 +2,5 @@
+Wed May 2 19:08:53 CEST 2007 - tonyj@suse.de
+
+- Upgrade to 1.5.3.
+
+-------------------------------------------------------------------
Old:
----
audit-1.2.9.tar.bz2
audit-auparse_missing_return.patch
audit-change-paths.patch
audit-disable-syscall-contexts.patch
New:
----
audit-1.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audit-libs-python.spec ++++++
--- /var/tmp/diff_new_pack.O18026/_old 2007-05-06 17:10:33.000000000 +0200
+++ /var/tmp/diff_new_pack.O18026/_new 2007-05-06 17:10:33.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package audit-libs-python (Version 1.2.9)
+# spec file for package audit-libs-python (Version 1.5.3)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,17 +12,14 @@
Name: audit-libs-python
%define _name audit
-BuildRequires: audit-devel gcc-c++ python-devel swig
+BuildRequires: audit-devel gcc-c++ pkg-config python-devel swig
Summary: Python bindings for libaudit
-Version: 1.2.9
-Release: 2
+Version: 1.5.3
+Release: 1
License: GNU General Public License (GPL)
Group: System/Monitoring
URL: http://people.redhat.com/sgrubb/audit/
-Source0: audit-%{version}.tar.bz2
-Patch0: audit-change-paths.patch
-Patch1: audit-disable-syscall-contexts.patch
-Patch2: audit-auparse_missing_return.patch
+Source0: audit-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: audit-libs = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' audit-libs`)
PreReq: %insserv_prereq %fillup_prereq
@@ -39,12 +36,9 @@
%prep
%setup -q -n audit-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
-autoreconf -fv --install
+autoreconf -iv --install
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --with-apparmor
@@ -55,33 +49,24 @@
%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
+make DESTDIR=$RPM_BUILD_ROOT install -C bindings
+ls -lR $RPM_BUILD_ROOT/
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
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse-1.0-py2.5.egg-info
%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,-)
-%attr(750,root,root) /usr/sbin/audispd
%{_libdir}/python%{py_ver}/site-packages/_audit.so
+%{_libdir}/python%{py_ver}/site-packages/auparse.so
%{_libdir}/python%{py_ver}/site-packages/audit.py*
-%{_libdir}/python%{py_ver}/site-packages/AuditMsg.py*
-%changelog -n audit-libs-python
+%changelog
+* Wed May 02 2007 - tonyj@suse.de
+- Upgrade to 1.5.3.
* 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
++++++ audit.spec ++++++
--- /var/tmp/diff_new_pack.O18026/_old 2007-05-06 17:10:33.000000000 +0200
+++ /var/tmp/diff_new_pack.O18026/_new 2007-05-06 17:10:33.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package audit (Version 1.2.9)
+# spec file for package audit (Version 1.5.3)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,20 +11,17 @@
# norootforbuild
Name: audit
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++ pkg-config
Summary: User Space Tools for 2.6 Kernel Auditing
-Version: 1.2.9
-Release: 2
+Version: 1.5.3
+Release: 1
License: GNU General Public License (GPL)
Group: System/Monitoring
URL: http://people.redhat.com/sgrubb/audit/
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.gz
Source1: auditd.init
Source2: auditd.sysconfig
-Patch0: audit-change-paths.patch
-Patch1: audit-no_python.patch
-Patch2: audit-disable-syscall-contexts.patch
-Patch3: audit-auparse_missing_return.patch
+Patch0: audit-no_python.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-libs = %{version}-%{release}
PreReq: %insserv_prereq %fillup_prereq
@@ -72,25 +69,38 @@
--------
Steve Grubb
+%package audispd-plugins
+Summary: Default plugins for the audit dispatcher
+License: GNU General Public License (GPL)
+Group: System/Monitoring
+
+%description audispd-plugins
+The audit-audispd-plugins package contains plugin components for the
+audit dispatcher (audispd).
+
+
+
+Authors:
+--------
+ Steve Grubb
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-autoreconf -fv --install
+autoreconf -iv --install
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
-./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --with-apparmor
+./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
make
%install
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,init.d}}
+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}/man8
mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
@@ -100,18 +110,11 @@
# 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
-# -- 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
+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
-mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
-rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la
+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
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
@@ -125,6 +128,8 @@
# 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
%clean
rm -rf $RPM_BUILD_ROOT
@@ -155,28 +160,34 @@
%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
+%{_includedir}/auparse.h
+%{_includedir}/auparse-defs.h
%{_mandir}/man3/*
%files
%defattr(-,root,root,-)
-%doc README COPYING ChangeLog sample.rules
+%doc README COPYING ChangeLog sample.rules 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(750,root,root) /sbin/ausearch
+%attr(755,root,root) /sbin/ausearch
%attr(750,root,root) /sbin/rcauditd
%attr(750,root,root) /sbin/autrace
-%attr(750,root,root) /sbin/aureport
+%attr(750,root,root) /sbin/audispd
+%attr(755,root,root) /sbin/aureport
/etc/init.d/auditd
%dir %attr(750,root,root) /etc/audit
+%attr(750,root,root) %dir /etc/audispd
+%attr(750,root,root) %dir /etc/audispd/plugins.d
%ghost /etc/auditd.conf
%ghost /etc/audit.rules
%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
@@ -185,7 +196,9 @@
%dir %attr(700,root,root) /var/log/audit
%ghost /var/log/audit/audit.log
-%changelog -n audit
+%changelog
+* Wed May 02 2007 - tonyj@suse.de
+- Upgrade to 1.5.3. Drop AUDITD_DISABLE_CONTEXTS from audit sysconfig
* 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
++++++ auditd.init ++++++
--- audit/auditd.init 2006-12-05 21:42:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/audit/auditd.init 2007-05-02 14:23:51.638464000 +0200
@@ -98,9 +98,6 @@
case "$1" in
start)
echo -n "Starting auditd "
- if [ "$AUDITD_DISABLE_CONTEXTS" == "yes" ] ; then
- EXTRAOPTIONS="$EXTRAOPTIONS -n"
- fi
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
startproc $AUDITD_BIN $EXTRAOPTIONS
++++++ auditd.sysconfig ++++++
--- audit/auditd.sysconfig 2006-08-31 22:56:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/audit/auditd.sysconfig 2007-05-02 14:23:33.350768000 +0200
@@ -29,7 +29,3 @@
#
## Type: yesno
## Default: yes
-#
-# This option disables syscall auditing by default. This can also be
-# accomplished by auditctl -e.
-AUDITD_DISABLE_CONTEXTS="yes"
++++++ audit-no_python.patch ++++++
--- /var/tmp/diff_new_pack.O18026/_old 2007-05-06 17:10:33.000000000 +0200
+++ /var/tmp/diff_new_pack.O18026/_new 2007-05-06 17:10:33.000000000 +0200
@@ -1,19 +1,11 @@
-From: tonyj@suse.de
-Date: unknown
-Upstream: no
-
-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/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
+--- audit-1.5.1/configure.ac.orig 2007-03-01 01:54:19.977676000 +0100
++++ audit-1.5.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(2.4)
-+#AM_PATH_PYTHON(2.4)
+-AM_PATH_PYTHON
++#AM_PATH_PYTHON
echo .
echo Checking for programs
@@ -21,21 +13,20 @@
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 src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile)
-+#AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile)
-+AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile docs/Makefile init.d/Makefile)
+-AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile bindings/Makefile bindings/python/Makefile)
++#AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile bindings/Makefile bindings/python/Makefile)
++AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile docs/Makefile init.d/Makefile audisp/Makefile)
echo .
echo "
---- audit-1.2.6/Makefile.am.xx 2006-07-13 22:24:35.000000000 +0200
-+++ audit-1.2.6/Makefile.am 2006-08-31 20:52:49.000000000 +0200
-@@ -22,7 +22,8 @@
+--- audit-1.5.1/Makefile.am.orig 2007-04-05 23:31:18.152428000 +0200
++++ audit-1.5.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 audisp/tests swig 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
+-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 sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec
CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
