packages: audit/audit.spec, audit/audit-m4.patch (NEW) - up to 2.0

[arekm]

Author: arekm                        Date: Tue Aug 18 09:14:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0

---- Files affected:
packages/audit:
   audit.spec (1.72 -> 1.73) , audit-m4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/audit/audit.spec
diff -u packages/audit/audit.spec:1.72 packages/audit/audit.spec:1.73
--- packages/audit/audit.spec:1.72	Mon Jul  6 13:02:52 2009
+++ packages/audit/audit.spec	Tue Aug 18 11:14:23 2009
@@ -8,16 +8,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:	1.7.13
-Release:	5
+Version:	2.0
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5:	967776cbec046043ef02ffefe0e89cb7
+# Source0-md5:	d0c064c4646f8fe5c50de789c627f2da
 Source2:	%{name}d.init
 Source3:	%{name}d.sysconfig
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-pthread.patch
+Patch2:		%{name}-m4.patch
 URL:		http://people.redhat.com/sgrubb/audit/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -153,27 +154,19 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if !%{with python}
 sed 's#swig/Makefile ##' -i configure.ac
 sed 's/swig//' -i Makefile.am
 %endif
 
-sed -i -e 's,/main\.py,/main.pyc,' system-config-audit/src/system-config-audit.in
-
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd system-config-audit
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
 %configure \
 	--with-apparmor \
 	--enable-gssapi-krb5 \
@@ -216,9 +209,6 @@
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/*.py
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
-
-%py_postclean $RPM_BUILD_ROOT%{_datadir}/system-config-audit
-%find_lang system-config-audit
 %endif
 
 %clean
@@ -286,7 +276,7 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libaudit.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libaudit.so.0
+%attr(755,root,root) %ghost /%{_lib}/libaudit.so.1
 %attr(755,root,root) /%{_lib}/libauparse.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libauparse.so.0
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libaudit.conf
@@ -326,13 +316,6 @@
 %attr(755,root,root) %{py_sitedir}/_audit.so
 %attr(755,root,root) %{py_sitedir}/auparse.so
 %{py_sitedir}/audit.py[co]
-
-%files -n system-config-audit -f system-config-audit.lang
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/system-config-audit
-%attr(755,root,root) %{_libexecdir}/system-config-audit-server
-%{_datadir}/system-config-audit
-%{_desktopdir}/system-config-audit.desktop
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -341,6 +324,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2009/08/18 09:14:23  arekm
+- up to 2.0
+
 Revision 1.72  2009/07/06 11:02:52  baggins
 - rel 5
 - add BR heimdal-devel

================================================================
Index: packages/audit/audit-m4.patch
diff -u /dev/null packages/audit/audit-m4.patch:1.1
--- /dev/null	Tue Aug 18 11:14:28 2009
+++ packages/audit/audit-m4.patch	Tue Aug 18 11:14:23 2009
@@ -0,0 +1,45 @@
+diff -urN audit-2.0.org/acinclude.m4 audit-2.0/acinclude.m4
+--- audit-2.0.org/acinclude.m4	1970-01-01 01:00:00.000000000 +0100
++++ audit-2.0/acinclude.m4	2009-08-18 11:11:24.700738677 +0200
+@@ -0,0 +1,41 @@
++# libcap-ng.m4 - Checks for the libcap-ng support
++# 	Copyright (c) 2009 Steve Grubb sgrubb at redhat.com
++#
++AC_DEFUN([LIBCAP_NG_PATH],
++[
++  AC_ARG_WITH(libcap-ng,
++    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
++    with_libcap_ng=auto)
++
++  # Check for Libcap-ng API
++  #
++  # libcap-ng detection
++
++  if test x$with_libcap_ng = xno ; then
++      have_libcap_ng=no;
++  else
++      # Start by checking for header file
++      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
++
++      # See if we have libcap-ng library
++      AC_CHECK_LIB(cap-ng, capng_clear,
++	         CAPNG_LDADD=-lcap-ng,)
++
++      # Check results are usable
++      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
++         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
++      fi
++      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
++         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
++      fi
++  fi
++  AC_SUBST(CAPNG_LDADD)
++  AC_MSG_CHECKING(whether to use libcap-ng)
++  if test x$CAPNG_LDADD != x ; then
++      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
++      AC_MSG_RESULT(yes)
++  else
++      AC_MSG_RESULT(no)
++  fi
++])
++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/audit.spec?r1=1.72&r2=1.73&f=u