Skip to content

Commit

Permalink
Revert "Merge pull request #9505 from bastelfreak/syslog"
Browse files Browse the repository at this point in the history
This reverts commit 2d332ce, reversing
changes made to d2f3cd5.
  • Loading branch information
joshcooper committed Oct 25, 2024
1 parent 2d332ce commit b2b381b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ group(:features) do
# requires native ldap headers/libs
# gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
gem 'puppetserver-ca', '~> 2.0', require: false
gem 'syslog', '~> 0.1.1', require: false, platforms: [:ruby]
gem 'CFPropertyList', ['>= 3.0.6', '< 4'], require: false
end

Expand Down
6 changes: 1 addition & 5 deletions puppet.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,15 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency('puppet-resource_api', '~> 1.5')
spec.add_runtime_dependency('scanf', '~> 1.0')
spec.add_runtime_dependency('semantic_puppet', '~> 1.0')
spec.add_runtime_dependency('ostruct', '~> 0.6.0')

platform = spec.platform.to_s
if platform == 'universal-darwin'
spec.add_runtime_dependency('CFPropertyList', ['>= 3.0.6', '< 4'])
end

if (platform == 'x64-mingw32' || platform == 'x86-mingw32') || Gem.win_platform?
if platform == 'x64-mingw32' || platform == 'x86-mingw32'
# ffi 1.16.0 - 1.16.2 are broken on Windows
spec.add_runtime_dependency('ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2')
spec.add_runtime_dependency('minitar', '~> 0.9')
elsif !Gem.java_platform?
# don't depend on syslog on jruby, it requires extensions
spec.add_runtime_dependency('syslog', '~> 0.1.2')
end
end

0 comments on commit b2b381b

Please sign in to comment.