From ba77ade69438b69f200fa825235aa8fcb8456faa Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Thu, 23 Apr 2015 10:56:56 +0200
Subject: [PATCH] AVR: Upgrading bundled toolchains

---
 build/build.xml                               | 32 +++++++++----------
 ...8.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...8.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ...8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ...1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 .../linux/avr-toolchain-linux32-3.4.5.zip.sha |  1 -
 .../linux/avr-toolchain-linux64-3.4.5.zip.sha |  1 -
 ...0.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...1-arduino3-x86_64-pc-linux-gnu.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 +
 ...1-arduino3-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...1-arduino5-i386-apple-darwin11.tar.bz2.sha |  1 +
 .../macosx/avr-toolchain-mac32-3.4.5.zip.sha  |  1 -
 ...1-arduino3-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...1-arduino5-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...vr-gcc-4.8.1-arduino3-i686-mingw32.zip.sha |  1 -
 ...vr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha |  1 +
 ...avr-toolchain-win32-3.4.5-arduino1.zip.sha |  1 -
 ...vrdude-6.0.1-arduino3-i686-mingw32.zip.sha |  1 -
 ...vrdude-6.0.1-arduino5-i686-mingw32.zip.sha |  1 +
 22 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-toolchain-linux32-3.4.5.zip.sha
 delete mode 100644 build/linux/avr-toolchain-linux64-3.4.5.zip.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.8.1-arduino3-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/macosx/avr-toolchain-mac32-3.4.5.zip.sha
 delete mode 100644 build/macosx/avrdude-6.0.1-arduino3-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.8.1-arduino3-i686-mingw32.zip.sha
 create mode 100644 build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
 delete mode 100644 build/windows/avr-toolchain-win32-3.4.5-arduino1.zip.sha
 delete mode 100644 build/windows/avrdude-6.0.1-arduino3-i686-mingw32.zip.sha
 create mode 100644 build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index 12ccf77a9..aaa84b653 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -367,10 +367,10 @@
   <target name="macosx-build-common-avr-toolchain" unless="light_bundle">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino3-i386-apple-darwin11.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino3"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino3-i386-apple-darwin11.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino3"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
 
     <chmod perm="+x">
@@ -612,20 +612,20 @@
   <target name="linux32-build" depends="linux-build" unless="light_bundle" description="Build linux (32-bit) version">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino3-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino3"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino3-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino3"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <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"/>
     </antcall>
   </target>
 
   <target name="linux64-build" depends="linux-build"  unless="light_bundle" description="Build linux (64-bit) version">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino3-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino3"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino3-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino3"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <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"/>
     </antcall>
   </target>
 
@@ -841,10 +841,10 @@
   <target name="windows-build-avr-toolchain">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="unzip"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino3-i686-mingw32.zip"/>
-      <param name="gcc_version" value="4.8.1-arduino3"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino3-i686-mingw32.zip"/>
-      <param name="avrdude_version" value="6.0.1-arduino3"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
   </target>
 
diff --git a/build/linux/avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 4ad742cf2..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8bd0a037c1c99670b49185016665273971494e60
diff --git a/build/linux/avr-gcc-4.8.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 8d3342ebe..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b5909b44c80db8f895996fde3b160d8ee88c9287
diff --git a/build/linux/avr-gcc-4.8.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index f829fef12..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-bf1c7b76f94f04fda16c4806971340ebfec95b07
diff --git a/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..ba1b5c7e8
--- /dev/null
+++ b/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+fdd09172450c3970a55e1876d1fc112d0db626ac
diff --git a/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..3c333ee78
--- /dev/null
+++ b/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+0398e498559c42e45cb98ba13251da7e5b306e0c
diff --git a/build/linux/avr-toolchain-linux32-3.4.5.zip.sha b/build/linux/avr-toolchain-linux32-3.4.5.zip.sha
deleted file mode 100644
index aaf92d1e2..000000000
--- a/build/linux/avr-toolchain-linux32-3.4.5.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-7be134b7daae4160f069725ab4924759c213b171
diff --git a/build/linux/avr-toolchain-linux64-3.4.5.zip.sha b/build/linux/avr-toolchain-linux64-3.4.5.zip.sha
deleted file mode 100644
index 17c01c528..000000000
--- a/build/linux/avr-toolchain-linux64-3.4.5.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-0c4f955273ba09fe9a5a9bd90b2e8713295ba4b4
diff --git a/build/linux/avrdude-6.0.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 918c9fc7c..000000000
--- a/build/linux/avrdude-6.0.1-arduino3-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-5694d3b4cf48af4ed53ae1d539518375cb649142
diff --git a/build/linux/avrdude-6.0.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 875a4275d..000000000
--- a/build/linux/avrdude-6.0.1-arduino3-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-c677e3ecc0e2b61144b096c8af34b2007d1ce2e3
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
new file mode 100644
index 000000000..0bc23f688
--- /dev/null
+++ b/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e4b0302e0
--- /dev/null
+++ b/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+cfc52036f532c3a7050f6d4ec7645d060800aa39
diff --git a/build/macosx/avr-gcc-4.8.1-arduino3-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.8.1-arduino3-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 222afe7c0..000000000
--- a/build/macosx/avr-gcc-4.8.1-arduino3-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-1cd9b024553e541d96a9e1dfca6c3c86e6b7b108
diff --git a/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..95effe5bd
--- /dev/null
+++ b/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+1d63137e9b4bd9bf54f82f462171952703501935
diff --git a/build/macosx/avr-toolchain-mac32-3.4.5.zip.sha b/build/macosx/avr-toolchain-mac32-3.4.5.zip.sha
deleted file mode 100644
index ff372c9ef..000000000
--- a/build/macosx/avr-toolchain-mac32-3.4.5.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-7883269bd9ba654ed6ca943d983c02c8691b858b
diff --git a/build/macosx/avrdude-6.0.1-arduino3-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino3-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index da429dab4..000000000
--- a/build/macosx/avrdude-6.0.1-arduino3-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-d129a2f687828cda6784365bb0dd0e8689e7619b
diff --git a/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..359455e69
--- /dev/null
+++ b/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+1eb447a6c11f374d71e91bf4c381380216f9a476
diff --git a/build/windows/avr-gcc-4.8.1-arduino3-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.8.1-arduino3-i686-mingw32.zip.sha
deleted file mode 100644
index f8253b0e8..000000000
--- a/build/windows/avr-gcc-4.8.1-arduino3-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-9bd8b817f0b63896f58214ef8513df901816f4cf
diff --git a/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
new file mode 100644
index 000000000..34509a5aa
--- /dev/null
+++ b/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+da0805de78417c51001d8f609ae7d8ef320425b9
diff --git a/build/windows/avr-toolchain-win32-3.4.5-arduino1.zip.sha b/build/windows/avr-toolchain-win32-3.4.5-arduino1.zip.sha
deleted file mode 100644
index bd01f1dae..000000000
--- a/build/windows/avr-toolchain-win32-3.4.5-arduino1.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-077d8d7f0234a65f754bca44fe37497f08c0bd90
diff --git a/build/windows/avrdude-6.0.1-arduino3-i686-mingw32.zip.sha b/build/windows/avrdude-6.0.1-arduino3-i686-mingw32.zip.sha
deleted file mode 100644
index 265192b58..000000000
--- a/build/windows/avrdude-6.0.1-arduino3-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-8764e67cea23a14041ff8f3fbe475b3048ade71e
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
new file mode 100644
index 000000000..e55aa9d55
--- /dev/null
+++ b/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+bad246afeb0b9bcbe623a29cb204127f901102cf