diff mbox series

[meta-security,16/19] aide: upgrade 0.19.3 -> 0.19.4

Message ID bb7ac2179a808e0e1122d999ed6fb564205513c1.1789595456.git.scott.murray@konsulko.com
State New
Headers show
Series Assorted updates 09/16 | expand

Commit Message

Scott Murray Sept. 16, 2026, 9:58 p.m. UTC 
Release notes:
https://github.com/aide/aide/releases/tag/v0.19.4

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../0002-Support-build-with-nettle-4.patch    | 53 -------------------
 .../aide/{aide_0.19.3.bb => aide_0.19.4.bb}   |  3 +-
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 recipes-ids/aide/aide/0002-Support-build-with-nettle-4.patch
 rename recipes-ids/aide/{aide_0.19.3.bb => aide_0.19.4.bb} (94%)
diff mbox series

Patch

diff --git a/recipes-ids/aide/aide/0002-Support-build-with-nettle-4.patch b/recipes-ids/aide/aide/0002-Support-build-with-nettle-4.patch
deleted file mode 100644
index d9c6fad..0000000
--- a/recipes-ids/aide/aide/0002-Support-build-with-nettle-4.patch
+++ /dev/null
@@ -1,53 +0,0 @@ 
-From 84936cec8ddb7151327563800d752d1d20e39224 Mon Sep 17 00:00:00 2001
-From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
-Date: Tue, 26 May 2026 21:41:52 +0200
-Subject: [PATCH] Support build with nettle 4
-
-* closes: #218
-
-Upstream-Status: Backport [https://github.com/aide/aide/commit/61130addb02a58d7de95d6b8f344ab9b6151d6aa]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- ChangeLog | 3 +++
- src/md.c  | 6 ++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 89905e3..5b3963e 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2026-05-26 Hannes von Haugwitz <hannes@vonhaugwitz.com>
-+	* Support build with nettle 4 (closes: #218)
-+
- 2026-01-31 Hannes von Haugwitz <hannes@vonhaugwitz.com>
- 	* Release aide 0.19.3
- 
-diff --git a/src/md.c b/src/md.c
-index e4e66ad..1aec9d9 100644
---- a/src/md.c
-+++ b/src/md.c
-@@ -47,6 +47,8 @@
- #include <nettle/gosthash94.h>
- #include <nettle/streebog.h>
- 
-+#include <nettle/version.h>
-+
- typedef struct {
-   nettle_hash_init_func *init;
-   nettle_hash_update_func *update;
-@@ -166,7 +168,11 @@ int close_md(struct md_container* md, md_hashsums * hs, const char *filename, co
-         for (HASHSUM i = 0 ; i < num_hashes ; ++i) {
-             DB_ATTR_TYPE h = ATTR(hashsums[i].attribute);
-             if (h&md->calc_attr) {
-+#if NETTLE_VERSION_MAJOR < 4
-                 nettle_functions[i].digest(&md->ctx[i].md5, hashsums[i].length, hs->hashsums[i]);
-+#else
-+                nettle_functions[i].digest(&md->ctx[i].md5, hs->hashsums[i]);
-+#endif
-             }
-         }
- #endif
--- 
-2.47.3
-
diff --git a/recipes-ids/aide/aide_0.19.3.bb b/recipes-ids/aide/aide_0.19.4.bb
similarity index 94%
rename from recipes-ids/aide/aide_0.19.3.bb
rename to recipes-ids/aide/aide_0.19.4.bb
index c352583..9cdd601 100644
--- a/recipes-ids/aide/aide_0.19.3.bb
+++ b/recipes-ids/aide/aide_0.19.4.bb
@@ -7,11 +7,10 @@  DEPENDS = "bison-native libpcre2"
 
 SRC_URI = "https://github.com/aide/aide/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
            file://0001-Fixes-build-issues.patch \
-           file://0002-Support-build-with-nettle-4.patch \
            file://aide.conf \
 "
 
-SRC_URI[sha256sum] = "6513170bb5b8c22802dd1b72f02d8aa9f432aef2b4470522db03e755212a3f47"
+SRC_URI[sha256sum] = "47ab7c696f0745911479a41f90d7ad99d26536e186d66c4aad093bc72d20ff5f"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"