From patchwork Sat Nov 4 09:58:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1859256 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=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::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 4SMtNh0bRpz1yQ4 for ; Sat, 4 Nov 2023 20:58:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5325141EA7; Sat, 4 Nov 2023 09:58:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5325141EA7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F7Opv0p33y11; Sat, 4 Nov 2023 09:58:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 685ED41EA0; Sat, 4 Nov 2023 09:58:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 685ED41EA0 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 57F881BF417 for ; Sat, 4 Nov 2023 09:58:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 261C941EA0 for ; Sat, 4 Nov 2023 09:58:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 261C941EA0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zQFz6En3U_jg for ; Sat, 4 Nov 2023 09:58:31 +0000 (UTC) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp4.osuosl.org (Postfix) with ESMTPS id A25DC41E9B for ; Sat, 4 Nov 2023 09:58:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A25DC41E9B Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4094301d505so22132165e9.2 for ; Sat, 04 Nov 2023 02:58:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699091909; x=1699696709; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D0B/IUR1EqP7pM6kilKqExBaAmk9konJHYnZF8iAino=; b=WicbjT9EAfiDbdiqUIzciPpLqpiOYggi3BIx/RnGN9DFDHuJIdFK8+uysque8lHcJa +AGwZVMIPbbfvhZhCgYlCUfx6mes5+6sxnH9u/VNGyz4soMnkrZq1PnzLZ8fCUgKOpHd Q2iJOTLBhaP1t1BrP7kNdG1CZyEkiUmV9Viexyhksjt4Sb/OG4n2HNldfYURdUqXsUmA sMH7vR7Qm5uN/XyWPKfvMo5M1umvG4gQCtyULWSdDOsOTwcRjy+//2xDc9Or1fuzbh9s CPtvd0iAq6suBJGkcsXv5XRNHADTrzL0wg1D99v/hZ/aFPqNn3n7UxOg+7XnVUD9B1Su fFbA== X-Gm-Message-State: AOJu0YxUg8qKEEr2ZkY86h0H5cMCtO0AOSpbL7lt+UQhaONYtuQ5+MCy RtAATUsFlOR4SmqaDStyQb3+Qc4YkAo= X-Google-Smtp-Source: AGHT+IFovPpt3x4Kd2Hzi+2IxeqystN9mn//ORnW9kaRCvi8eZkL+nxuX6f9DxiwKwhKJFWiKdnuyw== X-Received: by 2002:a05:600c:4751:b0:401:bdf9:c336 with SMTP id w17-20020a05600c475100b00401bdf9c336mr21504601wmo.27.1699091908526; Sat, 04 Nov 2023 02:58:28 -0700 (PDT) Received: from kali.home (lfbn-ren-1-787-165.w83-197.abo.wanadoo.fr. [83.197.114.165]) by smtp.gmail.com with ESMTPSA id b15-20020a05600010cf00b00318147fd2d3sm3964849wrx.41.2023.11.04.02.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 02:58:28 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 4 Nov 2023 10:58:26 +0100 Message-ID: <20231104095826.655479-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699091909; x=1699696709; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=D0B/IUR1EqP7pM6kilKqExBaAmk9konJHYnZF8iAino=; b=H/vtMJQP++At6ro+/gYqPPgzcUom13mcd6C/r92gcHbRzrWWYe4nKtbtKdl/ucFwCS bcAhszNJnLiTFqO2dPFLrbyZ5NgH/KMi2hm84FbDT9PG5G+Zdc1k2bD012rMTVUd0+6O p5qigE47h6K0mzdRR1yqPQXzgiY4mJeHSiesAARt8igfznMOkoSt9lG3sdqXfJKoWrlm dxayBhfR6OxZbhxb+ryLQTKQbp/LNrnuOy05khgOwN5RDi+ARerryqj2AQsLW8isJDcZ nCQeRO3qKks8szNi+OSmkmMBom13ghop6OQS09f2gGY4vTfYcym6Tk3wCubyptbbncfk Ja4A== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=H/vtMJQP Subject: [Buildroot] [PATCH 1/1] package/freeradius-server: bump to version 3.2.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David GOUARIN , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" - Refresh patches - autoconf must be switched to autoreconf because of https://github.com/FreeRADIUS/freeradius-server/commit/7cd23f2de660fc07bdd53816c646e7600f57b8dd https://github.com/FreeRADIUS/freeradius-server/blob/release_3_2_3/doc/ChangeLog Signed-off-by: Fabrice Fontaine --- .../0001-jlibtool-cross-with-host-CC.patch | 7 ++-- ...configure.ac-allow-cross-compilation.patch | 20 ++++++----- ...-execinfo-in-libc-before-searching-l.patch | 34 +++++++------------ .../freeradius-server/freeradius-server.hash | 4 +-- .../freeradius-server/freeradius-server.mk | 8 ++--- 5 files changed, 35 insertions(+), 38 deletions(-) diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 398f88e4ad..0cd55071c4 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -9,6 +9,8 @@ Upstream: Not applicable Signed-off-by: David Gouarin Signed-off-by: Matt Weber +[Fabrice: update for 3.2.3] +SIgned-off-by: Fabrice Fontaine --- scripts/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -18,13 +20,14 @@ index 57915e1053..c28260dd7e 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk @@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c -- $(Q)${CC} $< -o $@ +- $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo HOSTCC jlibtool.c -+ $(Q)${HOSTCC} $< -o $@ ++ $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS} clean: jlibtool_clean diff --git a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch index d6d1bcfc78..a34c872af7 100644 --- a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch +++ b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch @@ -19,6 +19,8 @@ Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/ Signed-off-by: David Gouarin Signed-off-by: Matt Weber Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- src/modules/rlm_krb5/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -28,15 +30,15 @@ index efc9f29d7f..98a97e438a 100644 --- a/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then - FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) - if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], -- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) -+ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], -+ [AC_MSG_WARN(cross compiling: not checking)]) - fi - else - krb5threadsafe="" + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" -- 2.17.1 diff --git a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch index b4cbc61a89..6633bd2786 100644 --- a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch +++ b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch @@ -12,6 +12,8 @@ FR_SMART_CHECK_LIB can find an incompatible library. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- configure.ac | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) @@ -20,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index f431da6db5..faa7cfc2b4 100644 --- a/configure.ac +++ b/configure.ac -@@ -2165,26 +2165,26 @@ dnl # +@@ -2165,21 +2165,21 @@ dnl # smart_try_dir=$execinfo_include_dir FR_SMART_CHECK_INCLUDE(execinfo.h) if test "x$ac_cv_header_execinfo_h" = "xyes"; then @@ -28,39 +30,29 @@ index f431da6db5..faa7cfc2b4 100644 - FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) + dnl # Might be provided as part of libc + AC_MSG_CHECKING([if execinfo provided as part of libc]) -+ AC_TRY_LINK( -+ [ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include -+ ], -+ [ ++ ]], [[ + void *sym[1]; -+ backtrace_symbols(&sym, sizeof(sym)) ], -+ [ ++ backtrace_symbols(&sym, sizeof(sym)) ]])],[ + AC_MSG_RESULT(yes) + ac_cv_lib_execinfo_backtrace_symbols="yes" -+ ], -+ [ ++ ],[ + AC_MSG_RESULT(no) -+ ] -+ ) ++ ]) if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then - dnl # Might be provided as part of libc - AC_MSG_CHECKING([if execinfo provided as part of libc]) -- AC_TRY_LINK( -- [ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include -- ], -- [ +- ]], [[ - void *sym[1]; -- backtrace_symbols(&sym, sizeof(sym)) ], -- [ +- backtrace_symbols(&sym, sizeof(sym)) ]])],[ - AC_MSG_RESULT(yes) - ac_cv_lib_execinfo_backtrace_symbols="yes" -- ], -- [ +- ],[ - AC_MSG_RESULT(no) -- ] -- ) +- ]) + smart_try_dir=$execinfo_lib_dir + FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) fi diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index 33ec09e7b0..a267bd6f8c 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2.sig -sha256 a3071cd78ffcb4706217561d822ee4c760daeb277a63f36a9f11d412c3c39e56 freeradius-server-3.2.0.tar.bz2 +# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig +sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1931c970e8..2dd9c4e609 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERADIUS_SERVER_VERSION = 3.2.0 +FREERADIUS_SERVER_VERSION = 3.2.3 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius @@ -16,10 +16,10 @@ FREERADIUS_SERVER_DEPENDENCIES = libtalloc FREERADIUS_SERVER_AUTORECONF = YES # We're patching src/modules/rlm_krb5/configure.ac -define FREERADIUS_SERVER_RUN_KRB5_AUTOCONF - cd $(@D)/src/modules/rlm_krb5; $(AUTOCONF) -I$(@D) +define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF + cd $(@D)/src/modules/rlm_krb5; $(AUTORECONF) -I$(@D)/m4 endef -FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTOCONF +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTORECONF # some compiler checks are not supported while cross compiling. # instead of removing those checks, we cache the answers