{,py-}unicorn: Update to 1.0.2

Changes:
1.0.2
-----
- Fix Java binding compilation
- Enable building for ARM little-endian only (ignore big-endian)
- Add uc_context_free() API
- Fix context saving/retoring API (core & Python binding)
- Add cmake option to build Unicorn as a static library
- Fix error handling of mmap()
- uc_emu_start() can be reentrant
- Fix naming conflicts when built with systemd
- Fix setjmp/longjmp on native Windows
- Fix enabled hooks even after deleting them
- X86:
    - Fix 64bit fstenv
    - Fix IP value of 16bit mode
- ARM:
    - Fix APSR handling
- Python: Remove UC_ERR_TIMEOUT
- No longer require Python to build
- Fix recursive UC_HOOK_MEM callbacks for cross pages access
- Remove UC_ERR_TIMEOUT, so timeout on uc_emu_start() is not considered error
- Added UC_QUERY_TIMEOUT to query exit reason
- Fix UAF when deleting hook while in hook callback
- Ensure that hooks are unaffected by a request to stop emulation.
- Fix block hooks being called twice after an early exit from execution.
- Fix binding install on python2 (MacOS)
- X86:
    - Support read/write STn registers
    - Support read/write X64 base regs
- ARM64:
    - Support some new registers

7 files changed, 38 insertions, 38 deletions

diff --git a/emulators/unicorn/Makefile b/emulators/unicorn/Makefile
index 79e4fb0e4cd..6786de29a9f 100644
--- a/emulators/unicorn/Makefile
+++ b/emulators/unicorn/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.14 2020/12/04 20:45:17 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/02/25 19:47:50 leot Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,7 +8,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake pkg-config
 
-PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.0.1
+#PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.0.1
 
 .include "../../lang/python/application.mk"
 
diff --git a/emulators/unicorn/Makefile.common b/emulators/unicorn/Makefile.common
index 79537f25336..414d358562e 100644
--- a/emulators/unicorn/Makefile.common
+++ b/emulators/unicorn/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2020/08/18 00:35:20 tnn Exp $
+# $NetBSD: Makefile.common,v 1.5 2021/02/25 19:47:50 leot Exp $
 #
 # used by emulators/py-unicorn/Makefile
 
-DISTNAME=	unicorn-1.0.1
+DISTNAME=	unicorn-1.0.2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=unicorn-engine/}
 
diff --git a/emulators/unicorn/PLIST b/emulators/unicorn/PLIST
index 810591651d3..f1f39cd947c 100644
--- a/emulators/unicorn/PLIST
+++ b/emulators/unicorn/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2018/02/26 02:25:28 khorben Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/02/25 19:47:50 leot Exp $
 include/unicorn/arm.h
 include/unicorn/arm64.h
 include/unicorn/m68k.h
 include/unicorn/mips.h
+include/unicorn/platform.h
 include/unicorn/sparc.h
 include/unicorn/unicorn.h
 include/unicorn/x86.h
diff --git a/emulators/unicorn/distinfo b/emulators/unicorn/distinfo
index f512506b7d1..5c296003c25 100644
--- a/emulators/unicorn/distinfo
+++ b/emulators/unicorn/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2019/12/31 13:14:51 wiz Exp $
+$NetBSD: distinfo,v 1.7 2021/02/25 19:47:50 leot Exp $
 
-SHA1 (unicorn-1.0.1.tar.gz) = 85c9d7aad2a87b110b729560ed9333b66018ca6a
-RMD160 (unicorn-1.0.1.tar.gz) = 599b7ce96fe4040a48561bd9474666583265960b
-SHA512 (unicorn-1.0.1.tar.gz) = edfe1f7bfbc1d20f5b62232057e194a937bc09db686ef2efadb33a54605029a53426432cdb2a29511385aacdb9343b3b3091af50a1909098d7cf6db3429eb966
-Size (unicorn-1.0.1.tar.gz) = 3241225 bytes
-SHA1 (patch-Makefile) = c050394e6bac19022f897e5c5952690a2f74bf09
-SHA1 (patch-bindings_python_setup.py) = 35b6a68a75e18bf6a0e8f7c745fee2e148f26c1c
-SHA1 (patch-bindings_python_unicorn_unicorn.py) = 0835b53b508400f0ca8464f09262c4c64a9a8a54
+SHA1 (unicorn-1.0.2.tar.gz) = d7431249092cb2eba79b54927df8d928624a2660
+RMD160 (unicorn-1.0.2.tar.gz) = 1e9c125e12afcc9674f9e85f56c14d6807b98a80
+SHA512 (unicorn-1.0.2.tar.gz) = e459c849407ce3e42e40035953f6236f69518d0626ba5233ca4a36e0c70f50f7bac56ecfe4432a9741ac178d982192f588c6cc9795eb2a38c95a04de741fa33c
+Size (unicorn-1.0.2.tar.gz) = 3735111 bytes
+SHA1 (patch-Makefile) = 1c69fa8838ad53397811bbe29fc41914dbcbdc6a
+SHA1 (patch-bindings_python_setup.py) = 035888ce0599abb8ef4670fffb051cb1510d9a29
+SHA1 (patch-bindings_python_unicorn_unicorn.py) = d7653d205bc999b8c53941c161771b8f72fcfa6e
diff --git a/emulators/unicorn/patches/patch-Makefile b/emulators/unicorn/patches/patch-Makefile
index cd392244213..466524ec587 100644
--- a/emulators/unicorn/patches/patch-Makefile
+++ b/emulators/unicorn/patches/patch-Makefile
@@ -1,17 +1,17 @@
-$NetBSD: patch-Makefile,v 1.1 2019/12/31 13:14:51 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2021/02/25 19:47:51 leot Exp $
 
