From nobody Sat Jul 22 03:31:50 2023 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 4R7Bmn4cCCz4nqQB; Sat, 22 Jul 2023 03:31:53 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R7Bmn3cLGz3J1b; Sat, 22 Jul 2023 03:31:53 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=V0BL8B92wPOczwEaFCP7EGD9SI3Ap5PCEwLxrv4wBic=; b=liG2xrqczOYE0R1UcgFog7fyXF2WFsEWuSxpSzjmf2w7Z3BpJ7pOcU/r2yZ7vogn+zsiYl 3ombH7IOcPqKNDY3wpop/6FwKpVsy30Ngb5B/7Q3RqyqbeuAZLSgAc+4TYYAYIK1nWnMNA 2FfmS15gwa4uc/5UCnm51W/FiUNQjgOmSsyqTXNcMcEar+41GfCGpNDoeHOuHxNHATxy0K y18dSp29xE8GXrFpECQSpmp+OcQwxsCwQHmKYKY3lId7Jv9HZMrhGiYyXLB3dqTbUQPiPB FulvrHjLFJ+h+tZW9hR/10l2QRfZFCPlcBY1T90YV2iuyq/UdXAnpPgcz41N9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=V0BL8B92wPOczwEaFCP7EGD9SI3Ap5PCEwLxrv4wBic=; b=HQCYeiasMN2ve81dAGV/Z3BteTFLaCHYqDZvtPVYWSeRsM0p9E24w+NI/wZPMZqkVR3U5w Lfb/fowIcvaRtAlHJrF6QVsIez6v09OZoR5kB3Vr+yTgsAycFbdUsngopjdQC43J+1JMPI H/OYtyPEQFTr0cu23LG9PrxVvVOeqvcI9GB4St6+Bmfi/YnipTnRrIDPTYuFkwSG1LM6+3 pwMoipeYb8Od1tptULe9dgCncpDZiB3dviSYFTRC3dQaZCzIgJF3wULwUEX1eaWeBR/xso ddNFsay2QkCzBGaarVGBre5Yo0hqqGYOt1gq2Txe3k3ZfIYpQOeGgZA5WnO76A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996713; a=rsa-sha256; cv=none; b=Zmi4ICU99tk7wiy/8KsXputj3lbSOy+qoKYVdHpoyoB6r80eJc1IBbPAF52gA/UdrD0csK gqp8lJGklv1MOnnuj4XAIRJG67tF0m9/J7RHJXqU0V/mnyahIKPOQoo6Ptx+Lj41btWLEG neGWjZq29MJogGwBLOkaXleAuavbnUiGQCo5rZADlB9+qK0XdYvwXD5IaaGA0H1tDRvRx3 iZpIWX0oCwdalHFiuxJzfkPqCbZLyikaHKLAxINYv6uGPqZ0fxwgov10aMgLBpnXIriFVV EQlrzRGf9MS+y3UgWgVsBCpUrJJNKYu1HCttGmDExCfP/MUGIy6M2vzhj98MUA== Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 1504716336; Sat, 22 Jul 2023 03:31:53 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Sat, 22 Jul 2023 03:31:50 +0000 From: Glen Barber To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: a1e58f1f630f - stable/13 - release: pass UNAME_r to fix building 14.x ports on 13.x Message-ID: <20230722033150.GX1219@FreeBSD.org> References: <202307220324.36M3OXFu085901@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wQ8ANTl3uYPVjUZt" Content-Disposition: inline In-Reply-To: <202307220324.36M3OXFu085901@gitrepo.freebsd.org> --wQ8ANTl3uYPVjUZt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jul 22, 2023 at 03:24:33AM +0000, Glen Barber wrote: > The branch stable/13 has been updated by gjb: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da1e58f1f630ffa2de1d54d9d59= a7d0ab2a178695 >=20 > commit a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695 > Author: Glen Barber > AuthorDate: 2021-02-18 23:52:39 +0000 > Commit: Glen Barber > CommitDate: 2023-07-22 03:23:06 +0000 >=20 > release: pass UNAME_r to fix building 14.x ports on 13.x > =20 > Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd > Sponsored by: PayPal https://paypal.me/gjbbsd > =20 > (cherry picked from commit 80ab50e1de19ca125f05a13937c796d48c4edd4a) >=20 This indeed was an empty commit. The conflict resolved here was fixed in a previous commit where UNAME_r was adjusted, so this cherry-pick is empty as result of that former resolution. Glen --wQ8ANTl3uYPVjUZt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmS7TaAACgkQAxRYpUeP 4pPY3A//VJiPQ8UeP/L35owCvDUTsCxTlcrODLLv95ExuV67kPAnz1WjrFZUcXKy Z9/RWL4XJZ+MJQMCb4rxoeTmHGJpoX/RSAI7hcQp1s9+Ba1HvqmKuhAc2xfK1sek UPNeVS079JXOx3aANcMmnxowgWYgxHoou+KA6d6irq6Eus/4MQp7utO0dXfUbwup Xnn0Rymw+sSIxPqrOmiPGl6NKwXUpOBTSR75LC07+V3T28itful60dsjyeCZFMgs xqT5hrC5LhGOaF/9+J2V9y45cQ8ZW+zAl9eSdBw3lLCFbtJZY3tQT8Akll3PDb4Q 6qo2nvwM8cpevqolFwe7Z22oveuZ9WItMkAIG3ganNnLZRbOw0BTp5k/5nFIlqyg /V+14yCXErk3+VjZTQ6eevwueSZDyORaQBNcwNynGmbadFl5IsMvm+fqfag1o0eq LYwSuF1HAbnL6AJpmJIcdJb/NG20TY+yi7NwI7twLeFThwxsQSPiK15yEZYZ4VqB +RJ3dRL+AA/gYSfDw7nl+EBQhhiylpAimtDwwoiYc8dci34WdlmtWXFzq3CK3Zkl wUHK7VX23R/B6YkE8x51rpORiTQMs7yUbJLBVNWAwcDUWON3hyA6S8MyG3/hxnuc lGb/0Zfpqvv1X0mbxBvkOVQa3RLYUmO62tppnfTRetGBqodpn1o= =DOaz -----END PGP SIGNATURE----- --wQ8ANTl3uYPVjUZt--