diff mbox series

[1/1] package/audit: bump to version 3.1.2

Message ID 20231230152627.256604-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/audit: bump to version 3.1.2 | expand

Commit Message

Fabrice Fontaine Dec. 30, 2023, 3:26 p.m. UTC 
Drop patch (already in version)

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ine-__attribute_malloc__-when-needed.patch | 35 -------------------
 package/audit/audit.hash                      |  2 +-
 package/audit/audit.mk                        |  2 +-
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 package/audit/0001-Define-__attribute_malloc__-when-needed.patch

Comments

Thomas Petazzoni Dec. 30, 2023, 6:01 p.m. UTC | #1 
On Sat, 30 Dec 2023 16:26:27 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Drop patch (already in version)
> 
> https://github.com/linux-audit/audit-userspace/blob/v3.1.2/ChangeLog
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...ine-__attribute_malloc__-when-needed.patch | 35 -------------------
>  package/audit/audit.hash                      |  2 +-
>  package/audit/audit.mk                        |  2 +-
>  3 files changed, 2 insertions(+), 37 deletions(-)
>  delete mode 100644 package/audit/0001-Define-__attribute_malloc__-when-needed.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch
deleted file mode 100644
index 3dd5359bfc..0000000000
--- a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From cf93d8579d5cec0b1ba585bd661776f03c2743ba Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd@kuhls.net>
-Date: Tue, 27 Jun 2023 20:19:13 +0200
-Subject: [PATCH] Define __attribute_malloc__ when needed
-
-attribute_malloc is not available on musl
-
-auparse.h: In function 'auparse_init':
-auparse.h:54:2: error: expected declaration specifiers before '__attribute_malloc__'
-   54 |  __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-
-Upstream: https://github.com/linux-audit/audit-userspace/pull/311
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- auparse/auparse.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/auparse/auparse.h b/auparse/auparse.h
-index 95cf256d..5cb7402e 100644
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -32,6 +32,9 @@
- # define __attr_dealloc(dealloc, argno)
- # define __attr_dealloc_free
- #endif
-+#ifndef __attribute_malloc__
-+#  define __attribute_malloc__
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
--- 
-2.39.2
-
diff --git a/package/audit/audit.hash b/package/audit/audit.hash
index 310b0a0f6a..5743b3a13a 100644
--- a/package/audit/audit.hash
+++ b/package/audit/audit.hash
@@ -1,4 +1,4 @@ 
 #Locally computed
-sha256  46e46b37623cce09e6ee134e78d668afc34f4e1c870c853ef12e4193078cfe87  audit-3.1.1.tar.gz
+sha256  c0b1792d1f0a88c6f1828710509cbb987059fc68712c97669ca90eae103d287d  audit-3.1.2.tar.gz
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
 sha256  f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa  COPYING.LIB
diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index 168bc04ad7..8d54359038 100644
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-AUDIT_VERSION = 3.1.1
+AUDIT_VERSION = 3.1.2
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
 AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 AUDIT_LICENSE_FILES = COPYING COPYING.LIB