From 9a4cc0a53d1817543154deedd71f7770e827195d Mon Sep 17 00:00:00 2001
From: Todd Derr <salty@google.com>
Date: Wed, 28 Oct 2015 16:50:01 -0400
Subject: [PATCH] Release version 1.5.4 with plugin version 0.4.10

Includes a workaround for missing xz/lzma libraries: https://github.com/treasure-data/omnibus-td-agent/issues/57
---
 config/projects/google-fluentd.rb | 4 ++--
 config/software/liblzma.rb        | 4 +++-
 plugin_gems.rb                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb
index 27f6d48f..b8258c3b 100644
--- a/config/projects/google-fluentd.rb
+++ b/config/projects/google-fluentd.rb
@@ -8,7 +8,7 @@
 description "Google Fluentd: A data collector for Google Cloud Logging"
 
 install_dir     "/opt/google-fluentd"
-build_version   "1.5.3"
+build_version   "1.5.4"
 build_iteration 1
 
 # creates required build directories
@@ -20,7 +20,7 @@
 override :postgresql, :version => '9.3.5'
 # CentOS7 needs latest liblzma to build pg and some gems
 if ohai['platform_family'] == 'rhel' && ohai['platform_version'].split('.').first.to_i == 7
-  override :liblzma, :version => '5.1.2alpha'
+  override :liblzma, :version => '5.2.2'
 end
 
 # td-agent dependencies/components
diff --git a/config/software/liblzma.rb b/config/software/liblzma.rb
index f20cab63..ef4ed6f1 100644
--- a/config/software/liblzma.rb
+++ b/config/software/liblzma.rb
@@ -15,10 +15,12 @@
 #
 
 name "liblzma"
-default_version "5.0.5"
+default_version "5.0.8"
 
 version('5.0.5') { source md5: "19d924e066b6fff0bc9d1981b4e53196" }
+version('5.0.8') { source md5: "d19507f40e0d904d0a1b7914b173800e" }
 version('5.1.2alpha') { source md5: "9bad1e249537ce69b206815cf28ca87b" }
+version('5.2.2') { source md5: "7cf6a8544a7dae8e8106fdf7addfa28c" }
 
 source url: "http://tukaani.org/xz/xz-#{version}.tar.gz"
 
diff --git a/plugin_gems.rb b/plugin_gems.rb
index 3649fe4b..50a465bc 100644
--- a/plugin_gems.rb
+++ b/plugin_gems.rb
@@ -16,4 +16,4 @@
 download "fluent-plugin-webhdfs", "0.4.1"
 download "fluent-plugin-rewrite-tag-filter", "1.4.1"
 download "fluent-plugin-td-monitoring", "0.2.1"
-download "fluent-plugin-google-cloud", "0.4.7"
+download "fluent-plugin-google-cloud", "0.4.10"