From patchwork Thu Jun 11 11:28:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1307464 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=TaQmvlL/; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jM792C15z9sR4 for ; Thu, 11 Jun 2020 21:28:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 30BD3886B8; Thu, 11 Jun 2020 11:28:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C0HzTdS+LUUG; Thu, 11 Jun 2020 11:28:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 84BB1886B3; Thu, 11 Jun 2020 11:28:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6CD6F1BF2C4 for ; Thu, 11 Jun 2020 11:28:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 691F1879B3 for ; Thu, 11 Jun 2020 11:28:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X6YGMHXjfRVp for ; Thu, 11 Jun 2020 11:28:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4E98E879AE for ; Thu, 11 Jun 2020 11:28:30 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id x14so5778283wrp.2 for ; Thu, 11 Jun 2020 04:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WwE6QPGAYUXj4/Ee7AohEC/Ps1FvRNT2cbOgZUZLQ0Q=; b=TaQmvlL/4mOs0VNg0o4VsXWVoVcoonj+GxHUsvHGgw4bIDCgOFfjBqhKJ/WMgaNRSQ CA0HoqXBIYKDWERre1dF28mqmKCRtPaVX/hOOU/PXqixWylSJ4hFP2kMpGVxt5WzaKZf AsRdfC4rDXbGWKxlJCE7LcIWfoaG3x4RPj/OSvX+8KjKgAIDN/uK6AeJ6cdmkxLzR6ky foYSoYscxYSWlG1zEHX4tcx6Uh+21nVfFyd7w7+lgIoENzgNH20Q8n+b1ho4JYE2zMnn /ob5UrbSMlX93J0vCesdHleV9HJd5vZbYBiqEJbRO2tMwz1zhbYhu3889KpbTjHauUqz 8Mpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WwE6QPGAYUXj4/Ee7AohEC/Ps1FvRNT2cbOgZUZLQ0Q=; b=gSBpiWOp8jewxKGXYKJEpuLKTLaFXxmNQfIYDpmHRbANqkwXp9o+U/4PmIEhe9lsjH fF+Jawb2jVZvkoq8kmgzLjJQW/XnWl/pJHOFCzIssSkJg08UCuaU81YhKo553w5gip7b 51wSRpQxTdtHSn9SNf1lypv3cd8DwfxrJncxpUVtz2c5PCAWztJe06mBB8cppOB8DjxH aWBNwttgyhgVyNn9Xu++TOvKkEjzqLLzYsWHpB6fnXP4BNpFTzQTeS5OmQO8Xj07cG2A /SvMCe38XZSiAAWG7qoNuUw0f012sJb6kOhGrGo2lm//l6lTRo5iUvma+W96RJbCoUc8 xeEQ== X-Gm-Message-State: AOAM5311HkizXjUdOZlfvE3hIjVScQGGQalHnkeh39FKuo3mUnEM/mkN 1stajiZ7fXuKYWMr4U2NR6cpailo X-Google-Smtp-Source: ABdhPJwlaQvxhsbrvlXMI7MpEUa8G9LboI3Deao//xIknIudqwO5OfcEWaRYKqk3Zinx6vvkksBUYA== X-Received: by 2002:a5d:55c2:: with SMTP id i2mr9119381wrw.225.1591874908337; Thu, 11 Jun 2020 04:28:28 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id c16sm4586917wrx.4.2020.06.11.04.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 04:28:27 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 11 Jun 2020 13:28:20 +0200 Message-Id: <20200611112820.952960-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/linux-pam: fix build with uclibc X-BeenThere: buildroot@busybox.net 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/92b3dd7c984d2b843ac9aacacd69eec99f28743e Signed-off-by: Fabrice Fontaine --- ...when-crypt-does-not-require-libcrypt.patch | 37 +++++++++++++++++++ package/linux-pam/linux-pam.mk | 2 + 2 files changed, 39 insertions(+) create mode 100644 package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch diff --git a/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch b/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch new file mode 100644 index 0000000000..ebcb81aa91 --- /dev/null +++ b/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch @@ -0,0 +1,37 @@ +From aef363c7e8e942224e6cffc4398366c6e5d31749 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jun 2020 00:04:32 +0200 +Subject: [PATCH] configure.ac: fix build failure when crypt() does not require + libcrypt + +Since commit 522246d20e4cd92fadc2d760228cb7e78cbeb4c5, the build fails +if "none required" is returned by AC_SEARCH_LIBS for libcrypt. + +Resolves: https://github.com/linux-pam/linux-pam/pull/235 +Fixes: http://autobuild.buildroot.org/results/92b3dd7c984d2b843ac9aacacd69eec99f28743e +Fixes: v1.4.0~228 ("Use cached 'crypt' library result correctly") + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/aef363c7e8e942224e6cffc4398366c6e5d31749] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ea08a7a3..c1862ea7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -428,7 +428,11 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], + [crypt_libs="crypt"]) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_cv_search_crypt}", LIBCRYPT="") ++AC_SEARCH_LIBS([crypt],[$crypt_libs]) ++case "$ac_cv_search_crypt" in ++ -l*) LIBCRYPT="$ac_cv_search_crypt" ;; ++ *) LIBCRYPT="" ;; ++esac + AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 8f8d575102..57fb2c9cfd 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -20,6 +20,8 @@ LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright +# We're patching configure.ac +LINUX_PAM_AUTORECONF = YES LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBSELINUX),y)