diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD index 959f7006b6b..17a97d21004 100644 --- a/main/audit/APKBUILD +++ b/main/audit/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Tycho Andersen # Maintainer: Celeste pkgname=audit -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=0 pkgdesc="User space tools for kernel auditing" url="https://people.redhat.com/sgrubb/audit/" @@ -21,7 +21,6 @@ subpackages=" source="https://people.redhat.com/sgrubb/audit/audit-$pkgver.tar.gz 0003-all-get-rid-of-strndupa.patch usr-paths.patch - musl.patch test-uid-42.patch auditd.initd auditd.confd @@ -66,10 +65,9 @@ static() { } sha512sums=" -7fbc426d0ddea340a36ceab52ac090e8e3dfb3450ebf50b478324a097f19ab4bb2cf78a2532644acb17e6114b59b8fda718affda9da62fb84181e3abf76039df audit-4.0.1.tar.gz +13d4d07b316fc1380d75baefbb1345b34286015d52e758c14b2f82781cf4cffc16b6eb29d999563ff40caa6d005630a5dfc44741e49b71291c9beb84ddc452a4 audit-4.0.2.tar.gz f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch 90c7d213a0b4ef27bf643e046dd2b3c5909706c62fba24ef34ecb32ff07b73fda13ed04c616a7cf8148115fc977aa1096b61e717abd5bd32f72f7bb4ac07999f usr-paths.patch -68e49b5056197b555dc95eeb7ee7f26b3fe9a7b2d38ad5c5d788c8bd90c5f410a2001ce8513ab3ebb663a58b0999a5fab00c9d754cb09bd0559852f14d90b722 musl.patch a8379c26553f524a4684ee660fe1e3422d720080f137ac9ebc17873cf90d13b6b81a5fde2d9b076ee32a2c1115240146bc12daca9a22ec53e7986c7454278794 test-uid-42.patch b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd 69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd diff --git a/main/audit/musl.patch b/main/audit/musl.patch deleted file mode 100644 index 9db71cfa198..00000000000 --- a/main/audit/musl.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -55,7 +55,7 @@ - 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) ---- a/audisp/plugins/remote/queue.c -+++ b/audisp/plugins/remote/queue.c -@@ -49,10 +49,8 @@ - }; - - /* 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 { \ ---- a/audisp/plugins/remote/queue.h -+++ b/audisp/plugins/remote/queue.h -@@ -53,15 +53,14 @@ - * 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__)); - - /* 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); - - /* Peek at head of Q, storing it into BUF of SIZE. Return 1 if an entry - * exists, 0 if queue is empty. On error, return -1 and set errno. */ --int q_peek(struct queue *q, char *buf, size_t size) -- __attr_access ((__write_only__, 2, 3)); -+int q_peek(struct queue *q, char *buf, size_t size); - - /* Drop head of Q and return 0. On error, return -1 and set errno. */ - int q_drop_head(struct queue *q);