From patchwork Fri Oct 7 00:36:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 43180 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2EF5927BBEA; Fri, 7 Oct 2022 01:37:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B21EC27BBE9 for ; Fri, 7 Oct 2022 01:37:21 +0100 (BST) Received: from localhost ([::1]:42290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ogbMe-0005oS-TP for patchwork@mira.cbaines.net; Thu, 06 Oct 2022 20:37:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogbMM-0005o5-GO for guix-patches@gnu.org; Thu, 06 Oct 2022 20:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ogbMM-0006P7-7a for guix-patches@gnu.org; Thu, 06 Oct 2022 20:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ogbML-0002U3-Nq for guix-patches@gnu.org; Thu, 06 Oct 2022 20:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55762] [PATCH core-updates] Upgrade linux-pam to 1.5.2 Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Oct 2022 00:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55762 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55762@debbugs.gnu.org Cc: Tobias Geerinckx-Rice Received: via spool by 55762-submit@debbugs.gnu.org id=B55762.16651030219541 (code B ref 55762); Fri, 07 Oct 2022 00:37:01 +0000 Received: (at 55762) by debbugs.gnu.org; 7 Oct 2022 00:37:01 +0000 Received: from localhost ([127.0.0.1]:33864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogbMK-0002To-TK for submit@debbugs.gnu.org; Thu, 06 Oct 2022 20:37:01 -0400 Received: from linode.us-core.com ([23.239.4.72]:45008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogbME-0002Tb-Lf for 55762@debbugs.gnu.org; Thu, 06 Oct 2022 20:36:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=njAvsawp08GJEnj +zLWja7mGN41bCzIX24hy2u+zRkY=; h=cc:to:subject:date:from:in-reply-to: references; d=lease-up.com; b=aTjGmmMnVF2fW4hMc0oiKbsyJIW8+p+K5PiW9AWR uPp40af4RY/EWXhe+coEgE6UKNs5jjXgoKSJZ7P2N2fyypLb97aNJ+zU3xuf8qCEKcAEuS qLEZtD85+6bEruGJxRiqahUBhnnXrclXKE3y61Eryt2a3+QSO27UU0jWMq2Lo= Received: by linode.us-core.com (OpenSMTPD) with ESMTPSA id da31438d (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <55762@debbugs.gnu.org>; Fri, 7 Oct 2022 00:36:53 +0000 (UTC) Received: by mail-lf1-f43.google.com with SMTP id s20so5064707lfi.11 for <55762@debbugs.gnu.org>; Thu, 06 Oct 2022 17:36:52 -0700 (PDT) X-Gm-Message-State: ACrzQf0p3zOhPi6mfNnFRx+sTEskTkO+NeKejyMg7oFHQ5Ilr28g/+I+ TUfzpKKlLVBTV4c5L0w1kPFw5TTdmuYlcP8q7YQ= X-Google-Smtp-Source: AMsMyM6QB9TOwX5tuv7f0DkfBN/Su8Zbl8dw762R4tQgwZ9IfzW7Bb/tJ9iW4sXcRglkN/vrx6cfWPaBLMvb/M3hQYs= X-Received: by 2002:a19:2d4f:0:b0:4a2:7ee2:de91 with SMTP id t15-20020a192d4f000000b004a27ee2de91mr835123lft.651.1665103009350; Thu, 06 Oct 2022 17:36:49 -0700 (PDT) MIME-Version: 1.0 References: <87bkva9aat@nckx> In-Reply-To: Date: Thu, 6 Oct 2022 17:36:12 -0700 X-Gmail-Original-Message-ID: Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner X-getmail-retrieved-from-mailbox: Patches Hi, Upstream accepted my merge request [1] so I added a code comment with the version reference. Here is the updated patch. Thanks! Kind regards Felix Lechner [1] https://github.com/linux-pam/linux-pam/pull/493 From 0854ffe7bd25ce883fbe63f4862929239e7a1907 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Thu, 29 Sep 2022 13:34:21 -0700 Subject: [PATCH] gnu: linux-pam: Update to 1.5.2. * gnu/packages/linux.scm (linux-pam): Update to 1.5.2. Add explicit libdir for pkgconfig files. --- gnu/packages/linux.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a97b84d657..a81b8c7641 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1566,7 +1566,7 @@ (define-public xpadneo (define-public linux-pam (package (name "linux-pam") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) @@ -1575,7 +1575,7 @@ (define-public linux-pam version "/Linux-PAM-" version ".tar.xz")) (sha256 (base32 - "1z4jayf69qyyxln1gl6ch4qxfd66ib1g42garnrv2d8i1drl0790")) + "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74")) (patches (search-patches "linux-pam-unix_chkpwd.patch" "linux-pam-no-setfsuid.patch")))) @@ -1592,6 +1592,12 @@ (define-public linux-pam #:configure-flags (list (string-append "--includedir=" (assoc-ref %outputs "out") "/include/security") + ;; explicit libdir for pkgconfig files + ;; drop with 1.5.3, which fixes + ;; https://github.com/linux-pam/linux-pam/issues/466 + (string-append "--libdir=" + (assoc-ref %outputs "out") + "/lib") ;; XXX: is missing from glibc when ;; cross-compiling, so we have to disable NIS base-commit: 511d584906c6304a3dc6ffcf7096bb14c6bee222 -- 2.37.3