From nobody Thu Feb 20 21:51:33 2025 X-Original-To: dev-commits-ports-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 4YzRmP4KB5z5pT98; Thu, 20 Feb 2025 21:51:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzRmP14JVz3l1M; Thu, 20 Feb 2025 21:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740088293; 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=OwY5zBEQ2uIydbIZdw4EvmoQsibpyy6zv2bO3QT1pZM=; b=nn2F+C+8mxpblS/42cu2+u2LoqjCSX8kUXmYHM3Y19kSQTLLOmOzX0UE5yh+D4mRxizZPh 8PryvahxhR4sR9Vfrcim4J4tEnyE39hq/6GWNKZw4UnzCYMhcXTK4lvYbz1zez7flh0yHO 6rL5jT1bYWuyNC+ynPbfanSaBcFg/mFBVTKO5/cndbHZF8b78CtH6zK+i69HfRtckxcxFb pk1C6UYt7GljmV5Tt5q3d8OGqxx+im9uDD24MdsM/rTQ5Bo1zB0Hr3BLKdw4s3qju5i8cw lziupuqjcrwQjKt7XZysMxNkt5LuIVWSgZnh40TV0o3m/l8Owg+C7E7AnFEH/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740088293; a=rsa-sha256; cv=none; b=a+DnLL2N0dTyFhi4b/r65FDRGWWRQk/RPQQCd++GHBy2sGaI3WvV0eCxEj486J9HBazQ6k Lu2dxf2yARZXHVCnZH1K/i8isnlcYZdDPWLPCeJ+KTCC+7HdzjtmMl1qi6j3ny9f0flHz8 WrNryj+j7ZrxK3ocN8Qoc3J/eLA3P1bBXL8K3F7j/mLgd8VlJjhf8+v8aNyPk5vhnPaFkd /WrcHAdTY50fQql0qXKAu6QhW0/7MQmX56sUmQKrd6mJuSeNih/8xqOHJT29gJoDb0s+i/ XoY5jQmumRxiDEM5WYORjWPCVdz1wZu12Yfuo+Xg9Yw0+mBaOncXPhuTfdljEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740088293; 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=OwY5zBEQ2uIydbIZdw4EvmoQsibpyy6zv2bO3QT1pZM=; b=i0owFFbmSG9R7DYXzkv8JPlB5NmPohHomOvxsFG5wonXGss6cjFfmbPy/s2CWPCEQGuCY7 4RcGFHL7yMEXGEzJLDapxcLVW2SHnVyXuFyJKToAOI2y5KShXrFpgbYvuGjmiY7fx8iyaI mMYTmM9EoOlEG6Ni6DgLd8znpInXKtBdxd+NWKOP40pKAOU5Mo3TgP6yP4nGdYTFDXPhfs lY433Rnzk0BtnQsRRgLqLUKqVxPBDDOD3pGhVqtIaamLnFKtXNsAhR0076XHhquR4VQ39f HElWReTfcdYY8lpTwYoNdBlmlr5+5ImO94TLbl0GPlGZiqw55IQJjDNU/POJMg== 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 4YzRmP0ZDBz18GY; Thu, 20 Feb 2025 21:51:33 +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 51KLpXNC012731; Thu, 20 Feb 2025 21:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KLpXik012728; Thu, 20 Feb 2025 21:51:33 GMT (envelope-from git) Date: Thu, 20 Feb 2025 21:51:33 GMT Message-Id: <202502202151.51KLpXik012728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 4afa6308d101 - main - emulators/qemu-user-static: fix build on main List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4afa6308d101da21a749701566c5088bc2c7041e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4afa6308d101da21a749701566c5088bc2c7041e commit 4afa6308d101da21a749701566c5088bc2c7041e Author: Brooks Davis AuthorDate: 2025-02-20 21:45:56 +0000 Commit: Brooks Davis CommitDate: 2025-02-20 21:50:07 +0000 emulators/qemu-user-static: fix build on main Call __sys___readlinkat() rather than the now removed __readlinkeat(). Neither are public interfaces, but __sys___readlinkat is somewhat more so and is declared in libsys.h. Reported by: cperciva MFH: 2025Q1 Sponsored by: DARPA, AFRL --- emulators/qemu-user-static/Makefile | 2 +- .../qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile index 02ab9e4f2c05..9521422f9f6b 100644 --- a/emulators/qemu-user-static/Makefile +++ b/emulators/qemu-user-static/Makefile @@ -1,6 +1,6 @@ PORTNAME= qemu PORTVERSION= 3.1.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= emulators PKGNAMESUFFIX= -user-static DIST_SUBDIR= qemu/${PORTVERSION} diff --git a/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h b/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h new file mode 100644 index 000000000000..cec077643992 --- /dev/null +++ b/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h @@ -0,0 +1,11 @@ +--- bsd-user/freebsd/os-stat.h.orig ++++ bsd-user/freebsd/os-stat.h +@@ -702,7 +702,7 @@ + return -TARGET_EFAULT; + } + +- ret = get_errno(__realpathat(arg1, p, b, arg4, arg5)); ++ ret = get_errno(__sys___realpathat(arg1, p, b, arg4, arg5)); + UNLOCK_PATH(p, arg2); + unlock_user(b, arg3, ret); +