Skip to content

(PA-1941) Fix libnames for new OpenSSL dlls #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2018
Merged

(PA-1941) Fix libnames for new OpenSSL dlls #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions configs/components/facter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,17 @@
# Copy these into facter's bindir, they've already been copied into ruby's
# in the runtime component
pkg.install_file "#{settings[:tools_root]}/bin/zlib1.dll", "#{settings[:facter_root]}/bin/zlib1.dll"
if platform.architecture == "x64"
gcc_postfix = 'seh'
ssl_postfix = '-x64'
else
gcc_postfix = 'sjlj'
ssl_postfix = ''
end
[
"libeay32.dll",
platform.architecture == "x64" ? "libgcc_s_seh-1.dll" : "libgcc_s_sjlj-1.dll",
"ssleay32.dll"
"libssl-1_1#{ssl_postfix}.dll",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be cool if this info. was loaded as part of the yaml output for the settings. Maybe something like settings[:imported_libraries][:openssl].

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess it won't matter once the PATH'ing stuff is fixed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, at this point the plan is to get pathing fixed soon anyway, so the refactor is unnecessary

"libcrypto-1_1#{ssl_postfix}.dll",
"libgcc_s_#{gcc_postfix}-1.dll"
].each do |dll|
pkg.install_file "#{settings[:prefix]}/bin/#{dll}", "#{settings[:facter_root]}/bin/#{dll}"
end
Expand Down
25 changes: 14 additions & 11 deletions configs/components/pxp-agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,20 @@
# we ensure that Windows uses our in-house .dll files to start up pxp-agent.
#
# See https://tickets.puppetlabs.com/browse/PA-1850 for all the details.
pkg.install do
dependent_dlls = [
"libeay32.dll",
"ssleay32.dll",
platform.architecture == "x64" ? "libgcc_s_seh-1.dll" : "libgcc_s_sjlj-1.dll",
"libstdc++-6.dll"
]

dependent_dlls.map do |dll|
"C:/cygwin64/bin/cp.exe #{settings[:prefix]}/bin/#{dll} #{settings[:pxp_root]}/bin"
end
if platform.architecture == "x64"
gcc_postfix = 'seh'
ssl_postfix = '-x64'
else
gcc_postfix = 'sjlj'
ssl_postfix = ''
end
[
"libssl-1_1#{ssl_postfix}.dll",
"libcrypto-1_1#{ssl_postfix}.dll",
"libgcc_s_#{gcc_postfix}-1.dll",
"libstdc++-6.dll"
].each do |dll|
pkg.install_file "#{settings[:prefix]}/bin/#{dll}", "#{settings[:pxp_root]}/bin/#{dll}"
end
end

Expand Down