From 35743b1fa6705bc8bb931947292fbcc4a08d8210 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 15 Sep 2016 17:42:40 +0200
Subject: [PATCH] Update to avrdude 6.3 and avr core 1.6.14

---
 build/build.xml                               | 40 ++++++------------
 ...5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha |  1 -
 ...0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ....0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha |  1 +
 ...3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ...0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 ...rduino5-r2-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...0-arduino6-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...vrdude-6.0.1-arduino5-i686-mingw32.zip.sha |  1 -
 ...de-6.3.0-arduino2-i686-w64-mingw32.zip.sha |  1 -
 ...de-6.3.0-arduino6-i686-w64-mingw32.zip.sha |  1 +
 hardware/arduino/avr/platform.txt             |  2 +-
 hardware/package_index_bundled.json           | 42 +++++++++----------
 14 files changed, 39 insertions(+), 56 deletions(-)
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.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-arduino6-i686-w64-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index e4ef168f78d..258b22a7170 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -88,6 +88,7 @@
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.21" />
   <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-arduino6" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -491,19 +492,14 @@
       <param name="unpack_target" value="untar"/>
       <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-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <chmod perm="+x">
       <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
       <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
     </chmod>
-
-    <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
-    <chmod perm="-x">
-      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
-    </chmod>
   </target>
 
   <target name="macosx-run" depends="build,start"/>
@@ -721,8 +717,8 @@
       <param name="unpack_target" value="untar"/>
       <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-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
   </target>
 
@@ -751,8 +747,8 @@
       <param name="unpack_target" value="untar"/>
       <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-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
   </target>
 
@@ -781,8 +777,8 @@
       <param name="unpack_target" value="untar"/>
       <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-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
   </target>
 
@@ -1067,8 +1063,8 @@
       <param name="unpack_target" value="unzip"/>
       <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-6.0.1-arduino5-i686-mingw32.zip"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
   </target>
 
@@ -1155,8 +1151,7 @@
     </antcall>
 
     <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
-    <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
@@ -1164,17 +1159,6 @@
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>
 
-  <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
-    <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
-    </exec>
-    <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
-    </exec>
-  </target>
-
   <target name="generate-hourly-build-txt" if="hourly">
     <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
   </target>
diff --git a/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
deleted file mode 100644
index 6d87ebcafe9..00000000000
--- a/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b5968416647e79f5c395bf2a9ba000127dacc9da
diff --git a/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 0bc23f68811..00000000000
--- a/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cf859c679713cae2f1b9089d797d211dd84fe658
diff --git a/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index e4b0302e0fa..00000000000
--- a/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cfc52036f532c3a7050f6d4ec7645d060800aa39
diff --git a/build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..8663e67d529
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+9788fdd59bcc5b6267eb12b5be6667476e5cc8d9
diff --git a/build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..e868a48ef68
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+dec8e05d06c945746169c318922d68dee36c178f
diff --git a/build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..ab528b16700
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+9e747ae659b320777882678272c39ed3f8ef7705
diff --git a/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 3b1625eee60..00000000000
--- a/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-52afce6cbe1cc1021bca1234cf25b298350f97dd
diff --git a/build/macosx/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..df211693bd8
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+a29947719bb971af22feb430e5070e67c62b265b
diff --git a/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha b/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
deleted file mode 100644
index e55aa9d558b..00000000000
--- a/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-bad246afeb0b9bcbe623a29cb204127f901102cf
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-arduino6-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip.sha
new file mode 100644
index 00000000000..0acf7cdc6f5
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+e14651bfc29065ce0c6a1bacb3cfeac53705430a
diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 0738d798113..05d83a43281 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -6,7 +6,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
 
 name=Arduino AVR Boards
-version=1.6.13
+version=1.6.14
 
 # AVR compile variables
 # ---------------------
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index 4e301a285aa..0da309fc76e 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -12,15 +12,15 @@
         {
           "name": "Arduino AVR Boards",
           "architecture": "avr",
-          "version": "1.6.13",
+          "version": "1.6.14",
           "category": "Arduino",
           "help": {
             "online": "http://www.arduino.cc/en/Reference/HomePage"
           },
           "url": "http://downloads.arduino.cc/cores/avr-1.6.13.tar.bz2",
-          "archiveFileName": "avr-1.6.13.tar.bz2",
-          "checksum": "SHA-256:617f458dd3507072b9a6f9fdc78888c66aa420a2fb081c4c1556598a2d69d643",
-          "size": "4993644",
+          "archiveFileName": "avr-1.6.14.tar.bz2",
+          "checksum": "SHA-256:a5f7d66c83e3d4722f4c8dab42bdbcf5af98c611ffca1802ef3d1957b894bd92",
+          "size": "4993455",
           "boards": [
             {"name": "Arduino Yún"},
             {"name": "Arduino/Genuino Uno"},
@@ -52,7 +52,7 @@
             {
               "packager": "arduino",
               "name": "avrdude",
-              "version": "6.0.1-arduino5"
+              "version": "6.3.0-arduino6"
             }
           ]
         }
@@ -60,41 +60,41 @@
       "tools": [
         {
           "name": "avrdude",
-          "version": "6.0.1-arduino5",
+          "version": "6.3.0-arduino6",
           "systems": [
             {
-              "size": "267095",
-              "checksum": "SHA-256:23ea1341dbc117ec067f2eb1a498ad2bdd7d11fff0143c00b2e018c39804f6b4",
+              "size": "644600",
+              "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2",
+              "archiveFileName": "avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "264894",
-              "checksum": "SHA-256:41af8d3b0a586853c8317b4fb5163ca0db594a1870ddf680fd988c42166fc3e5",
+              "size": "696273",
+              "checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2",
+              "archiveFileName": "avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "292629",
-              "checksum": "SHA-256:d826cca7383461f7e8adde686372cf900e9cb3afd639555cf2d6c645b283a476",
+              "size": "746653",
+              "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2",
+              "archiveFileName": "avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "283121",
-              "checksum": "SHA-256:5933d66927bce46ababa9b68a8b7f1d53f68c4f3ff7a5ce4b85d7cf4e6c6bfee",
+              "size": "733127",
+              "checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",
               "host": "i686-linux-gnu",
-              "archiveFileName": "avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2",
+              "archiveFileName": "avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "241634",
-              "checksum": "SHA-256:41f667f1f6a0ab8df46b4ffacd023176dcdef331d6db3b74bddd37d18cca0a44",
+              "size": "645859",
+              "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
               "host": "i686-mingw32",
-              "archiveFileName": "avrdude-6.0.1-arduino5-i686-mingw32.zip",
+              "archiveFileName": "avrdude-6.3.0-arduino6-i686-mingw32.zip",
               "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-mingw32.zip"
             }
           ]