Author: jajcus Date: Fri Apr 27 12:42:54 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- heimdal and openldap dependencies made optional
---- Files affected:
packages/audit:
audit.spec (1.88 -> 1.89) , audit-no_zos_remote.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/audit/audit.spec
diff -u packages/audit/audit.spec:1.88 packages/audit/audit.spec:1.89
--- packages/audit/audit.spec:1.88 Tue Apr 17 18:59:24 2012
+++ packages/audit/audit.spec Fri Apr 27 14:42:49 2012
@@ -1,9 +1,11 @@
# $Revision$, $Date$
#
# Conditional build:
+%bcond_without kerberos5 # do not build with heimdal
%bcond_without pie # auditd as PIE binary
%bcond_without prelude # prelude audisp plugin
%bcond_without python # don't build python bindings
+%bcond_without zos_remote # do not build zos-remote audisp plugin (LDAP dep)
#
Summary: User space tools for 2.6 kernel auditing
Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika do audytu jąder 2.6
@@ -20,18 +22,19 @@
Patch0: %{name}-install.patch
Patch1: %{name}-m4.patch
Patch2: %{name}-nolibs.patch
+Patch3: %{name}-no_zos_remote.patch
URL: http://people.redhat.com/sgrubb/audit/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
%{?with_pie:BuildRequires: gcc >= 5:3.4}
BuildRequires: glibc-headers >= 6:2.3.6
-BuildRequires: heimdal-devel
+%{?with_kerberos5:BuildRequires: heimdal-devel}
BuildRequires: libcap-ng-devel
%{?with_prelude:BuildRequires: libprelude-devel}
BuildRequires: libtool
BuildRequires: libwrap-devel
BuildRequires: linux-libc-headers >= 7:2.6.30
-BuildRequires: openldap-devel
+%{?with_zos_remote:BuildRequires: openldap-devel}
%if %{with python}
BuildRequires: python-devel >= 1:2.5
BuildRequires: rpm-pythonprov
@@ -141,6 +144,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%{!?with_zos_remote:%patch3 -p1}
%if %{without python}
sed 's#swig/Makefile ##' -i configure.ac
@@ -154,7 +158,7 @@
%{__autoheader}
%{__automake}
%configure \
- --enable-gssapi-krb5 \
+ %{?with_kerberos5:--enable-gssapi-krb5} \
--with-apparmor \
--with-libwrap \
%{?with_prelude:--with-prelude}
@@ -237,15 +241,15 @@
%attr(750,root,root) %{_sbindir}/ausearch
%attr(750,root,root) %{_sbindir}/autrace
%attr(755,root,root) %{_sbindir}/audisp-remote
-%attr(755,root,root) %{_sbindir}/audispd-zos-remote
+%{?with_zose_remote:%attr(755,root,root) %{_sbindir}/audispd-zos-remote}
%dir %{_sysconfdir}/audisp
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/audispd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/audisp-remote.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/zos-remote.conf
+%{?with_zose_remote:%attr(640,root,root) %config(noreplace) %verify(not md5
mtime size) %{_sysconfdir}/audisp/zos-remote.conf}
%dir %{_sysconfdir}/audisp/plugins.d
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/plugins.d/af_unix.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/plugins.d/au-remote.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/plugins.d/audispd-zos-remote.conf
+%{?with_zose_remote:%attr(640,root,root) %config(noreplace) %verify(not md5
mtime size) %{_sysconfdir}/audisp/plugins.d/audispd-zos-remote.conf}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audisp/plugins.d/syslog.conf
%dir %{_sysconfdir}/audit
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/audit/auditd.conf
@@ -258,10 +262,10 @@
%{_mandir}/man5/audisp-remote.conf.5*
%{_mandir}/man5/auditd.conf.5*
%{_mandir}/man5/ausearch-expression.5*
-%{_mandir}/man5/zos-remote.conf.5*
+%{?with_zose_remote:%{_mandir}/man5/zos-remote.conf.5*}
%{_mandir}/man7/audit.rules.7*
%{_mandir}/man8/audisp-remote.8*
-%{_mandir}/man8/audispd-zos-remote.8*
+%{?with_zose_remote:%{_mandir}/man8/audispd-zos-remote.8*}
%{_mandir}/man8/audispd.8*
%{_mandir}/man8/auditctl.8*
%{_mandir}/man8/auditd.8*
@@ -325,6 +329,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2012/04/27 12:42:49 jajcus
+- heimdal and openldap dependencies made optional
+
Revision 1.88 2012/04/17 16:59:24 baggins
- rel 2
- better systemd deps
================================================================
Index: packages/audit/audit-no_zos_remote.patch
diff -u /dev/null packages/audit/audit-no_zos_remote.patch:1.1
--- /dev/null Fri Apr 27 14:42:54 2012
+++ packages/audit/audit-no_zos_remote.patch Fri Apr 27 14:42:49 2012
@@ -0,0 +1,11 @@
+--- audit-2.2.1/audisp/plugins/Makefile.am.orig 2012-03-23
13:42:40.000000000 +0100
++++ audit-2.2.1/audisp/plugins/Makefile.am 2012-04-27 14:35:04.000000000
+0200
+@@ -22,7 +22,7 @@
+
+ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
+
+-SUBDIRS = builtins zos-remote remote
++SUBDIRS = builtins remote
+ #SUBDIRS = builtins zos-remote
+ if HAVE_PRELUDE
+ SUBDIRS += prelude
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/audit/audit.spec?r1=1.88&r2=1.89
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
