From d9ed338cbab14178bd1e802be6509df51cae79e0 Mon Sep 17 00:00:00 2001
From: Todd Derr <salty@google.com>
Date: Wed, 16 Sep 2015 14:19:44 -0400
Subject: [PATCH] Release google-fluentd 1.5.3

- Update cloud logging plugin from 0.4.5 -> 0.4.7
- Remove obsolete ncurses workaround
- Add workaround for patches being renamed in omnbus
---
 config/projects/google-fluentd.rb | 4 +---
 config/software/ruby.rb           | 4 ++--
 plugin_gems.rb                    | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb
index 0f5278ee..27f6d48f 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.2"
+build_version   "1.5.3"
 build_iteration 1
 
 # creates required build directories
@@ -22,8 +22,6 @@
 if ohai['platform_family'] == 'rhel' && ohai['platform_version'].split('.').first.to_i == 7
   override :liblzma, :version => '5.1.2alpha'
 end
-# workaround until https://github.com/chef/omnibus-software/pull/473 is live.
-override :ncurses, :version => '5.9'
 
 # td-agent dependencies/components
 dependency "td-agent"
diff --git a/config/software/ruby.rb b/config/software/ruby.rb
index f409f7f6..6f2931da 100644
--- a/config/software/ruby.rb
+++ b/config/software/ruby.rb
@@ -78,7 +78,7 @@
 
 build do
   if solaris2? && version.to_f >= 2.1
-    patch source: "ruby-solaris-no-stack-protector.patch", plevel: 1
+    patch source: "ruby-no-stack-protector.patch", plevel: 1
   end
 
   # AIX needs /opt/freeware/bin only for patch
@@ -93,7 +93,7 @@
   # embedded and non-embedded libs get into a fight (libiconv, openssl, etc)
   # and ruby trying to set LD_LIBRARY_PATH itself gets it wrong.
   if version.to_f >= 2.1
-    patch source: "ruby_aix_2_1_3_mkmf.patch", plevel: 1, env: patch_env
+    patch source: "ruby-2_1_3-no-mkmf.patch", plevel: 1, env: patch_env
     # should intentionally break and fail to apply on 2.2, patch will need to
     # be fixed.
   end
diff --git a/plugin_gems.rb b/plugin_gems.rb
index 86048333..3649fe4b 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.5"
+download "fluent-plugin-google-cloud", "0.4.7"