All of lore.kernel.org
 help / color / mirror / Atom feed
From: Prasanth R <ragaprasanth@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: jaipaul.cheernam@est.tech, ross.burton@arm.com,
	Prasanth R <ragaprasanth@gmail.com>
Subject: [PATCH v2] libjitterentropy: upgrade 3.6.3 -> 3.7.0
Date: Tue, 17 Nov 2026 11:46:44 +0900	[thread overview]
Message-ID: <20261117024644.2849146-1-ragaprasanth@gmail.com> (raw)
In-Reply-To: <20261002071557.74249-2-jaipaul.cheernam@est.tech>

3.7.0 locks the collector memory with mlock(), changes the startup to
meet NTG.1, replaces the SHA3-256 output with XDRBG-256 and adds
jent_status(). LICENSE only changes the copyright year.

Two fixes are needed:

- 3.7.0 uses C11 threads on Linux and makes struct jent_notime_ctx
  private, so rng-tools fails to build. Backport the Linux part of the
  upstream fix.
- The Makefile now uses -std=c11, which hides clock_gettime() on arm,
  mips and riscv. Build with -D_DEFAULT_SOURCE.

This picks up Jaipaul Cheernam's earlier upgrade patch [1].

[1] https://patchwork.yoctoproject.org/project/oe-core/patch/20261002071557.74249-2-jaipaul.cheernam@est.tech/

AI-Generated: Uses Claude
Signed-off-by: Prasanth R <prasanth.r@lineo.co.jp>
---
v2:
- Picked up Jaipaul's upgrade; backport the rng-tools fix and build
  with -D_DEFAULT_SOURCE for arm, mips and riscv.

Tested:
- qemux86-64 and qemuarm: libjitterentropy with rng-tools.

 ...Linux-and-make-struct-jent_notime_ct.patch | 75 +++++++++++++++++++
 ...opy_3.6.3.bb => libjitterentropy_3.7.0.bb} | 13 +++-
 2 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-support/libjitterentropy/libjitterentropy/0001-Use-pthreads-on-Linux-and-make-struct-jent_notime_ct.patch
 rename meta/recipes-support/libjitterentropy/{libjitterentropy_3.6.3.bb => libjitterentropy_3.7.0.bb} (67%)

diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Use-pthreads-on-Linux-and-make-struct-jent_notime_ct.patch b/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Use-pthreads-on-Linux-and-make-struct-jent_notime_ct.patch
new file mode 100644
index 0000000000..6fd654fc37
--- /dev/null
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy/0001-Use-pthreads-on-Linux-and-make-struct-jent_notime_ct.patch
@@ -0,0 +1,75 @@
+From 1bc2ca956d4c64b765c2f19751614949ebe3734d Mon Sep 17 00:00:00 2001
+From: Prasanth R <ragaprasanth@gmail.com>
+Date: Tue, 17 Nov 2026 10:12:23 +0900
+Subject: [PATCH] Use pthreads on Linux and make struct jent_notime_ctx public
+
+3.7.0 switched Linux to C11 <threads.h> and moved struct jent_notime_ctx
+out of jitterentropy.h. This breaks callers that install their own
+thread handler with jent_entropy_switch_notime_impl(), such as
+rng-tools: the start callback no longer takes a pthread start routine,
+and the context is an incomplete type.
+
+Use pthreads on Linux again and define the pthread context in the
+public header, as upstream did in commit a038d0c ("threads: always use
+pthreads on Linux, add a native Win32 backend"). Only the Linux part
+of that commit is taken.
+
+Upstream-Status: Backport [https://github.com/smuellerDD/jitterentropy-library/commit/a038d0c372f83aba10f3850c5b122dc5ff8cdc8c]
+Signed-off-by: Prasanth R <prasanth.r@lineo.co.jp>
+
+---
+ jitterentropy.h           | 15 ++++++++++++++-
+ src/jitterentropy-timer.c |  8 +-------
+ 2 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/jitterentropy.h b/jitterentropy.h
+index f935c09..3ab1ba3 100644
+--- a/jitterentropy.h
++++ b/jitterentropy.h
+@@ -154,10 +154,23 @@ extern "C" {
+ #endif
+ #endif
+ 
+-#if defined(__MINGW32__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__MINGW32__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+ #define JENT_PTHREAD
+ #endif
+ 
++#ifdef JENT_PTHREAD
++#include <pthread.h>
++/*
++ * Context handed to the jent_notime_thread handlers. It is part of the API:
++ * a caller that installs its own handler with
++ * jent_entropy_switch_notime_impl() has to create and join the thread.
++ */
++struct jent_notime_ctx {
++	pthread_attr_t notime_pthread_attr;	/* pthreads library */
++	pthread_t notime_thread_id;		/* pthreads thread ID */
++};
++#endif
++
+ /* Forward declaration of opaque value */
+ struct rand_data;
+ 
+diff --git a/src/jitterentropy-timer.c b/src/jitterentropy-timer.c
+index 77f732e..2c974f5 100644
+--- a/src/jitterentropy-timer.c
++++ b/src/jitterentropy-timer.c
+@@ -24,13 +24,7 @@
+ /* Timer-less entropy source */
+ #ifdef JENT_CONF_ENABLE_INTERNAL_TIMER
+ 
+-#ifdef JENT_PTHREAD
+-#include <pthread.h>
+-struct jent_notime_ctx {
+-	pthread_attr_t notime_pthread_attr;     /* pthreads library */
+-	pthread_t notime_thread_id;             /* pthreads thread ID */
+-};
+-#else
++#ifndef JENT_PTHREAD
+ #include <threads.h>
+ struct jent_notime_ctx {
+ 	thrd_t notime_thread_id;                /* thread ID */
+-- 
+2.43.0
+
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.6.3.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.7.0.bb
similarity index 67%
rename from meta/recipes-support/libjitterentropy/libjitterentropy_3.6.3.bb
rename to meta/recipes-support/libjitterentropy/libjitterentropy_3.7.0.bb
index 27c87c1322..2186127b76 100644
--- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.6.3.bb
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.7.0.bb
@@ -5,15 +5,22 @@ stamp. It is a small-scale, yet fast entropy source that is viable in almost \
 all environments and on a lot of CPU architectures."
 HOMEPAGE = "https://www.chronox.de/jent"
 LICENSE = "BSD-3-Clause OR GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e01027c4ad1fe5a4768f8488c945d491 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fcaa2e2fa77c4ea22e45bf79e9a41093 \
                     file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \
                     file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
                     "
-SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "c90ff465dcdb6a6949542c72a26a8ab496daa8cb"
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https;tag=v${PV} \
+           file://0001-Use-pthreads-on-Linux-and-make-struct-jent_notime_ct.patch \
+           "
+SRCREV = "e783cf1c450bce4d72f95c9f9c84546a6094976a"
 
 do_configure[noexec] = "1"
 
+# The Makefile builds with -std=c11, which hides clock_gettime() on
+# targets without a cycle counter in jitterentropy-base-user.h (arm, mips,
+# riscv). Fixed upstream after 3.7.0.
+CFLAGS += "-D_DEFAULT_SOURCE"
+
 LDFLAGS += "-Wl,-O0"
 
 do_install () {
-- 
2.34.1


  parent reply	other threads:[~2026-11-17  2:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-02  7:15 [PATCH 0/4] Upgrades on 02-10-2026 Jaipaul Cheernam
2026-10-02  7:15 ` [PATCH 1/4] libjitterentropy: upgrade 3.6.3 -> 3.7.0 Jaipaul Cheernam
2026-10-02  8:52   ` [OE-core] " Mathieu Dubois-Briand
2026-10-02  9:35     ` Alexander Kanavin
2026-10-05  6:51       ` Jaipaul Cheernam
2026-11-17  2:46   ` Prasanth R [this message]
2026-11-17  3:01     ` Patchtest results for [PATCH v2] " patchtest
2026-11-17 13:40     ` [OE-core] " Mathieu Dubois-Briand
2026-11-18  0:06       ` Prasanth Ramesh
2026-11-18  0:03     ` [PATCH v3] " Prasanth R
2026-10-02  7:15 ` [PATCH 2/4] libjitterentropy: Fix HOMEPAGE Jaipaul Cheernam
2026-10-02  7:15 ` [PATCH 3/4] shadow: upgrade 4.20.2 -> 4.20.3 Jaipaul Cheernam
2026-10-02  8:25   ` [OE-core] " Mathieu Dubois-Briand
2026-10-02 10:49     ` Jaipaul Cheernam
2026-10-02 11:57   ` [PATCH v2] " Jaipaul Cheernam
2026-10-02  7:15 ` [PATCH 4/4] glib-networking: upgrade 2.80.1 -> 2.90.0 Jaipaul Cheernam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117024644.2849146-1-ragaprasanth@gmail.com \
    --to=ragaprasanth@gmail.com \
    --cc=jaipaul.cheernam@est.tech \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=ross.burton@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.