buildroot.busybox.net archive mirror
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/audit: fix musl build
@ 2023-06-25 14:44 Bernd Kuhls
  2023-06-25 14:44 ` [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1 Bernd Kuhls
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Bernd Kuhls @ 2023-06-25 14:44 UTC (permalink / raw)
  To: buildroot

Fixes:
http://autobuild.buildroot.net/results/a52/a52ff08c3373ffb253b89e9197671583354d1360/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...ute_malloc__-with-__attribute__-__ma.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch

diff --git a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
new file mode 100644
index 0000000000..1a276ca2df
--- /dev/null
+++ b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
@@ -0,0 +1,39 @@
+From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 9 Aug 2022 23:57:03 -0700
+Subject: [PATCH] Replace __attribute_malloc__ with 
+ __attribute__((__malloc__))
+
+__attribute_malloc__ is not available on musl
+
+Fixes
+| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
+|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
+|         ^
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream: https://github.com/linux-audit/audit-userspace/pull/311
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+
+ auparse/auparse.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/auparse/auparse.h b/auparse/auparse.h
+index 95cf256d..c7dbe5ff 100644
+--- a/auparse/auparse.h
++++ b/auparse/auparse.h
+@@ -51,7 +51,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)
+-- 
+2.37.1
+
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1
  2023-06-25 14:44 [Buildroot] [PATCH 1/2] package/audit: fix musl build Bernd Kuhls
@ 2023-06-25 14:44 ` Bernd Kuhls
  2023-07-16  6:05   ` Peter Korsgaard
  2023-06-25 19:24 ` [Buildroot] [PATCH 1/2] package/audit: fix musl build Arnout Vandecappelle via buildroot
  2023-07-16  6:05 ` Peter Korsgaard
  2 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2023-06-25 14:44 UTC (permalink / raw)
  To: buildroot

Changelog:
https://github.com/linux-audit/audit-userspace/blob/v3.1.1/ChangeLog

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/audit/audit.hash | 2 +-
 package/audit/audit.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/audit/audit.hash b/package/audit/audit.hash
index 87c00ec241..310b0a0f6a 100644
--- a/package/audit/audit.hash
+++ b/package/audit/audit.hash
@@ -1,4 +1,4 @@
 #Locally computed
-sha256  b5cf3cdabb2786c08b1de3599a3b1a547e55f7a9f9c1eb2078f5b44cf44e8378  audit-3.1.tar.gz
+sha256  46e46b37623cce09e6ee134e78d668afc34f4e1c870c853ef12e4193078cfe87  audit-3.1.1.tar.gz
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
 sha256  f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa  COPYING.LIB
diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index 252f5865b5..e77e06bd6b 100644
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUDIT_VERSION = 3.1
+AUDIT_VERSION = 3.1.1
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
 AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 AUDIT_LICENSE_FILES = COPYING COPYING.LIB
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/audit: fix musl build
  2023-06-25 14:44 [Buildroot] [PATCH 1/2] package/audit: fix musl build Bernd Kuhls
  2023-06-25 14:44 ` [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1 Bernd Kuhls
@ 2023-06-25 19:24 ` Arnout Vandecappelle via buildroot
  2023-07-16  6:05 ` Peter Korsgaard
  2 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2023-06-25 19:24 UTC (permalink / raw)
  To: Bernd Kuhls, buildroot



On 25/06/2023 16:44, Bernd Kuhls wrote:
> Fixes:
> http://autobuild.buildroot.net/results/a52/a52ff08c3373ffb253b89e9197671583354d1360/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>   ...ute_malloc__-with-__attribute__-__ma.patch | 39 +++++++++++++++++++
>   1 file changed, 39 insertions(+)
>   create mode 100644 package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
> 
> diff --git a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
> new file mode 100644
> index 0000000000..1a276ca2df
> --- /dev/null
> +++ b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
> @@ -0,0 +1,39 @@
> +From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 9 Aug 2022 23:57:03 -0700
> +Subject: [PATCH] Replace __attribute_malloc__ with
> + __attribute__((__malloc__))
> +
> +__attribute_malloc__ is not available on musl
> +
> +Fixes
> +| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
> +|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
> +|         ^
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Upstream: https://github.com/linux-audit/audit-userspace/pull/311
> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

  Applied both to master, thanks.

  Regards,
  Arnout

> +---
> +
> + auparse/auparse.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/auparse/auparse.h b/auparse/auparse.h
> +index 95cf256d..c7dbe5ff 100644
> +--- a/auparse/auparse.h
> ++++ b/auparse/auparse.h
> +@@ -51,7 +51,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)
> +--
> +2.37.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/audit: fix musl build
  2023-06-25 14:44 [Buildroot] [PATCH 1/2] package/audit: fix musl build Bernd Kuhls
  2023-06-25 14:44 ` [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1 Bernd Kuhls
  2023-06-25 19:24 ` [Buildroot] [PATCH 1/2] package/audit: fix musl build Arnout Vandecappelle via buildroot
@ 2023-07-16  6:05 ` Peter Korsgaard
  2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-07-16  6:05 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/a52/a52ff08c3373ffb253b89e9197671583354d1360/

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1
  2023-06-25 14:44 ` [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1 Bernd Kuhls
@ 2023-07-16  6:05   ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-07-16  6:05 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Changelog:
 > https://github.com/linux-audit/audit-userspace/blob/v3.1.1/ChangeLog

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-16  6:05 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-25 14:44 [Buildroot] [PATCH 1/2] package/audit: fix musl build Bernd Kuhls
2023-06-25 14:44 ` [Buildroot] [PATCH 2/2] package/audit: bump version to 3.1.1 Bernd Kuhls
2023-07-16  6:05   ` Peter Korsgaard
2023-06-25 19:24 ` [Buildroot] [PATCH 1/2] package/audit: fix musl build Arnout Vandecappelle via buildroot
2023-07-16  6:05 ` Peter Korsgaard

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).