From 4abf58d9eb1557a871faa587b732038902c3ed7b Mon Sep 17 00:00:00 2001
From: Blerim Sheqa <blerim.sheqa@icinga.com>
Date: Wed, 1 Feb 2017 16:06:13 +0100
Subject: [PATCH] Preparations and fixes for package builds

---
 Makefile                                                       | 3 +++
 .../elastic/beats/dev-tools/packer/platforms/binary/run.sh.j2  | 2 +-
 .../elastic/beats/dev-tools/packer/platforms/darwin/run.sh.j2  | 2 +-
 .../elastic/beats/dev-tools/packer/platforms/windows/run.sh.j2 | 2 +-
 vendor/github.com/elastic/beats/dev-tools/packer/version.yml   | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d98f8708..41622ba5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 BEATNAME=icingabeat
 BEAT_DIR=github.com/icinga/icingabeat
+BEAT_DESCRIPTION=Icingabeat ships Icinga 2 events and states to Elasticsearch or Logstash.
 SYSTEM_TESTS=false
 TEST_ENVIRONMENT=false
 ES_BEATS?=./vendor/github.com/elastic/beats
 GOPACKAGES=$(shell glide novendor)
 PREFIX?=.
 
+SNAPSHOT=false
+
 # Path to the libbeat Makefile
 -include $(ES_BEATS)/libbeat/scripts/Makefile
 
diff --git a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/binary/run.sh.j2 b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/binary/run.sh.j2
index 9ae01a10..dbd1d3ff 100644
--- a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/binary/run.sh.j2
+++ b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/binary/run.sh.j2
@@ -11,7 +11,7 @@ if [ "$SNAPSHOT" = "yes" ]; then
 fi
 
 mkdir /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}
-cp -a homedir/. /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/
+cp -R homedir/. /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/
 install -D -m 755 import_dashboards-linux-{{.arch}} /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/scripts/import_dashboards
 cp {{.beat_name}}-linux-{{.arch}} /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/{{.beat_name}}
 cp {{.beat_name}}-linux.yml /{{.beat_name}}-${VERSION}-linux-{{.bin_arch}}/{{.beat_name}}.yml
diff --git a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/darwin/run.sh.j2 b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/darwin/run.sh.j2
index f246aeec..8605d2ee 100644
--- a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/darwin/run.sh.j2
+++ b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/darwin/run.sh.j2
@@ -11,7 +11,7 @@ if [ "$SNAPSHOT" = "yes" ]; then
 fi
 
 mkdir /{{.beat_name}}-${VERSION}-darwin-x86_64
-cp -a homedir/. /{{.beat_name}}-${VERSION}-darwin-x86_64/
+cp -R homedir/. /{{.beat_name}}-${VERSION}-darwin-x86_64/
 install -D -m 755 import_dashboards-darwin-{{.arch}} /{{.beat_name}}-${VERSION}-darwin-x86_64/scripts/import_dashboards
 cp {{.beat_name}}-darwin-amd64 /{{.beat_name}}-${VERSION}-darwin-x86_64/{{.beat_name}}
 cp {{.beat_name}}-darwin.yml /{{.beat_name}}-${VERSION}-darwin-x86_64/{{.beat_name}}.yml
diff --git a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/windows/run.sh.j2 b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/windows/run.sh.j2
index d35643cd..03447404 100644
--- a/vendor/github.com/elastic/beats/dev-tools/packer/platforms/windows/run.sh.j2
+++ b/vendor/github.com/elastic/beats/dev-tools/packer/platforms/windows/run.sh.j2
@@ -11,7 +11,7 @@ if [ "$SNAPSHOT" = "yes" ]; then
 fi
 
 mkdir /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}
-cp -a homedir/. /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
+cp -R homedir/. /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/
 install -D -m 755 import_dashboards-windows-{{.arch}} /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/scripts/import_dashboards.exe
 cp {{.beat_name}}-windows-{{.arch}}.exe /{{.beat_name}}-${VERSION}-windows-{{.win_arch}}/{{.beat_name}}.exe
 unix2dos {{.beat_name}}-win.yml
diff --git a/vendor/github.com/elastic/beats/dev-tools/packer/version.yml b/vendor/github.com/elastic/beats/dev-tools/packer/version.yml
index b8874691..637accb9 100644
--- a/vendor/github.com/elastic/beats/dev-tools/packer/version.yml
+++ b/vendor/github.com/elastic/beats/dev-tools/packer/version.yml
@@ -1 +1 @@
-version: "5.1.2"
+version: "0.2.0"