SHA256
1
0
forked from pool/audit

Accepting request 173998 from security

- audit-no_m4_dir.patch: Removed AC_CONFIG_MACRO_DIR([m4]) from
  configure.ac to fix build with new automake

  buildrequired and the lack of those requires causes a broken
  configure script after autoreconf add pkgconfig(libcap-ng)
  to both audit and audit-secondary, cap-ng is actually only
  use in the latter.

OBS-URL: https://build.opensuse.org/request/show/173998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audit?expand=0&rev=64
This commit is contained in:
Stephan Kulow 2013-05-02 13:29:17 +00:00 committed by Git OBS Bridge
commit f01c67e5ca
3 changed files with 27 additions and 4 deletions

15
audit-no_m4_dir.patch Normal file
View File

@ -0,0 +1,15 @@
From: Maximilian Meister <mmeister@suse.de>
Subject: Remove AC_CONFIG_MACRO_DIR([m4]) from configure.ac
audit cannnot build with automake-1.13.1 when looking for a m4 directory
--- configure.ac.orig 2013-04-26 13:09:46.019388414 +0200
+++ configure.ac 2013-04-26 13:10:54.607385058 +0200
@@ -35,7 +35,6 @@
echo Configuring auditd $VERSION
-AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL

View File

@ -1,11 +1,17 @@
-------------------------------------------------------------------
Fri Apr 26 11:14:39 UTC 2013 - mmeister@suse.com
- audit-no_m4_dir.patch: Removed AC_CONFIG_MACRO_DIR([m4]) from
configure.ac to fix build with new automake
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 25 17:25:31 UTC 2013 - crrodriguez@opensuse.org Mon Mar 25 17:25:31 UTC 2013 - crrodriguez@opensuse.org
- --with-libcap-ng=yes has no effect if libcap-ng is not - --with-libcap-ng=yes has no effect if libcap-ng is not
buildrequired and the lack of those requires causes a broken buildrequired and the lack of those requires causes a broken
configure script after autoreconf add pkgconfig(libcap-ng) configure script after autoreconf add pkgconfig(libcap-ng)
to both audit and audit-secondary, cap-ng is actually only to both audit and audit-secondary, cap-ng is actually only
use in the latter. use in the latter.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 25 16:58:10 UTC 2013 - crrodriguez@opensuse.org Mon Mar 25 16:58:10 UTC 2013 - crrodriguez@opensuse.org

View File

@ -29,6 +29,7 @@ Source3: baselibs.conf
Source4: README-BEFORE-ADDING-PATCHES Source4: README-BEFORE-ADDING-PATCHES
Patch2: audit-no_plugins.patch Patch2: audit-no_plugins.patch
Patch3: audit-no-gss.patch Patch3: audit-no-gss.patch
Patch4: audit-no_m4_dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.12 BuildRequires: autoconf >= 2.12
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -81,6 +82,7 @@ libraries.
%setup -q %setup -q
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4
%build %build
autoreconf -fi autoreconf -fi