CVS commit: pkgsrc/devel/boehm-gc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 20 23:55:25 UTC 2018

Modified Files:
        pkgsrc/devel/boehm-gc: Makefile distinfo
Added Files:
        pkgsrc/devel/boehm-gc/patches: patch-os__dep.c

Log Message:
boehm-gc: update to 8.0.0nb2.

Fix PaX mprotect on NetBSD using upstream patch by Ivan Maidanski
from https://github.com/ivmai/bdwgc/issues/255


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/devel/boehm-gc/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/boehm-gc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/boehm-gc/patches/patch-os__dep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/boehm-gc/Makefile
diff -u pkgsrc/devel/boehm-gc/Makefile:1.96 pkgsrc/devel/boehm-gc/Makefile:1.97
--- pkgsrc/devel/boehm-gc/Makefile:1.96 Fri Dec 14 09:21:22 2018
+++ pkgsrc/devel/boehm-gc/Makefile      Thu Dec 20 23:55:24 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2018/12/14 09:21:22 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2018/12/20 23:55:24 wiz Exp $
 
 DISTNAME=      gc-8.0.0
 PKGNAME=       ${DISTNAME:S/gc/boehm-gc/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.hboehm.info/gc/gc_source/
 
@@ -15,8 +15,6 @@ USE_LANGUAGES=                c c++
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-cplusplus
-# https://github.com/ivmai/bdwgc/issues/255
-CONFIGURE_ARGS+=       --disable-munmap
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/doc
 PKGCONFIG_OVERRIDE=    bdw-gc.pc.in
 INSTALLATION_DIRS=     ${PKGMANDIR}/man3

Index: pkgsrc/devel/boehm-gc/distinfo
diff -u pkgsrc/devel/boehm-gc/distinfo:1.63 pkgsrc/devel/boehm-gc/distinfo:1.64
--- pkgsrc/devel/boehm-gc/distinfo:1.63 Mon Dec 10 08:55:45 2018
+++ pkgsrc/devel/boehm-gc/distinfo      Thu Dec 20 23:55:24 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.63 2018/12/10 08:55:45 wiz Exp $
+$NetBSD: distinfo,v 1.64 2018/12/20 23:55:24 wiz Exp $
 
 SHA1 (gc-8.0.0.tar.gz) = bfb22367b95c796f2248b41405d37388027fe382
 RMD160 (gc-8.0.0.tar.gz) = 3c2e3a5b8b706d8f359528208bf95e4177b50ce6
 SHA512 (gc-8.0.0.tar.gz) = 133b3b96014c20736c5d89fd85f3a94c59a335238d55e1a03db47debee91b5118ede6bd4260c31fe0dde623b7fd3da29d1b8fb86b5de6048183eca6c269d32da
 Size (gc-8.0.0.tar.gz) = 1138310 bytes
+SHA1 (patch-os__dep.c) = 9d7b4ce081bf16ff51212176f291a4e1b2119308

Added files:

Index: pkgsrc/devel/boehm-gc/patches/patch-os__dep.c
diff -u /dev/null pkgsrc/devel/boehm-gc/patches/patch-os__dep.c:1.1
--- /dev/null   Thu Dec 20 23:55:25 2018
+++ pkgsrc/devel/boehm-gc/patches/patch-os__dep.c       Thu Dec 20 23:55:25 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-os__dep.c,v 1.1 2018/12/20 23:55:25 wiz Exp $
+
+Fix NetBSD PaX case.
+https://github.com/ivmai/bdwgc/commit/f70a2fe9058f655bb75759f7b9ec534fa27ca949
+
+--- os_dep.c.orig      2018-09-05 07:37:07.000000000 +0000
++++ os_dep.c
+@@ -2632,8 +2632,10 @@ GC_INNER void GC_remap(ptr_t start, size
+ #   else
+       /* It was already remapped with PROT_NONE. */
+       {
+-#       ifdef NACL
++#       if defined(NACL) || defined(NETBSD)
+           /* NaCl does not expose mprotect, but mmap should work fine.  */
++          /* In case of NetBSD, mprotect fails (unlike mmap) even       */
++          /* without PROT_EXEC if PaX MPROTECT feature is enabled.      */
+           void *result = mmap(start_addr, len, (PROT_READ | PROT_WRITE)
+                                     | (GC_pages_executable ? PROT_EXEC : 0),
+                                    MAP_PRIVATE | MAP_FIXED | OPT_MAP_ANON,