svn commit: r536392 - in head/emulators/wine-devel: . files
Gerald Pfeifer
gerald at FreeBSD.org
Sun May 24 12:37:01 UTC 2020
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 <damjan.jov at gmail.com>
+Subject: [PATCH] libwine: Fix a regression in the return value check for mmap() on FreeBSD
+Message-Id: <CAJm2B-=eV0e12Dw7mODFf5An=USGa-3bHhvLLDFsj2kDWsiyJw at mail.gmail.com>
+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 <damjan.jov at gmail.com>
+
+--- 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 ) )
+
More information about the svn-ports-head
mailing list