From d6c5344b6792ce0e24a08bf695aa5cde6701e461 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jul 2015 12:28:42 +0200
Subject: [PATCH] Workaround for MacOSX gatekeeper (OSX 10.10.4)

It seems that gatekeeper now applies tighter checks on
libraries dinamically linked from executables included
in a package.

This is a workaround until a proper solution is found.

Fixes #3468
---
 build/build.xml                                            | 7 ++++++-
 ...rdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha

diff --git a/build/build.xml b/build/build.xml
index f94e7975ca0..f10df8785e6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -409,7 +409,7 @@
       <param name="unpack_target" value="untar"/>
       <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_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
 
@@ -417,6 +417,11 @@
       <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-old-run" depends="macosx-old-build" description="Run Mac OS X version">
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
new file mode 100644
index 00000000000..3b1625eee60
--- /dev/null
+++ b/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+52afce6cbe1cc1021bca1234cf25b298350f97dd