- updated to 2.1.1

- enabled tcp_wrappers (libwrap) support, added nolibs patch to avoid libnsl linking

Changed files:
    audit-nolibs.patch -> 1.1
    audit.spec -> 1.81

diff --git a/audit-nolibs.patch b/audit-nolibs.patch
new file mode 100644 (file)
index 0000000..bb3cd75
--- /dev/null
+++ b/audit-nolibs.patch
@@ -0,0 +1,20 @@
+--- audit-2.1.1/configure.ac.orig      2011-04-20 22:53:56.000000000 +0200
++++ audit-2.1.1/configure.ac   2011-04-23 08:24:34.033844797 +0200
+@@ -193,8 +193,6 @@
+               AC_CHECK_HEADER(tcpd.h, [],
+                       AC_MSG_ERROR([Could not find libwrap headers]),)
+               AC_CHECK_LIB(wrap, request_init, [ LIBWRAP_LIBS="-lwrap" ])
+-              AC_CHECK_LIB(nsl, yp_get_default_domain, [
+-                      LIBWRAP_LIBS="$LIBWRAP_LIBS -lnsl" ])
+               ;;
+       *)
+               AC_MSG_RESULT(yes)
+@@ -206,8 +204,6 @@
+               AC_CHECK_HEADER(tcpd.h, [],
+                       AC_MSG_ERROR([Could not find libwrap headers]))
+               AC_CHECK_LIB(wrap, request_init, [])
+-              AC_CHECK_LIB(nsl, yp_get_default_domain, [
+-                      LIBWRAP_LIBS="$LIBWRAP_LIBS -lnsl" ])
+               OLDLIBS="$LIBS"
+               LIBS="$LIBWRAP_LIBS $LIBS"
+               AC_TRY_LINK([ int allow_severity; int deny_severity; ],

diff --git a/audit.spec b/audit.spec
index c4749d4645d35ce335f12f21c672086fc0fa9a3f..f793f49359075e333b1649a4f5c535f6ba9aaac6 100644 (file)
--- a/audit.spec
+++ b/audit.spec
@@ -7,16 +7,17 @@
 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:       2.1
+Version:       2.1.1
 Release:       1
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5: 5a936571764a4d39eae69c2958331e20
+# Source0-md5: 24c15eb02a100b0fcf809a29b32f0dbd
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-m4.patch
+Patch2:                %{name}-nolibs.patch
 URL:           http://people.redhat.com/sgrubb/audit/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
@@ -26,6 +27,7 @@ BuildRequires:        heimdal-devel
 BuildRequires: libcap-ng-devel
 %{?with_prelude:BuildRequires: libprelude-devel}
 BuildRequires: libtool
+BuildRequires: libwrap-devel
 BuildRequires: linux-libc-headers >= 7:2.6.20
 BuildRequires: openldap-devel
 %if %{with python}
@@ -133,6 +135,7 @@ Pythonowy interfejs do biblioteki libaudit.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if %{without python}
 sed 's#swig/Makefile ##' -i configure.ac
@@ -146,8 +149,9 @@ sed 's/swig//' -i Makefile.am
 %{__autoheader}
 %{__automake}
 %configure \
-       --with-apparmor \
        --enable-gssapi-krb5 \
+       --with-apparmor \
+       --with-libwrap \
        %{?with_prelude:--with-prelude}
 # override auditd_{C,LD}FLAGS to avoid -fPIE unsupported by gcc 3.3
 %{__make} \