Hello community,
here is the log from the commit of package audit for openSUSE:Factory
checked in at Mon Nov 16 09:56:51 CET 2009.
--------
--- audit/audit.changes 2009-06-20 12:46:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/audit/audit.changes 2009-11-03 20:15:56.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Nov 3 19:11:33 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
+Mon Sep 28 16:23:29 CEST 2009 - crrodriguez@suse.de
+
+- do not package static libraries
+- fix -devel package dependencies
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audit-secondary.spec ++++++
--- /var/tmp/diff_new_pack.z4Hy0g/_old 2009-11-16 09:55:54.000000000 +0100
+++ /var/tmp/diff_new_pack.z4Hy0g/_new 2009-11-16 09:55:54.000000000 +0100
@@ -26,7 +26,7 @@
License: GPL v2 or later
Group: System/Monitoring
Version: 1.7.13
-Release: 3
+Release: 4
Url: http://people.redhat.com/sgrubb/audit/
Source0: audit-%{version}.tar.bz2
Patch0: audit-no_sca.patch
++++++ audit.spec ++++++
--- /var/tmp/diff_new_pack.z4Hy0g/_old 2009-11-16 09:55:54.000000000 +0100
+++ /var/tmp/diff_new_pack.z4Hy0g/_new 2009-11-16 09:55:54.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: gcc-c++ tcpd-devel
Summary: User Space Tools for 2.6 Kernel Auditing
Version: 1.7.13
-Release: 3
+Release: 4
License: GPL v2 or later
Group: System/Monitoring
Url: http://people.redhat.com/sgrubb/audit/
@@ -73,7 +73,7 @@
Summary: Header files and static library for libaudit
License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version} glibc-devel
%description devel
The audit-devel package contains the static libraries and header files
@@ -99,8 +99,11 @@
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
# no krb support (omit --enable-gssapi-krb5=yes), see audit-no-gss.patch
-./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --libexecdir=%{_prefix}/lib/%{name} --with-apparmor --with-libwrap
-make
+%configure --sbindir=/sbin \
+ --libdir=/%{_lib} --libexecdir=%{_prefix}/lib/%{name} \
+ --with-apparmor --with-libwrap \
+ --disable-static --with-pic
+%{__make} %{?jobs:-j%jobs}
%install
mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}}
@@ -112,12 +115,10 @@
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
-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
+for libname in libaudit libauparse;do
+%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/$libname.so) %{buildroot}%{_libdir}/$libname.so
+%{__rm} -v %{buildroot}/%{_lib}/$libname.{so,la}
+done
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
++++++ audit-no_plugins.patch ++++++
--- /var/tmp/diff_new_pack.z4Hy0g/_old 2009-11-16 09:55:55.000000000 +0100
+++ /var/tmp/diff_new_pack.z4Hy0g/_new 2009-11-16 09:55:55.000000000 +0100
@@ -5,21 +5,24 @@
Non builtin plugins is build as part of phase2 by audit-secondary.spec.
Conf files for builtins are still installed
---- audit-1.7.2/audisp/plugins/Makefile.am.orig 2008-04-22 17:20:29.022441000 +0200
-+++ audit-1.7.2/audisp/plugins/Makefile.am 2008-04-22 17:20:36.657804000 +0200
+Index: audit-1.7.13/audisp/plugins/Makefile.am
+===================================================================
+--- audit-1.7.13.orig/audisp/plugins/Makefile.am
++++ audit-1.7.13/audisp/plugins/Makefile.am
@@ -22,7 +22,7 @@
- CONFIG_CLEAN_FILES = Makefile.in *.loT *.rej *.orig
+ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
-SUBDIRS = builtins zos-remote remote
+SUBDIRS = builtins
#SUBDIRS = builtins zos-remote
if HAVE_PRELUDE
SUBDIRS += prelude
-
---- audit-1.7.2/docs/Makefile.am.orig 2008-04-22 17:21:45.409978000 +0200
-+++ audit-1.7.2/docs/Makefile.am 2008-04-22 17:21:59.923451000 +0200
-@@ -49,5 +49,5 @@
+Index: audit-1.7.13/docs/Makefile.am
+===================================================================
+--- audit-1.7.13.orig/docs/Makefile.am
++++ audit-1.7.13/docs/Makefile.am
+@@ -52,5 +52,5 @@ ausearch_add_expression.3 ausearch_add_t
ausearch_clear.3 \
ausearch_next_event.3 ausearch_set_stop.3 \
autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \
++++++ audit-no_python.patch ++++++
--- /var/tmp/diff_new_pack.z4Hy0g/_old 2009-11-16 09:55:55.000000000 +0100
+++ /var/tmp/diff_new_pack.z4Hy0g/_new 2009-11-16 09:55:55.000000000 +0100
@@ -6,9 +6,11 @@
This is apparantly necessary due to the SuSE build system. Bit of a PITA but
there you have it.
---- audit-1.7.7/configure.ac.orig 2008-09-23 01:24:06.345492000 +0200
-+++ audit-1.7.7/configure.ac 2008-09-23 01:25:15.325453000 +0200
-@@ -39,7 +39,6 @@
+Index: audit-1.7.13/configure.ac
+===================================================================
+--- audit-1.7.13.orig/configure.ac
++++ audit-1.7.13/configure.ac
+@@ -39,7 +39,6 @@ AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
@@ -16,7 +18,7 @@
OLDLIBS="$LIBS"
m4_include([src/libev/libev.m4])
libev_LIBS="$LIBS"
-@@ -195,7 +195,8 @@
+@@ -202,7 +201,8 @@ AC_SUBST(libev_LIBS)
AC_SUBST(LIBPRELUDE_CFLAGS)
AC_SUBST(LIBPRELUDE_LDFLAGS)
@@ -26,8 +28,10 @@
echo .
echo "
---- audit-1.7.7/Makefile.am.orig 2008-09-23 01:24:26.915901000 +0200
-+++ audit-1.7.7/Makefile.am 2008-09-23 01:25:43.035708000 +0200
+Index: audit-1.7.13/Makefile.am
+===================================================================
+--- audit-1.7.13.orig/Makefile.am
++++ audit-1.7.13/Makefile.am
@@ -21,8 +21,8 @@
# Rickard E. (Rik) Faith