rpm/audit
SHA256
1
0
Fork 0
forked from pool/audit
Code Pull Requests Activity

Accepting request 24465 from security

Browse Source 
Copy from security/audit based on submit request 24465 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audit?expand=0&rev=30
This commit is contained in:
OBS User autobuild 2009-11-16 08:56:53 +00:00 committed by Git OBS Bridge
parent 779376fee2
commit 5a9dff2cf2
5 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audit-no_plugins.patch
View File

@ -5,21 +5,24 @@ Upsteam: never
Non builtin plugins is build as part of phase2 by audit-secondary.spec. Non builtin plugins is build as part of phase2 by audit-secondary.spec.
Conf files for builtins are still installed Conf files for builtins are still installed
--- audit-1.7.2/audisp/plugins/Makefile.am.orig 2008-04-22 17:20:29.022441000 +0200 Index: audit-1.7.13/audisp/plugins/Makefile.am
+++ audit-1.7.2/audisp/plugins/Makefile.am 2008-04-22 17:20:36.657804000 +0200 ===================================================================
--- audit-1.7.13.orig/audisp/plugins/Makefile.am
+++ audit-1.7.13/audisp/plugins/Makefile.am
@@ -22,7 +22,7 @@ @@ -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 zos-remote remote
+SUBDIRS = builtins +SUBDIRS = builtins
#SUBDIRS = builtins zos-remote #SUBDIRS = builtins zos-remote
if HAVE_PRELUDE if HAVE_PRELUDE
SUBDIRS += prelude SUBDIRS += prelude
Index: audit-1.7.13/docs/Makefile.am
--- 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 --- audit-1.7.13.orig/docs/Makefile.am
@@ -49,5 +49,5 @@ +++ audit-1.7.13/docs/Makefile.am
@@ -52,5 +52,5 @@ ausearch_add_expression.3 ausearch_add_t
ausearch_clear.3 \ ausearch_clear.3 \
ausearch_next_event.3 ausearch_set_stop.3 \ ausearch_next_event.3 ausearch_set_stop.3 \
autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \ autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \

26
audit-no_python.patch
View File

@ -6,9 +6,11 @@ Python code is disabled for audit.spec. Built manually by audit-libs-python.spe
This is apparantly necessary due to the SuSE build system. Bit of a PITA but This is apparantly necessary due to the SuSE build system. Bit of a PITA but
there you have it. there you have it.
--- audit-1.7.7/configure.ac.orig 2008-09-23 01:24:06.345492000 +0200 Index: audit-1.7.13/configure.ac
+++ audit-1.7.7/configure.ac 2008-09-23 01:25:15.325453000 +0200 ===================================================================
@@ -39,7 +39,6 @@ --- audit-1.7.13.orig/configure.ac
+++ audit-1.7.13/configure.ac
@@ -39,7 +39,6 @@ AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
@ -16,7 +18,7 @@ there you have it.
OLDLIBS="$LIBS" OLDLIBS="$LIBS"
m4_include([src/libev/libev.m4]) m4_include([src/libev/libev.m4])
libev_LIBS="$LIBS" libev_LIBS="$LIBS"
@@ -195,7 +195,8 @@ @@ -202,7 +201,8 @@ AC_SUBST(libev_LIBS)
AC_SUBST(LIBPRELUDE_CFLAGS) AC_SUBST(LIBPRELUDE_CFLAGS)
AC_SUBST(LIBPRELUDE_LDFLAGS) AC_SUBST(LIBPRELUDE_LDFLAGS)
@ -26,8 +28,10 @@ there you have it.
echo . echo .
echo " echo "
--- audit-1.7.7/Makefile.am.orig 2008-09-23 01:24:26.915901000 +0200 Index: audit-1.7.13/Makefile.am
+++ audit-1.7.7/Makefile.am 2008-09-23 01:25:43.035708000 +0200 ===================================================================
--- audit-1.7.13.orig/Makefile.am
+++ audit-1.7.13/Makefile.am
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
# Rickard E. (Rik) Faith <faith@redhat.com> # Rickard E. (Rik) Faith <faith@redhat.com>
# #
@ -39,13 +43,15 @@ there you have it.
EXTRA_DIST = ChangeLog AUTHORS NEWS README INSTALL audit.spec \ EXTRA_DIST = ChangeLog AUTHORS NEWS README INSTALL audit.spec \
contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \ contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \
contrib/stig.rules contrib/skeleton.c contrib/avc_snap \ contrib/stig.rules contrib/skeleton.c contrib/avc_snap \
--- audit-1.7.7/auparse/Makefile.am.orig 2008-09-23 20:45:53.245409000 +0200 Index: audit-1.7.13/auparse/Makefile.am
+++ audit-1.7.7/auparse/Makefile.am 2008-09-23 20:46:02.659985000 +0200 ===================================================================
--- audit-1.7.13.orig/auparse/Makefile.am
+++ audit-1.7.13/auparse/Makefile.am
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
# Steve Grubb <sgrubb@redhat.com> # Steve Grubb <sgrubb@redhat.com>
# #
-SUBDIRS = test -SUBDIRS = test
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
CONFIG_CLEAN_FILES = Makefile.in *.loT *.rej *.orig CONFIG_CLEAN_FILES = *.loT *.rej *.orig
AM_CFLAGS = -fPIC -DPIC -D_GNU_SOURCE -g AM_CFLAGS = -fPIC -DPIC -D_GNU_SOURCE -g ${DEBUG}

