guile22: Use correct mmap permissions for later PROT_WRITE mprotect.

Revert paxctl hack. Bump revision.

4 files changed, 17 insertions, 19 deletions

diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile
index 346a43d07be..b37459665ec 100644
--- a/lang/guile22/Makefile
+++ b/lang/guile22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2018/01/08 10:39:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/08 22:37:08 joerg Exp $
 
 DISTNAME=	guile-2.2.3
 PKGNAME=	${DISTNAME:S/guile/guile22/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/guile/
 
diff --git a/lang/guile22/distinfo b/lang/guile22/distinfo
index 27c15e336e8..872bfb4baae 100644
--- a/lang/guile22/distinfo
+++ b/lang/guile22/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/01/08 10:39:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2018/01/08 22:37:08 joerg Exp $
 
 SHA1 (guile-2.2.3.tar.gz) = b80fac5002e8725b59fb65a8b049ff6337d045c9
 RMD160 (guile-2.2.3.tar.gz) = 62d71904c228adc4fda0bfc752bf7a01f69c5663
 SHA512 (guile-2.2.3.tar.gz) = 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 Size (guile-2.2.3.tar.gz) = 17266587 bytes
-SHA1 (patch-libguile_Makefile.in) = d948162124a4263d3185fe1bcf8e90f4930d161c
+SHA1 (patch-libguile_loader.c) = ec424d2c3430e82ec425f9436ee50c871aaead4c
diff --git a/lang/guile22/patches/patch-libguile_Makefile.in b/lang/guile22/patches/patch-libguile_Makefile.in
deleted file mode 100644
index c9d00710cc2..00000000000
--- a/lang/guile22/patches/patch-libguile_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libguile_Makefile.in,v 1.1 2018/01/08 10:39:45 wiz Exp $
-
-Fix build on NetBSD>=8.
-
---- libguile/Makefile.in.orig	2017-11-06 09:12:56.000000000 +0000
-+++ libguile/Makefile.in
-@@ -2444,6 +2444,8 @@ clean-noinstPROGRAMS:
- guile$(EXEEXT): $(guile_OBJECTS) $(guile_DEPENDENCIES) $(EXTRA_guile_DEPENDENCIES) 
- 	@rm -f guile$(EXEEXT)
- 	$(AM_V_CCLD)$(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS)
-+	if [ `uname -s` = "NetBSD" ]; then paxctl +m .libs/guile$(EXEEXT); fi
-+
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
diff --git a/lang/guile22/patches/patch-libguile_loader.c b/lang/guile22/patches/patch-libguile_loader.c
new file mode 100644
index 00000000000..1ea1cdf2c9d
--- /dev/null
+++ b/lang/guile22/patches/patch-libguile_loader.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libguile_loader.c,v 1.1 2018/01/08 22:37:08 joerg Exp $
+
+--- libguile/loader.c.orig	2018-01-08 16:21:04.790894906 +0000
++++ libguile/loader.c
+@@ -484,7 +484,7 @@ map_file_contents (int fd, size_t len, i
+   char *data;
+ 
+ #ifdef HAVE_SYS_MMAN_H
+-  data = mmap (NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
++  data = mmap (NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+   if (data == MAP_FAILED)
+     SCM_SYSERROR;
+   *is_read_only = 1;