From patchwork Fri Oct 3 13:55:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 2145323 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4cdVYn5PQ7z1y05 for ; Fri, 3 Oct 2025 23:55:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 52DAD40ED2; Fri, 3 Oct 2025 13:55:56 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id M18PS-DpKL8o; Fri, 3 Oct 2025 13:55:55 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3349E40ED4 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 3349E40ED4; Fri, 3 Oct 2025 13:55:55 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists1.osuosl.org (Postfix) with ESMTP id B9A0E13D for ; Fri, 3 Oct 2025 13:55:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A06C2409C7 for ; Fri, 3 Oct 2025 13:55:53 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aZse7UBh7Cjz for ; Fri, 3 Oct 2025 13:55:52 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=85.13.140.57; helo=dd20012.kasserver.com; envelope-from=bernd@kuhls.net; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 62AB8408E5 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 62AB8408E5 Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp2.osuosl.org (Postfix) with ESMTPS id 62AB8408E5 for ; Fri, 3 Oct 2025 13:55:52 +0000 (UTC) Received: from fli4l.lan.fli4l (p4fd6cc8f.dip0.t-ipconnect.de [79.214.204.143]) by dd20012.kasserver.com (Postfix) with ESMTPSA id 344A9A4C5D11; Fri, 3 Oct 2025 15:55:35 +0200 (CEST) Received: from [192.168.1.144] (port=42458 helo=bruckner.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.98.2) (envelope-from ) id 1v4gFy-000000005ND-1AnK; Fri, 03 Oct 2025 13:55:34 +0000 From: Bernd Kuhls To: buildroot@buildroot.org Date: Fri, 3 Oct 2025 15:55:28 +0200 Message-ID: <20251003135530.371676-1-bernd@kuhls.net> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Spamd-Bar: ++++++ X-Spam: Yes X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202506031021; t=1759499735; bh=/zouEOt3zUgkEopTEt/GYVOCWKaU3Eyd0NNwgxbv73U=; h=From:To:Cc:Subject:Date:From; b=sKWOP7ydL51Nqjuyx9xDLo/T/8u0Ae/ZJZJ0wYVeaQ9V/XuT7mqR31RnP9GgrMn3y LaHPMx6ScAUdERSnWnw9vYsowcE5ZRnM2vyVv+lJjsWYij2gGVVd+cb4PCP9BVwA0x oaMZVp0UT8JG+CnMA6Htz0uRBbrE/jwpR0yIfbHNlneU6NWuhCC+uSWTcGIaV17mro 8CKRFC4vngHooNL5cp8hd8lpv0xyyE2QNipPKy4pJVfhmopY/5H1Sa7dmYi1AK21Nn MUk5NSZv4up1AECqVHOUqbyJ004M6AeFHaGf5DJaRpexpS1ftCwP4W7+GMIpsrwDpX LWtZfFr+4nZaA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=kuhls.net X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202506031021 header.b=sKWOP7yd Subject: [Buildroot] [PATCH 1/3] package/asterisk: fix build caused by libjwt bump X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Petazzoni In commit 770f9154978c40ce5b7718174108b37c5310869d, libjwt was bumped from 1.17.2 to 3.2.0, which is a big bump. And the libjwt website states "Version 3 of LibJWT is a complete overhaul of the code. Please see documentation for usage." And indeed, this version bump breaks the build of Asterisk: res_stir_shaken/attestation.c: In function 'pack_payload': res_stir_shaken/attestation.c:357:9: error: implicit declaration of function 'jwt_add_grants_json' [-Wimplicit-function-declaration] 357 | jwt_add_grants_json(jwt, payload_str); | ^~~~~~~~~~~~~~~~~~~ In file included from /home/autobuild/autobuild/instance-11/output-1/build/asterisk-22.3.0/include/asterisk/module.h:39, from res_stir_shaken/attestation.c:24: res_stir_shaken/attestation.c: In function '_dtor_jwt': res_stir_shaken/attestation.c:367:38: error: implicit declaration of function 'jwt_free'; did you mean 'jwks_free'? [-Wimplicit-function-declaration] 367 | RAII_VAR(jwt_t *, jwt, NULL, jwt_free); | ^~~~~~~~ To fix this, let's use the bundled version of libjwt in Asterisk, since even Asterisk master hasn't been fixed to be compatible with libjwt 3.x. Of course, this raises the question of whether the separate libjwt package should be removed, as it is anyway only used by Asterisk. Fixes: http://autobuild.buildroot.net/results/2d39791c65c5b71b0533d4b2bce5f073f5919552/ Cc: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls --- package/asterisk/Config.in | 1 - package/asterisk/asterisk.hash | 2 ++ package/asterisk/asterisk.mk | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index 71c741acfd..c7101d70f4 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC - select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBPJSIP select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 7b28624921..f11ed08ef4 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -3,6 +3,8 @@ sha256 4cc403c8885d4aed3956dfb75d315d3e5bcc129eb9cd47c156d3b12ecceed1ba asteri # Locally computed sha256 58bb83cec4d431f48d006e455d821668450f8cf6b6c95f090def47062fa3a60c pjproject-2.15.1.tar.bz2 +sha256 6775095bcd417d375faddc1f17cdd7706ad8aa9b9b02404990c4b0ee218ee379 libjwt-1.15.3.tar.gz + # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed sha1 721c512feaea102700d5bdce952fdc0bb29dc640 asterisk-core-sounds-en-gsm-1.6.1.tar.gz diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 18af217129..e7e802aa45 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -13,11 +13,13 @@ ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) # segfaults. The reason behind this is unclear. # https://github.com/asterisk/asterisk/issues/671 ASTERISK_PJSIP_URL = https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/ +ASTERISK_LIBJWT_URL = https://raw.githubusercontent.com/asterisk/third-party/master/libjwt/1.15.3/ ASTERISK_SOUNDS_BASE_URL = http://downloads.asterisk.org/pub/telephony/sounds/releases ASTERISK_EXTRA_DOWNLOADS = \ $(ASTERISK_SOUNDS_BASE_URL)/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \ $(ASTERISK_SOUNDS_BASE_URL)/asterisk-moh-opsound-wav-2.03.tar.gz \ - $(ASTERISK_PJSIP_URL)/pjproject-2.15.1.tar.bz2 + $(ASTERISK_PJSIP_URL)/pjproject-2.15.1.tar.bz2 \ + $(ASTERISK_LIBJWT_URL)/libjwt-1.15.3.tar.gz ASTERISK_LICENSE = GPL-2.0, BSD-3-Clause (SHA1, resample), BSD-4-Clause (db1-ast) ASTERISK_LICENSE_FILES = \ @@ -39,7 +41,6 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ - libjwt \ libpjsip \ libxml2 \ sqlite \ @@ -94,7 +95,7 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ - --with-libjwt="$(STAGING_DIR)/usr" \ + --with-libjwt-bundled \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ --with-pjproject-bundled \