diff options
author | Anthony Roussel <anthony@roussel.dev> | 2023-08-27 17:41:50 +0200 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-08-28 20:17:45 +0000 |
commit | 397a55ac9f0b0bfa98305d30daf09924cacc81ea (patch) | |
tree | 0ef09c3ea19c71cc5a5571be9264e4930b3d635c | |
parent | a5bf2567cb478fa1e2209e3589b413c1ac5c64e5 (diff) | |
download | nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar.gz nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar.bz2 nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar.lz nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar.xz nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.tar.zst nixpkgs-397a55ac9f0b0bfa98305d30daf09924cacc81ea.zip |
audit: 3.1.1 -> 3.1.2
https://github.com/linux-audit/audit-userspace/releases/tag/v3.1.2
3 files changed, 2 insertions, 55 deletions
diff --git a/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff b/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff deleted file mode 100644 index ce76fc3b87a..00000000000 --- a/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 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__ __attribute__ ((__malloc__)) -+#endif - - #ifdef __cplusplus - extern "C" { \ No newline at end of file diff --git a/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch b/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch deleted file mode 100644 index e072cc942cf..00000000000 --- a/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch +++ /dev/null @@ -1,35 +0,0 @@ -From beed138222421a2eb4212d83cb889404bd7efc49 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Wed, 23 Mar 2022 07:27:05 +0000 -Subject: [PATCH] auditswig.i: avoid setter generation for audit_rule_data::buf - -As it's a flexible array generated code was never safe to use. -With kernel's https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed98ea2128b6fd83bce13716edf8f5fe6c47f574 -change it's a build failure now: - - audit> audit_wrap.c:5010:15: error: invalid use of flexible array member - audit> 5010 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size)); - audit> | ^ - -Let's avoid setter generation entirely. - -Closes: https://github.com/linux-audit/audit-userspace/issues/252 ---- - bindings/swig/src/auditswig.i | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i -index 21aafca31..9a2c5661d 100644 ---- a/bindings/swig/src/auditswig.i -+++ b/bindings/swig/src/auditswig.i -@@ -39,6 +39,10 @@ signed - #define __attribute(X) /*nothing*/ - typedef unsigned __u32; - typedef unsigned uid_t; -+/* Sidestep SWIG's limitation of handling c99 Flexible arrays by not: -+ * generating setters against them: https://github.com/swig/swig/issues/1699 -+ */ -+%ignore audit_rule_data::buf; - %include "/usr/include/linux/audit.h" - #define __extension__ /*nothing*/ - %include <stdint.i> diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 0fd96892013..1e941a13767 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -18,20 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz"; - hash = "sha256-RuRrN2I8zgnm7hNOeNZor8NPThyHDIU+8S5BkweM/oc="; + hash = "sha256-wLF5LR8KiMbxgocQUJy7mHBZ/GhxLJdmnKkOrhA9KH0="; }; - patches = [ - ./000-fix-static-attribute-malloc.diff - ./001-ignore-flexible-array.patch - ]; - postPatch = '' - sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c substituteInPlace bindings/swig/src/auditswig.i \ --replace "/usr/include/linux/audit.h" \ "${linuxHeaders}/include/linux/audit.h" |