Skip to content

Commit b2b381b

Browse files
committed
Revert "Merge pull request #9505 from bastelfreak/syslog"
This reverts commit 2d332ce, reversing changes made to d2f3cd5.
1 parent 2d332ce commit b2b381b

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ group(:features) do
3535
# requires native ldap headers/libs
3636
# gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
3737
gem 'puppetserver-ca', '~> 2.0', require: false
38+
gem 'syslog', '~> 0.1.1', require: false, platforms: [:ruby]
3839
gem 'CFPropertyList', ['>= 3.0.6', '< 4'], require: false
3940
end
4041

puppet.gemspec

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,15 @@ Gem::Specification.new do |spec|
3030
spec.add_runtime_dependency('puppet-resource_api', '~> 1.5')
3131
spec.add_runtime_dependency('scanf', '~> 1.0')
3232
spec.add_runtime_dependency('semantic_puppet', '~> 1.0')
33-
spec.add_runtime_dependency('ostruct', '~> 0.6.0')
3433

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

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

0 commit comments

Comments
 (0)