Add unicorn-1.0.2-rc3.tar.gz

.gitignore

@@ -1 +1,2 @@
 /unicorn-1.0.1.tar.gz
+/unicorn-1.0.2-rc3.tar.gz

sources

@@ -1 +1 @@
-SHA512 (unicorn-1.0.1.tar.gz) = edfe1f7bfbc1d20f5b62232057e194a937bc09db686ef2efadb33a54605029a53426432cdb2a29511385aacdb9343b3b3091af50a1909098d7cf6db3429eb966
+SHA512 (unicorn-1.0.2-rc3.tar.gz) = 6d27fa74504fe2c3d9292b4f67634042ac87015c203dfa0085d17d0efb82c12d0084bb5bd3f96200fb0c861820d499f09fa2e9e2a27addb68e1ba3bf2c7fea37

unicorn-1.0.2-rc3-python3.patch

@@ -1,21 +1,21 @@
-diff -u --recursive unicorn-1.0.1-vanilla/Makefile unicorn-1.0.1/Makefile
---- unicorn-1.0.1-vanilla/Makefile	2017-04-20 02:14:24.000000000 -0400
-+++ unicorn-1.0.1/Makefile	2018-07-22 00:42:14.440939938 -0400
-@@ -212,7 +212,7 @@
+diff -u --recursive unicorn-1.0.2-rc3-vanilla/Makefile unicorn-1.0.2-rc3/Makefile
+--- unicorn-1.0.2-rc3-vanilla/Makefile	2020-04-08 10:52:43.000000000 -0400
++++ unicorn-1.0.2-rc3/Makefile	2020-05-18 12:05:00.990026573 -0400
+@@ -226,7 +226,7 @@
  
  qemu/config-host.h-timestamp:
  	cd qemu && \
 -	./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS}
-+	./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" --python=python2 ${UNICORN_QEMU_FLAGS}
++	./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" --python=python3 ${UNICORN_QEMU_FLAGS}
  	printf "$(UNICORN_ARCHS)" > config.log
  	$(MAKE) -C qemu $(SMP_MFLAGS)
  	$(eval UC_TARGET_OBJ += $$(wildcard qemu/util/*.o) $$(wildcard qemu/*.o) $$(wildcard qemu/qom/*.o) $$(wildcard qemu/hw/core/*.o) $$(wildcard qemu/qapi/*.o) $$(wildcard qemu/qobject/*.o))
-@@ -303,7 +303,7 @@
- 	$(eval TARGETS := m68k arm armeb aarch64 mips mipsel mips64 mips64el\
+@@ -322,7 +322,7 @@
+ 	$(eval TARGETS := m68k arm armeb aarch64 aarch64eb mips mipsel mips64 mips64el\
  		powerpc sparc sparc64 x86_64)
  	$(foreach var,$(TARGETS),\
 -		$(shell python qemu/header_gen.py $(var) > qemu/$(var).h;))
-+		$(shell python2 qemu/header_gen.py $(var) > qemu/$(var).h;))
++		$(shell python3 qemu/header_gen.py $(var) > qemu/$(var).h;))
  	@echo "Generated headers for $(TARGETS)."
  
  

unicorn.spec

@@ -1,6 +1,8 @@
+%global         rctag rc3
+
 Name:           unicorn
-Version:        1.0.1
-Release:        8%{?dist}
+Version:        1.0.2
+Release:        0.1.%{rctag}%{?dist}
 Summary:        A lightweight multi-platform, multi-architecture CPU emulator framework
 
 # GPLv2:        Most of unicorn is licensed under the GPLv2, with exception
@@ -10,15 +12,7 @@ Summary:        A lightweight multi-platform, multi-architecture CPU emulator fr
 # BSD:          Portions of code from QEMU
 License:        GPLv2 and LGPLv2+ and MIT and BSD
 URL:            https://www.unicorn-engine.org/
-Source0:        https://github.com/unicorn-engine/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
-
-# Warning: there is no python2 subpkg, but we still supply --python=python2 to configure, or we get:
-# ERROR: Cannot use 'python3', Python 2.4 or later is required.
-#       Note that Python 3 or later is not yet supported.
-#       Use --python=/path/to/python to specify a supported Python.
-Patch0:         unicorn-1.0.1-python2.patch
-BuildRequires:  %{__python2}
-
+Source0:        https://github.com/unicorn-engine/%{name}/archive/%{version}%{rctag}/%{name}-%{version}-%{rctag}.tar.gz
 BuildRequires:  gcc
 BuildRequires:  python3-devel
 
@@ -51,7 +45,7 @@ Requires:       %{name} = %{version}-%{release}
 The unicorn-python3 package contains python3 bindings for unicorn.
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version}-%{rctag}
 
 %build
 %make_build
@@ -80,10 +74,14 @@ rm -rf %{buildroot}%{python3_sitelib}/unicorn/lib
 %{_includedir}/unicorn/
 
 %files -n python3-unicorn
-%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info/
+%{python3_sitelib}/%{name}-%{version}%{rctag}-py?.?.egg-info/
 %{python3_sitelib}/%{name}/
 
 %changelog
+* Mon May 18 2020 W. Michael Petullo <mike@flyn.org> - 1.0.2-0.1.rc3
+- Update to 1.0.2-rc3 to satisfy pwntools (Red Hat Bugzilla #1836767 and #1833654)
+- Removed obsolete patch to use python2
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild