From nobody Sat Apr 30 23:58:22 2022 X-Original-To: dev-commits-src-all@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 42F971AABAB3; Sat, 30 Apr 2022 23:58:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrRBl1MQMz4tfN; Sat, 30 Apr 2022 23:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651363103; 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=0NIeUWpSaXM2EsGq/WrD2veJB//2CX5Y1wjIqFgcR8Q=; b=Sa6JFWe+FpEo8S+qY9NU/+iKvz+mYa37wt6EPwzfn9LWKdr2tWY+yGbSyniTcVyAuso95B fv9YjuclsYOHnauoIWSEroXn1WKx/P/q2yx1RTICNFSGC228h1jncHcgxTNV9vRuq5SgMh NRwh8gQzwVxCczWEpaTjv7l9DdSTnbvg2ibbXXdSWrZIdzyVft9rqwC/3VpS6pyaVNo8tl CjHTM7vsviumZq6lgKUaekTufcI/ORRJdUN5NCkcxgpWnTdDuKjDYEZXpnXVlSq7NjHVAM JmhvZqImlEIe65hHhyrbOz52CPcjtOV5WryUNymdcZAycHu2YMLtzSFNT/JdDg== 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 0A88E2F69; Sat, 30 Apr 2022 23:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23UNwM0M047672; Sat, 30 Apr 2022 23:58:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UNwMPj047671; Sat, 30 Apr 2022 23:58:22 GMT (envelope-from git) Date: Sat, 30 Apr 2022 23:58:22 GMT Message-Id: <202204302358.23UNwMPj047671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: f44280bf5fbb - main - libz: update the upgrade instructions to reflect reality List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f44280bf5fbb0599871612e9286407981ad4aaa3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651363103; 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=0NIeUWpSaXM2EsGq/WrD2veJB//2CX5Y1wjIqFgcR8Q=; b=cfvE4d2ofgBt+jfND9O29XMoxP2EGcb7vIBF+9Ch5wkfkxIrI+G/Ol6K17HK/pZ+0nvko7 j69DSwh3+rP5kJ5tXra6D7fBEIpebW0DQRo+0uf3+qV08tP1JOZvijzA6KkUg2nSGUcLS7 DAhlySRpUIz7qXp5vE23W4s0tUcvBqp/bzIjbn7Il9e+aK92vw/WG8zmCE+Ak3gUB55FCf mogCqRPpOM/UPHA2LFVDENlfyv+8HgzZsrkY46/ePnHk7PSeYAU7+3GMgf7QjG6fDrRZrX aRBn6UIg0FhZg/OQcmWAsmy9CPyz0zTVU2yc9jfgvLxzwbN5ApjKL6Mz9HYVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651363103; a=rsa-sha256; cv=none; b=WpagoU19iGoB/ysYWh/wyEtP8k+2c7rlYPghiCwJTmtvtWDR9OIDz00uo7TUuNzAZBpUSu WztCC54Ct1KouYvNRIZLk2Qtr2LqIby9noLFFM9J1VMhZS1FfAsjeaj144JhGBR4OgkNXf 8AIsyB5aHtWcF7LWAOJUGNOJCEIHF9vhfO96Ldl3k/Joudqmen7v5/YVcR4VHsH/iQYU9R ZTPk1QQ6oVWAjo6FqYZgRREagTfkpyAXR8yT8wcATg3cXskT1HCnybtFkxhphUR8WwHVjB a6bkcPvVKv75xlH38SezbSAFMfFgzxHY67bFOB2WqULGot+hmpCftazcdIdWLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=f44280bf5fbb0599871612e9286407981ad4aaa3 commit f44280bf5fbb0599871612e9286407981ad4aaa3 Author: Xin LI AuthorDate: 2022-04-30 23:57:54 +0000 Commit: Xin LI CommitDate: 2022-04-30 23:57:54 +0000 libz: update the upgrade instructions to reflect reality --- lib/libz/FREEBSD-upgrade | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade index 203ae5c220c2..1b034f86f211 100644 --- a/lib/libz/FREEBSD-upgrade +++ b/lib/libz/FREEBSD-upgrade @@ -1,11 +1,9 @@ -$FreeBSD$ - Original distribution from http://zlib.net/. Currently, only trivial -changes were made to support build of libstand and to suppress certain +changes were made to support build of libsa and to suppress certain compiler warnings, we upstream our local changes whenever they would benefit other consumers. -To Update: +To update: 1) Unpack vendor sources into a clean directory. 2) Import onto the vendor area. 3) Merge the vendor tree to sys/contrib/zlib, which contains a stripped down