mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:59:02 +08:00
[audit] update to version 4.0.2 and fix the issue of multiple definitions of a function (#40703)
Co-authored-by: Jon <v-zhli17@microsoft.com>
This commit is contained in:
parent
c9b1114d69
commit
e4547aa871
26
ports/audit/fix-multiple-def.patch
Normal file
26
ports/audit/fix-multiple-def.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/src/ausearch-lookup.c b/src/ausearch-lookup.c
|
||||||
|
index 2d6f48c..8c610e9 100644
|
||||||
|
--- a/src/ausearch-lookup.c
|
||||||
|
+++ b/src/ausearch-lookup.c
|
||||||
|
@@ -242,7 +242,7 @@ const char *aulookup_uid(uid_t uid, char *buf, size_t size)
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void aulookup_destroy_uid_list(void)
|
||||||
|
+void aulookup_destroy_uid_nvl_list(void)
|
||||||
|
{
|
||||||
|
if (uid_list_created == 0)
|
||||||
|
return;
|
||||||
|
diff --git a/src/ausearch-lookup.h b/src/ausearch-lookup.h
|
||||||
|
index c80f782..67f1e56 100644
|
||||||
|
--- a/src/ausearch-lookup.h
|
||||||
|
+++ b/src/ausearch-lookup.h
|
||||||
|
@@ -38,7 +38,7 @@ const char *aulookup_syscall(llist *l, char *buf, size_t size)
|
||||||
|
__attr_access ((__write_only__, 2, 3));
|
||||||
|
const char *aulookup_uid(uid_t uid, char *buf, size_t size)
|
||||||
|
__attr_access ((__write_only__, 2, 3));
|
||||||
|
-void aulookup_destroy_uid_list(void);
|
||||||
|
+void aulookup_destroy_uid_nvl_list(void);
|
||||||
|
char *unescape(const char *buf);
|
||||||
|
void print_tty_data(const char *val);
|
||||||
|
void safe_print_string_n(const char *s, unsigned int len, int ret)
|
@ -1,17 +1,11 @@
|
|||||||
vcpkg_download_distfile(PATCH_FIX_MISSING_HEADERS_IN_AUDISP_FILTER
|
|
||||||
URLS https://github.com/linux-audit/audit-userspace/commit/f8e9bc5914d715cdacb2edc938ab339d5094d017.patch?full_index=1
|
|
||||||
SHA512 b9606c711befe99ce9540b9885e943733ab06faa55d32bf029b23e1984adf2e914d46bd95b81a2517380c6b9e714b3b3d2181b86586c97dc09a0418ae40bd33f
|
|
||||||
FILENAME 0000-fix-missing-header-in-audisp-filter.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO linux-audit/audit-userspace
|
REPO linux-audit/audit-userspace
|
||||||
SHA512 297664a55ab44b40c9280202c19612cfbfdacc209c4d226461ea5faa638e35617cb516e53d1f0bc3748cdd038d9524f3e5ebe11c8de4a5511ab4f12b7d06478c
|
SHA512 558b9211a5dc1062eee98aa7bcd292797f06109a8ee735da1d704bc18d97b0bee93487ef9303404016df2e08cff32d90f1dd056797ac05beaabe3cccb5db5af2
|
||||||
REF "v${VERSION}"
|
REF "v${VERSION}"
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
"${PATCH_FIX_MISSING_HEADERS_IN_AUDISP_FILTER}"
|
fix-multiple-def.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n"
|
message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "audit",
|
"name": "audit",
|
||||||
"version": "4.0.1",
|
"version": "4.0.2",
|
||||||
"description": "Library for working with audit subsystem",
|
"description": "Library for working with audit subsystem",
|
||||||
"homepage": "https://github.com/linux-audit/audit-userspace",
|
"homepage": "https://github.com/linux-audit/audit-userspace",
|
||||||
"license": "GPL-2.0-or-later OR LGPL-2.1-or-later",
|
"license": "GPL-2.0-or-later OR LGPL-2.1-or-later",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "7bc8ba38796968e68cd87e9537c85a803c203b1a",
|
||||||
|
"version": "4.0.2",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "926ccd42caae517216220ee699e30c86abdf7ed9",
|
"git-tree": "926ccd42caae517216220ee699e30c86abdf7ed9",
|
||||||
"version": "4.0.1",
|
"version": "4.0.1",
|
||||||
|
@ -345,7 +345,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"audit": {
|
"audit": {
|
||||||
"baseline": "4.0.1",
|
"baseline": "4.0.2",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"aurora": {
|
"aurora": {
|
||||||
|
Loading…
Reference in New Issue
Block a user