[Buildroot] [PATCH 1/1] package/mupdf: fix building with zlib-ng

[Buildroot] [PATCH 1/1] package/mupdf: fix building with zlib-ng

[Raphaël Mélotte]

The current mupdf version fails to build when zlib-ng is used as the
zlib implementation. Add a patch to fix it.

This fixes the following build failure raised since the bump to
version 1.21.0 of the mupdf package in commit
3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0:

source/fitz/encode-basic.c: In function 'deflate_write':
source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
  343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
      |                           ^~~~~~~~
source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?

Fixes: http://autobuild.buildroot.net/results/87128e9967cff20078c65ab847877aa44cc409d9

Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
---
 ...issing-limits.h-include-for-UINT_MAX.patch | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch

diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
new file mode 100644
index 0000000000..95f2f86666
--- /dev/null
+++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
@@ -0,0 +1,70 @@
+From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
+Date: Mon, 24 Apr 2023 17:27:35 +0200
+Subject: [PATCH] Add missing limits.h include for UINT_MAX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h'
+header.
+
+In some configurations that build with zlib from [1], by chance
+limits.h gets indirectly included when including 'z-imp.h' (the
+includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so
+the build succeeds.
+
+When using other zlib implementations however (for example from [2]),
+limits.h is not necessarily included indirectly, which leads to the
+build failing in the following way:
+
+source/fitz/encode-basic.c: In function 'deflate_write':
+source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
+  343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
+      |                           ^~~~~~~~
+source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
+
+Add the missing include, so that the build succeeds no matter if zlib
+indirectly includes 'limit.h' or not.
+
+Similarly, also add it in output-ps.c where it's also missing.
+
+[1]: https://zlib.net/
+[2]: https://github.com/zlib-ng/zlib-ng
+
+Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
+Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667
+---
+ source/fitz/encode-basic.c | 2 ++
+ source/fitz/output-ps.c    | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c
+index 03a4ff76b..84f0c35e6 100644
+--- a/source/fitz/encode-basic.c
++++ b/source/fitz/encode-basic.c
+@@ -24,6 +24,8 @@
+ 
+ #include "z-imp.h"
+ 
++#include <limits.h>
++
+ struct ahx
+ {
+ 	fz_output *chain;
+diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c
+index ef22c3cd6..3dc8ea17d 100644
+--- a/source/fitz/output-ps.c
++++ b/source/fitz/output-ps.c
+@@ -24,6 +24,8 @@
+ 
+ #include "z-imp.h"
+ 
++#include <limits.h>
++
+ typedef struct ps_band_writer_s
+ {
+ 	fz_band_writer super;
+-- 
+2.39.1
+
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mupdf: fix building with zlib-ng

[Yann E. MORIN]

Raphaël, All,

On 2023-04-25 09:09 +0200, Raphaël Mélotte spake thusly:
> The current mupdf version fails to build when zlib-ng is used as the
> zlib implementation. Add a patch to fix it.
> 
> This fixes the following build failure raised since the bump to
> version 1.21.0 of the mupdf package in commit
> 3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0:
> 
> source/fitz/encode-basic.c: In function 'deflate_write':
> source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
>   343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
>       |                           ^~~~~~~~
> source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
> 
> Fixes: http://autobuild.buildroot.net/results/87128e9967cff20078c65ab847877aa44cc409d9
> 
> Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...issing-limits.h-include-for-UINT_MAX.patch | 70 +++++++++++++++++++
>  1 file changed, 70 insertions(+)
>  create mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
> 
> diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
> new file mode 100644
> index 0000000000..95f2f86666
> --- /dev/null
> +++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
> @@ -0,0 +1,70 @@
> +From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
> +Date: Mon, 24 Apr 2023 17:27:35 +0200
> +Subject: [PATCH] Add missing limits.h include for UINT_MAX
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h'
> +header.
> +
> +In some configurations that build with zlib from [1], by chance
> +limits.h gets indirectly included when including 'z-imp.h' (the
> +includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so
> +the build succeeds.
> +
> +When using other zlib implementations however (for example from [2]),
> +limits.h is not necessarily included indirectly, which leads to the
> +build failing in the following way:
> +
> +source/fitz/encode-basic.c: In function 'deflate_write':
> +source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
> +  343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
> +      |                           ^~~~~~~~
> +source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
> +
> +Add the missing include, so that the build succeeds no matter if zlib
> +indirectly includes 'limit.h' or not.
> +
> +Similarly, also add it in output-ps.c where it's also missing.
> +
> +[1]: https://zlib.net/
> +[2]: https://github.com/zlib-ng/zlib-ng
> +
> +Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
> +Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667
> +---
> + source/fitz/encode-basic.c | 2 ++
> + source/fitz/output-ps.c    | 2 ++
> + 2 files changed, 4 insertions(+)
> +
> +diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c
> +index 03a4ff76b..84f0c35e6 100644
> +--- a/source/fitz/encode-basic.c
> ++++ b/source/fitz/encode-basic.c
> +@@ -24,6 +24,8 @@
> + 
> + #include "z-imp.h"
> + 
> ++#include <limits.h>
> ++
> + struct ahx
> + {
> + 	fz_output *chain;
> +diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c
> +index ef22c3cd6..3dc8ea17d 100644
> +--- a/source/fitz/output-ps.c
> ++++ b/source/fitz/output-ps.c
> +@@ -24,6 +24,8 @@
> + 
> + #include "z-imp.h"
> + 
> ++#include <limits.h>
> ++
> + typedef struct ps_band_writer_s
> + {
> + 	fz_band_writer super;
> +-- 
> +2.39.1
> +
> -- 
> 2.39.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 1/1] package: busybox: backport fix for missing getrandom()

[Raphaël Mélotte via buildroot]

The current Busybox version (1.36.0) fails to build with some
libc/linux combinations where getrandom() is not available. Two fixes
for glibc already exists upstream, so backport them here. A third
one (submitted upstream, not part of the main branch yet) was needed
to be able to compile with older musl and uClibc versions (or older
kernels).

This fixes the following build failure raised since commit
d68b617993bd2f5c82a4936ed1e24e4fec6b94a2:

miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory
 #include <sys/random.h>

Fixes:
- http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c
- http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051

It also fixes the following (similar) build failure, raised since the
same commit:

miscutils/lib.a(seedrng.o): In function `seedrng_main':
seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom'
seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom'
collect2: error: ld returned 1 exit status

Fixes:
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028
- https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031

Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
---
Changes v1 -> v2:
- fix building with make 4.2.1 and earlier.
- use the current latest patch sent upstream (v4).

 ...r-glibc-2.24-not-providing-getrandom.patch |  39 ++++++
 ...glibc-2.24-not-providing-random-head.patch |  60 +++++++++
 ...trandom-detection-for-non-glibc-libc.patch | 124 ++++++++++++++++++
 3 files changed, 223 insertions(+)
 create mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
 create mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
 create mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch

diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
new file mode 100644
index 0000000000..4a194612b4
--- /dev/null
+++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
@@ -0,0 +1,39 @@
+From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 10 Apr 2023 17:26:04 +0200
+Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom()
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a
+---
+ miscutils/seedrng.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
+index 967741dc7..7cc855141 100644
+--- a/miscutils/seedrng.c
++++ b/miscutils/seedrng.c
+@@ -45,6 +45,20 @@
+ #include <sys/random.h>
+ #include <sys/file.h>
+ 
++/* Fix up glibc <= 2.24 not having getrandom() */
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
++#include <sys/syscall.h>
++# define getrandom(...) bb_getrandom(__VA_ARGS__)
++static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
++{
++# if defined(__NR_getrandom)
++	return syscall(__NR_getrandom, buffer, length, flags);
++# else
++	return ENOSYS;
++# endif
++}
++#endif
++
+ #ifndef GRND_INSECURE
+ #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */
+ #endif
+-- 
+2.39.1
+
diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
new file mode 100644
index 0000000000..d729884805
--- /dev/null
+++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
@@ -0,0 +1,60 @@
+From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas@devoogdt.com>
+Date: Mon, 10 Apr 2023 19:58:15 +0200
+Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header
+
+ - dropped the wrong define (not sure why it was there)
+ - <sys/random.h> not available if glibc <= 2.24
+ - GRND_NONBLOCK not defined if <sys/random.h> not included
+ - ret < 0 && errno == ENOSYS has to be true to get creditable set
+
+Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf
+---
+ miscutils/seedrng.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
+index 7cc855141..3bf6e2ea7 100644
+--- a/miscutils/seedrng.c
++++ b/miscutils/seedrng.c
+@@ -42,25 +42,31 @@
+ #include "libbb.h"
+ 
+ #include <linux/random.h>
+-#include <sys/random.h>
+ #include <sys/file.h>
+ 
+ /* Fix up glibc <= 2.24 not having getrandom() */
+ #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
+ #include <sys/syscall.h>
+-# define getrandom(...) bb_getrandom(__VA_ARGS__)
+ static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
+ {
+ # if defined(__NR_getrandom)
+ 	return syscall(__NR_getrandom, buffer, length, flags);
+ # else
+-	return ENOSYS;
++	errno = ENOSYS;
++	return -1;
+ # endif
+ }
++#else
++#include <sys/random.h>
++#endif
++
++/* Apparently some headers don't ship with this yet. */
++#ifndef GRND_NONBLOCK
++#define GRND_NONBLOCK 0x0001
+ #endif
+ 
+ #ifndef GRND_INSECURE
+-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */
++#define GRND_INSECURE 0x0004
+ #endif
+ 
+ #define DEFAULT_SEED_DIR         "/var/lib/seedrng"
+-- 
+2.39.1
+
diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch
new file mode 100644
index 0000000000..140b27cae6
--- /dev/null
+++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch
@@ -0,0 +1,124 @@
+From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
+Date: Tue, 18 Apr 2023 15:54:43 +0200
+Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+glibc <= 2.24 does not provide getrandom(). A check for it has been
+added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in
+cb57abb46f06f4ede8d9ccbdaac67377fdf416cf.
+
+However, building with a libc other than glibc can lead to the same
+problem as not every other libc has getrandom() either:
+
+- uClibc provides it from v1.0.2 onwards, but requires to define
+_GNU_SOURCE (all versions - we already define it by default), and
+stddef to be included first (when using uClibc < 1.0.35 - we already
+include it through libbb.h).
+
+- musl libc has getrandom(), but only from version 1.1.20 onwards. As
+musl does not provide __MUSL__ or version information, it's not
+possible to check for it like we did for glibc.
+
+All of this makes it difficult (or impossible in case of musl) to
+check what we need to do to have getrandom() based on each libc
+versions.
+
+On top of that, getrandom() is also not available on older kernels. As
+an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom()
+is declared so compiling works, but it fails at link time because
+getrandom() is not defined.
+
+To make it easier, take a similar approach to what was done for the
+crypt library: try to build a sample program to see if we have
+getrandom(). To keep it compatible with different versions of
+make (for reference see [1]), a variable for '#' is also introduced.
+
+Based on the new Makefile variable, we now either use the
+libc-provided getrandom() when it's available, or use our own
+implementation when it's not (like it was the case already for glibc <
+2.25).
+
+This should fix compiling with many libc/kernel combinations.
+
+[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4
+
+Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
+Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html
+---
+Changes v3 -> v4:
+  - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier.
+
+Changes v2 -> v3:
+  - fix _GNU_SOURCE define location
+
+Changes v1 -> v2:
+  - move _GNU_SOURCE to bb_libtest.c
+  - remove GRND_NONBLOCK
+
+Note that I was not able to test every single combination, but I could
+confirm it builds successfully for:
+uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used)
+uClibc 1.0.36, linux headers 4.9 (libc getrandom used)
+musl 1.1.16, linux headers 4.12 (libc getrandom NOT used)
+musl 1.2.1, linux headers (libc getrandom used)
+glibc 2.25, linux headers 4.10 (libc getrandom used)
+
+ Makefile.flags      | 12 ++++++++++++
+ miscutils/seedrng.c |  8 ++++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.flags b/Makefile.flags
+index 1cec5ba20..0d437303a 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y)
+ LDLIBS += rt
+ endif
+ 
++# GNU Make version 4.2.1 and earlier require number signs ('#')
++# inside function invocations to be escaped, while versions 4.3+
++# require them to be unescaped. Use a variable for it so that it works
++# for both versions:
++C := \#
++# Not all libc versions have getrandom, so check for it:
++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude <stddef.h>\n$Cinclude <sys/random.h>\nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
++
++ifeq ($(HAVE_GETRANDOM),y)
++CFLAGS += -DHAVE_GETRANDOM
++endif
++
+ # libpam may use libpthread, libdl and/or libaudit.
+ # On some platforms that requires an explicit -lpthread, -ldl, -laudit.
+ # However, on *other platforms* it fails when some of those flags
+diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
+index 3bf6e2ea7..2f1e18c32 100644
+--- a/miscutils/seedrng.c
++++ b/miscutils/seedrng.c
+@@ -44,8 +44,10 @@
+ #include <linux/random.h>
+ #include <sys/file.h>
+ 
+-/* Fix up glibc <= 2.24 not having getrandom() */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */
++#if defined HAVE_GETRANDOM
++#include <sys/random.h>
++#else /* No getrandom */
+ #include <sys/syscall.h>
+ static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
+ {
+@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
+ 	return -1;
+ # endif
+ }
+-#else
+-#include <sys/random.h>
+ #endif
+ 
+ /* Apparently some headers don't ship with this yet. */
+-- 
+2.39.1
+
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package: busybox: backport fix for missing getrandom()

[Yann E. MORIN]

Raphaël, All,

On 2023-05-09 13:58 +0200, Raphaël Mélotte via buildroot spake thusly:
> The current Busybox version (1.36.0) fails to build with some
> libc/linux combinations where getrandom() is not available. Two fixes
> for glibc already exists upstream, so backport them here. A third
> one (submitted upstream, not part of the main branch yet) was needed
> to be able to compile with older musl and uClibc versions (or older
> kernels).
> 
> This fixes the following build failure raised since commit
> d68b617993bd2f5c82a4936ed1e24e4fec6b94a2:
> 
> miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory
>  #include <sys/random.h>
> 
> Fixes:
> - http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c
> - http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051
> 
> It also fixes the following (similar) build failure, raised since the
> same commit:
> 
> miscutils/lib.a(seedrng.o): In function `seedrng_main':
> seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom'
> seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom'
> collect2: error: ld returned 1 exit status
> 
> Fixes:
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031
> 
> Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2:
> - fix building with make 4.2.1 and earlier.
> - use the current latest patch sent upstream (v4).
> 
>  ...r-glibc-2.24-not-providing-getrandom.patch |  39 ++++++
>  ...glibc-2.24-not-providing-random-head.patch |  60 +++++++++
>  ...trandom-detection-for-non-glibc-libc.patch | 124 ++++++++++++++++++
>  3 files changed, 223 insertions(+)
>  create mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
>  create mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
>  create mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch
> 
> diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
> new file mode 100644
> index 0000000000..4a194612b4
> --- /dev/null
> +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch
> @@ -0,0 +1,39 @@
> +From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001
> +From: Denys Vlasenko <vda.linux@googlemail.com>
> +Date: Mon, 10 Apr 2023 17:26:04 +0200
> +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom()
> +
> +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
> +Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a
> +---
> + miscutils/seedrng.c | 14 ++++++++++++++
> + 1 file changed, 14 insertions(+)
> +
> +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
> +index 967741dc7..7cc855141 100644
> +--- a/miscutils/seedrng.c
> ++++ b/miscutils/seedrng.c
> +@@ -45,6 +45,20 @@
> + #include <sys/random.h>
> + #include <sys/file.h>
> + 
> ++/* Fix up glibc <= 2.24 not having getrandom() */
> ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
> ++#include <sys/syscall.h>
> ++# define getrandom(...) bb_getrandom(__VA_ARGS__)
> ++static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
> ++{
> ++# if defined(__NR_getrandom)
> ++	return syscall(__NR_getrandom, buffer, length, flags);
> ++# else
> ++	return ENOSYS;
> ++# endif
> ++}
> ++#endif
> ++
> + #ifndef GRND_INSECURE
> + #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */
> + #endif
> +-- 
> +2.39.1
> +
> diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
> new file mode 100644
> index 0000000000..d729884805
> --- /dev/null
> +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch
> @@ -0,0 +1,60 @@
> +From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001
> +From: Thomas Devoogdt <thomas@devoogdt.com>
> +Date: Mon, 10 Apr 2023 19:58:15 +0200
> +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header
> +
> + - dropped the wrong define (not sure why it was there)
> + - <sys/random.h> not available if glibc <= 2.24
> + - GRND_NONBLOCK not defined if <sys/random.h> not included
> + - ret < 0 && errno == ENOSYS has to be true to get creditable set
> +
> +Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
> +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
> +Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf
> +---
> + miscutils/seedrng.c | 14 ++++++++++----
> + 1 file changed, 10 insertions(+), 4 deletions(-)
> +
> +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
> +index 7cc855141..3bf6e2ea7 100644
> +--- a/miscutils/seedrng.c
> ++++ b/miscutils/seedrng.c
> +@@ -42,25 +42,31 @@
> + #include "libbb.h"
> + 
> + #include <linux/random.h>
> +-#include <sys/random.h>
> + #include <sys/file.h>
> + 
> + /* Fix up glibc <= 2.24 not having getrandom() */
> + #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
> + #include <sys/syscall.h>
> +-# define getrandom(...) bb_getrandom(__VA_ARGS__)
> + static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
> + {
> + # if defined(__NR_getrandom)
> + 	return syscall(__NR_getrandom, buffer, length, flags);
> + # else
> +-	return ENOSYS;
> ++	errno = ENOSYS;
> ++	return -1;
> + # endif
> + }
> ++#else
> ++#include <sys/random.h>
> ++#endif
> ++
> ++/* Apparently some headers don't ship with this yet. */
> ++#ifndef GRND_NONBLOCK
> ++#define GRND_NONBLOCK 0x0001
> + #endif
> + 
> + #ifndef GRND_INSECURE
> +-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */
> ++#define GRND_INSECURE 0x0004
> + #endif
> + 
> + #define DEFAULT_SEED_DIR         "/var/lib/seedrng"
> +-- 
> +2.39.1
> +
> diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch
> new file mode 100644
> index 0000000000..140b27cae6
> --- /dev/null
> +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch
> @@ -0,0 +1,124 @@
> +From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
> +Date: Tue, 18 Apr 2023 15:54:43 +0200
> +Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +glibc <= 2.24 does not provide getrandom(). A check for it has been
> +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in
> +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf.
> +
> +However, building with a libc other than glibc can lead to the same
> +problem as not every other libc has getrandom() either:
> +
> +- uClibc provides it from v1.0.2 onwards, but requires to define
> +_GNU_SOURCE (all versions - we already define it by default), and
> +stddef to be included first (when using uClibc < 1.0.35 - we already
> +include it through libbb.h).
> +
> +- musl libc has getrandom(), but only from version 1.1.20 onwards. As
> +musl does not provide __MUSL__ or version information, it's not
> +possible to check for it like we did for glibc.
> +
> +All of this makes it difficult (or impossible in case of musl) to
> +check what we need to do to have getrandom() based on each libc
> +versions.
> +
> +On top of that, getrandom() is also not available on older kernels. As
> +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom()
> +is declared so compiling works, but it fails at link time because
> +getrandom() is not defined.
> +
> +To make it easier, take a similar approach to what was done for the
> +crypt library: try to build a sample program to see if we have
> +getrandom(). To keep it compatible with different versions of
> +make (for reference see [1]), a variable for '#' is also introduced.
> +
> +Based on the new Makefile variable, we now either use the
> +libc-provided getrandom() when it's available, or use our own
> +implementation when it's not (like it was the case already for glibc <
> +2.25).
> +
> +This should fix compiling with many libc/kernel combinations.
> +
> +[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4
> +
> +Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
> +Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html
> +---
> +Changes v3 -> v4:
> +  - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier.
> +
> +Changes v2 -> v3:
> +  - fix _GNU_SOURCE define location
> +
> +Changes v1 -> v2:
> +  - move _GNU_SOURCE to bb_libtest.c
> +  - remove GRND_NONBLOCK
> +
> +Note that I was not able to test every single combination, but I could
> +confirm it builds successfully for:
> +uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used)
> +uClibc 1.0.36, linux headers 4.9 (libc getrandom used)
> +musl 1.1.16, linux headers 4.12 (libc getrandom NOT used)
> +musl 1.2.1, linux headers (libc getrandom used)
> +glibc 2.25, linux headers 4.10 (libc getrandom used)
> +
> + Makefile.flags      | 12 ++++++++++++
> + miscutils/seedrng.c |  8 ++++----
> + 2 files changed, 16 insertions(+), 4 deletions(-)
> +
> +diff --git a/Makefile.flags b/Makefile.flags
> +index 1cec5ba20..0d437303a 100644
> +--- a/Makefile.flags
> ++++ b/Makefile.flags
> +@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y)
> + LDLIBS += rt
> + endif
> + 
> ++# GNU Make version 4.2.1 and earlier require number signs ('#')
> ++# inside function invocations to be escaped, while versions 4.3+
> ++# require them to be unescaped. Use a variable for it so that it works
> ++# for both versions:
> ++C := \#
> ++# Not all libc versions have getrandom, so check for it:
> ++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude <stddef.h>\n$Cinclude <sys/random.h>\nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c)
> ++
> ++ifeq ($(HAVE_GETRANDOM),y)
> ++CFLAGS += -DHAVE_GETRANDOM
> ++endif
> ++
> + # libpam may use libpthread, libdl and/or libaudit.
> + # On some platforms that requires an explicit -lpthread, -ldl, -laudit.
> + # However, on *other platforms* it fails when some of those flags
> +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
> +index 3bf6e2ea7..2f1e18c32 100644
> +--- a/miscutils/seedrng.c
> ++++ b/miscutils/seedrng.c
> +@@ -44,8 +44,10 @@
> + #include <linux/random.h>
> + #include <sys/file.h>
> + 
> +-/* Fix up glibc <= 2.24 not having getrandom() */
> +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24
> ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */
> ++#if defined HAVE_GETRANDOM
> ++#include <sys/random.h>
> ++#else /* No getrandom */
> + #include <sys/syscall.h>
> + static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
> + {
> +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags)
> + 	return -1;
> + # endif
> + }
> +-#else
> +-#include <sys/random.h>
> + #endif
> + 
> + /* Apparently some headers don't ship with this yet. */
> +-- 
> +2.39.1
> +
> -- 
> 2.37.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package: busybox: backport fix for missing getrandom()

[Peter Korsgaard]

>>>>> "Raphaël" == Raphaël Mélotte via buildroot <buildroot@buildroot.org> writes:

 > The current Busybox version (1.36.0) fails to build with some
 > libc/linux combinations where getrandom() is not available. Two fixes
 > for glibc already exists upstream, so backport them here. A third
 > one (submitted upstream, not part of the main branch yet) was needed
 > to be able to compile with older musl and uClibc versions (or older
 > kernels).

 > This fixes the following build failure raised since commit
 > d68b617993bd2f5c82a4936ed1e24e4fec6b94a2:

 > miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory
 >  #include <sys/random.h>

 > Fixes:
 > - http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c
 > - http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051

 > It also fixes the following (similar) build failure, raised since the
 > same commit:

 > miscutils/lib.a(seedrng.o): In function `seedrng_main':
 > seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom'
 > seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom'
 > collect2: error: ld returned 1 exit status

 > Fixes:
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028
 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031

 > Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
 > ---
 > Changes v1 -> v2:
 > - fix building with make 4.2.1 and earlier.
 > - use the current latest patch sent upstream (v4).

Committed to 2023.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mupdf: fix building with zlib-ng

[Peter Korsgaard]

>>>>> "Raphaël" == Raphaël Mélotte <raphael.melotte@mind.be> writes:

 > The current mupdf version fails to build when zlib-ng is used as the
 > zlib implementation. Add a patch to fix it.

 > This fixes the following build failure raised since the bump to
 > version 1.21.0 of the mupdf package in commit
 > 3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0:

 > source/fitz/encode-basic.c: In function 'deflate_write':
 > source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
 >   343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
 >       |                           ^~~~~~~~
 > source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?

 > Fixes: http://autobuild.buildroot.net/results/87128e9967cff20078c65ab847877aa44cc409d9

 > Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>

Committed to 2023.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot