diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index bf9e34024..45c96003d 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -10,13 +10,6 @@ expeditor: timeout_in_minutes: 30 steps: -- label: run-lint-and-specs-ruby-2.7 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.7-buster - label: run-lint-and-specs-ruby-3.0 command: diff --git a/lib/omnibus/packagers/rpm.rb b/lib/omnibus/packagers/rpm.rb index 9606b9811..3a19266c2 100644 --- a/lib/omnibus/packagers/rpm.rb +++ b/lib/omnibus/packagers/rpm.rb @@ -421,13 +421,15 @@ def create_rpm_file log.info(log_key) { "Creating .rpm file" } shellout!("#{command}") - + log.info(log_key) { "<< #{signing_script}" } + log.info(log_key) { "<<<<<< signing_script - cat #{signing_script} " } + command1 = "cat #{signing_script} " + shellout!("#{command1}") end shellout!("#{sign_cmd}", environment: { "HOME" => home }) @@ -510,7 +526,7 @@ def rpm_file def with_rpm_signing(&block) directory = Dir.mktmpdir destination = "#{directory}/sign-rpm" - + log.info(log_key) { " << 1.0" gem.add_dependency "contracts", ">= 0.16.0", "< 0.17.0" gem.add_dependency "rexml", "~> 3.2" + if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("3.1.0") + gem.add_dependency "ffi", "< 1.17.0" + gem.add_dependency "train-core", "< 3.12.5" + gem.add_dependency "public_suffix", "< 6.0.0" + end gem.add_dependency "mixlib-versioning" gem.add_dependency "pedump" diff --git a/resources/rpm/rpmmacros.erb b/resources/rpm/rpmmacros.erb index ea0382347..7dfccffd5 100644 --- a/resources/rpm/rpmmacros.erb +++ b/resources/rpm/rpmmacros.erb @@ -1,3 +1,5 @@ %_signature gpg %_gpg_path <%= gpg_path %> %_gpg_name <%= gpg_name %> +%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --batch --verbose --no-armor --passphrase-fd 3 --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} \ +--digest-algo sha256 %{__plaintext_filename} diff --git a/resources/rpm/signing.erb b/resources/rpm/signing.erb index 7ba782f81..940d27ddc 100755 --- a/resources/rpm/signing.erb +++ b/resources/rpm/signing.erb @@ -10,6 +10,7 @@ password = '<%= passphrase %>' require 'pty' puts rpm_cmd +puts " <<< DEBUGGING Stmt - omnibus-signing.erb rpm_cmd - #{rpm_cmd}" PTY.spawn(rpm_cmd) do |r, w, pid| # Older versions of rpmsign will prompt right away for the passphrase prompt = r.read(19)