已开启
backport patches for fixing Wincompatible-pointer-types when building with newer compilers #193
jchzhou创建于 2025年8月27日
backport patches for fixing Wincompatible-pointer-types when building with newer compilers #193
已开启
从refs/pull/193/head合入到openEuler-24.03-LTS-Next
共 2 个文件变更+41-1
| @@ -2,7 +2,7 @@ Summary: User space tools for kernel auditing | |||
| 2 | Name: audit | 2 | Name: audit |
| 3 | Epoch: 1 | 3 | Epoch: 1 |
| 4 | Version: 3.1.2 | 4 | Version: 3.1.2 |
| 5 | -Release: 12 | 5 | +Release: 13 |
| 6 | License: GPLv2+ and LGPLv2+ | 6 | License: GPLv2+ and LGPLv2+ |
| 7 | URL: https://people.redhat.com/sgrubb/audit/ | 7 | URL: https://people.redhat.com/sgrubb/audit/ |
| 8 | Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz | 8 | Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz |
| @@ -65,6 +65,7 @@ Patch51: backport-make-slist_last-a-static-function.patch | |||
| 65 | Patch52: backport-code-cleanup-constification-deadcode-removal-lower-s.patch | 65 | Patch52: backport-code-cleanup-constification-deadcode-removal-lower-s.patch |
| 66 | # https://github.com/linux-audit/audit-userspace/commit/8c7eaa7ead6c70486623674c19d649f3831578ad | 66 | # https://github.com/linux-audit/audit-userspace/commit/8c7eaa7ead6c70486623674c19d649f3831578ad |
| 67 | Patch53: backport-Implicit-builtin-functions.patch | 67 | Patch53: backport-Implicit-builtin-functions.patch |
| 68 | +Patch54: backport-Fix-introduced-warnings.patch | ||
| 68 | 69 | ||
| 69 | BuildRequires: gcc swig libtool systemd kernel-headers >= 2.6.29 | 70 | BuildRequires: gcc swig libtool systemd kernel-headers >= 2.6.29 |
| 70 | BuildRequires: openldap-devel krb5-devel libcap-ng-devel | 71 | BuildRequires: openldap-devel krb5-devel libcap-ng-devel |
| @@ -406,6 +407,9 @@ fi | |||
| 406 | %attr(644,root,root) %{_mandir}/man8/*.8.gz | 407 | %attr(644,root,root) %{_mandir}/man8/*.8.gz |
| 407 | 408 | ||
| 408 | %changelog | 409 | %changelog |
| 410 | +* Tue Aug 26 2025 jchzhou <zhoujiacheng@iscas.ac.cn>- 1:3.1.2-13 | ||
| 411 | +- backport patches for fixing Wincompatible-pointer-types when building with newer compilers | ||
| 412 | + | ||
| 409 | * Tue Aug 26 2025 jchzhou <zhoujiacheng@iscas.ac.cn>- 1:3.1.2-12 | 413 | * Tue Aug 26 2025 jchzhou <zhoujiacheng@iscas.ac.cn>- 1:3.1.2-12 |
| 410 | - backport patches for fixing Wimplicit-function-declaration, Wbuiltin-declaration-mismatch when building with newer compilers | 414 | - backport patches for fixing Wimplicit-function-declaration, Wbuiltin-declaration-mismatch when building with newer compilers |
| 411 | 415 | ||
| @@ -0,0 +1,36 @@ | |||
| 1 | +From b8479df52ce3f286ba010268527c9c280abaf478 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: Steve Grubb <ausearch.1@gmail.com> | ||
| 3 | +Date: Sun, 5 Nov 2023 15:10:46 -0500 | ||
| 4 | +Subject: [PATCH] Fix introduced warnings | ||
| 5 | + | ||
| 6 | +Reference:https://github.com/linux-audit/audit-userspace/commit/b8479df52ce3f286ba010268527c9c280abaf478 | ||
| 7 | +Conflict:NA | ||
| 8 | +--- | ||
| 9 | + src/auditd-config.c | 4 ++-- | ||
| 10 | + 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | + | ||
| 12 | +diff --git a/src/auditd-config.c b/src/auditd-config.c | ||
| 13 | +index 6a860fa..b2992e6 100644 | ||
| 14 | +--- a/src/auditd-config.c | ||
| 15 | ++++ b/src/auditd-config.c | ||
| 16 | +@@ -53,7 +53,7 @@ struct nv_pair | ||
| 17 | + struct kw_pair | ||
| 18 | + { | ||
| 19 | + const char *name; | ||
| 20 | +- int (*parser)(struct nv_pair *, int, struct daemon_conf *); | ||
| 21 | ++ int (*parser)(const struct nv_pair *, int, struct daemon_conf *); | ||
| 22 | + int max_options; | ||
| 23 | + }; | ||
| 24 | + | ||
| 25 | +@@ -727,7 +727,7 @@ static int qos_parser(const struct nv_pair *nv, int line, | ||
| 26 | + return 0; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | +-static int dispatch_parser(const const struct nv_pair *nv, int line, | ||
| 30 | ++static int dispatch_parser(const struct nv_pair *nv, int line, | ||
| 31 | + struct daemon_conf *config) | ||
| 32 | + { | ||
| 33 | + audit_msg(LOG_DEBUG, "dispatch_parser called with: %s", nv->value); | ||
| 34 | +-- | ||
| 35 | +2.50.1 | ||
| 36 | + | ||
感谢审阅，我改一下