From owner-svn-ports-all@freebsd.org Sun May 24 12:37:01 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 562F032CDBA; Sun, 24 May 2020 12:37:01 +0000 (UTC) (envelope-from gerald@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49VKVP1fb7z3gTJ; Sun, 24 May 2020 12:37:01 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B15B2103D; Sun, 24 May 2020 12:37:01 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04OCb0gp049373; Sun, 24 May 2020 12:37:00 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04OCb0fU049369; Sun, 24 May 2020 12:37:00 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202005241237.04OCb0fU049369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 24 May 2020 12:37:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536392 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 536392 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 May 2020 12:37:01 -0000 Author: gerald Date: Sun May 24 12:37:00 2020 New Revision: 536392 URL: https://svnweb.freebsd.org/changeset/ports/536392 Log: Add a (temporary) patch wine-devel/files/patch-libs-wine-mmap.c to address an issue that creeped in upstream among the fixes for FreeBSD that made it into Wine 5.9. [1] Remove files/patch-tools-winegcc which temporarily reverted the upstream change that triggered a flurry of breakage and improvements for FreeBSD. Bump PORTREVISION since both changes are substantial. Added: head/emulators/wine-devel/files/patch-libs-wine-mmap.c (contents, props changed) Deleted: head/emulators/wine-devel/files/patch-tools-winegcc Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sun May 24 12:35:54 2020 (r536391) +++ head/emulators/wine-devel/Makefile Sun May 24 12:37:00 2020 (r536392) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 5.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Added: head/emulators/wine-devel/files/patch-libs-wine-mmap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-libs-wine-mmap.c Sun May 24 12:37:00 2020 (r536392) @@ -0,0 +1,27 @@ +From: Damjan Jovanovic +Subject: [PATCH] libwine: Fix a regression in the return value check for mmap() on FreeBSD +Message-Id: +Date: Sat, 23 May 2020 11:01:49 +0200 + +This fixes a regression from my previous patch in commit +55ba3648379d90642f174e74809b84130d6d1ddc, which was +checking for mmap() returning NULL instead of MAP_FAILED. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 +Signed-off-by: Damjan Jovanovic + +--- UTC +diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c +index 0fbe2efea7..af91b3e352 100644 +--- libs/wine/mmap.c ++++ libs/wine/mmap.c +@@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) + /* If available, this will attempt a fixed mapping in-kernel */ + flags |= MAP_TRYFIXED; + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +- if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) ++ if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) + return start; + #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) + if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) ) +