From c9dec60b6c2c8212299c4545cb754f223a641245c4d787af400c1b87918ca327 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 29 Apr 2013 10:57:24 +0000 Subject: [PATCH 1/2] Accepting request 173494 from openSUSE:Factory:Staging:Automake - Removed AC_CONFIG_MACRO_DIR([m4]) from configure.ac to fix build with new automake OBS-URL: https://build.opensuse.org/request/show/173494 OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=49 --- audit-no_m4_dir.patch | 15 +++++++++++++++ audit.changes | 6 ++++++ audit.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 audit-no_m4_dir.patch diff --git a/audit-no_m4_dir.patch b/audit-no_m4_dir.patch new file mode 100644 index 0000000..2d5250a --- /dev/null +++ b/audit-no_m4_dir.patch @@ -0,0 +1,15 @@ +From: Maximilian Meister +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 diff --git a/audit.changes b/audit.changes index de5e048..f468dc7 100644 --- a/audit.changes +++ b/audit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 26 11:14:39 UTC 2013 - mmeister@suse.com + +- 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 diff --git a/audit.spec b/audit.spec index d2f5601..583af0a 100644 --- a/audit.spec +++ b/audit.spec @@ -29,6 +29,7 @@ Source3: baselibs.conf Source4: README-BEFORE-ADDING-PATCHES Patch2: audit-no_plugins.patch Patch3: audit-no-gss.patch +Patch4: audit-no_m4_dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.12 BuildRequires: gcc-c++ @@ -81,6 +82,7 @@ libraries. %setup -q %patch2 -p1 %patch3 -p1 +%patch4 %build autoreconf -fi From 6fe93068b6426edb6e8a9e5041c201f36b8b0e14f9a03f4d5c24f5b7e94d6e6a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 30 Apr 2013 13:55:28 +0000 Subject: [PATCH 2/2] - 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/package/show/security/audit?expand=0&rev=50 --- audit.changes | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/audit.changes b/audit.changes index f468dc7..9125f69 100644 --- a/audit.changes +++ b/audit.changes @@ -1,17 +1,17 @@ ------------------------------------------------------------------- Fri Apr 26 11:14:39 UTC 2013 - mmeister@suse.com -- Removed AC_CONFIG_MACRO_DIR([m4]) from configure.ac to fix - build with new automake +- 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 - --with-libcap-ng=yes has no effect if libcap-ng is not -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. + 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. ------------------------------------------------------------------- Mon Mar 25 16:58:10 UTC 2013 - crrodriguez@opensuse.org