From nobody Mon Oct 20 17:12:38 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 4cr26t6xydz6CmM0; Mon, 20 Oct 2025 17:12:38 +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 4cr26t66qXz3lvT; Mon, 20 Oct 2025 17:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760980358; 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=rCUha8fvG+41/k9n3FL9lRAneH1HCM2gseT0B+s+G6w=; b=IsArZp08VMULMOAgHdDbATtL7aMHVQL9lCPFCTalg88DphK/64+VFiHOdSdMA4g2Q6aLX4 xt+6pz1Ixz36kkne+VApCnyZl2ug5zOtyAJ66LlY5ZtAy14i+os9iuN7kK9AN88x8tvGkN QJLaY8nIyV4pwwjXvZE7/gioxpNUcefWFGx9KQpQS8KF6ykW4C0zgqc6syBg40xFtQyXnP Buds9QE3NYPXP32/uOa7ploJghBgL8mPvLboSst08Ya8s2AYkQFxNO1fEywuR8J5UjOni6 BIEydGf9sYPzuj3eLQCaU20prDySsT/85CXKbL4DEASRNKM8T+OVuFgF94Vr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760980358; 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=rCUha8fvG+41/k9n3FL9lRAneH1HCM2gseT0B+s+G6w=; b=mYqV+nkYdzb5d69Xjr5KIi8crx6N8LXysQ7mJ4ZLz/764ZLuV5NVbEFFpI4WiF+Uno/e8Z 2/8jG0t/DQZT3jr+N57+Ftp+bvJNVAEMTc+9EwuW/4eMm3G3wsjtWiGvwmDhcTQMDivvb0 2VKvhlitdWblHA5OquuDnhVP5MqbC+JJo6ZWx+RFqjJGP4Nt5vSdQ1D6JYL2vkz9fPxS44 +4SGdmDKbYJBoZlIyd9tdkUaZvPlam/6srkZKnVYPUnH8++5xIJP3dfhVdLwIgYOlOD5TA +VHoJo+81Bb4aOZ2wd9Lxr83ZlauAJ9oOcn8DwdCXpnn8uFHfgKHkgwi41JUdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760980358; a=rsa-sha256; cv=none; b=l0fBZlqFRgXF6OoIMDEgeBncW1VW/JkAiwnFiOqcteS/iyXAqpfucL5H3R+G2l1Pmd3fL1 AHvNkIn7Ca9NPTbUJ+RthPslgW7WnpaeAvTR+7FtgzLOQWwFjdQ5EPCjc8qhdmihaGLwZ9 YfI1k7szlXejAN4HeMLrHj7XTBawmhMMS0ViXKcL37OcHH+4sZ/KugADVA0R+IyHniPRYg YAxjd3JSTAhYw8AWnp6Vdt7tGTMu0y+KS4utFC56X4ZcC9gRLtzfTxWNshAQrSGZRaTBnl kHKfi5ETJvDSUkGCXUEV9aTEeqfOKCAlxVRqtoRW/g3GFmWGtrgIkWw2bgC8Gw== 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 4cr26t5hYHz6fw; Mon, 20 Oct 2025 17:12:38 +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 59KHCckC056011; Mon, 20 Oct 2025 17:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KHCc9K056008; Mon, 20 Oct 2025 17:12:38 GMT (envelope-from git) Date: Mon, 20 Oct 2025 17:12:38 GMT Message-Id: <202510201712.59KHCc9K056008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a1b0fae4182c - stable/14 - libc: Avoid installing timezone.3 multiple times 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 commit a1b0fae4182c3455ee24a5f3dcfc1a69553f2c93 Author: Ed Maste AuthorDate: 2025-10-20 16:16:21 +0000 Commit: Ed Maste CommitDate: 2025-10-20 17:10:44 +0000 libc: Avoid installing timezone.3 multiple times Commit a34940a9756a ("timezone: Move to the XSI/POSIX definition for timezone") was not merged to stable/14. The MFC of 29810aa6ae70 ("libc: Move tzset.3 to stdtime") didn't take this into account and ended up installing two different versions of timezone.3 over top of each other. This is a direcct commit to stable/14 as the issue is not present in main. If a34940a9756a gets merged in the future the reverted part of 29810aa6ae70 will need to be reapplied. Fixes: 29810aa6ae70 ("libc: Move tzset.3 to stdtime") Sponsored by: The FreeBSD Foundation --- lib/libc/stdtime/Makefile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc index 842166201fd1..1c5880797f43 100644 --- a/lib/libc/stdtime/Makefile.inc +++ b/lib/libc/stdtime/Makefile.inc @@ -31,5 +31,4 @@ MLINKS+=strftime.3 strftime_l.3 MLINKS+=strptime.3 strptime_l.3 MLINKS+=time2posix.3 posix2time.3 MLINKS+=tzset.3 daylight.3 \ - tzset.3 timezone.3 \ tzset.3 tzname.3