From patchwork Sun Aug 27 11:18:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1826488 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.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4RYWR31Bpzz1yZs for ; Sun, 27 Aug 2023 21:18:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4FC9240549; Sun, 27 Aug 2023 11:18:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4FC9240549 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k_sqNOsichlE; Sun, 27 Aug 2023 11:18:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8C017404DF; Sun, 27 Aug 2023 11:18:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8C017404DF X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EDDF61BF3F6 for ; Sun, 27 Aug 2023 11:18:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9B44760BBD for ; Sun, 27 Aug 2023 11:18:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9B44760BBD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZTeKETR_KiT5 for ; Sun, 27 Aug 2023 11:18:44 +0000 (UTC) Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) by smtp3.osuosl.org (Postfix) with ESMTPS id D858060ABD for ; Sun, 27 Aug 2023 11:18:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D858060ABD Received: by helium.openadk.org (Postfix, from userid 1000) id B285C3520BF2; Sun, 27 Aug 2023 13:18:39 +0200 (CEST) Date: Sun, 27 Aug 2023 13:18:39 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-21-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1693135119; bh=EJj5yeOE5YFha5O8IbECgyy4kfZNIsc6ORiyPUVzi8o=; h=Date:From:To:Subject:From; b=HMoneUj5Ck71M6BFClkvo2OeZLpQKm4IaS27FOrOkoDK2ga4e4v9/3DMgghXffA1B pO9d2yR7P+pZ/rs7GmdrNoUurnIbys2lWovgq+EUVY7tj+n2QdGfYnkmTrIYm4uFzx 5g2hjcdHuWpVrfkSB9VN/bcH2N3/6PoXn7Tkx2xoLJjt9/mstceFCU2oSY6+ErApJq 8wILGyu7QFlS3N+1bK6Fo6jYDATEv/xJZtAeM9TfqXGzbMTpwMHrl18P456xkfq1RU YIYx38jrUEjwHIzlcwVtayR1O/SW0cScqhii3KUYC97y9kWYjhofd6DUYzb/E9v+FQ z9khT0uSJT/qQ== Subject: [Buildroot] [PATCH] package/pam: fix uclibc compile error 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Following build failure occurs: opasswd.c: In function 'compare_password': opasswd.c:142:3: error: 'retval' undeclared (first use in this function); did you mean 'outval'? 142 | retval = outval != NULL && strcmp(outval, oldpass) == 0; | ^~~~~~ | outval Add a patch from upstream to fix it. Happens since the update to 1.5.3 in Buildroot commit: f8147e27cdac8f998ec6644a09ce4e8d62b6433c Fixes: - http://autobuild.buildroot.net/results/576/576fc4b9ccbc6cff82569692bdec82192e89f036 Signed-off-by: Waldemar Brodkorb --- ...Fix-build-if-crypt_r-isn-t-available.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch diff --git a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch new file mode 100644 index 0000000000..c7fdd8be36 --- /dev/null +++ b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch @@ -0,0 +1,37 @@ +From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001 +From: Bernhard Rosenkränzer +Date: Wed, 7 Jun 2023 19:49:01 +0200 +Subject: [PATCH] Fix build if crypt_r isn't available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +retval was being defined only in #ifdef HAVE_CRYPT_R, but used +unconditionally. + +Signed-off-by: Bernhard Rosenkränzer +Fixes: bcba17939e1b ("modules: make use of secure memory erasure") +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab +--- + modules/pam_pwhistory/opasswd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c +index 479e3fc4..fc610e2f 100644 +--- a/modules/pam_pwhistory/opasswd.c ++++ b/modules/pam_pwhistory/opasswd.c +@@ -128,9 +128,9 @@ static int + compare_password(const char *newpass, const char *oldpass) + { + char *outval; ++ int retval; + #ifdef HAVE_CRYPT_R + struct crypt_data output; +- int retval; + + output.initialized = 0; + +-- +2.39.2 +