From ae80f8a2e38a0e8e6dea8d9829e4c25907966a9d Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Mon, 27 Jul 2015 08:53:41 +0900 Subject: [PATCH 1/5] Add debian 8 support --- Berksfile | 2 +- Berksfile.lock | 24 ++++++++++++------------ Vagrantfile | 1 + bin/pkg_build | 1 + 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Berksfile b/Berksfile index a94e08d0..c2559990 100644 --- a/Berksfile +++ b/Berksfile @@ -5,7 +5,7 @@ source 'https://api.berkshelf.com' cookbook 'apt', '~> 2.3' cookbook 'yum-epel', '~> 0.3' -cookbook 'omnibus' +cookbook 'omnibus', '2.6.8' # 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 8d8e1fa0..c8630602 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -1,28 +1,28 @@ DEPENDENCIES apt (~> 2.3) - omnibus + omnibus (= 2.6.8) yum-epel (~> 0.3) GRAPH 7-zip (1.0.2) windows (>= 1.2.2) - apt (2.6.1) - build-essential (2.1.3) - chef-sugar (2.5.0) - chef_handler (1.1.6) - homebrew (1.12.0) + apt (2.7.0) + build-essential (2.2.3) + chef-sugar (3.1.1) + chef_handler (1.2.0) + homebrew (1.13.0) build-essential (>= 2.1.2) - omnibus (2.5.2) + omnibus (2.6.8) 7-zip (~> 1.0) build-essential (~> 2.0) - chef-sugar (~> 2.0) + chef-sugar (~> 3.0) homebrew (~> 1.9) windows (~> 1.30) wix (~> 1.1) - windows (1.36.1) + windows (1.37.0) chef_handler (>= 0.0.0) wix (1.1.0) windows (>= 1.2.2) - yum (3.5.2) - yum-epel (0.6.0) - yum (~> 3.0) + yum (3.6.3) + yum-epel (0.6.2) + yum (~> 3.2) diff --git a/Vagrantfile b/Vagrantfile index 00b45b68..350888da 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -25,6 +25,7 @@ Vagrant.configure('2') do |config| ubuntu-14.04 debian-6.0.10 debian-7.7 + debian-8.1 centos-5.11 centos-5.11-i386 centos-6.6 diff --git a/bin/pkg_build b/bin/pkg_build index 7c010f6c..ac50efa4 100755 --- a/bin/pkg_build +++ b/bin/pkg_build @@ -28,6 +28,7 @@ end unless ARGV.include?('--without-debian') platforms += [ + "debian-8.1", "debian-7.7", "debian-6.0.10" ] From 597d36ad942db6864f1f2c06da1f4c9f6fb98e5d Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Wed, 26 Aug 2015 21:52:49 +0900 Subject: [PATCH 2/5] Add License section --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 58a57d08..8d6b2e40 100644 --- a/README.md +++ b/README.md @@ -237,3 +237,7 @@ $ bundle exec kitchen login default-ubuntu-1204 For a complete list of all commands and platforms, run `kitchen list` or `kitchen help`. + +# License + +Treasure Agent package is released under the Apache2 license. From 61bc566fc36410663b4ab6d95ede3d75d76d6b05 Mon Sep 17 00:00:00 2001 From: Todd Derr Date: Wed, 2 Sep 2015 17:07:03 -0400 Subject: [PATCH 3/5] Workaround for ncurses build breakage. Pin ncurses version to 5.9 since otherwise omnibus tries to use a version that no longer exists. See https://github.com/chef/omnibus-software/pull/473 and https://github.com/chef/omnibus-software/issues/475 --- config/projects/td-agent2.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/projects/td-agent2.rb b/config/projects/td-agent2.rb index 8516847f..a43b5ff3 100644 --- a/config/projects/td-agent2.rb +++ b/config/projects/td-agent2.rb @@ -22,6 +22,8 @@ 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" From 678b04e39ba79f46dde6d8246bd678dcdf6874ec Mon Sep 17 00:00:00 2001 From: Todd Derr Date: Wed, 2 Sep 2015 17:11:59 -0400 Subject: [PATCH 4/5] Update cacerts to latest version (2015.09.02) Pull https://github.com/chef/omnibus-software/pull/477 into this project --- config/software/cacerts.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/software/cacerts.rb b/config/software/cacerts.rb index 8da87a7b..c0413a69 100644 --- a/config/software/cacerts.rb +++ b/config/software/cacerts.rb @@ -17,7 +17,11 @@ name "cacerts" # Date of the file is in a comment at the start, or in the changelog -default_version "2015.04.22" +default_version "2015.09.02" + +version "2015.09.02" do + source md5: "3e0e6f302bd4f5b94040b8bcee0ffe15" +end version "2015.04.22" do source md5: "380df856e8f789c1af97d0da9a243769" From 3a9ea19211ee5213aab400f3869ec7be604b9d15 Mon Sep 17 00:00:00 2001 From: Todd Derr Date: Tue, 15 Sep 2015 15:13:26 -0400 Subject: [PATCH 5/5] Get rid of obsolete ncurses workaround. Since we pull omnibus from github and the ncurses change has been merged, we don't need the workaround anymore. --- config/projects/td-agent2.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/projects/td-agent2.rb b/config/projects/td-agent2.rb index a43b5ff3..8516847f 100644 --- a/config/projects/td-agent2.rb +++ b/config/projects/td-agent2.rb @@ -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"