From nobody Fri Aug 02 06:26:50 2024 X-Original-To: dev-commits-ports-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 4WZwpf4wl4z5SJy0; Fri, 02 Aug 2024 06:26:50 +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 4WZwpf491fz4S5t; Fri, 2 Aug 2024 06:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722580010; 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=bLG4hl4+12wCdcBll4cUfTtrLYzGZq6dT9Q55mLbHW8=; b=vGtk+w9KjWebfbZLDe9XsW3tVKsBHo/fTAEoJofjOwYqQmFpuMfsgqKFCzTwCwD9ZYAaKO Kh2MVxTBdhAX/uuweDsjgl0rCkLybDgaloPdeIyK38ZRoWKpoHysyId2Cd99pyqSGXctib fyM9uZxz1auKlp1ZRQJXY2O7uImYOF3B2G1xAW6xxz37YT3e02AJQKjXZYLl5DMom0dU9F /EU5AvUZTC/1p9/6BuHQWqdBCWhoFo86gooi3BEFC6zjG9yv95K3qtazHdWQ8Xdj89Ehx2 Ize92u0TmId0JThzEpiUwCGKZI5wzihlIOVJk0POB5aGu9Dpwms6+mDvZ3g9Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722580010; a=rsa-sha256; cv=none; b=cXHT5Dd7GxZe07aVVQs3VIoFnBtyyH3t82sIq7Rgqi6F8d4mWg9n0P3PD6WNAday4cQNEK k8OwBq9eFLJ7Wb4uq2N+tcGgjATrL20wnhmCqfgaPuNMXyLI7N4H0pPz/lcKLaKshfC1FC B5t6lwYm5tJeML2MQY1pkP8lw6QmHLeKE+57LVHWOFWDmPlWz9YU/W7Cxe3PILe8dQYd99 pQiBjo3yHNPjQ6p4R6jM+xfQUNfgZbqXFrVCZ2sNxb/uaUhWMqUQzJ17++wjgv09l7y6Le OGlWO8Li4AwIBFNvt4N+mojl+8xIEP0+Y1Mty5pQN0L6i19bU+UsIvEmNvXmvA== 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=1722580010; 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=bLG4hl4+12wCdcBll4cUfTtrLYzGZq6dT9Q55mLbHW8=; b=akt7sHX8yMcMBMKBZjm/+GBK0UG817M97A/Yy2Nh/qmjzH1WCW+QnHAoc9byWnhl7KqpXM M4QlIkcX/XOMB1Fdurbmez689CEVDIP0Dc0g6Z35doj0ya+IqoBtXARE/piHT6LLwikMsv kBfITp1qb5qd/0lyGZr7OeU0VWoFZd0JPmerJwLzfCnRV8v0PY9S0v51xbZqX4hdrC+VyS /uHr/MbVSzRi4f6xwYSlTn6Mm6DqbD/G6u24m2wdvLj6SrBi9XlHxZuSmls+tfdYYU4c6z Ev/PkrehAzUKw2uGFJyak8iNnm4Rv1OMWIeWy/Rs6DM9n9XdFtTa78OKJxUabw== 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 4WZwpf3fBHzHXr; Fri, 2 Aug 2024 06:26:50 +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 4726QoUY041879; Fri, 2 Aug 2024 06:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4726QoXm041876; Fri, 2 Aug 2024 06:26:50 GMT (envelope-from git) Date: Fri, 2 Aug 2024 06:26:50 GMT Message-Id: <202408020626.4726QoXm041876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 017665613e15 - main - emulators/wine-devel: Update to Wine 9.14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 017665613e15852d92e105f95ba16d0dc8098a6e Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=017665613e15852d92e105f95ba16d0dc8098a6e commit 017665613e15852d92e105f95ba16d0dc8098a6e Author: Gerald Pfeifer AuthorDate: 2024-08-02 06:24:26 +0000 Commit: Gerald Pfeifer CommitDate: 2024-08-02 06:24:26 +0000 emulators/wine-devel: Update to Wine 9.14 This includes the following changes: - Mailslots reimplemented using server-side I/O. - More support for ODBC Windows drivers (if enabled). - Still more user32 data structures in shared memory. - Various bug fixes. We also need a patch of mine to address an upstream regression on non-macos, non-Linux systems: files/patch-nsiproxy.sys-buildfix . --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/distinfo | 6 ++-- .../wine-devel/files/patch-nsiproxy.sys-buildfix | 38 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 26b5ec61419d..1556e9322854 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 9.13 +DISTVERSION= 9.14 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.x/ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 4827ff8ccbf8..660e16b5e1d3 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722291307 -SHA256 (wine-9.13.tar.xz) = d79651d0fe38defe84cbd9e345f001c02ffc125979e29ebf203d6d487abf7348 -SIZE (wine-9.13.tar.xz) = 30542188 +TIMESTAMP = 1722413658 +SHA256 (wine-9.14.tar.xz) = 24572f49cf3473fc9ef2a1ad1cddf511ce0ef43daa55413b4720a6c3e3c89ea6 +SIZE (wine-9.14.tar.xz) = 30561796 diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix b/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix new file mode 100644 index 000000000000..f138e5d3e075 --- /dev/null +++ b/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix @@ -0,0 +1,38 @@ +commit ba1393465b53e0ef251e3a62b632c4d1b326433e +Author: Gerald Pfeifer +Date: Wed Jul 31 09:21:52 2024 +0200 + + nsiproxy.sys: Fix the build on non-Apple, non-Linux systems + + commit 5261811d471 revamped the code around pcblist structures, + alas assumes a variable mib is always present on non-Apple, non-Linux + systems when it is not. And in any case, ARRAY_SIZE should be used for + the actual structure it applies to, not a similar one. + +--- UTC +diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c +index 67dcfed19f3..dd8c9d1102a 100644 +--- dlls/nsiproxy.sys/tcp.c ++++ dlls/nsiproxy.sys/tcp.c +@@ -645,7 +645,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k + pthread_once( &mib_init_once, init_pcblist64_mib ); + #else + int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST }; +- size_t pcblist_mib_len = ARRAY_SIZE(mib); ++ size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib); + #endif + + if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0) +diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c +index 3cb215c1c58..80d6d1aa89f 100644 +--- dlls/nsiproxy.sys/udp.c ++++ dlls/nsiproxy.sys/udp.c +@@ -316,7 +316,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void + pthread_once( &mib_init_once, init_pcblist64_mib ); + #else + int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST }; +- size_t pcblist_mib_len = ARRAY_SIZE(mib); ++ size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib); + #endif + + if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0)