diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2026-03-19 04:15:05 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-19 13:22:58 -0700 |
| commit | 2f44b98cb1bdaf54b08f8ea7bb776a0a06af657b (patch) | |
| tree | a809fa57f0aaba062b2f54881390b6a49202e27a | |
| parent | ca6b9d8738bbcad675c146872f6db22b0d37f35a (diff) | |
| download | meta-openembedded-2f44b98cb1bdaf54b08f8ea7bb776a0a06af657b.tar.gz | |
liboauth2: Backport a patch to build with glibc 2.43
Also remove PV. There is no need to set PV since the version is in the
recipe file name.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch new file mode 100644 index 0000000000..65340e806a --- /dev/null +++ b/meta-oe/recipes-support/liboauth2/liboauth2/0002-Fix-use-of-strchr-with-new-GCC.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 0dcba079907d559550ee8d9a201d26203bb8aebd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Bokovoy <abokovoy@redhat.com> | ||
| 3 | Date: Wed, 7 Jan 2026 11:41:37 +0200 | ||
| 4 | Subject: [PATCH] Fix use of strchr with new GCC | ||
| 5 | |||
| 6 | According to C specification, 7.28.5.1, strchr() is a generic function | ||
| 7 | and its string argument's type is promoted to the result. So if it is | ||
| 8 | const char*, the result will be const char* as well. | ||
| 9 | |||
| 10 | gcc in Fedora Rawhide (15.2.1 20251111 or later) implements this | ||
| 11 | conformance, resulting in a compilation fail with | ||
| 12 | -Werror=discarded-qualifiers. | ||
| 13 | |||
| 14 | Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com> | ||
| 15 | Upstream-Status: Backport [https://github.com/OpenIDC/liboauth2/commit/0dcba079907d559550ee8d9a201d26203bb8aebd] | ||
| 16 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 17 | --- | ||
| 18 | src/jose.c | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/src/jose.c b/src/jose.c | ||
| 22 | index fbaf661..a3441c8 100644 | ||
| 23 | --- a/src/jose.c | ||
| 24 | +++ b/src/jose.c | ||
| 25 | @@ -993,7 +993,7 @@ char *oauth2_jose_jwt_header_peek(oauth2_log_t *log, | ||
| 26 | { | ||
| 27 | char *input = NULL, *result = NULL; | ||
| 28 | json_t *json = NULL; | ||
| 29 | - char *p = NULL; | ||
| 30 | + const char *p = NULL; | ||
| 31 | size_t result_len; | ||
| 32 | char *rv = NULL; | ||
| 33 | |||
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb index 31d7aec69d..5b1ecd23dd 100644 --- a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb +++ b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" | |||
| 6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
| 7 | git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \ | 7 | git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \ |
| 8 | file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \ | 8 | file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \ |
| 9 | file://0002-Fix-use-of-strchr-with-new-GCC.patch \ | ||
| 9 | " | 10 | " |
| 10 | 11 | ||
| 11 | PV = "2.2.0" | ||
| 12 | SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19" | 12 | SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19" |
| 13 | 13 | ||
| 14 | DEPENDS = "libpcre2 jansson curl openssl cjose" | 14 | DEPENDS = "libpcre2 jansson curl openssl cjose" |
