Merge pull request #759 from simonswine/automated-cherry-pick-of-#758-release-0.6

Automated cherry pick of #758

Author: jetstack-bot

Makefile

@@ -162,10 +162,11 @@ $(BINDIR)/npm: $(BINDIR)/node
 # upx binary packer, only supported on Linux
 $(BINDIR)/upx:
 ifeq ($(UNAME_S),Linux)
-	curl -sL -o [email protected] https://github.com/upx/upx/releases/download/v3.95/upx-3.95-amd64_linux.tar.xz
-	echo "b5d6856b89dd696138ad8c7245a8f0dae4b76f41b5a31c7c43a21bc72c479c4e  [email protected]" | $(SHASUM)
+	# Do not upgrade to 3.95 as it produces wrong binaries for darwin
+	curl -sL -o [email protected] https://github.com/upx/upx/releases/download/v3.94/upx-3.94-amd64_linux.tar.xz
+	echo "e1fc0d55c88865ef758c7e4fabbc439e4b5693b9328d219e0b9b3604186abe20  [email protected]" | $(SHASUM)
 	which xz || ( apt-get update && apt-get -y install xz-utils)
-	cd $(BINDIR) && tar xvf $(shell basename $@).tar.xz upx-3.95-amd64_linux/upx --strip-components=1
+	cd $(BINDIR) && tar xvf $(shell basename $@).tar.xz upx-3.94-amd64_linux/upx --strip-components=1
 	rm [email protected]
 else
 	echo -e "#/bin/sh\nexit 0" > $@