CVS commit: pkgsrc/emulators/tme

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Fri Oct  1 16:14:48 UTC 2021

Modified Files:
        pkgsrc/emulators/tme: Makefile distinfo
        pkgsrc/emulators/tme/patches: patch-configure patch-configure.in
Added Files:
        pkgsrc/emulators/tme/patches: patch-libtme_host_recode-mmap.c

Log Message:
tme: workaround failures of SS2 emulation.

https://mail-index.netbsd.org/current-users/2021/07/11/msg041254.html
https://mail-index.netbsd.org/current-users/2021/07/12/msg041257.html
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/emulators/tme/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/emulators/tme/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/tme/patches/patch-configure \
    pkgsrc/emulators/tme/patches/patch-configure.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/tme/patches/patch-libtme_host_recode-mmap.c

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

Modified files:

Index: pkgsrc/emulators/tme/Makefile
diff -u pkgsrc/emulators/tme/Makefile:1.82 pkgsrc/emulators/tme/Makefile:1.83
--- pkgsrc/emulators/tme/Makefile:1.82  Mon May 24 19:52:11 2021
+++ pkgsrc/emulators/tme/Makefile       Fri Oct  1 16:14:48 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2021/05/24 19:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2021/10/01 16:14:48 tsutsui Exp $
 #
 
 DISTNAME=              tme-0.8
-PKGREVISION=           48
+PKGREVISION=           49
 CATEGORIES=            emulators
 MASTER_SITES=          http://csail.mit.edu/~fredette/tme/
 

Index: pkgsrc/emulators/tme/distinfo
diff -u pkgsrc/emulators/tme/distinfo:1.28 pkgsrc/emulators/tme/distinfo:1.29
--- pkgsrc/emulators/tme/distinfo:1.28  Thu Aug 13 06:33:59 2020
+++ pkgsrc/emulators/tme/distinfo       Fri Oct  1 16:14:48 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2020/08/13 06:33:59 tsutsui Exp $
+$NetBSD: distinfo,v 1.29 2021/10/01 16:14:48 tsutsui Exp $
 
 SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c
 RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded
 SHA512 (tme-0.8.tar.gz) = 961ccee96d5192ff7373a401834e96d5946f3aa783bd4c8839c6b1f5fa15a768e3241972d1e5049f89b8593ff9db0e9dc2378a50e85dae680327c11bc14323e8
 Size (tme-0.8.tar.gz) = 2100123 bytes
-SHA1 (patch-configure) = 53835d3d9c3f77618962d67b3a72c5d44f72bf2b
-SHA1 (patch-configure.in) = 9795ad35a16698057f01e78314b5ee215065e450
+SHA1 (patch-configure) = 75fb974a21641cf27fefd34837226367042e5d1d
+SHA1 (patch-configure.in) = 64b4717bc68fab1ece476e11e2d685b2c90aa9ac
 SHA1 (patch-host_bsd_Makefile.am) = db0add22732e95b18886877a92e57e1a19d3099f
 SHA1 (patch-host_bsd_Makefile.in) = 0c361aca770ec7e323cef150e0e1b29d6a442306
 SHA1 (patch-host_bsd_bsd-if.c) = 929ddb1cbf3cbbc84dc9b1c8facba42032857dfa
@@ -18,6 +18,7 @@ SHA1 (patch-ic_m68k_m68k-insns.c) = dcb2
 SHA1 (patch-ic_m68k_m68k-misc.c) = a5d5f5dfdd0331d30b19815687ead49554a771f1
 SHA1 (patch-ic_mm58167.c) = 1c35c599f56f6a13a9dfc85dc5154f094bd8c0d0
 SHA1 (patch-ic_sparc_sparc-execute.c) = bccd0f021d3921273f61d9dddb1e93d45ff7d84c
+SHA1 (patch-libtme_host_recode-mmap.c) = 3e405f1783e17f91166539a042f67109f5632b7e
 SHA1 (patch-libtme_memory-auto.sh) = b7f70df312e69d711f9ef5c99dc5244e80ea6a14
 SHA1 (patch-libtme_misc.c) = 30b27fc54550555d54124af20ef746072c083695
 SHA1 (patch-libtme_module.c) = 622db6788f4159b41486bd433a699de75e66d998

