From 9e308aee8bbd09349ec949ed305aeb20af44d610 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 17 Jan 2017 12:21:59 +0100
Subject: [PATCH 1/4] Update avr-gcc to avr-gcc-4.9.2-atmel3.5.4-arduino2

---
 build/build.xml                               |  2 +-
 ....3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha |  1 -
 ...5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ....4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha |  1 +
 ...5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ...4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 ...3-arduino2-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...4-arduino2-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...2-atmel3.5.3-arduino2-i686-mingw32.zip.sha |  1 -
 ...2-atmel3.5.4-arduino2-i686-mingw32.zip.sha |  1 +
 hardware/package_index_bundled.json           | 44 +++++++++----------
 12 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha
 create mode 100644 build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index ba4b4db50e1..3fd7ac44060 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -87,7 +87,7 @@
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.24" />
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
-  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
+  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
   <property name="arduinoOTA-VERSION" value="1.0.0" />
 
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index b12002e8be3..00000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-e2377fc99bf9e93daf4957e5fde65d244a3ccbff
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index c5308463728..00000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-4c1ca6daf11c210f99927a60261c4a17024eb9ed
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 96b49e1b397..00000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-7eff6a3bb6b73f933a941a8962f820e63a79ed7e
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..ebfe8ab49ce
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+ba879ff3e212c1d13cf18bd74c72032a07564826
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..457e8e3dfdd
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+fd449aa8a7f6f56c6e94226f9b0b80ce99dddb24
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..0f646213739
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+7db39e171782e5b3cafad2fed918fcab93938603
diff --git a/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 4fc95475135..00000000000
--- a/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-bd0a579e8b1613a97ed74ef018505f63872ec023
diff --git a/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..3a72dba3815
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+431bc914b508d3ced22914b11096f73cd7f19f3e
diff --git a/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha
deleted file mode 100644
index e8e9b342674..00000000000
--- a/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-1fb69fc6c9dce945d5e595cb9e76a8d2d4cebae8
diff --git a/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha
new file mode 100644
index 00000000000..5c09ce10f28
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+78c77b2a5724c627861684cc8fe45a39e57cc0f4
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index 671659070b9..c404be65348 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -53,7 +53,7 @@
             {
               "packager": "arduino",
               "name": "avr-gcc",
-              "version": "4.9.2-atmel3.5.3-arduino2"
+              "version": "4.9.2-atmel3.5.4-arduino2"
             },
             {
               "packager": "arduino",
@@ -112,42 +112,42 @@
         },
         {
           "name": "avr-gcc",
-          "version": "4.9.2-atmel3.5.3-arduino2",
+          "version": "4.9.2-atmel3.5.4-arduino2",
           "systems": [
             {
-              "size": "27400889",
-              "checksum": "SHA-256:77f300d519bc6b9a25df17b36cb303218e9a258c059b2f6bff8f71a0d8f96821",
+              "size": "27764772",
+              "checksum": "SHA-256:ee36009e19bd238d1f6351cbc9aa5db69714761f67dec4c1d69d5d5d7758720c",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "27048070",
-              "checksum": "SHA-256:311258af188defe24a4b341e4e1f4dc93ca6c80516d3e3b55a2fc07a7050248b",
+              "size": "28574644",
+              "checksum": "SHA-256:67b3ed3555eacf0b4fc6f62240773b9f0220171fe4de26bb8d711547fc884730",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "43847945",
-              "checksum": "SHA-256:f8e6ede8746c70be01ec79a30803277cd94360cc5b2e104762da0fbcf536fcc6",
+              "size": "44386446",
+              "checksum": "SHA-256:6044551cd729d88ea6ffcccf10aad1934c5b164d61f4f5890b0e78524ffff853",
               "host": "i686-mingw32",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip"
             },
             {
-              "size": "29292729",
-              "checksum": "SHA-256:f108951e7c4dc90926d1fc76cc27549f6ea63c702a2bb7ff39647a19ae86ec68",
+              "size": "29723974",
+              "checksum": "SHA-256:63a9d4cebbac06fd5fa8f48a2e2ba7d513837dcddc97f560129b4e466af901b5",
               "host": "i686-linux-gnu",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "29882960",
-              "checksum": "SHA-256:3903a6d1bb9fdd91727e504b5993d5501f119bcb7f99f7aee98a2101e5629188",
+              "size": "30374404",
+              "checksum": "SHA-256:19480217f1524d78467b83cd742f503182bbcc76b5440093261f146828aa588c",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"
             }
           ]
         },