---- Makefile.orig	2017-04-20 06:14:24.000000000 +0000
+--- Makefile.orig	2020-10-21 11:34:41.000000000 +0000
 +++ Makefile
-@@ -223,10 +223,10 @@ $(LIBRARY): qemu/config-host.h-timestamp
+@@ -305,10 +305,10 @@ $(LIBRARY): $(UC_OBJ_ALL)
  ifeq ($(UNICORN_SHARED),yes)
  ifeq ($(V),0)
  	$(call log,GEN,$(LIBRARY))
--	@$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
-+	@$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
+-	@$(CC) $(CFLAGS) -shared $(UC_OBJ_ALL) -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
++	@$(CC) $(CFLAGS) -shared $(UC_OBJ_ALL) -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
  	@-ln -sf $(LIBRARY) $(LIBRARY_SYMLINK)
  else
--	$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
-+	$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
+-	$(CC) $(CFLAGS) -shared $(UC_OBJ_ALL) -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
++	$(CC) $(CFLAGS) -shared $(UC_OBJ_ALL) -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
  	-ln -sf $(LIBRARY) $(LIBRARY_SYMLINK)
  endif
  ifeq ($(DO_WINDOWS_EXPORT),1)
diff --git a/emulators/unicorn/patches/patch-bindings_python_setup.py b/emulators/unicorn/patches/patch-bindings_python_setup.py
index 0d39b03e77e..f0f84ca67de 100644
--- a/emulators/unicorn/patches/patch-bindings_python_setup.py
+++ b/emulators/unicorn/patches/patch-bindings_python_setup.py
@@ -1,20 +1,18 @@
-$NetBSD: patch-bindings_python_setup.py,v 1.1 2018/03/24 17:09:34 joerg Exp $
+$NetBSD: patch-bindings_python_setup.py,v 1.2 2021/02/25 19:47:51 leot Exp $
 
---- bindings/python/setup.py.orig	2018-03-24 14:17:22.780317467 +0000
+--- bindings/python/setup.py.orig	2020-10-21 11:34:41.000000000 +0000
 +++ bindings/python/setup.py
-@@ -195,7 +195,6 @@ class custom_sdist(sdist):
- class custom_build(build):
+@@ -208,13 +208,11 @@ class custom_build(build):
+             log.info("Skipping building C extensions since LIBUNICORN_PATH is set")
+         else:
+             log.info("Building C extensions")
+-            build_libraries()
+         return build.run(self)
+ 
+ class custom_develop(develop):
      def run(self):
          log.info("Building C extensions")
 -        build_libraries()
-         return build.run(self)
+         return develop.run(self)
  
  class custom_bdist_egg(bdist_egg):
-@@ -235,7 +234,6 @@ try:
-     class custom_develop(develop):
-         def run(self):
-             log.info("Building C extensions")
--            build_libraries()
-             return develop.run(self)
- 
-     cmdclass['develop'] = custom_develop
diff --git a/emulators/unicorn/patches/patch-bindings_python_unicorn_unicorn.py b/emulators/unicorn/patches/patch-bindings_python_unicorn_unicorn.py
index 12b86c398a3..d4a369cfc6a 100644
--- a/emulators/unicorn/patches/patch-bindings_python_unicorn_unicorn.py
+++ b/emulators/unicorn/patches/patch-bindings_python_unicorn_unicorn.py
@@ -1,18 +1,20 @@
-$NetBSD: patch-bindings_python_unicorn_unicorn.py,v 1.1 2018/03/24 17:09:34 joerg Exp $
+$NetBSD: patch-bindings_python_unicorn_unicorn.py,v 1.2 2021/02/25 19:47:51 leot Exp $
 
---- bindings/python/unicorn/unicorn.py.orig	2018-03-24 14:18:11.440281233 +0000
+--- bindings/python/unicorn/unicorn.py.orig	2020-10-21 11:34:41.000000000 +0000
 +++ bindings/python/unicorn/unicorn.py
-@@ -71,18 +71,9 @@ def _load_lib(path):
+@@ -71,20 +71,9 @@ def _load_lib(path):
  _uc = None
  
  # Loading attempts, in order
+-# - user-provided environment variable
 -# - pkg_resources can get us the path to the local libraries
 -# - we can get the path to the local libraries by parsing our filename
 -# - global load
 -# - python's lib directory
 -# - last-gasp attempt at some hardcoded paths on darwin and linux
 -
--_path_list = [pkg_resources.resource_filename(__name__, 'lib'),
+-_path_list = [os.getenv('LIBUNICORN_PATH', None),
+-              pkg_resources.resource_filename(__name__, 'lib'),
 -              os.path.join(os.path.split(__file__)[0], 'lib'),
 -              '',
 -              distutils.sysconfig.get_python_lib(),