From 62a84bbffd5b306af6c2e8459b7950add7295329 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 3 Aug 2016 18:23:59 +0200
Subject: [PATCH 1/3] Update bundled avrdude to avrdue-6.3.0-arduino3

---
 build/build.xml                                                 | 2 +-
 .../linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha  | 1 -
 .../avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 -
 .../linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 .../linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha  | 1 +
 .../avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 +
 .../avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha      | 1 -
 .../avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha      | 1 +
 build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha   | 1 -
 build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha   | 1 +
 11 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha
 create mode 100644 build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index 4723bcda7ad..a6fb176a3c8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -92,7 +92,7 @@
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.20" />
   <property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
-  <property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino3" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
diff --git a/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 389ab1832ad..00000000000
--- a/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-a074c17e2013942e3e081fe03875c9d5701a0922
diff --git a/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 844fb6a27cc..00000000000
--- a/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-e9ce49f5e5c7d0d2eabd9405ca6160b70cd52645
diff --git a/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 1104a38421e..00000000000
--- a/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-3ba4c2660f8a8c40ba3902ab8a158aa3e1b91764
diff --git a/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..e4bfd3e7d52
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+8206e6d24c8a04be3e53e95f5825728309873878
diff --git a/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..cc8ee50ac99
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+8ef69a2ae43bb1aa41676cfd32768a6ede5c135c
diff --git a/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..14f46aaa020
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+fca4f190b2b72fd674bb7260100e6b499d735281
diff --git a/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index edb160cf3ea..00000000000
--- a/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-39a1940fbb4a25af5316d9a6bde99b6a29585e37
diff --git a/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..dd5f133832d
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+7d71d17bcc5097e5818534ba22270d34f9b559d5
diff --git a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha
deleted file mode 100644
index 9b9d3b373ff..00000000000
--- a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-5eaea443fd51515e1b51790a180b35e7f0949b30
diff --git a/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha
new file mode 100644
index 00000000000..4ffe498ca35
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+002a293359179ac4848626b39e98a4099189a36d

From 1090facf818ffa1908e663c6125f515e63f99975 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 3 Aug 2016 19:14:54 +0200
Subject: [PATCH 2/3] [REMOVEME] make the IDE happy

---
 build/build.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index a6fb176a3c8..ad861ee591f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -93,6 +93,7 @@
   <property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino3" />
+  <property name="AVRDUDE-VERSION-FAKE" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -495,7 +496,7 @@
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION-FAKE}"/>
     </antcall>
 
     <chmod perm="+x">
@@ -720,7 +721,7 @@
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION-FAKE}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -752,7 +753,7 @@
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION-FAKE}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -784,7 +785,7 @@
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION-FAKE}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -1072,7 +1073,7 @@
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION-FAKE}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>

From c9e965987c521299f8c18c1a2cf8bd0abba00e61 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 4 Aug 2016 18:45:35 +0200
Subject: [PATCH 3/3] update to avrdude-6.3.0-arduino4

---
 build/build.xml                                                 | 2 +-
 .../linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha  | 1 -
 .../avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 -
 .../linux/avrdude-6.3.0-arduino4-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 .../linux/avrdude-6.3.0-arduino4-i686-pc-linux-gnu.tar.bz2.sha  | 1 +
 .../avrdude-6.3.0-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 +
 .../avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha      | 1 -
 .../avrdude-6.3.0-arduino4-i386-apple-darwin11.tar.bz2.sha      | 1 +
 build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha   | 1 -
 build/windows/avrdude-6.3.0-arduino4-i686-w64-mingw32.zip.sha   | 1 +
 11 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino4-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3.0-arduino4-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha
 create mode 100644 build/windows/avrdude-6.3.0-arduino4-i686-w64-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index ad861ee591f..cd22ac59933 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -92,7 +92,7 @@
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.20" />
   <property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
-  <property name="AVRDUDE-VERSION" value="6.3.0-arduino3" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino4" />
   <property name="AVRDUDE-VERSION-FAKE" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
diff --git a/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index e4bfd3e7d52..00000000000
--- a/build/linux/avrdude-6.3.0-arduino3-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8206e6d24c8a04be3e53e95f5825728309873878
diff --git a/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index cc8ee50ac99..00000000000
--- a/build/linux/avrdude-6.3.0-arduino3-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8ef69a2ae43bb1aa41676cfd32768a6ede5c135c
diff --git a/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 14f46aaa020..00000000000
--- a/build/linux/avrdude-6.3.0-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-fca4f190b2b72fd674bb7260100e6b499d735281
diff --git a/build/linux/avrdude-6.3.0-arduino4-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..7efb59e2c27
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+5d2082a40b13870ca87cfa0e1f85bf1b0fc5cf18
diff --git a/build/linux/avrdude-6.3.0-arduino4-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino4-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..7d6c15b5b7c
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino4-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+698337629f145c6580d1ec510b2f520ffc3cc37b
diff --git a/build/linux/avrdude-6.3.0-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..904666ff86d
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+ae652e8b58ff1f4e6243879b69462059fe965a8f
diff --git a/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index dd5f133832d..00000000000
--- a/build/macosx/avrdude-6.3.0-arduino3-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-7d71d17bcc5097e5818534ba22270d34f9b559d5
diff --git a/build/macosx/avrdude-6.3.0-arduino4-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino4-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..24cd32f91f0
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino4-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+1cb059035389c31b22391b79665da290428a418c
diff --git a/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha
deleted file mode 100644
index 4ffe498ca35..00000000000
--- a/build/windows/avrdude-6.3.0-arduino3-i686-w64-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-002a293359179ac4848626b39e98a4099189a36d
diff --git a/build/windows/avrdude-6.3.0-arduino4-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino4-i686-w64-mingw32.zip.sha
new file mode 100644
index 00000000000..50ce34dc3e9
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino4-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+bf60549a0bffcf93523798dc276ddf6074885ab9