From 2f2160d007bc8d3392b60f85bc52839a086f61d6 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 17 Jan 2017 12:50:48 +0100
Subject: [PATCH 2/4] Update avrdude to 6.3.0-arduino9

---
 build/build.xml                               |  2 +-
 ...3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ...0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha} |  0
 ...3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ...0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 ...0-arduino8-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...0-arduino9-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...de-6.3.0-arduino8-i686-w64-mingw32.zip.sha |  1 -
 ...de-6.3.0-arduino9-i686-w64-mingw32.zip.sha |  1 +
 hardware/package_index_bundled.json           | 40 +++++++++----------
 11 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha
 rename build/linux/{avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2.sha => avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha} (100%)
 create mode 100644 build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha
 create mode 100644 build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index 3fd7ac44060..5401c0485fe 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -88,7 +88,7 @@
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.24" />
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
-  <property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino9" />
   <property name="arduinoOTA-VERSION" value="1.0.0" />
 
   <!-- Libraries required for running arduino -->
diff --git a/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 05e6e604056..00000000000
--- a/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8e3941f694d17d80dfea9a3cad7d3ec13e64284f
diff --git a/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 3a7e416912a..00000000000
--- a/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-d6cc64c9d8faa7a5dc83d2b3b3c4aef0f92f8f1b
diff --git a/build/linux/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
similarity index 100%
rename from build/linux/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2.sha
rename to build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
diff --git a/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..2c7e131c27b
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+989bb9e20618fd1007e09ac0b51c8cac27447aa9
diff --git a/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..1d2b02dc3ed
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+28546bfcb6e6c8f326020c0b8df7e46cca71b25a
diff --git a/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index cf5122f4707..00000000000
--- a/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b0ecf552e27c35cd79411b220b68cb980860f505
diff --git a/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..7c2e108bea1
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+0ea78df7016daaa53a0c774618bea72f33617afa
diff --git a/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha
deleted file mode 100644
index e337fc1c99f..00000000000
--- a/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-2799d620d4ea3933cb88c1e3e39e9f407ec3fef7
diff --git a/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha
new file mode 100644
index 00000000000..0c7ce435b91
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+90b367fb9b07c0427e491841efbbf15fd3cd0565
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index c404be65348..d86b2d79c74 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -58,7 +58,7 @@
             {
               "packager": "arduino",
               "name": "avrdude",
-              "version": "6.3.0-arduino8"
+              "version": "6.3.0-arduino9"
             },
             {
               "packager": "arduino",
@@ -71,42 +71,42 @@
       "tools": [
         {
           "name": "avrdude",
-          "version": "6.3.0-arduino8",
+          "version": "6.3.0-arduino9",
           "systems": [
             {
               "size": "644550",
               "checksum": "SHA-256:25a6834ae48019fccf37024236a1f79fe21760414292a4f3fa058d937ceee1ce",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "697268",
-              "checksum": "SHA-256:be8a33a7ec01bb7123279466ffa31371e0aa4fccefffcc23ce71810b59531947",
+              "size": "697309",
+              "checksum": "SHA-256:bfa06bc042dff252d3a8eded98da159484e75b46d2697da4d9446dcd2aea8465",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2"
+              "archiveFileName": "avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "711544",
-              "checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
+              "size": "711229",
+              "checksum": "SHA-256:c8cccb84e2fe49ee837b24f0a60a99e9c371dae26e84c5b0b22b6b6aab2f1f6a",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "701718",
-              "checksum": "SHA-256:8e2e4bc71d22e9d11ed143763b97f3aa2d164cdeee678a9deaf5b36e245b2d20",
+              "size": "701590",
+              "checksum": "SHA-256:4235a2d58e3c3224c603d6c5f0610507ed6c48ebf4051fdcce9f77a7646e218b",
               "host": "i686-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "645996",
-              "checksum": "SHA-256:3a7592f6c33efd658b820c73d1058d3c868a297cbddb37da5644973c3b516d5e",
+              "size": "645974",
+              "checksum": "SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f",
               "host": "i686-mingw32",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i686-w64-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip"
+              "archiveFileName": "avrdude-6.3.0-arduino9-i686-w64-mingw32.zip",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip"
             }
           ]
         },

From 224844b50f08296200e9ed802943a498964771c7 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 17 Jan 2017 12:41:33 +0100
Subject: [PATCH 3/4] Update arduinoOTA to 1.1.1

---
 build/build.xml                               | 14 +++---
 .../arduinoOTA-1.0.0-linux32.tar.bz2.sha      |  1 -
 .../arduinoOTA-1.0.0-linux64.tar.bz2.sha      |  1 -
 .../arduinoOTA-1.0.0-linuxarm.tar.bz2.sha     |  1 -
 .../arduinoOTA-1.1.1-linux_386.tar.bz2.sha    |  1 +
 .../arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha  |  1 +
 .../arduinoOTA-1.1.1-linux_arm.tar.bz2.sha    |  1 +
 build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha |  1 -
 .../arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha |  1 +
 .../windows/arduinoOTA-1.0.0-windows.zip.sha  |  1 -
 .../arduinoOTA-1.1.1-windows_386.zip.sha      |  1 +
 hardware/package_index_bundled.json           | 44 +++++++++----------
 12 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha
 delete mode 100644 build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha
 delete mode 100644 build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha
 create mode 100644 build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha
 create mode 100644 build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha
 create mode 100644 build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha
 delete mode 100644 build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha
 create mode 100644 build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha
 delete mode 100644 build/windows/arduinoOTA-1.0.0-windows.zip.sha
 create mode 100644 build/windows/arduinoOTA-1.1.1-windows_386.zip.sha

diff --git a/build/build.xml b/build/build.xml
index 5401c0485fe..be3172fdfeb 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -89,7 +89,7 @@
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino9" />
-  <property name="arduinoOTA-VERSION" value="1.0.0" />
+  <property name="arduinoOTA-VERSION" value="1.1.1" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -487,7 +487,7 @@
       <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="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-osx.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
 
@@ -700,7 +700,7 @@
       <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="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linuxarm.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -718,7 +718,7 @@
       <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="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux32.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -736,7 +736,7 @@
       <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="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux64.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -1055,7 +1055,7 @@
       <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="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows.zip"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows_386.zip"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -1153,7 +1153,7 @@
 
     <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" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/arduinoOTA/" 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.arduinoOTA=${arduinoOTA_version}${line.separator}"/>
diff --git a/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha
deleted file mode 100644
index 51e6c12e886..00000000000
--- a/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-ea57315a2dc1ebadd219684ad720acc29914e5ea
diff --git a/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha
deleted file mode 100644
index a2a96b0feaf..00000000000
--- a/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-597dabb3a04c8036c38985c424e11be245a2a88c
diff --git a/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha
deleted file mode 100644
index 26e04174b14..00000000000
--- a/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-9f0b23cc318f4cf88561884b4857a292438685e8
diff --git a/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha
new file mode 100644
index 00000000000..fcb87f259a3
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha
@@ -0,0 +1 @@
+0706774128b910342c8d95dcd598a424a998a923
diff --git a/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha
new file mode 100644
index 00000000000..b090447ae70
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha
@@ -0,0 +1 @@
+69a301f10e0aa0895545851037dac354d058864b
diff --git a/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha
new file mode 100644
index 00000000000..4bb17549777
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha
@@ -0,0 +1 @@
+4a4df0746debf7768a5ffae7201d533d0ca79685
diff --git a/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha b/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha
deleted file mode 100644
index 3d8571bdf03..00000000000
--- a/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-3d9f65a3313ca4447e502df82ce6f433552090e5
diff --git a/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha b/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha
new file mode 100644
index 00000000000..92cb17c7d6f
--- /dev/null
+++ b/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha
@@ -0,0 +1 @@
+4ae94bbe639cab1e5d295a73fc95f56cbf3d5d51
diff --git a/build/windows/arduinoOTA-1.0.0-windows.zip.sha b/build/windows/arduinoOTA-1.0.0-windows.zip.sha
deleted file mode 100644
index 245449da56f..00000000000
--- a/build/windows/arduinoOTA-1.0.0-windows.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-474366736c4a9a15ab8f228e2c198be44fced561
diff --git a/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha b/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha
new file mode 100644
index 00000000000..b445ee2ef59
--- /dev/null
+++ b/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha
@@ -0,0 +1 @@
+d649b42b7b66896c14878d0f27b7e09d7717ee47
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index d86b2d79c74..ecd97c858fe 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -63,7 +63,7 @@
             {
               "packager": "arduino",
               "name": "arduinoOTA",
-              "version": "1.0.0"
+              "version": "1.1.1"
             }
           ]
         }