2
audit-secondary.spec
View File

@ -26,7 +26,7 @@ Summary: Python Bindings for libaudit
License: GPL v2 or later License: GPL v2 or later
Group: System/Monitoring Group: System/Monitoring
Version: 1.7.13 Version: 1.7.13
Release: 3 Release: 4
Url: http://people.redhat.com/sgrubb/audit/ Url: http://people.redhat.com/sgrubb/audit/
Source0: audit-%{version}.tar.bz2 Source0: audit-%{version}.tar.bz2
Patch0: audit-no_sca.patch Patch0: audit-no_sca.patch

11
audit.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jun 20 12:33:00 CEST 2009 - cmorve69@yahoo.es Sat Jun 20 12:33:00 CEST 2009 - cmorve69@yahoo.es

21
audit.spec
View File

@ -22,7 +22,7 @@ Name: audit
BuildRequires: gcc-c++ tcpd-devel BuildRequires: gcc-c++ tcpd-devel
Summary: User Space Tools for 2.6 Kernel Auditing Summary: User Space Tools for 2.6 Kernel Auditing
Version: 1.7.13 Version: 1.7.13
Release: 3 Release: 4
License: GPL v2 or later License: GPL v2 or later
Group: System/Monitoring Group: System/Monitoring
Url: http://people.redhat.com/sgrubb/audit/ Url: http://people.redhat.com/sgrubb/audit/
@ -73,7 +73,7 @@ Authors:
Summary: Header files and static library for libaudit Summary: Header files and static library for libaudit
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version} glibc-devel
%description devel %description devel
The audit-devel package contains the static libraries and header files The audit-devel package contains the static libraries and header files
@ -99,8 +99,11 @@ autoreconf -fi
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
# no krb support (omit --enable-gssapi-krb5=yes), see audit-no-gss.patch # 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 %configure --sbindir=/sbin \
make --libdir=/%{_lib} --libexecdir=%{_prefix}/lib/%{name} \
--with-apparmor --with-libwrap \
--disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
%install %install
mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}} mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}}
@ -112,12 +115,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_includedir}
mkdir -p $RPM_BUILD_ROOT/%{_libdir} mkdir -p $RPM_BUILD_ROOT/%{_libdir}
# We manually install this since Makefile doesn't # We manually install this since Makefile doesn't
install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir} install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir}
# This winds up in the wrong place when libtool is involved for libname in libaudit libauparse;do
rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so $RPM_BUILD_ROOT/%{_lib}/libauparse.so %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/$libname.so) %{buildroot}%{_libdir}/$libname.so
ln -sf /%{_lib}/libaudit.so.0 $RPM_BUILD_ROOT%{_libdir}/libaudit.so %{__rm} -v %{buildroot}/%{_lib}/$libname.{so,la}
ln -sf /%{_lib}/libauparse.so.0 $RPM_BUILD_ROOT%{_libdir}/libauparse.so done
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 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd
# delete redhat script, use ours # delete redhat script, use ours