From nobody Wed Nov 05 19:37:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d1wZZ25dvz651tr; Wed, 05 Nov 2025 19:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZZ0zYpz3sSH; Wed, 05 Nov 2025 19:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w8/RiuT46mZcPl2TYBJ9LamgPlx3yv3Sp/3+SWbNx0=; b=ktMYBKdrwO86HVUZ2ydCMsrm9U8k/Ixt8RgIKqV1Y3kNi/JnymwsAw38NA/Xrge3Llx+sJ w+1PimZrCK+fQozpF2IhfgtjKQbK4RyybMcpmQeGHGcdhBBJczT14WGXNkf7r9a2LHXIKl CFceiMNLHHc/496jyqtKHufzxQjI9PhJlHqt8YOYz+tEqZqHjo51ye7NFs5L1hbSC5F+P3 lvwlzx2Lcf4FU7XPKj55ea59AZihGtUVblzzYA6ktj7xfVR7Gag0gnm65hXllbLVHQGQDh Re0BYLS51F3M0mYtvCz7Jw1OLyShbliNoyKvYrDIfduq1kHOms96IVGp5Iq6Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w8/RiuT46mZcPl2TYBJ9LamgPlx3yv3Sp/3+SWbNx0=; b=n7bMGsLVkhDsAhTXYPtTUtoDxUUmxr6R3ypdh8HYUc7wnbhmtf6i8vSD4GKJvHSSsjV0ju CAHOLaW/EMLH/hCEE7ynRbCuODPJNJZRSZNH0GxZK7WwVlRx+CHiI2DM8cMcDSgE7VVBpp +kiL+MgC1QHazr4x6VEcAWlZh+OFqzYRuuKQx9q4QWpuWk31l+ZZz2+f/zPovBIE3QBDHm xmK7hWrMYouZHwr1/iRSaosYn/nieVvHygs/jRoSGD4HdlMNaJEDjb+VOpnP4FGWXKAcD7 LrFgDe/fJhSJaQYbDC6JxVwataoiTGRxCG5sjuUrh+8kBxwdJqre+kU+qoADaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371446; a=rsa-sha256; cv=none; b=atR18GalzEWQ81/6E5aMmU08nuOFVJfJ5kVnwE2VPGplpaCtCUwFAtlsuNSxNCDDbQmh6z EcvR+ZzP+xEjK280ULB9GqNdra4gQO737TmhMiM42z79whhvgINnwRfYwVHjNoR7ggEndj wmXX1q0yxqigYTvLSDC+iloWz0Irk1WSKDjphgQ+yNYsnQ5AQPGOrfiUuvM2c/pUoJrJLx QDgN2p9454EfQR9M+SoOvy/hav05/iIaI+V9z6+FMEmBA2G/69St6okt3uK6rzyoSYrbRO N+hlDcI2R+7LfZ6jTzDnmWHSn2e3mWHYKH+48twEz1DOV332gE+PqKlRBx+4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1wZZ0PlPzx26; Wed, 05 Nov 2025 19:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbP2g086142; Wed, 5 Nov 2025 19:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbPlL086139; Wed, 5 Nov 2025 19:37:25 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:25 GMT Message-Id: <202511051937.5A5JbPlL086139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 593f5b29ef7c - releng/15.0 - static_libpam: Don't install pam.d.5 twice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 593f5b29ef7c79d09e39c2a32861d4ecdb9049ad Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=593f5b29ef7c79d09e39c2a32861d4ecdb9049ad commit 593f5b29ef7c79d09e39c2a32861d4ecdb9049ad Author: Lexi Winter AuthorDate: 2025-11-01 13:38:26 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:18 +0000 static_libpam: Don't install pam.d.5 twice static_libpam's Makefile includes libpam's Makefile after setting some variables (like MAN) to empty to avoid installing the manpages twice. After commit 031e711647c3, it neglected to do this for MANNODEVLINKS, causing pam.d.5.gz to be installed twice. This is harmless for installworld, but breaks some things that rely on METALOG (NO_ROOT installs) since it causes two METALOG entries to be generated for the same file. Approved by: re (cperciva) Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days PR: 290708 Reported by: emaste Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53512 (cherry picked from commit a1806e6ff37a606277ab9657b951e918164e9f63) (cherry picked from commit 92a081bc2d1ad2c06749d5fbcf31697db05a2001) --- lib/libpam/static_libpam/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index 8830f09ef0da..703e6a4a2f00 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -45,6 +45,7 @@ MAN= MANNODEV= INCS= MLINKS= +MANNODEVLINKS= MK_TESTS= no #