Index: pkgsrc/emulators/tme/patches/patch-configure
diff -u pkgsrc/emulators/tme/patches/patch-configure:1.1 pkgsrc/emulators/tme/patches/patch-configure:1.2
--- pkgsrc/emulators/tme/patches/patch-configure:1.1    Thu Aug 13 05:59:52 2020
+++ pkgsrc/emulators/tme/patches/patch-configure        Fri Oct  1 16:14:48 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-configure,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+$NetBSD: patch-configure,v 1.2 2021/10/01 16:14:48 tsutsui Exp $
 
+- Workaround for SS2 emulation on NetBSD/amd64.
 - Fix wrong comparison.
 
 --- configure.orig     2010-06-05 19:57:30.000000000 +0000
 +++ configure
+@@ -12948,7 +12948,7 @@ echo $ECHO_N "checking for target recode
+ 
+     # get the host recode parts:
+     case "${target}" in
+-    i[3456789]86-*-netbsd* | x86_64-*-netbsd* | i[3456789]86-*-linux*)
++    i[3456789]86-*-netbsd* | i[3456789]86-*-linux*)
+       recode_hosts="mmap x86"
+       ;;
+     *) recode_hosts= ;;
 @@ -12985,7 +12985,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
  esac
  { echo "$as_me:$LINENO: result: ${misc_hosts}" >&5
Index: pkgsrc/emulators/tme/patches/patch-configure.in
diff -u pkgsrc/emulators/tme/patches/patch-configure.in:1.1 pkgsrc/emulators/tme/patches/patch-configure.in:1.2
--- pkgsrc/emulators/tme/patches/patch-configure.in:1.1 Thu Aug 13 05:59:52 2020
+++ pkgsrc/emulators/tme/patches/patch-configure.in     Fri Oct  1 16:14:48 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-configure.in,v 1.1 2020/08/13 05:59:52 tsutsui Exp $
+$NetBSD: patch-configure.in,v 1.2 2021/10/01 16:14:48 tsutsui Exp $
 
+- Workaround for SS2 emulation on NetBSD/amd64.
 - Fix wrong comparison.
 
 --- configure.in.orig  2010-06-05 19:56:37.000000000 +0000
 +++ configure.in
+@@ -565,7 +565,7 @@ else
+ 
+     # get the host recode parts:
+     case "${target}" in
+-    i[3456789]86-*-netbsd* | x86_64-*-netbsd* | i[3456789]86-*-linux*)
++    i[3456789]86-*-netbsd* | i[3456789]86-*-linux*)
+       recode_hosts="mmap x86"
+       ;;
+     *) recode_hosts= ;;
 @@ -599,7 +599,7 @@ i[3456789]86-* | x86_64-*) misc_hosts="x
  esac
  changequote([, ])dnl

Added files:

Index: pkgsrc/emulators/tme/patches/patch-libtme_host_recode-mmap.c
diff -u /dev/null pkgsrc/emulators/tme/patches/patch-libtme_host_recode-mmap.c:1.1
--- /dev/null   Fri Oct  1 16:14:48 2021
+++ pkgsrc/emulators/tme/patches/patch-libtme_host_recode-mmap.c        Fri Oct  1 16:14:48 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-libtme_host_recode-mmap.c,v 1.1 2021/10/01 16:14:48 tsutsui Exp $
+
+- handle PAX_MPROTEXT properly
+
+--- libtme/host/recode-mmap.c.orig     2008-07-01 02:00:53.000000000 +0000
++++ libtme/host/recode-mmap.c
+@@ -82,7 +82,12 @@ tme_recode_host_thunks_alloc(struct tme_
+           size_run,
+           (PROT_READ
+            | PROT_WRITE
+-           | PROT_EXEC),
++#ifdef PROT_MPROTECT
++           | PROT_MPROTECT(PROT_EXEC)
++#else
++           | PROT_EXEC
++#endif /* PROT_MPROTECT */
++           ),
+           (MAP_SHARED
+ #ifdef MAP_ANON
+            | MAP_ANON