Merge pull request #669 from donoghuc/ntml

(PE-36058) Only use ntlm gem fork in bolt-server 2023.y

Author: nmburgan

configs/components/rubygem-rubyntlm-fork.rb

@@ -0,0 +1,20 @@
+component 'rubygem-rubyntlm-fork' do |pkg, settings, platform|
+    #until we solve https://tickets.puppetlabs.com/browse/PE-36078 ship this fork of ruby-ntlm
+    
+    # This is only needed when building the gem ourselves, as the
+    # gemspec file calls out to git for one of its values.
+    pkg.build_requires 'git'
+    pkg.environment "GEM_HOME", settings[:gem_home]
+    pkg.environment "GEM_PATH", settings[:gem_home]
+    pkg.url("https://github.com/nmburgan/rubyntlm.git")
+    pkg.ref("openssl-3-legacy")
+    pkg.build do
+      ["#{settings[:gem_build]} rubyntlm.gemspec"]
+    end
+  
+    pkg.install do
+      [
+      "#{settings[:gem_install]} rubyntlm-*.gem",
+      ]
+    end
+  end

configs/components/rubygem-rubyntlm.rb

@@ -1,23 +1,5 @@
 component 'rubygem-rubyntlm' do |pkg, settings, platform|
-  #pkg.version '0.6.3'
-  #pkg.md5sum 'e1f7477acf8a7d3effb2a3fb931aa84c'
-  
-  # This is only needed when building the gem ourselves, as the
-  # gemspec file calls out to git for one of its values.
-  pkg.build_requires 'git'
-  pkg.environment "GEM_HOME", settings[:gem_home]
-  pkg.environment "GEM_PATH", settings[:gem_home]
-  pkg.url("https://github.com/nmburgan/rubyntlm.git")
-  pkg.ref("openssl-3-legacy")
-  pkg.build do
-    ["#{settings[:gem_build]} rubyntlm.gemspec"]
-  end
-
-  pkg.install do
-    [
-    "#{settings[:gem_install]} rubyntlm-*.gem",
-    ]
-  end
-
-  #instance_eval File.read('configs/components/_base-rubygem.rb')
+  pkg.version '0.6.3'
+  pkg.md5sum 'e1f7477acf8a7d3effb2a3fb931aa84c'
+  instance_eval File.read('configs/components/_base-rubygem.rb')
 end

configs/projects/pe-bolt-server-runtime-2021.7.x.rb

@@ -8,5 +8,7 @@
   proj.setting(:no_doc, true)
 
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server.rb'))
+  # TODO: Move ntml back to shared runtime when PE-36078 is done
+  proj.component('rubygem-rubyntlm')
   proj.component 'rubygem-prime'
 end

configs/projects/pe-bolt-server-runtime-main.rb

@@ -8,6 +8,8 @@
   proj.setting(:no_doc, true)
 
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server.rb'))
+  # TODO: Work around PE-36078 by using forked non-optimal solution
+  proj.component('rubygem-rubyntlm-fork')
   proj.component 'rubygem-prime'
   proj.component 'rubygem-rexml'
 end