* [PR PATCH] audit: update to 3.1.4
@ 2024-06-02 20:28 MIvanchev
2024-06-02 20:33 ` MIvanchev
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-02 20:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
There is a new pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 1214 bytes --]
From 69b290f11d6da25a4fb964c50459de0bfa80f274 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..eb181d4083aa26 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
@ 2024-06-02 20:33 ` MIvanchev
2024-06-15 20:07 ` piekay
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-02 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#issuecomment-2144012612
Comment:
Fixes #50646 (hopefully).
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
2024-06-02 20:33 ` MIvanchev
@ 2024-06-15 20:07 ` piekay
2024-06-15 21:13 ` piekay
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: piekay @ 2024-06-15 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#issuecomment-2170624379
Comment:
https://git.alpinelinux.org/aports/plain/main/audit/musl.patch
Should fix the issue
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
2024-06-02 20:33 ` MIvanchev
2024-06-15 20:07 ` piekay
@ 2024-06-15 21:13 ` piekay
2024-06-16 7:47 ` [PR PATCH] [Updated] " MIvanchev
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: piekay @ 2024-06-15 21:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#issuecomment-2170624379
Comment:
https://git.alpinelinux.org/aports/plain/main/audit/musl.patch
Should fix the issue
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (2 preceding siblings ...)
2024-06-15 21:13 ` piekay
@ 2024-06-16 7:47 ` MIvanchev
2024-06-16 7:50 ` MIvanchev
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-16 7:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 1484 bytes --]
From 6094df4fc16cb7500db5834e34e4a2339d0083de Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..56f94480fbd23d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,13 +15,20 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
*) ;;
esac
+post_patch() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i "${FILESDIR}/musl.patch" ;;
+ *) ;;
+ esac
+}
+
post_install() {
vinstall rules/10-base-config.rules 644 etc/audit/rules.d
vmkdir usr/share/examples/audit/rules.d
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (3 preceding siblings ...)
2024-06-16 7:47 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-06-16 7:50 ` MIvanchev
2024-06-16 7:54 ` MIvanchev
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-16 7:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 3892 bytes --]
From 461847aa9bd98f74e24be411c1210e0c82916d1c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/files/musl.patch | 43 ++++++++++++++++++++++++++++++++++
srcpkgs/audit/template | 13 +++++++---
2 files changed, 53 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/audit/files/musl.patch
diff --git a/srcpkgs/audit/files/musl.patch b/srcpkgs/audit/files/musl.patch
new file mode 100644
index 00000000000000..4a6c77d7e5bdf1
--- /dev/null
+++ b/srcpkgs/audit/files/musl.patch
@@ -0,0 +1,43 @@
+diff --git a/audisp/plugins/remote/queue.c b/audisp/plugins/remote/queue.c
+index bd9f9bd5..16aabb61 100644
+--- a/audisp/plugins/remote/queue.c
++++ b/audisp/plugins/remote/queue.c
+@@ -49,10 +49,8 @@ struct queue
+ };
+
+ /* Local Declarations */
+-static int full_pread(int fd, void *buf, size_t size, off_t offset)
+- __attr_access ((__write_only__, 2, 3));
+-static int full_pwrite(int fd, const void *buf, size_t size, off_t offset)
+- __attr_access ((__read_only__, 2, 3));
++static int full_pread(int fd, void *buf, size_t size, off_t offset);
++static int full_pwrite(int fd, const void *buf, size_t size, off_t offset);
+
+ /* Compile-time expression verification */
+ #define verify(E) do { \
+diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h
+index 2c70e839..05a2eafc 100644
+--- a/audisp/plugins/remote/queue.h
++++ b/audisp/plugins/remote/queue.h
+@@ -54,7 +54,7 @@ void q_close(struct queue *q);
+ * On error, return NULL and set errno. */
+ struct queue *q_open(int q_flags, const char *path, size_t num_entries,
+ size_t entry_size)
+- __attribute_malloc__ __attr_dealloc (q_close, 1) __wur;
++ __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur;
+
+ /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */
+ int q_append(struct queue *q, const char *data);
+diff --git a/auparse/auparse.h b/auparse/auparse.h
+index 6c48967a..c5cdb66d 100644
+--- a/auparse/auparse.h
++++ b/auparse/auparse.h
+@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
+ void auparse_destroy(auparse_state_t *au);
+ void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
+ auparse_state_t *auparse_init(ausource_t source, const void *b)
+- __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
++ __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
+ int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
+ __attr_access ((__read_only__, 2, 3));
+ int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..56f94480fbd23d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,13 +15,20 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
*) ;;
esac
+post_patch() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i "${FILESDIR}/musl.patch" ;;
+ *) ;;
+ esac
+}
+
post_install() {
vinstall rules/10-base-config.rules 644 etc/audit/rules.d
vmkdir usr/share/examples/audit/rules.d
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (4 preceding siblings ...)
2024-06-16 7:50 ` MIvanchev
@ 2024-06-16 7:54 ` MIvanchev
2024-06-16 8:02 ` MIvanchev
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-16 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 1214 bytes --]
From 8a188ebd3a5b64385aa4496abe202e026b674780 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..eb181d4083aa26 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (5 preceding siblings ...)
2024-06-16 7:54 ` MIvanchev
@ 2024-06-16 8:02 ` MIvanchev
2024-06-17 17:18 ` piekay
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-16 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 1214 bytes --]
From c8bc27a6ead4a2f47b576fd8ab5afaef693eedb0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..eb181d4083aa26 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (6 preceding siblings ...)
2024-06-16 8:02 ` MIvanchev
@ 2024-06-17 17:18 ` piekay
2024-06-17 20:03 ` [PR PATCH] [Updated] " MIvanchev
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: piekay @ 2024-06-17 17:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#issuecomment-2173935969
Comment:
I finally had time to test this myself:
With https://git.alpinelinux.org/aports/tree/main/audit/0003-all-get-rid-of-strndupa.patch I can get it to compile for musl
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (7 preceding siblings ...)
2024-06-17 17:18 ` piekay
@ 2024-06-17 20:03 ` MIvanchev
2024-06-17 20:04 ` MIvanchev
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-17 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 3422 bytes --]
From 7b51ba5bd48188c7f3010c6fe552a4af9bbe1574 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/files/musl.patch | 64 ++++++++++++++++++++++++++++++++++
srcpkgs/audit/template | 13 +++++--
2 files changed, 74 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/audit/files/musl.patch
diff --git a/srcpkgs/audit/files/musl.patch b/srcpkgs/audit/files/musl.patch
new file mode 100644
index 00000000000000..dcd7f6330d4cf3
--- /dev/null
+++ b/srcpkgs/audit/files/musl.patch
@@ -0,0 +1,64 @@
+diff --git a/auparse/auparse.c b/auparse/auparse.c
+index 20ebe4f8..ab3d3189 100644
+--- a/auparse/auparse.c
++++ b/auparse/auparse.c
+@@ -1224,12 +1224,23 @@ static int extract_timestamp(const char *b, au_event_t *e)
+ {
+ char *ptr, *tmp;
+ int rc = 1;
++ size_t len;
+
+ e->host = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Optionally grab the node - may or may not be included
+diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
+index 9893afb0..4695817e 100644
+--- a/src/ausearch-lol.c
++++ b/src/ausearch-lol.c
+@@ -178,12 +178,23 @@ static inline char *strndupa(const char *old, size_t n)
+ static int extract_timestamp(const char *b, event *e)
+ {
+ char *ptr, *tmp, *tnode, *ttype;
++ size_t len;
+
+ e->node = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Check to see if this is the node info
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..56f94480fbd23d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,13 +15,20 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
*) ;;
esac
+post_patch() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i "${FILESDIR}/musl.patch" ;;
+ *) ;;
+ esac
+}
+
post_install() {
vinstall rules/10-base-config.rules 644 etc/audit/rules.d
vmkdir usr/share/examples/audit/rules.d
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (8 preceding siblings ...)
2024-06-17 20:03 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-06-17 20:04 ` MIvanchev
2024-06-17 20:17 ` [PR PATCH] [Updated] " MIvanchev
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-17 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 292 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#issuecomment-2174326268
Comment:
@piekay This is a serious issue actually, I'm reporting it to upstream, I've changed the patch a bit to better reflect the original code. Thank you.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (9 preceding siblings ...)
2024-06-17 20:04 ` MIvanchev
@ 2024-06-17 20:17 ` MIvanchev
2024-06-18 16:47 ` [PR REVIEW] " classabbyamp
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-17 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 3489 bytes --]
From c6978ffc3ab742535d96fc6fe6d4c876b4852a66 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/files/musl.patch | 64 ++++++++++++++++++++++++++++++++++
srcpkgs/audit/template | 14 ++++++--
2 files changed, 75 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/audit/files/musl.patch
diff --git a/srcpkgs/audit/files/musl.patch b/srcpkgs/audit/files/musl.patch
new file mode 100644
index 00000000000000..dcd7f6330d4cf3
--- /dev/null
+++ b/srcpkgs/audit/files/musl.patch
@@ -0,0 +1,64 @@
+diff --git a/auparse/auparse.c b/auparse/auparse.c
+index 20ebe4f8..ab3d3189 100644
+--- a/auparse/auparse.c
++++ b/auparse/auparse.c
+@@ -1224,12 +1224,23 @@ static int extract_timestamp(const char *b, au_event_t *e)
+ {
+ char *ptr, *tmp;
+ int rc = 1;
++ size_t len;
+
+ e->host = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Optionally grab the node - may or may not be included
+diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
+index 9893afb0..4695817e 100644
+--- a/src/ausearch-lol.c
++++ b/src/ausearch-lol.c
+@@ -178,12 +178,23 @@ static inline char *strndupa(const char *old, size_t n)
+ static int extract_timestamp(const char *b, event *e)
+ {
+ char *ptr, *tmp, *tnode, *ttype;
++ size_t len;
+
+ e->node = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Check to see if this is the node info
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..5868d85ca33417 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,13 +15,21 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
*) ;;
esac
+post_patch() {
+ # See https://github.com/linux-audit/audit-userspace/issues/381
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i "${FILESDIR}/musl.patch" ;;
+ *) ;;
+ esac
+}
+
post_install() {
vinstall rules/10-base-config.rules 644 etc/audit/rules.d
vmkdir usr/share/examples/audit/rules.d
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (10 preceding siblings ...)
2024-06-17 20:17 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-06-18 16:47 ` classabbyamp
2024-06-19 7:01 ` [PR PATCH] [Updated] " MIvanchev
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2024-06-18 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50666#discussion_r1644776871
Comment:
if this patch works on glibc, don't apply it conditionally. conditional patches are icky
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (11 preceding siblings ...)
2024-06-18 16:47 ` [PR REVIEW] " classabbyamp
@ 2024-06-19 7:01 ` MIvanchev
2024-06-19 7:26 ` MIvanchev
2024-06-21 23:50 ` [PR PATCH] [Merged]: " classabbyamp
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-19 7:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 3517 bytes --]
From 62fb21dc0f98a60e780a0050963f37137495651f Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/patches/strndupa.patch | 64 ++++++++++++++++++++++++++++
srcpkgs/audit/template | 14 ++++--
2 files changed, 75 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/audit/patches/strndupa.patch
diff --git a/srcpkgs/audit/patches/strndupa.patch b/srcpkgs/audit/patches/strndupa.patch
new file mode 100644
index 00000000000000..dcd7f6330d4cf3
--- /dev/null
+++ b/srcpkgs/audit/patches/strndupa.patch
@@ -0,0 +1,64 @@
+diff --git a/auparse/auparse.c b/auparse/auparse.c
+index 20ebe4f8..ab3d3189 100644
+--- a/auparse/auparse.c
++++ b/auparse/auparse.c
+@@ -1224,12 +1224,23 @@ static int extract_timestamp(const char *b, au_event_t *e)
+ {
+ char *ptr, *tmp;
+ int rc = 1;
++ size_t len;
+
+ e->host = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Optionally grab the node - may or may not be included
+diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
+index 9893afb0..4695817e 100644
+--- a/src/ausearch-lol.c
++++ b/src/ausearch-lol.c
+@@ -178,12 +178,23 @@ static inline char *strndupa(const char *old, size_t n)
+ static int extract_timestamp(const char *b, event *e)
+ {
+ char *ptr, *tmp, *tnode, *ttype;
++ size_t len;
+
+ e->node = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Check to see if this is the node info
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..5868d85ca33417 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,13 +15,21 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
*) ;;
esac
+post_patch() {
+ # See https://github.com/linux-audit/audit-userspace/issues/381
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i "${FILESDIR}/musl.patch" ;;
+ *) ;;
+ esac
+}
+
post_install() {
vinstall rules/10-base-config.rules 644 etc/audit/rules.d
vmkdir usr/share/examples/audit/rules.d
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (12 preceding siblings ...)
2024-06-19 7:01 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-06-19 7:26 ` MIvanchev
2024-06-21 23:50 ` [PR PATCH] [Merged]: " classabbyamp
14 siblings, 0 replies; 16+ messages in thread
From: MIvanchev @ 2024-06-19 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages audit
https://github.com/void-linux/void-packages/pull/50666
audit: update to 3.1.4
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audit-50666.patch --]
[-- Type: text/x-diff, Size: 3187 bytes --]
From 8b3765b49c27a009c99e2aa47c85cf3e84ce86ec Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sun, 2 Jun 2024 22:28:22 +0200
Subject: [PATCH] audit: update to 3.1.4
---
srcpkgs/audit/patches/strndupa.patch | 64 ++++++++++++++++++++++++++++
srcpkgs/audit/template | 6 +--
2 files changed, 67 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/audit/patches/strndupa.patch
diff --git a/srcpkgs/audit/patches/strndupa.patch b/srcpkgs/audit/patches/strndupa.patch
new file mode 100644
index 00000000000000..dcd7f6330d4cf3
--- /dev/null
+++ b/srcpkgs/audit/patches/strndupa.patch
@@ -0,0 +1,64 @@
+diff --git a/auparse/auparse.c b/auparse/auparse.c
+index 20ebe4f8..ab3d3189 100644
+--- a/auparse/auparse.c
++++ b/auparse/auparse.c
+@@ -1224,12 +1224,23 @@ static int extract_timestamp(const char *b, au_event_t *e)
+ {
+ char *ptr, *tmp;
+ int rc = 1;
++ size_t len;
+
+ e->host = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Optionally grab the node - may or may not be included
+diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
+index 9893afb0..4695817e 100644
+--- a/src/ausearch-lol.c
++++ b/src/ausearch-lol.c
+@@ -178,12 +178,23 @@ static inline char *strndupa(const char *old, size_t n)
+ static int extract_timestamp(const char *b, event *e)
+ {
+ char *ptr, *tmp, *tnode, *ttype;
++ size_t len;
+
+ e->node = NULL;
+- if (*b == 'n')
+- tmp = strndupa(b, 340);
+- else
+- tmp = strndupa(b, 80);
++ if (*b == 'n') {
++ /* tmp = strndupa(b, 340); */
++ len = strnlen(b, 340);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
++ else {
++ /* tmp = strndupa(b, 80); */
++ len = strnlen(b, 80);
++ tmp = alloca(len + 1);
++ tmp[len] = 0;
++ memcpy(tmp, b, len);
++ }
+ ptr = audit_strsplit(tmp);
+ if (ptr) {
+ // Check to see if this is the node info
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 63913bc07c31b6..eb181d4083aa26 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
-version=3.0.3
-revision=6
+version=3.1.4
+revision=1
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://people.redhat.com/sgrubb/audit"
changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=23777e1dc9a80a2ee06a4d442a6a0a9bcbf1ae7ee4b5738a220ff619738cc904
+checksum=220a78cf35e6a7c57f42fcfc42b759692641c7e8e0e39c9844fbc0aa51783631
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" --disable-zos-remote" ;;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: audit: update to 3.1.4
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
` (13 preceding siblings ...)
2024-06-19 7:26 ` MIvanchev
@ 2024-06-21 23:50 ` classabbyamp
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2024-06-21 23:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
There's a merged pull request on the void-packages repository
audit: update to 3.1.4
https://github.com/void-linux/void-packages/pull/50666
Description:
#### Testing the changes
- I tested the changes in this PR: **NO**
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-06-21 23:50 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-02 20:28 [PR PATCH] audit: update to 3.1.4 MIvanchev
2024-06-02 20:33 ` MIvanchev
2024-06-15 20:07 ` piekay
2024-06-15 21:13 ` piekay
2024-06-16 7:47 ` [PR PATCH] [Updated] " MIvanchev
2024-06-16 7:50 ` MIvanchev
2024-06-16 7:54 ` MIvanchev
2024-06-16 8:02 ` MIvanchev
2024-06-17 17:18 ` piekay
2024-06-17 20:03 ` [PR PATCH] [Updated] " MIvanchev
2024-06-17 20:04 ` MIvanchev
2024-06-17 20:17 ` [PR PATCH] [Updated] " MIvanchev
2024-06-18 16:47 ` [PR REVIEW] " classabbyamp
2024-06-19 7:01 ` [PR PATCH] [Updated] " MIvanchev
2024-06-19 7:26 ` MIvanchev
2024-06-21 23:50 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).