From nobody Thu Jun 26 14:12:15 2025 X-Original-To: dev-commits-src-main@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 4bSgcH495Fz60bw7; Thu, 26 Jun 2025 14:12:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSgcH1V0Gz3rSq; Thu, 26 Jun 2025 14:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750947135; 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=yV3P9Yv780TM0bGBtI54gT7Qqz8y/ovqIwkf4CQ1lXA=; b=W3CFkeX520Jdkaxy4M1rwFmoQe56XLcmWDMnCiCO1H2QbUB8tcMyvKp7fP7s9Yy1DXIV3G UBbk37k5Of1wnbtI9kL2ZdtqPIoHT2oAcAelQw4VhkdfViL4nGzP0py6VHGhBelL9eEmOK qi0hOoD67T2MVX4F1dtRvMqFsT3sff9PnmuQ7BTQyP68bxOsblv2xKZoA/PWyIm4NFg/6R dKHYJ+LGXxgy9fwMoZBLvyV1xDurBo/f2dcYLHR46ySnW/94dg8+LOr5kacxbapgFZ/6IZ uhbcrRN25rqVdxdL4uCKhqRJeSJj5RdReic0nkDj00zvn4MeB8ej1BZ9aD2x+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750947135; 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=yV3P9Yv780TM0bGBtI54gT7Qqz8y/ovqIwkf4CQ1lXA=; b=JQDy5G7UxJDk4IMsxyZBjf7F8fMWy9bfCIL4ow1Nr3crrFllAEzmvTNTdGBC3tW8Ltf0DB gW7KziPPBO9OM3UtoWAsoZggmbcumA+7Mm5c1Gvccww0urz4k9pj38hsNdcpUVwlI/0JwH WrCLLNZ9mloJ68Yj9FwPspkdsv9kpAFbPDwY2OZMcxcSxEesWtMAjSy4fcCckrR5hivM/c nP2D1Wdw8wOQ+JENyxcqf2RWUmzGfoFfcewcq8/JaSrOaM2wR3+9FJ8f0IK2+b6LuIrPXC Ln/a9qMWOxfUB3Yb6pg8Fm9c+6J13vf+4EtLeR4qLjm9vxXdKaJxMuMDDgPXgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750947135; a=rsa-sha256; cv=none; b=CR7W3EbsXNJRp57IJp90xLnRCi06omNPDvT9B6ETNBNujDqfYQ7jXySFXPzhBbuM+NcHUD COgvBaEmUVDv6diQFa0Q5Dt2H23J9w/zOPtU6J5kK9QUKW3ksgIwJV6p7oNruXYT2/cYsI m8N3axp8O+5gSDC2tVLve+2ySICSNo6ahLJs47ZwN9TYP8iHExdZg0Rl4o0UtUWB2XlP4p +Hr3UV+CtDGG9eRF/Y8a1zn3dh06es7ZcnXTCyygj9rbXbEpAem+iBcXCpsjLankFjSlHz kVJ/2l+yTWd3PakLSGGIz/fxf0v4s9fiVJzIBgknOB8qIFHMMnxACisoB5KwgA== 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 4bSgcH14xnz15rQ; Thu, 26 Jun 2025 14:12:15 +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 55QECFJO040049; Thu, 26 Jun 2025 14:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QECFEW040046; Thu, 26 Jun 2025 14:12:15 GMT (envelope-from git) Date: Thu, 26 Jun 2025 14:12:15 GMT Message-Id: <202506261412.55QECFEW040046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: b5962a183756 - main - Fix location of libtpool.so.2 after 5c1ba994a8b List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5962a183756f2cfc93b056ce7c7c7beb5da3e7e Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b5962a183756f2cfc93b056ce7c7c7beb5da3e7e commit b5962a183756f2cfc93b056ce7c7c7beb5da3e7e Author: Alan Somers AuthorDate: 2025-06-26 14:04:50 +0000 Commit: Alan Somers CommitDate: 2025-06-26 14:12:04 +0000 Fix location of libtpool.so.2 after 5c1ba994a8b Commit 5c1ba994a8b inadvertently moved the installed location of a shared library. Move it back. Reported by: olivier Tested by: olivier Fixes: 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9 Sponsored by: ConnectWise --- ObsoleteFiles.inc | 3 +++ cddl/lib/libtpool/Makefile | 1 + 2 files changed, 4 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1f17d54bdf08..dcda9a035b44 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250626: For 11 days 15.0-CURRENT installed libtpool to the wrong location +MOVED_LIBS+=usr/lib/libtpool.so.2 + # 20250626: replace yaml.lua with lyaml OLD_FILES+=usr/share/flua/yaml.lua diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 3ab625dd306b..7acf34219a47 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -3,6 +3,7 @@ LIB= tpool +SHLIBDIR?= /lib LIBADD= spl PACKAGE= libzfs