From 429288534498b218ee40a334a562964842791167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marlin=20S=C3=B6=C3=B6se?= <30473690+msoose@users.noreply.github.com> Date: Fri, 24 Apr 2020 17:28:02 -0600 Subject: [PATCH] proxmark3: update to latest master and fix patch (#5199) --- packages/proxmark3/build.sh | 6 +- packages/proxmark3/build_fixes.patch | 95 ++++++++++++++-------------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/packages/proxmark3/build.sh b/packages/proxmark3/build.sh index 18421739d..099a368f1 100644 --- a/packages/proxmark3/build.sh +++ b/packages/proxmark3/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE="https://github.com/RfidResearchGroup/proxmark3" TERMUX_PKG_DESCRIPTION="The Swiss Army Knife of RFID Research - RRG/Iceman repo" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Marlin Sööse " -_COMMIT=682bded18abdee81a6064f5ef4dbc69c1f38de09 -TERMUX_PKG_VERSION=2020.04.12-g${_COMMIT:0:8} +_COMMIT=011f973e7ff145ee0f6ccf58c850765513c43d04 +TERMUX_PKG_VERSION=2020.04.24-g${_COMMIT:0:8} TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/RfidResearchGroup/proxmark3/archive/${_COMMIT}.tar.gz -TERMUX_PKG_SHA256=2f6bc40f012b2df305c137deff8cf6369a422611d26c261e1fafa32729432531 +TERMUX_PKG_SHA256=dc3c7a317d8ff24b304d9e85c1c43f30c854e85296ee2834f3bcbf0ef8745bbd TERMUX_PKG_BUILD_DEPENDS="readline" TERMUX_PKG_BUILD_IN_SRC="true" TERMUX_PKG_BLACKLISTED_ARCHES="i686, x86_64" diff --git a/packages/proxmark3/build_fixes.patch b/packages/proxmark3/build_fixes.patch index e0a4f7d0c..2cbaa6a9a 100644 --- a/packages/proxmark3/build_fixes.patch +++ b/packages/proxmark3/build_fixes.patch @@ -1,6 +1,37 @@ -diff -uNr proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/client/Makefile proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/client/Makefile ---- proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/client/Makefile 2020-02-23 11:45:23.000000000 +0200 -+++ proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/client/Makefile 2020-02-23 13:48:52.723946630 +0200 +diff -uNr proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/deps/hardnested/Makefile proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/deps/hardnested/Makefile +--- proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/deps/hardnested/Makefile 2020-04-24 19:21:38.000000000 +0300 ++++ proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/deps/hardnested/Makefile 2020-04-25 02:07:55.045517847 +0300 +@@ -4,7 +4,7 @@ + MYDEFS = + MYSRCS = hardnested_bruteforce.c + +-cpu_arch = $(shell uname -m) ++cpu_arch = generic + ifneq ($(findstring 86, $(cpu_arch)), ) + MULTIARCHSRCS = hardnested_bf_core.c hardnested_bitarray_core.c + endif +@@ -24,7 +24,7 @@ + $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \ + $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o) + +-SUPPORTS_AVX512 := $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" ) ++SUPPORTS_AVX512 := False + + HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2 + HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2 +diff -uNr proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/deps/reveng/Makefile proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/deps/reveng/Makefile +--- proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/deps/reveng/Makefile 2020-04-24 19:21:38.000000000 +0300 ++++ proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/deps/reveng/Makefile 2020-04-25 02:08:19.501640877 +0300 +@@ -30,6 +30,5 @@ + $(info [-] CC $<) + $(Q)$(CC) $(CFLAGS) -DBMPTST -o $@ $< + $(info [=] TEST $@) +- $(Q)( ./$@ && $(TOUCH) $@ ) || ( $(RM) $@ && $(FALSE) ) + + .PHONY: all clean +diff -uNr proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/Makefile proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/Makefile +--- proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/client/Makefile 2020-04-24 19:21:38.000000000 +0300 ++++ proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/client/Makefile 2020-04-25 02:09:05.293871331 +0300 @@ -22,7 +22,7 @@ OBJDIR = obj @@ -10,55 +41,27 @@ diff -uNr proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/client/Makefile pro # RPi Zero gcc requires -latomic # but MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld -@@ -50,7 +50,7 @@ +@@ -54,7 +54,7 @@ ZLIB = $(OBJDIR)/libz.a - LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) --INCLUDES_CLIENT = -I. -I../include -I../common -Iuart $(LIBS) -+INCLUDES_CLIENT = -I. -I../include -I../common -Iuart -I/data/data/com.termux/files/usr/include $(LIBS) - CFLAGS ?= -Wall -Werror -g -O3 + LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH) +-INCLUDES_CLIENT = -I./src -I../include -I../common -I../common_fpga $(LIBS) ++INCLUDES_CLIENT = -I./src -I../include -I../common -I../common_fpga -I/data/data/com.termux/files/usr/include $(LIBS) + CFLAGS ?= -Wall -Werror -O3 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: - PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) -@@ -252,7 +252,7 @@ - wiegand_formats.c \ - wiegand_formatutils.c - --cpu_arch = $(shell uname -m) -+cpu_arch = generic - ifneq ($(findstring 86, $(cpu_arch)), ) - MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c - endif -@@ -273,7 +273,7 @@ - $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \ - $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o) - --SUPPORTS_AVX512 := $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" ) -+SUPPORTS_AVX512 := False - - HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2 - HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2 -@@ -304,7 +304,7 @@ - proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(ZLIB) $(REVENGLIB) $(AMIIBOLIB) $(QTLDLIBS) - proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LUALIB) $(JANSSONLIB) $(CBORLIB) $(REVENGLIB) $(MBEDTLSLIB) $(ZLIB) $(AMIIBOLIB) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua + PM3CFLAGS = $(CFLAGS) $(INCLUDES_CLIENT) +@@ -286,7 +286,7 @@ + proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(ZLIB) $(REVENGLIB) $(AMIIBOLIB) $(HARDNESTEDLIB) $(CLIPARSERLIB) $(QTLDLIBS) + proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(LUALIB) $(JANSSONLIB) $(CBORLIB) $(REVENGLIB) $(MBEDTLSLIB) $(ZLIB) $(AMIIBOLIB) $(HARDNESTEDLIB) $(CLIPARSERLIB) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua $(info [=] LD $@) -- $(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS) -o $@ -+ $(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS) -o $@ tinycbor/tinycbor.a reveng/libreveng.a jansson/libjansson.a liblua/liblua.a obj/libmbedtls.a obj/libz.a +- $(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(LDLIBS) -o $@ ++ $(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(LDLIBS) -o $@ deps/hardnested/libhardnested.a deps/cliparser/libcliparser.a deps/tinycbor/tinycbor.a deps/reveng/libreveng.a deps/jansson/libjansson.a deps/liblua/liblua.a obj/libmbedtls.a obj/libz.a - proxgui.cpp: ui/ui_overlays.h + src/proxgui.cpp: src/ui/ui_overlays.h -diff -uNr proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/client/reveng/Makefile proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/client/reveng/Makefile ---- proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/client/reveng/Makefile 2020-02-23 11:45:23.000000000 +0200 -+++ proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/client/reveng/Makefile 2020-02-23 13:48:56.395974244 +0200 -@@ -28,6 +28,5 @@ - $(info [-] CC $<) - $(Q)$(CC) $(CFLAGS) -DBMPTST -o $@ $< - $(info [=] TEST $@) -- $(Q)( ./$@ && $(TOUCH) $@ ) || ( $(RM) $@ && $(FALSE) ) - - .PHONY: all clean -diff -uNr proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/Makefile.defs proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/Makefile.defs ---- proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de/Makefile.defs 2020-02-23 11:45:23.000000000 +0200 -+++ proxmark3-cfcb0494590d8dbe611e9e1eaf60f52495fd69de.mod/Makefile.defs 2020-02-23 13:48:52.723946630 +0200 +diff -uNr proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/Makefile.defs proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/Makefile.defs +--- proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04/Makefile.defs 2020-04-24 19:21:38.000000000 +0300 ++++ proxmark3-011f973e7ff145ee0f6ccf58c850765513c43d04.mod/Makefile.defs 2020-04-25 02:07:55.046517852 +0300 @@ -21,9 +21,6 @@ TARFLAGS ?= -v --ignore-failed-read -r TARFLAGS += -C .. -f