update proxmark3-iceman-git

3 files changed, 89 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db624dcfe810..a5a85911caee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proxmark3-iceman-git
 	pkgdesc = RRG / Iceman repo - Proxmark3 RDV4.0 and other Proxmark3 platforms.
-	pkgver = 13447.6f579e5b6
-	pkgrel = 1
+	pkgver = 4.17768.r170.gf48d495
+	pkgrel = 0
 	url = https://github.com/RfidResearchGroup/proxmark3
 	install = proxmark3-iceman-git.install
 	arch = x86_64
@@ -9,9 +9,17 @@ pkgbase = proxmark3-iceman-git
 	makedepends = git
 	makedepends = arm-none-eabi-gcc
 	makedepends = arm-none-eabi-newlib
+	makedepends = pkgconf
+	makedepends = readline
+	makedepends = bzip2
+	makedepends = lz4
 	depends = perl
 	depends = python
 	depends = libsndfile
+	depends = bluez
+	depends = bluez-libs
+	depends = gd
+	depends = qt5-tools
 	provides = proxmark3
 	provides = proxmark3-iceman
 	conflicts = proxmark3
@@ -20,6 +28,8 @@ pkgbase = proxmark3-iceman-git
 	replaces = proxmark3-iceman-git-rdv4
 	options = !buildflags
 	source = proxmark3-iceman-git::git+https://github.com/RfidResearchGroup/proxmark3.git
+	source = proxmark3-iceman-git.install
 	sha512sums = SKIP
+	sha512sums = ae447b36cdaf7e7985a4e193d2dc1b7458e04c33503ee417d6f46aa816956ab8b1a4e301d296eb8656bfbea1234da94593297e67c4762e2035faabfcc569a14c
 
 pkgname = proxmark3-iceman-git
diff --git a/PKGBUILD b/PKGBUILD
index d1e2a565a376..bb92145d8c60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,47 @@
 # Maintainer: edward-p <edward At edward-p Dot xyz>
+# Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=proxmark3-iceman-git
-pkgver=13447.6f579e5b6
-pkgrel=1
+pkgver=4.17768.r170.gf48d495
+pkgrel=0
 pkgdesc='RRG / Iceman repo - Proxmark3 RDV4.0 and other Proxmark3 platforms.'
 arch=('x86_64')
 url='https://github.com/RfidResearchGroup/proxmark3'
 license=('GPL2')
-depends=('perl' 'python' 'libsndfile')
-makedepends=('git' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib')
+depends=('perl'
+  'python'
+  'libsndfile'
+  'bluez'
+  'bluez-libs'
+  'gd'
+  'qt5-tools')
+makedepends=('git'
+  'arm-none-eabi-gcc'
+  'arm-none-eabi-newlib'
+  'pkgconf'
+  'readline'
+  'bzip2'
+  'lz4'
+#   'lua'
+#   'libwhereami'
+)
+checkdepends=(python-pyopenssl)
 options=(!buildflags)
 provides=('proxmark3' 'proxmark3-iceman')
 conflicts=('proxmark3' 'proxmark3-iceman')
 replaces=($pkgname'-generic' $pkgname'-rdv4')
-source=("$pkgname::git+https://github.com/RfidResearchGroup/proxmark3.git")
-sha512sums=('SKIP')
-install=proxmark3-iceman-git.install
+source=("$pkgname::git+${url}.git"
+  "${pkgname}.install")
+sha512sums=('SKIP'
+            'ae447b36cdaf7e7985a4e193d2dc1b7458e04c33503ee417d6f46aa816956ab8b1a4e301d296eb8656bfbea1234da94593297e67c4762e2035faabfcc569a14c')
+install=${pkgname}.install
 
 pkgver() {
-  cd $pkgname
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+    cd "${srcdir}/${pkgname}"
+    ( set -o pipefail
+        git describe --long --tag --abbrev=7 2>/dev/null | sed 's/^v//g;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+    )
 }
 
 build() {
@@ -32,29 +54,45 @@ build() {
   mkdir "$DESTDIR"
  
   STANDALONE_MODES=(
-          #'LF_SKELETON'
-          'LF_EM4100EMUL'
-          'LF_EM4100RSWB'
-          'LF_EM4100RWC'
-          'LF_HIDBRUTE'
-          'LF_PROXBRUTE'
-          'LF_SAMYRUN'
-          'HF_AVEFUL'
-          'HF_CRAFTBYTE'
-          'HF_LEGIC'
-          'HF_MATTYRUN'
-          'HF_MSDSAL'
-          'HF_TCPRST'
-          'HF_TMUDFORD'
-          'HF_YOUNG')
+    'LF_SKELETON'
+    'LF_EM4100EMUL'
+    'LF_EM4100RSWB'
+    'LF_EM4100RSWW'
+    'LF_EM4100RWC'
+    'LF_HIDBRUTE'
+    'LF_MULTIHID'
+    'LF_NEDAP_SIM'
+    'LF_PROXBRUTE'
+    'LF_PROX2BRUTE'
+    'LF_SAMYRUN'
+    'HF_14ASNIFF'
+    'HF_14BSNIFF'
+    'HF_15SNIFF'
+    'HF_AVEFUL'
+    'HF_CRAFTBYTE'
+    'HF_LEGIC'
+    'HF_MATTYRUN'
+    'HF_MSDSAL'
+    'HF_TCPRST'
+    'HF_TMUDFORD'
+    'HF_UNISNIFF'
+    'HF_YOUNG'
+    'DANKARMULTI'
+    )
   RDV4_STANDALONE_MODES=(
-          'LF_ICEHID'
-          'LF_NEXID'
-          'HF_14ASNIFF'
-          'HF_BOG'
-          'HF_COLIN'
-          'HF_ICECLASS'
-          )
+    'LF_HIDFCBRUTE'
+    'LF_ICEHID'
+    'LF_NEXID'
+    'LF_THAREXDE'
+    'HF_14ASNIFF'
+    'HF_BOG'
+    'HF_CARDHOPPER'
+    'HF_COLIN'
+    'HF_ICECLASS'
+    'HF_LEGICSIM'
+    'HF_MFCSIM'
+    'HF_REBLAY'
+    )
  
   # Build recovery (without PLATFORM_EXTRAS and STANDALONE)
   make \
@@ -90,6 +128,11 @@ build() {
   make {bootrom,client,mfkey,nonce2key,common}/install
 }
 
+check() {
+  cd "${srcdir}/${pkgname}"
+  make check
+}
+
 package() {
   export DESTDIR="build"
   cd "${srcdir}/${pkgname}"
diff --git a/proxmark3-iceman-git.install b/proxmark3-iceman-git.install
index c4579c40d926..35d5b535ca39 100644
--- a/proxmark3-iceman-git.install
+++ b/proxmark3-iceman-git.install
@@ -1,5 +1,7 @@
 post_install() {
     echo ":: Add yourself to the uucp group to access the serial ports:"
-    echo "   sudo usermod -a -G uucp <user>"
+    echo "   sudo usermod -a -G uucp \$USER"
+    echo "   sudo usermod -a -G bluetooth \$USER"
+    echo "   sudo udevadm control --reload-rules"
     echo ":: Firmwares are installed at /usr/share/proxmark3/firmware"
 }