From 31587d9c49441cf1deb99b4bacc0792db381d9a6 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 29 Dec 2016 17:14:05 +0900 Subject: [PATCH 1/9] fluentd v0.12.31 --- config/software/fluentd.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/software/fluentd.rb b/config/software/fluentd.rb index fd1d0a9e..eea92d98 100644 --- a/config/software/fluentd.rb +++ b/config/software/fluentd.rb @@ -1,6 +1,6 @@ name "fluentd" -# fluentd v0.12.29 -default_version 'cd458194c949851a2b76c06b994330e964b55cc0' +# fluentd v0.12.31 +default_version '93b8edbabe78693aa4bbf1b0454e15cdc3cc5d12' dependency "ruby" #dependency "bundler" From 7bb73ef8ed031f71f592e8db4fd9918ec9bcea41 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 29 Dec 2016 17:20:19 +0900 Subject: [PATCH 2/9] Update core gems --- core_gems.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core_gems.rb b/core_gems.rb index 3063e012..61f872ce 100644 --- a/core_gems.rb +++ b/core_gems.rb @@ -7,6 +7,6 @@ download "yajl-ruby", "1.2.1" download "sigdump", "0.2.4" download "thread_safe", "0.3.5" -download "oj", "2.15.1" +download "oj", "2.18.0" download "tzinfo", "1.2.2" -download "tzinfo-data", "1.2016.6" +download "tzinfo-data", "1.2016.10" From 78b05bb32d1e1f2bc517b3e4f1c37c3171eafd22 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 29 Dec 2016 17:24:24 +0900 Subject: [PATCH 3/9] Update plugin gems --- plugin_gems.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin_gems.rb b/plugin_gems.rb index 8d863a34..f8ac49b9 100644 --- a/plugin_gems.rb +++ b/plugin_gems.rb @@ -1,7 +1,7 @@ dir 'plugin_gems' -download "httpclient", "2.7.2" -download "td-client", "0.8.83" -download "td", "0.15.0" +download "httpclient", "2.8.2.4" +download "td-client", "0.8.85" +download "td", "0.15.2" download "fluent-plugin-td", "0.10.29" download "thrift", "0.8.0" download "fluent-plugin-scribe", "0.10.14" @@ -9,13 +9,13 @@ download "bson", "1.12.5" download "bson_ext", "1.12.5" download "mongo", "1.12.5" -download "fluent-plugin-mongo", "0.7.15" -download "aws-sdk", "2.6.3" +download "fluent-plugin-mongo", "0.7.16" +download "aws-sdk", "2.6.42" download "aws-sdk-v1", "1.66.0" -download "fluent-plugin-s3", "0.7.1" +download "fluent-plugin-s3", "0.8.0" download "webhdfs", "0.8.0" download "fluent-plugin-webhdfs", "0.4.2" download "fluent-plugin-rewrite-tag-filter", "1.5.5" download "ruby-kafka", "0.3.15" -download "fluent-plugin-kafka", "0.3.1" +download "fluent-plugin-kafka", "0.4.1" download "fluent-plugin-td-monitoring", "0.2.2" From 4900efe64072c2c0ffec31f20bf2b91d1d9c9b88 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 29 Dec 2016 17:26:23 +0900 Subject: [PATCH 4/9] Update fluentd-ui to master --- config/software/fluentd-ui.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/fluentd-ui.rb b/config/software/fluentd-ui.rb index 464d0e41..cc1e3a79 100644 --- a/config/software/fluentd-ui.rb +++ b/config/software/fluentd-ui.rb @@ -1,5 +1,5 @@ name "fluentd-ui" -default_version 'bd37b6393c25d3bcf941a12b42545488127703e0' +default_version '7848500e6af4bb1b90f19f7c6cce765a004ae0e2' dependency "ruby" From 0a965e0c179437bfa13c45d72dea453b959d787a Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 29 Dec 2016 17:27:58 +0900 Subject: [PATCH 5/9] td-agent 2.3.4 --- config/projects/td-agent2.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/projects/td-agent2.rb b/config/projects/td-agent2.rb index 93d3bbb0..d3e52c61 100644 --- a/config/projects/td-agent2.rb +++ b/config/projects/td-agent2.rb @@ -10,7 +10,7 @@ license_file "LICENSE" install_dir "/opt/td-agent" -build_version "2.3.3" +build_version "2.3.4" build_iteration 0 # creates required build directories From 8271f1cf114000533605f5f68bdad5aab365e227 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Sun, 1 Jan 2017 02:59:49 +0900 Subject: [PATCH 6/9] Update Gemfile.lock --- Gemfile.lock | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9dd7bba..fae92234 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/opscode/omnibus-software.git - revision: 2186b5816b13c5712d17ffe66e7cab8cf28ca735 + revision: 7f1b5f2bef8ca0d248d943688dd78cceaa1b18c5 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -11,12 +11,14 @@ GEM specs: addressable (2.3.8) artifactory (2.3.3) - aws-sdk (2.6.3) - aws-sdk-resources (= 2.6.3) - aws-sdk-core (2.6.3) + aws-sdk (2.6.42) + aws-sdk-resources (= 2.6.42) + aws-sdk-core (2.6.42) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.3) - aws-sdk-core (= 2.6.3) + aws-sdk-resources (2.6.42) + aws-sdk-core (= 2.6.42) + aws-sigv4 (1.0.0) berkshelf (3.3.0) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -50,7 +52,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.14.89) + chef-config (12.17.44) addressable fuzzyurl mixlib-config (~> 2.0) @@ -104,7 +106,7 @@ GEM nio4r (1.2.1) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - ohai (8.20.0) + ohai (8.22.1) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -193,7 +195,7 @@ GEM net-ssh-gateway (~> 1.2.0) safe_yaml (~> 1.0) thor (~> 0.18) - thor (0.19.1) + thor (0.19.4) timers (4.0.4) hitimes varia_model (0.4.1) From 4995f201e6c934e9c3338f3c4aceba01a72552ef Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Sun, 1 Jan 2017 03:00:39 +0900 Subject: [PATCH 7/9] Add ubuntu 16.04 32bit --- Vagrantfile | 1 + bin/pkg_build | 1 + 2 files changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 4ba7a762..bfb61176 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -26,6 +26,7 @@ Vagrant.configure('2') do |config| ubuntu-14.04 ubuntu-14.04-i386 ubuntu-16.04 + ubuntu-16.04-i386 debian-7.10 debian-8.4 centos-5.11 diff --git a/bin/pkg_build b/bin/pkg_build index 0b3ef896..35637dba 100755 --- a/bin/pkg_build +++ b/bin/pkg_build @@ -12,6 +12,7 @@ unless ARGV.include?('--without-deb') "ubuntu-14.04", "ubuntu-12.04", #"ubuntu-10.04", + "ubuntu-16.04-i386", "ubuntu-14.04-i386", "ubuntu-12.04-i386", #"ubuntu-10.04-i386" From c40246e02223cb31685aa842353bfac619fbc846 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 12 Jan 2017 05:51:41 +0900 Subject: [PATCH 8/9] Update Berksfile to use latest omnibus tools https://discourse.chef.io/t/end-of-life-announcement-for-chef-software-inc-s-bintray-account/9807 --- Berksfile | 6 +++--- Berksfile.lock | 49 ++++++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/Berksfile b/Berksfile index 87dd1ce3..2d52ccf4 100644 --- a/Berksfile +++ b/Berksfile @@ -2,10 +2,10 @@ source 'https://supermarket.chef.io' # The apt cookbook is required to bring the apt cache up-to-date on Ubuntu # systems, since the cache can become stale on older boxes. -cookbook 'apt', '~> 2.8' -cookbook 'yum-epel', '~> 0.6' +cookbook 'apt', '~> 5' +cookbook 'yum-epel', '~> 2.1' -cookbook 'omnibus', '~> 4' +cookbook 'omnibus', '~> 5' # Uncomment to use the latest version of the Omnibus cookbook from GitHub # cookbook 'omnibus', github: 'opscode-cookbooks/omnibus' diff --git a/Berksfile.lock b/Berksfile.lock index d3ec0231..68550ae1 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -1,53 +1,48 @@ DEPENDENCIES - apt (~> 2.8) - omnibus (~> 4) - yum-epel (~> 0.6) + apt (~> 5) + omnibus (~> 5) + yum-epel (~> 2.1) GRAPH - apt (2.9.2) - build-essential (6.0.4) - compat_resource (>= 12.10) + apt (5.0.1) + compat_resource (>= 12.16.3) + build-essential (7.0.3) + compat_resource (>= 12.16.3) mingw (>= 1.1) seven_zip (>= 0.0.0) - chef-ingredient (0.19.0) + chef-ingredient (0.21.2) + compat_resource (>= 12.10) chef-sugar (3.4.0) - chef_handler (1.4.0) - compat_resource (12.14.0) - dmg (2.4.0) - git (4.6.0) + compat_resource (12.16.3) + dmg (3.0.0) + git (5.0.1) build-essential (>= 0.0.0) dmg (>= 0.0.0) - windows (>= 0.0.0) yum-epel (>= 0.0.0) - homebrew (2.1.0) - build-essential (>= 2.1.2) - languages (0.2.8) - build-essential (>= 0.0.0) - chef-sugar (>= 0.0.0) - homebrew (>= 0.0.0) - remote_install (>= 0.0.0) + homebrew (3.0.0) mingw (1.2.4) compat_resource (>= 0.0.0) seven_zip (>= 0.0.0) - omnibus (4.2.4) + ohai (4.2.3) + compat_resource (>= 12.14.7) + omnibus (5.0.0) build-essential (>= 6.0.0) chef-ingredient (>= 0.18.0) chef-sugar (>= 3.2.0) git (>= 0.0.0) homebrew (>= 0.0.0) - languages (>= 0.0.0) remote_install (>= 0.0.0) + seven_zip (>= 0.0.0) windows (>= 0.0.0) windows-sdk (>= 0.0.0) wix (>= 0.0.0) remote_install (1.0.2) seven_zip (2.0.2) windows (>= 1.2.2) - windows (1.44.3) - chef_handler (>= 0.0.0) + windows (2.1.1) + ohai (>= 4.0.0) windows-sdk (1.0.2) - wix (2.0.2) + wix (3.0.0) windows (>= 1.38.2) - yum (3.12.0) - yum-epel (0.7.1) - yum (>= 3.6.3) + yum-epel (2.1.1) + compat_resource (>= 12.16.3) From 1140ad9d11af752196969504564441f96ea21f28 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 12 Jan 2017 05:54:59 +0900 Subject: [PATCH 9/9] Use patched liblzma software to fix broken build temporary https://github.com/chef/omnibus-software/pull/785 --- config/software/liblzma.rb | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 config/software/liblzma.rb diff --git a/config/software/liblzma.rb b/config/software/liblzma.rb new file mode 100644 index 00000000..2f28131d --- /dev/null +++ b/config/software/liblzma.rb @@ -0,0 +1,47 @@ +# +# Copyright 2014 Chef Software, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name "liblzma" +default_version "5.2.3" + +license "Public-Domain" +license_file "COPYING" +skip_transitive_dependency_licensing true + +source url: "http://tukaani.org/xz/xz-#{version}.tar.gz", + md5: "ef68674fb47a8b8e741b34e429d86e9d" + +relative_path "xz-#{version}" + +build do + env = with_standard_compiler_flags(with_embedded_path) + # liblzma properly uses CFLAGS for C compilation and CPPFLAGS for common + # flags used across tools such as windres. Don't put anything in it + # that can be misinterpreted by windres. + env["CPPFLAGS"] = "-I#{install_dir}/embedded/include" if windows? + + config_command = [ + "--disable-debug", + "--disable-dependency-tracking", + "--disable-doc", + "--disable-scripts", + ] + config_command << "--disable-nls" if windows? + + configure(*config_command, env: env) + + make "install", env: env +end