diff mbox series

[meta-oe,14/96] audit: upgrade 4.1.4 -> 4.2.1

Message ID 20261115074918.2932593-14-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,01/96] crow: upgrade 1.3.4 -> 1.3.5 | expand

Commit Message

Khem Raj Nov. 15, 2026, 7:47 a.m. UTC
Drop 0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch, included
in this release, and inherit bash-completion for the newly installed
completion scripts.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...te-ax_prog_cc_for_build.m4-to-latest.patch | 196 ------------------
 .../audit/{audit_4.1.4.bb => audit_4.2.1.bb}  |   5 +-
 2 files changed, 2 insertions(+), 199 deletions(-)
 delete mode 100644 meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch
 rename meta-oe/recipes-security/audit/{audit_4.1.4.bb => audit_4.2.1.bb} (95%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch b/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch
deleted file mode 100644
index cf322b8e1a..0000000000
--- a/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch
+++ /dev/null
@@ -1,196 +0,0 @@ 
-From 3da79b330527b5f9d6e6243c8ba12968810965a3 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Fri, 10 Apr 2026 14:53:41 +0200
-Subject: [PATCH] m4: update ax_prog_cc_for_build.m4 to latest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-After the autoconf update to 2.73 this was using -std=gnu23
-even on hosts with gcc-13 which doesn't support it:
-
-ac_cv_prog_ac_ct_CC_FOR_BUILD='gcc '
-ac_cv_prog_cc_c23=-std=gnu23
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cc_stdc=-std=gnu23
-
-Leading to:
-gcc  -std=gnu23 -DHAVE_CONFIG_H -I. -I../../sources/audit-4.1.4/lib -I..  -I. -I../../sources/audit-4.1.4 -I../../sources/audit-4.1.4/auparse -I../../sources/audit-4.1.4/common -isystem/audit/4.1.4/recipe-sysroot-native/usr/include '-DTABLE_H="fieldtab.h"' -isystem/audit/4.1.4/recipe-sysroot-native/usr/include -O2 -pipe -c -o gen_fieldtabs_h-gen_tables.o `test -f 'gen_tables.c' || echo '../../sources/audit-4.1.4/lib/'`gen_tables.c
-gcc: error: unrecognized command-line option ‘-std=gnu23’; did you mean ‘-std=gnu2x’?
-
-Needs the updated ac_cv_prog_cc_c23 from:
-https://github.com/autoconf-archive/autoconf-archive/commit/8a970ce96721f516fef4226e5eca8da341159765
-
-Upstream-Status: Submitted [https://github.com/linux-audit/audit-userspace/pull/524]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
- m4/ax_prog_cc_for_build.m4 | 100 +++++++++++++++++++++++++++----------
- 1 file changed, 75 insertions(+), 25 deletions(-)
-
-diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
-index 77fd346a..4d1de993 100644
---- a/m4/ax_prog_cc_for_build.m4
-+++ b/m4/ax_prog_cc_for_build.m4
-@@ -1,5 +1,5 @@
- # ===========================================================================
--#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
-+#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
- # ===========================================================================
- #
- # SYNOPSIS
-@@ -32,28 +32,32 @@
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
--#serial 8
-+#serial 26
- 
- AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
- AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_CPP])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
- 
- dnl Use the standard macros, but make them use other variable names
- dnl
- pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
- pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
-+pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
-+pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
-+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl
-+pushdef([ac_cv_prog_cc_c23], ac_cv_build_prog_cc_c23)dnl
-+pushdef([ac_cv_prog_cc_stdc], ac_cv_build_prog_cc_stdc)dnl
- pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
- pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
- pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
--pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
--pushdef([ac_cv_objext], ac_cv_build_objext)dnl
-+pushdef([ac_prog_cc_stdc], ac_build_prog_cc_stdc)dnl
- pushdef([ac_exeext], ac_build_exeext)dnl
- pushdef([ac_objext], ac_build_objext)dnl
- pushdef([CC], CC_FOR_BUILD)dnl
- pushdef([CPP], CPP_FOR_BUILD)dnl
-+pushdef([GCC], GCC_FOR_BUILD)dnl
- pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
- pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
- pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
-@@ -67,27 +71,58 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
- pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
- pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
- pushdef([ac_cv_host_os], ac_cv_build_os)dnl
--pushdef([ac_cpp], ac_build_cpp)dnl
--pushdef([ac_compile], ac_build_compile)dnl
--pushdef([ac_link], ac_build_link)dnl
-+pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
-+pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl
-+pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl
-+pushdef([cross_compiling], cross_compiling_build)dnl
-+dnl
-+dnl These variables are problematic to rename by M4 macros, so we save
-+dnl their values in alternative names, and restore the values later.
-+dnl
-+dnl _AC_COMPILER_EXEEXT and _AC_COMPILER_OBJEXT internally call
-+dnl AC_SUBST which prevents the renaming of EXEEXT and OBJEXT
-+dnl variables. It's not a good idea to rename ac_cv_exeext and
-+dnl ac_cv_objext either as they're related.
-+dnl Renaming ac_exeext and ac_objext is safe though.
-+dnl
-+ac_cv_host_exeext=$ac_cv_exeext
-+AS_VAR_SET_IF([ac_cv_build_exeext],
-+  [ac_cv_exeext=$ac_cv_build_exeext],
-+  [AS_UNSET([ac_cv_exeext])])
-+ac_cv_host_objext=$ac_cv_objext
-+AS_VAR_SET_IF([ac_cv_build_objext],
-+  [ac_cv_objext=$ac_cv_build_objext],
-+  [AS_UNSET([ac_cv_objext])])
-+dnl
-+dnl ac_cv_c_compiler_gnu is used in _AC_LANG_COMPILER_GNU (called by
-+dnl AC_PROG_CC) indirectly.
-+dnl
-+ac_cv_host_c_compiler_gnu=$ac_cv_c_compiler_gnu
-+AS_VAR_SET_IF([ac_cv_build_c_compiler_gnu],
-+  [ac_cv_c_compiler_gnu=$ac_cv_build_c_compiler_gnu],
-+  [AS_UNSET([ac_cv_c_compiler_gnu])])
-+
-+cross_compiling_build=no
- 
--save_cross_compiling=$cross_compiling
--save_ac_tool_prefix=$ac_tool_prefix
--cross_compiling=no
--ac_tool_prefix=
-+ac_build_tool_prefix=
-+AS_IF([test -n "$build"],      [ac_build_tool_prefix="$build-"],
-+      [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
- 
-+AC_LANG_PUSH([C])
- AC_PROG_CC
-+_AC_COMPILER_EXEEXT
-+_AC_COMPILER_OBJEXT
- AC_PROG_CPP
--AC_EXEEXT
- 
--ac_tool_prefix=$save_ac_tool_prefix
--cross_compiling=$save_cross_compiling
-+BUILD_EXEEXT=$ac_cv_exeext
-+BUILD_OBJEXT=$ac_cv_objext
- 
- dnl Restore the old definitions
- dnl
--popdef([ac_link])dnl
--popdef([ac_compile])dnl
--popdef([ac_cpp])dnl
-+popdef([cross_compiling])dnl
-+popdef([am_cv_prog_cc_c_o])dnl
-+popdef([am_cv_CC_dependencies_compiler_type])dnl
-+popdef([ac_tool_prefix])dnl
- popdef([ac_cv_host_os])dnl
- popdef([ac_cv_host_vendor])dnl
- popdef([ac_cv_host_cpu])dnl
-@@ -101,24 +136,39 @@ popdef([host])dnl
- popdef([LDFLAGS])dnl
- popdef([CPPFLAGS])dnl
- popdef([CFLAGS])dnl
-+popdef([GCC])dnl
- popdef([CPP])dnl
- popdef([CC])dnl
- popdef([ac_objext])dnl
- popdef([ac_exeext])dnl
--popdef([ac_cv_objext])dnl
--popdef([ac_cv_exeext])dnl
-+popdef([ac_prog_cc_stdc])dnl
- popdef([ac_cv_prog_cc_g])dnl
- popdef([ac_cv_prog_cc_cross])dnl
- popdef([ac_cv_prog_cc_works])dnl
-+popdef([ac_cv_prog_cc_stdc])dnl
-+popdef([ac_cv_prog_cc_c23])dnl
-+popdef([ac_cv_prog_cc_c11])dnl
-+popdef([ac_cv_prog_cc_c99])dnl
-+popdef([ac_cv_prog_cc_c89])dnl
- popdef([ac_cv_prog_gcc])dnl
- popdef([ac_cv_prog_CPP])dnl
-+dnl
-+ac_cv_exeext=$ac_cv_host_exeext
-+EXEEXT=$ac_cv_host_exeext
-+ac_cv_objext=$ac_cv_host_objext
-+OBJEXT=$ac_cv_host_objext
-+ac_cv_c_compiler_gnu=$ac_cv_host_c_compiler_gnu
-+ac_compiler_gnu=$ac_cv_host_c_compiler_gnu
-+
-+dnl restore global variables ac_ext, ac_cpp, ac_compile,
-+dnl ac_link, ac_compiler_gnu (dependent on the current
-+dnl language after popping):
-+AC_LANG_POP([C])
- 
- dnl Finally, set Makefile variables
- dnl
--BUILD_EXEEXT=$ac_build_exeext
--BUILD_OBJEXT=$ac_build_objext
--AC_SUBST(BUILD_EXEEXT)dnl
--AC_SUBST(BUILD_OBJEXT)dnl
-+AC_SUBST([BUILD_EXEEXT])dnl
-+AC_SUBST([BUILD_OBJEXT])dnl
- AC_SUBST([CFLAGS_FOR_BUILD])dnl
- AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
- AC_SUBST([LDFLAGS_FOR_BUILD])dnl
diff --git a/meta-oe/recipes-security/audit/audit_4.1.4.bb b/meta-oe/recipes-security/audit/audit_4.2.1.bb
similarity index 95%
rename from meta-oe/recipes-security/audit/audit_4.1.4.bb
rename to meta-oe/recipes-security/audit/audit_4.2.1.bb
index 363746ccf0..4a764a1257 100644
--- a/meta-oe/recipes-security/audit/audit_4.1.4.bb
+++ b/meta-oe/recipes-security/audit/audit_4.2.1.bb
@@ -9,13 +9,12 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https;tag=v${PV} \
            file://0001-Fixed-swig-host-contamination-issue.patch \
-           file://0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch \
            file://auditd \
           "
 
-SRCREV = "07eea50408d28c953d4048dfef3da6556ce4b569"
+SRCREV = "00659601cc23dc243bb0f451977636ff77fcf80f"
 
-inherit autotools python3targetconfig update-rc.d systemd
+inherit autotools python3targetconfig update-rc.d systemd bash-completion
 
 UPDATERCPN = "auditd"
 INITSCRIPT_NAME = "auditd"