From d62b6307744325e33d47b8e4a3413ff9e7ac404e Mon Sep 17 00:00:00 2001 From: Tobi Lehman Date: Wed, 22 May 2024 16:36:02 -0700 Subject: [PATCH 1/3] Remove base64 and nkf which conflict with default gems --- configs/projects/_shared-pe-installer-runtime.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/projects/_shared-pe-installer-runtime.rb b/configs/projects/_shared-pe-installer-runtime.rb index 654ade094..fec319e75 100644 --- a/configs/projects/_shared-pe-installer-runtime.rb +++ b/configs/projects/_shared-pe-installer-runtime.rb @@ -93,7 +93,6 @@ proj.component('rubygem-aws-sdk-core') proj.component('rubygem-aws-sdk-ec2') proj.component('rubygem-aws-sigv4') -proj.component('rubygem-base64') proj.component('rubygem-bcrypt_pbkdf') proj.component('rubygem-bindata') proj.component('rubygem-builder') @@ -122,7 +121,6 @@ proj.component('rubygem-net-http-persistent') proj.component('rubygem-net-scp') proj.component('rubygem-net-ssh-krb') -proj.component('rubygem-nkf') proj.component('rubygem-nori') proj.component('rubygem-rubyntlm') proj.component('rubygem-orchestrator_client') From d19ae92229b87bac89a438092325f64abe8b452b Mon Sep 17 00:00:00 2001 From: Tobi Lehman Date: Thu, 23 May 2024 09:56:06 -0700 Subject: [PATCH 2/3] Remove nkf and base64 from all projects --- configs/projects/_shared-pe-bolt-server.rb | 2 -- configs/projects/_shared-pe-bolt-server_with_ruby.rb | 2 -- configs/projects/bolt-runtime.rb | 2 -- 3 files changed, 6 deletions(-) diff --git a/configs/projects/_shared-pe-bolt-server.rb b/configs/projects/_shared-pe-bolt-server.rb index bb6fa7bd8..7631e6d40 100644 --- a/configs/projects/_shared-pe-bolt-server.rb +++ b/configs/projects/_shared-pe-bolt-server.rb @@ -110,7 +110,6 @@ proj.component('rubygem-aws-sdk-core') proj.component('rubygem-aws-sdk-ec2') proj.component('rubygem-aws-sigv4') -proj.component('rubygem-base64') proj.component('rubygem-bcrypt_pbkdf') proj.component('rubygem-bindata') proj.component('rubygem-builder') @@ -141,7 +140,6 @@ proj.component('rubygem-net-scp') proj.component('rubygem-net-ssh') proj.component('rubygem-net-ssh-krb') -proj.component('rubygem-nkf') proj.component('rubygem-rubyntlm') proj.component('rubygem-nori') proj.component('rubygem-orchestrator_client') diff --git a/configs/projects/_shared-pe-bolt-server_with_ruby.rb b/configs/projects/_shared-pe-bolt-server_with_ruby.rb index 18aaf82a9..06740fccd 100644 --- a/configs/projects/_shared-pe-bolt-server_with_ruby.rb +++ b/configs/projects/_shared-pe-bolt-server_with_ruby.rb @@ -145,7 +145,6 @@ proj.component('rubygem-aws-sdk-core') proj.component('rubygem-aws-sdk-ec2') proj.component('rubygem-aws-sigv4') -proj.component('rubygem-base64') proj.component('rubygem-bcrypt_pbkdf') proj.component('rubygem-bindata') proj.component('rubygem-builder') @@ -176,7 +175,6 @@ proj.component('rubygem-net-scp') proj.component('rubygem-net-ssh') proj.component('rubygem-net-ssh-krb') -proj.component('rubygem-nkf') proj.component('rubygem-nori') proj.component('rubygem-rubyntlm') proj.component('rubygem-orchestrator_client') diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index 8d4fd3fa2..87083324d 100644 --- a/configs/projects/bolt-runtime.rb +++ b/configs/projects/bolt-runtime.rb @@ -162,7 +162,6 @@ proj.component 'rubygem-aws-sdk-core' proj.component 'rubygem-aws-sdk-ec2' proj.component 'rubygem-aws-sigv4' - proj.component 'rubygem-base64' proj.component 'rubygem-bindata' proj.component 'rubygem-builder' proj.component 'rubygem-CFPropertyList' @@ -190,7 +189,6 @@ proj.component 'rubygem-net-scp' proj.component 'rubygem-net-ssh' proj.component 'rubygem-net-ssh-krb' - proj.component 'rubygem-nkf' proj.component 'rubygem-nori' proj.component 'rubygem-orchestrator_client' proj.component 'rubygem-paint' From ab6b4da6dd11d761dffe50741003127cab82fcc9 Mon Sep 17 00:00:00 2001 From: Tobi Lehman Date: Thu, 23 May 2024 10:37:59 -0700 Subject: [PATCH 3/3] Remove nkf and base64 components --- configs/components/rubygem-base64.rb | 6 ------ configs/components/rubygem-nkf.rb | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 configs/components/rubygem-base64.rb delete mode 100644 configs/components/rubygem-nkf.rb diff --git a/configs/components/rubygem-base64.rb b/configs/components/rubygem-base64.rb deleted file mode 100644 index 5f87eeb8e..000000000 --- a/configs/components/rubygem-base64.rb +++ /dev/null @@ -1,6 +0,0 @@ -component 'rubygem-base64' do |pkg, settings, platform| - pkg.version '0.2.0' - pkg.md5sum 'fe02f4347a5846f79f4d4615edababd3' - - instance_eval File.read('configs/components/_base-rubygem.rb') -end diff --git a/configs/components/rubygem-nkf.rb b/configs/components/rubygem-nkf.rb deleted file mode 100644 index 5f721f361..000000000 --- a/configs/components/rubygem-nkf.rb +++ /dev/null @@ -1,6 +0,0 @@ -component 'rubygem-nkf' do |pkg, settings, platform| - pkg.version '0.2.0' - pkg.md5sum '7a0af896fa45703c594cf0535096a8ed' - - instance_eval File.read('configs/components/_base-rubygem.rb') -end