Textual changes,

updated the homebrew download link. Now points to latest release.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d322acf3a89617e7a7596e36695e962cd7b0a5dd..8deb0ad26c81ceb64a83d61c9bd94dc115d48851 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,10 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
-  - 'hf mf chk' speedup
-  - 'hf 14a/mf sim x" attack mode,  now uses also moebius version of mfkey32 to try finding the key.
-  - 'hf 14a sim' Added emulation of Mifare cards with 10byte UID length.
-  - 'hf mf sim' Added emulation of Mifare cards with 10byte UID length.
+  - 'hf mf chk' speedup (iceman)
+  - 'hf 14a/mf sim x" attack mode,  now uses also moebius version of mfkey32 to try finding the key. (iceman)
+  - 'hf 14a sim' Added emulation of Mifare cards with 10byte UID length. (iceman)
+  - 'hf mf sim' Added emulation of Mifare cards with 10byte UID length. (iceman)
   -  Added bitsliced bruteforce solver in 'hf mf hardnested' (azcid)
   -  Added `lf guard clone/sim` (iceman)
   -  Added `lf pyramd clone/sim` (iceman) 

diff --git a/README.md b/README.md
index 7d696143abd9aefc549cfb85e4a82a262b65c65f..6e0008608e2d69de277df4f9becb19e6ab69ce13 100644 (file)
--- a/README.md
+++ b/README.md
@@ -67,10 +67,10 @@ Among the stuff is
 ---    
 Straight from the CHANGELOG
 ---
-  - 'hf mf chk' speedup
-  - 'hf 14a/mf sim x" attack mode,  now uses also moebius version of mfkey32 to try finding the key.
-  - 'hf 14a sim' Added emulation of Mifare cards with 10byte UID length.
-  - 'hf mf sim' Added emulation of Mifare cards with 10byte UID length.
+  - 'hf mf chk' speedup (iceman)
+  - 'hf 14a/mf sim x" attack mode,  now uses also moebius version of mfkey32 to try finding the key. (iceman)
+  - 'hf 14a sim' Added emulation of Mifare cards with 10byte UID length. (iceman)
+  - 'hf mf sim' Added emulation of Mifare cards with 10byte UID length. (iceman)
   - Added bitsliced bruteforce solver in 'hf mf hardnested' (azcid)
   - Added `lf guard clone/sim` (iceman)
   - Added `lf pyramd clone/sim` (iceman) 

diff --git a/README.txt b/README.txt
index 74566c0c74a6043a08c6b762729f111bd5fd32bb..13f2556a78b158f144b9c34edabc9062b000a14c 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -55,29 +55,28 @@ I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will
          
 DEVELOPMENT:
 
-This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8
+This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.9
 For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.
 
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS.
        - See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
        - Generally speaking, if you're running a "later" Proxmark, installation is very easy.
-       - Run "sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget"a
+       - Run "sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget
        - Follow these instructions
-Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
-
-(64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
-(32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
-Extract the contents of the .tar.bz2:
- tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
-Create a directory for the arm dev kit:
- sudo mkdir -p /opt/devkitpro/
-Move the ARM developer kit to the newly created directory:
- sudo mv devkitARM /opt/devkitpro/
-Add the appropriate environment variable:
- export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
-Add the environment variable to your profile:
- echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
-       - Use the magic build command "make UBUNTU_1404_QT4=1"
+        Get devkitARM release 41 from SourceForge (choose either the 64/32 bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
+                       (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
+                       (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
+                       Extract the contents of the .tar.bz2:
+                                       tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
+                       Create a directory for the arm dev kit:
+                                       sudo mkdir -p /opt/devkitpro/
+                       Move the ARM developer kit to the newly created directory:
+                                       sudo mv devkitARM /opt/devkitpro/
+                       Add the appropriate environment variable:
+                                       export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
+                       Add the environment variable to your profile:
+                                       echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
+       - make all
 
 Common errors linux/macOS finds
        

diff --git a/proxmark3.rb b/proxmark3.rb
index b28014d6b106ffd663acf07c4be82e2af19dd4a8..902949539660fd422bd12be688cc39436d749fbe 100644 (file)
--- a/proxmark3.rb
+++ b/proxmark3.rb
@@ -1,8 +1,8 @@
 class Proxmark3 < Formula
   desc "Proxmark3 client, flasher, HID flasher and firmware bundle"
   homepage "http://www.proxmark.org"
-  url "https://github.com/iceman1001/proxmark3/archive/v1.5.0.tar.gz"
-  sha256 "e1f9e3648978580bb8f7ee4e671ec41f5a4982bf07bd5525352af7a826073305"
+  url "https://github.com/iceman1001/proxmark3/archive/v1.6.0.tar.gz"
+  sha256 "254f6596cdeb42158abf4b7d5c19bdc7d97f7d41a83a34697fe9d380cc34b4fa"
   head "https://github.com/iceman1001/proxmark3.git"
 
   depends_on "automake" => :build