@@ -153,42 +153,42 @@
         },
         {
           "name": "arduinoOTA",
-          "version": "1.0.0",
+          "version": "1.1.1",
           "systems": [
             {
-              "size": "2044124",
-              "checksum": "SHA-256:850a86876403cb45c944590a8cc7f9d8ef6d53ed853f7a9593ec395c4c1c6b2d",
+              "size": "2045036",
+              "checksum": "SHA-256:7ac91ef1d5b357c0ceb790be02ef54986db598ba5a42fffbd6c8ecbdd6a271ef",
               "host": "i686-linux-gnu",
-              "archiveFileName": "arduinoOTA-1.0.0-linux32.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux32.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_386.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"
             },
             {
-              "size": "2178772",
-              "checksum": "SHA-256:f01f25e02787492a8a30414230635adae76ed85228045437433892d185991f9e",
+              "size": "2178288",
+              "checksum": "SHA-256:eb5ad0a457dd7f610f7f9b85454399c36755673d61a16f9d07cdfcbbb32ec277",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "arduinoOTA-1.0.0-linux64.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux64.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_amd64.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"
             },
             {
-              "size": "1961623",
-              "checksum": "SHA-256:0ca6c0a93bfad50be0b6e62dc51ba6c3267b809bab4ec91ef9606ab7d838e46b",
+              "size": "1962115",
+              "checksum": "SHA-256:e4880d83df3d3f6f4b7b7bcde161e80a0556877468803a3c6066ee4ad18a374c",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "arduinoOTA-1.0.0-linuxarm.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linuxarm.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_arm.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"
             },
             {
-              "size": "2180617",
-              "checksum": "SHA-256:e63c6034da2c1a7fe453eaa29c22df88627cc0aa3c5cbab7635c19367b74ee59",
+              "size": "2181376",
+              "checksum": "SHA-256:a1ce7cf578982f3af5e4fab6b5839e44830d7a41cb093faba5c4b45952a6fa55",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "arduinoOTA-1.0.0-osx.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-osx.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-darwin_amd64.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-darwin_amd64.tar.bz2"
             },
             {
-              "size": "2247970",
-              "checksum": "SHA-256:7bced1489217e07661ea1e75702a10a874b54f6146e2414ee47684c7eac014d1",
+              "size": "2248431",
+              "checksum": "SHA-256:b2d3610c77f969a68cd75b6ea66bf63ec10c263937009d99147fbcd975c90006",
               "host": "i686-mingw32",
-              "archiveFileName": "arduinoOTA-1.0.0-windows.zip",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-windows.zip"
+              "archiveFileName": "arduinoOTA-1.1.1-windows_386.zip",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-windows_386.zip"
             }
           ]
         }

From 31f26cac70ba0de37b5827ea303773c31c067aaa Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 23 Jan 2017 16:14:03 +0100
Subject: [PATCH 4/4] Update bundled avr core version to 1.6.18

---
 hardware/arduino/avr/platform.txt   | 2 +-
 hardware/package_index_bundled.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index c8a65d3131b..3985678bd88 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.17
+version=1.6.18
 
 # AVR compile variables
 # ---------------------
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index ecd97c858fe..4eb2fdac5fb 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -12,7 +12,7 @@
         {
           "name": "Arduino AVR Boards",
           "architecture": "avr",
-          "version": "1.6.17",
+          "version": "1.6.18",
           "category": "Arduino",
           "help": {
             "online": "http://www.arduino.cc/en/Reference/HomePage"