Merge pull request #28 from chef/jfm/chef17-berkshelf

Updating dependencies and minitar version
chef · Aug 9, 2024 · 78bbe5b · 78bbe5b
2 parents dcdb969 + e1ff9ba
commit 78bbe5b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,19 @@
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v8.0.9](https://github.com/chef/berkshelf/tree/v8.0.9) (2023-09-28)
+
+#### Merged Pull Requests
+- refactoring networking issues [#21](https://github.com/chef/berkshelf/pull/21) ([johnmccrae](https://github.com/johnmccrae))
+- This resolves an issue where &quot;berks install&quot; fails due to a cert is already being in the hash table. [#23](https://github.com/chef/berkshelf/pull/23) ([nikhil2611](https://github.com/nikhil2611))
+<!-- latest_stable_release -->
+
 ## [v8.0.7](https://github.com/chef/berkshelf/tree/v8.0.7) (2023-06-12)
 
 #### Merged Pull Requests
 - Added the SonarQube configuration [#16](https://github.com/chef/berkshelf/pull/16) ([nikhil2611](https://github.com/nikhil2611))
 - Refactoring the gemspec for chef-17 support [#17](https://github.com/chef/berkshelf/pull/17) ([johnmccrae](https://github.com/johnmccrae))
 - Fix cookbook dependency version validation against chef&#39;s required format to berks upload [#18](https://github.com/chef/berkshelf/pull/18) ([nikhil2611](https://github.com/nikhil2611))
-<!-- latest_stable_release -->
 
 ## [v8.0.5](https://github.com/chef/berkshelf/tree/v8.0.5) (2022-10-27)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.0.7
+8.0.9
diff --git a/berkshelf.gemspec b/berkshelf.gemspec
@@ -35,15 +35,15 @@ Gem::Specification.new do |s|
 
   s.add_dependency "mixlib-shellout",      ">= 2.0", "< 4.0"
   s.add_dependency "cleanroom",            "~> 1.0"
-  s.add_dependency "minitar",              ">= 0.6"
+  s.add_dependency "minitar",              ">= 0.6", "< 0.12"
   s.add_dependency "retryable",            ">= 2.0", "< 4.0"
   s.add_dependency "solve",                "~> 4.0"
   s.add_dependency "thor",                 ">= 0.20"
   s.add_dependency "octokit",              "~> 4.0"
   s.add_dependency "mixlib-archive",       ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal
   s.add_dependency "concurrent-ruby",      "~> 1.0"
   if RUBY_VERSION.match?(/3.0/)
-    s.add_dependency "chef",                 "~> 17.0" # needed for --skip-syntax-check
+    s.add_dependency "chef",                 "~> 17.10.122" # needed for --skip-syntax-check
   elsif 
     s.add_dependency "chef",                 ">= 15.7.32" 
   end

diff --git a/lib/berkshelf/ssl_policies.rb b/lib/berkshelf/ssl_policies.rb
@@ -16,7 +16,7 @@ def initialize
     def add_trusted_cert(cert)
       @store.add_cert(cert)
     rescue OpenSSL::X509::StoreError => e
-      raise e unless e.message == "cert already in hash table"
+      raise e unless e.message.match(/cert already in hash table/)
     end
 
     def trusted_certs_dir

diff --git a/lib/berkshelf/version.rb b/lib/berkshelf/version.rb
@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "8.0.7".freeze
+  VERSION = "8.0.9".freeze
 end