- rel 5

- add BR heimdal-devel
- fix linking with pthread

Changed files:
    audit-pthread.patch -> 1.1
    audit.spec -> 1.72

diff --git a/audit-pthread.patch b/audit-pthread.patch
new file mode 100644 (file)
index 0000000..34dd124
--- /dev/null
+++ b/audit-pthread.patch
@@ -0,0 +1,11 @@
+--- audit-1.7.13/src/Makefile.am~      2009-04-21 20:47:18.000000000 +0200
++++ audit-1.7.13/src/Makefile.am       2009-07-06 13:01:03.410269265 +0200
+@@ -34,7 +34,7 @@
+ auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing 
+ auditd_LDFLAGS = -pie -Wl,-z,relro
+ auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
+-auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
++auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs) $(LDADD)
+ 
+ auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
+ auditctl_DEPENDENCIES = mt/libauditmt.a 

diff --git a/audit.spec b/audit.spec
index f49eb2f7dcfb0c86db50ec7a376c7ae1bf49f826..7821219ae60d79a68c8dc0633157274ab7cbd9bd 100644 (file)
--- a/audit.spec
+++ b/audit.spec
@@ -8,7 +8,7 @@ Summary:        User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8):     Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:          audit
 Version:       1.7.13
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
@@ -16,12 +16,14 @@ Source0:    http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Patch0:                %{name}-install.patch
+Patch1:                %{name}-pthread.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: gettext-devel >= 0.14.6
 BuildRequires: glibc-headers >= 6:2.3.6
+BuildRequires: heimdal-devel
 BuildRequires: intltool
 BuildRequires: libstdc++-devel
 %{?with_prelude:BuildRequires: libprelude-devel}
@@ -149,6 +151,7 @@ Narzędzie do zmiany konfiguracji audytu.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if !%{with python}
 sed 's#swig/Makefile ##' -i configure.ac
@@ -172,6 +175,7 @@ cd system-config-audit
 cd ..
 %configure \
        --with-apparmor \
+       --enable-gssapi-krb5 \
        %{?with_prelude:--with-prelude}
 # override auditd_{C,LD}FLAGS to avoid -fPIE unsupported by gcc 3.3
 %{__make} \