packaging 0.99.76 → 0.99.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d737ac46704906a2bc986128797b3db649dd3e35e1432f2a98f362da67ffa56
-  data.tar.gz: 7a1ae857ec7a92940499a60c9d649f5e5e40fd8f2340aa95d2751f0de29d9fbd
+  metadata.gz: 3c641cdc322d55fe7c595fb4802ababf87830fe6a63a852f3acf291b601deeed
+  data.tar.gz: 39d19f13de74f2736b3aa8efcd9519345a81ee056f33ae7f1960cecc40e7d896
 SHA512:
-  metadata.gz: cacbbdc7c63c443a6a6bb6c0bc7f77367343b22b8356c4d99c00fe67a1fd448af0c7e0647d616ec533d1cb1cdfb6412fbff953bfb6926dbb4a06911d08da20df
-  data.tar.gz: 39ada32cc8dde4df7d661d00807ba937667338278191391ec534c98423228c594a49e2c74bedd10e9c8bd18601dae6bdff54804d48f2e255bc995b198bef4c13
+  metadata.gz: 690143636f97cba9f3a97918c60dd1f875b2b0a84eada68ae456f3b7c71a0295fcf38fcafcaf1584237ce2dbec6b3c4c8350e4e0d4112ac60f5c1f057ddd27ed
+  data.tar.gz: 3cfd026361b7b485eaffc9e9bb1ec8c0a2a296300631d3399f9edb3ee8d2e59a4cf3866cd0f1f7243f70f9ff15b3dc2b372477426ebf55fe5657362f531a76c9

data/lib/packaging/archive.rb

@@ -33,7 +33,7 @@ module Pkg::Archive
       sudo chmod g+w -R #{Pkg::Config.yum_archive_path}
       mv #{full_directory} #{archive_path}
     CMD
-    Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+    Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
   end
 
   # Move directories from freight path (aka repo staging path) to archive staging paths
@@ -60,7 +60,7 @@ module Pkg::Archive
         mv $pool_directory /opt/tmp-apt
       done
     CMD
-    Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+    Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
   end
 
   # Move downloads directories to archive staging path
@@ -85,7 +85,7 @@ module Pkg::Archive
       sudo chmod g+w -R #{Pkg::Config.downloads_archive_path}
       mv #{full_directory} #{archive_path}
     CMD
-    Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+    Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
   end
 
   # Delete empty directories from repo paths on weth
@@ -104,7 +104,7 @@ module Pkg::Archive
           fi
         done
       CMD
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+      Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
     end
   end
 
@@ -112,7 +112,7 @@ module Pkg::Archive
   def remove_dead_symlinks
     base_paths.each do |path|
       command = "find #{path} -xtype l -delete"
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+      Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
     end
   end
 
@@ -120,7 +120,7 @@ module Pkg::Archive
   def delete_staged_archives
     archive_paths.each do |archive_path|
       command = "sudo rm -rf #{File.join(archive_path, '*')}"
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+      Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
     end
   end
 end

data/lib/packaging/artifactory.rb

@@ -224,8 +224,6 @@ module Pkg
         deploy_properties(platform_tag, File.basename(package)),
         headers
       )
-    rescue
-      raise "Attempt to upload '#{package}' to #{File.join(@artifactory_uri, data[:full_artifactory_path])} failed"
     end
 
     # @param pkg [String] The package to download YAML for

data/lib/packaging/config.rb

@@ -81,7 +81,11 @@ module Pkg
         dir = "/opt/jenkins-builds/#{self.project}/#{self.ref}"
         cmd = "if [ -s \"#{dir}/artifacts\" ]; then cd #{dir};"\
               "find ./artifacts/ -mindepth 2 -type f; fi"
-        artifacts, _ = Pkg::Util::Net.remote_ssh_cmd(self.builds_server, cmd, true)
+        artifacts, _ = Pkg::Util::Net.remote_execute(
+                     self.builds_server,
+                     cmd,
+                     { capture_output: true }
+                   )
 
         artifacts = artifacts.split("\n")
         data = {}

data/lib/packaging/config/params.rb

@@ -65,6 +65,7 @@ module Pkg::Params
                   :gem_files,
                   :gem_forge_project,
                   :gem_host,
+                  :gem_license,
                   :gem_name,
                   :gem_path,
                   :gem_platform_dependencies,

data/lib/packaging/deb/repo.rb

@@ -125,7 +125,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
       command = repo_creation_command(File.join(artifact_directory, 'repos'), artifact_paths)
 
       begin
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, command)
         # Now that we've created our package repositories, we can generate repo
         # configurations for use with downstream jobs, acceptance clients, etc.
         Pkg::Deb::Repo.generate_repo_configs
@@ -134,7 +134,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
         Pkg::Deb::Repo.ship_repo_configs
       ensure
         # Always remove the lock file, even if we've failed
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
       end
     end
 
@@ -146,7 +146,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
 
       Pkg::Util::RakeUtils.invoke_task("pl:fetch")
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/deb"
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
         Pkg::Util::Net.rsync_to("pkg/#{target}/deb/", Pkg::Config.distribution_server, repo_dir)
       end
@@ -252,11 +252,11 @@ SignWith: #{Pkg::Config.gpg_key}"
       rsync_command = repo_deployment_command(apt_path, destination_staging_path, destination_server, dryrun)
       cp_command = repo_deployment_command(destination_staging_path, apt_path, nil, dryrun)
 
-      Pkg::Util::Net.remote_ssh_cmd(origin_server, rsync_command)
+      Pkg::Util::Net.remote_execute(origin_server, rsync_command)
       if dryrun
         puts "[DRYRUN] not executing #{cp_command} on #{destination_server}"
       else
-        Pkg::Util::Net.remote_ssh_cmd(destination_server, cp_command)
+        Pkg::Util::Net.remote_execute(destination_server, cp_command)
       end
     end
 

data/lib/packaging/platforms.rb

@@ -12,13 +12,6 @@ module Pkg
     # Each element in this hash
     PLATFORM_INFO = {
       'aix' => {
-        '6.1' => {
-          architectures: ['power'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          repo: false,
-        },
         '7.1' => {
           architectures: ['power'],
           source_architecture: 'SRPMS',
@@ -28,25 +21,6 @@ module Pkg
         },
       },
 
-      'cisco-wrlinux' => {
-        '5' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '7' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-      },
-
       'debian' => {
         '8' => {
           codename: 'jessie',
@@ -72,6 +46,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '11' => {
+          codename: 'bullseye',
+          architectures: ['amd64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'el' => {
@@ -109,14 +91,6 @@ module Pkg
         }
       },
 
-      'eos' => {
-        '4' => {
-          architectures: ['i386'],
-          package_format: 'swix',
-          repo: false,
-        },
-      },
-
       'fedora' => {
         '30' => {
           architectures: ['x86_64'],
@@ -142,6 +116,14 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '34' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {
@@ -160,6 +142,11 @@ module Pkg
           package_format: 'dmg',
           repo: false,
         },
+        '11' => {
+          architectures: ['x86_64', 'arm64'],
+          package_format: 'dmg',
+          repo: false,
+        },
       },
 
       'redhatfips' => {
@@ -232,7 +219,7 @@ module Pkg
         },
         '18.04' => {
           codename: 'bionic',
-          architectures: ['amd64', 'ppc64el'],
+          architectures: ['amd64', 'ppc64el', 'aarch64'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,

data/lib/packaging/repo.rb

@@ -110,7 +110,11 @@ module Pkg::Repo
       cmd = "[ -d #{artifact_directory} ] || exit 1 ; "
       cmd << "pushd #{artifact_directory} > /dev/null && "
       cmd << "find . -name '*.#{pkg_ext}' -print0 | xargs --no-run-if-empty -0 -I {} dirname {} "
-      stdout, stderr = Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, cmd, true)
+      stdout, _ = Pkg::Util::Net.remote_execute(
+                Pkg::Config.distribution_server,
+                cmd,
+                { capture_output: true }
+              )
       return stdout.split
     rescue => e
       fail "Error: Could not retrieve directories that contain #{pkg_ext} packages in #{Pkg::Config.distribution_server}:#{artifact_directory}"
@@ -120,7 +124,7 @@ module Pkg::Repo
       cmd = "[ -d #{artifact_parent_directory}/artifacts ] || exit 1 ; "
       cmd << "pushd #{artifact_parent_directory} > /dev/null && "
       cmd << 'rsync --archive --verbose --one-file-system --ignore-existing artifacts/ repos/ '
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, cmd)
+      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, cmd)
     rescue => e
       fail "Error: Could not populate repos directory in #{Pkg::Config.distribution_server}:#{artifact_parent_directory}"
     end
@@ -143,7 +147,9 @@ module Pkg::Repo
         __APT_PLATFORMS__: Pkg::Config.apt_releases.join(' '),
         __GPG_KEY__: Pkg::Util::Gpg.key
       }
-      Pkg::Util::Net.remote_ssh_cmd(remote_host, Pkg::Util::Misc.search_and_replace(command, whitelist))
+      Pkg::Util::Net.remote_execute(
+        remote_host,
+        Pkg::Util::Misc.search_and_replace(command, whitelist))
     end
   end
 end

data/lib/packaging/rpm/repo.rb

@@ -16,7 +16,7 @@ module Pkg::Rpm::Repo
 
       Pkg::Util::RakeUtils.invoke_task("pl:fetch")
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/rpm"
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
         Pkg::Util::Net.rsync_to("pkg/#{target}/rpm/", Pkg::Config.distribution_server, repo_dir)
       end
@@ -215,7 +215,7 @@ module Pkg::Rpm::Repo
       command = Pkg::Rpm::Repo.repo_creation_command(File.join(artifact_directory, directory), artifact_paths)
 
       begin
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, command)
         # Now that we've created our package repositories, we can generate repo
         # configurations for use with downstream jobs, acceptance clients, etc.
         Pkg::Rpm::Repo.generate_repo_configs
@@ -224,7 +224,7 @@ module Pkg::Rpm::Repo
         Pkg::Rpm::Repo.ship_repo_configs
       ensure
         # Always remove the lock file, even if we've failed
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
       end
     end
 
@@ -248,7 +248,7 @@ module Pkg::Rpm::Repo
     def deploy_repos(yum_path, origin_server, destination_server, dryrun = false)
       rsync_command = repo_deployment_command(yum_path, yum_path, destination_server, dryrun)
 
-      Pkg::Util::Net.remote_ssh_cmd(origin_server, rsync_command)
+      Pkg::Util::Net.remote_execute(origin_server, rsync_command)
     end
   end
 end

data/lib/packaging/sign/dmg.rb

@@ -1,41 +1,79 @@
 module Pkg::Sign::Dmg
   module_function
 
-  def sign(target_dir = 'pkg')
-    use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}" unless Pkg::Config.osx_signing_ssh_key.nil?
-
-    if Pkg::Config.osx_signing_server =~ /@/
-      host_string = "#{Pkg::Config.osx_signing_server}"
-    else
-      host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+  def sign(pkg_directory = 'pkg')
+    use_identity = ''
+    unless Pkg::Config.osx_signing_ssh_key.nil?
+      use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}"
     end
+
+    host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+    host_string = "#{Pkg::Config.osx_signing_server}" if Pkg::Config.osx_signing_server =~ /@/
+
     ssh_host_string = "#{use_identity} #{host_string}"
     rsync_host_string = "-e 'ssh #{use_identity}' #{host_string}"
+    archs =  Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/{x86_64,arm64}").map { |el| el.split('/').last }
+
+    if archs.empty?
+      $stderr.puts "Error: no architectures found in #{pkg_directory}/{apple,mac,osx}"
+      exit 1
+    end
+
+    archs.each do |arch|
+      remote_working_directory = "/tmp/#{Pkg::Util.rand_string}/#{arch}"
+      dmg_mount_point = File.join(remote_working_directory, "mount")
+      signed_items_directory    = File.join(remote_working_directory, "signed")
+
+      dmgs = Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/#{arch}/*.dmg")
+      if dmgs.empty?
+        $stderr.puts "Error: no dmgs found in #{pkg_directory}/{apple,mac,osx} for #{arch} architecture."
+        exit 1
+      end
+
+      dmg_basenames = dmgs.map { |d| File.basename(d, '.dmg') }.join(' ')
+
+      sign_package_command = %W[
+        for dmg in #{dmg_basenames}; do
+          /usr/bin/hdiutil attach #{remote_working_directory}/$dmg.dmg
+            -mountpoint #{dmg_mount_point} -nobrowse -quiet ;
 
-    work_dir  = "/tmp/#{Pkg::Util.rand_string}"
-    mount     = File.join(work_dir, "mount")
-    signed    = File.join(work_dir, "signed")
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p #{mount} #{signed}")
-    dmgs = Dir.glob("#{target_dir}/apple/**/*.dmg")
-    Pkg::Util::Net.rsync_to(dmgs.join(" "), rsync_host_string, work_dir)
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, %Q[for dmg in #{dmgs.map { |d| File.basename(d, ".dmg") }.join(" ")}; do
-      /usr/bin/hdiutil attach #{work_dir}/$dmg.dmg -mountpoint #{mount} -nobrowse -quiet ;
-      /usr/bin/security -q unlock-keychain -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
-        for pkg in $(ls #{mount}/*.pkg | xargs -n 1 basename); do
-          if /usr/sbin/pkgutil --check-signature #{mount}/$pkg ; then
-            echo "$pkg is already signed, skipping . . ." ;
-            cp #{mount}/$pkg #{signed}/$pkg ;
-          else
-            /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}" --sign "#{Pkg::Config.osx_signing_cert}" #{mount}/$pkg #{signed}/$pkg ;
-          fi
+          /usr/bin/security -q unlock-keychain
+            -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
+
+          for pkg in #{dmg_mount_point}/*.pkg; do
+            pkg_basename=$(basename $pkg) ;
+            if /usr/sbin/pkgutil --check-signature $pkg ; then
+              echo "Warning: $pkg is already signed, skipping" ;
+              cp $pkg #{signed_items_directory}/$pkg_basename ;
+              continue ;
+            fi ;
+
+            /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}"
+              --sign "#{Pkg::Config.osx_signing_cert}"
+              $pkg #{signed_items_directory}/$pkg_basename ;
+          done ;
+
+          /usr/bin/hdiutil detach #{dmg_mount_point} -quiet ;
+          /bin/rm #{remote_working_directory}/$dmg.dmg ;
+          /usr/bin/hdiutil create -volname $dmg
+            -srcfolder #{signed_items_directory}/ #{remote_working_directory}/$dmg.dmg ;
+          /bin/rm #{signed_items_directory}/* ;
         done
-      /usr/bin/hdiutil detach #{mount} -quiet ;
-      /bin/rm #{work_dir}/$dmg.dmg ;
-      /usr/bin/hdiutil create -volname $dmg -srcfolder #{signed}/ #{work_dir}/$dmg.dmg ;
-      /bin/rm #{signed}/* ; done])
-    dmgs.each do | dmg |
-      Pkg::Util::Net.rsync_from("#{work_dir}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+      ].join(' ')
+
+      Pkg::Util::Net.remote_execute(ssh_host_string,
+                                    "mkdir -p #{dmg_mount_point} #{signed_items_directory}")
+
+      Pkg::Util::Net.rsync_to(dmgs.join(' '), rsync_host_string, remote_working_directory)
+
+      Pkg::Util::Net.remote_execute(ssh_host_string, sign_package_command)
+
+      dmgs.each do |dmg|
+        Pkg::Util::Net.rsync_from(
+          "#{remote_working_directory}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+      end
+
+      Pkg::Util::Net.remote_execute(ssh_host_string, "rm -rf '#{remote_working_directory}'")
     end
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -d '#{work_dir}' ]; then rm -rf '#{work_dir}'; fi")
   end
 end

data/lib/packaging/sign/ips.rb

@@ -15,14 +15,14 @@ module Pkg::Sign::Ips
       repo_dir     = "#{work_dir}/repo"
       signed_dir   = "#{work_dir}/pkgs"
 
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p #{repo_dir} #{unsigned_dir} #{signed_dir}")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "mkdir -p #{repo_dir} #{unsigned_dir} #{signed_dir}")
       Pkg::Util::Net.rsync_to(p5p, rsync_host_string, unsigned_dir)
 
       # Before we can get started with signing packages we need to create a repo
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrepo create #{repo_dir}")
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrepo set -s #{repo_dir} publisher/prefix=puppetlabs.com")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrepo create #{repo_dir}")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrepo set -s #{repo_dir} publisher/prefix=puppetlabs.com")
       # And import all the packages into the repo.
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrecv -s #{unsigned_dir}/#{File.basename(p5p)} -d #{repo_dir} '*'")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrecv -s #{unsigned_dir}/#{File.basename(p5p)} -d #{repo_dir} '*'")
       # We are going to hard code the values for signing cert locations for now.
       # This autmation will require an update to actually become reusable, but
       # for now these values will stay this way so solaris signing will stop
@@ -37,21 +37,21 @@ module Pkg::Sign::Ips
                   -k /root/signing/signing_key_2020.pem \
                   -s 'file://#{work_dir}/repo' '*'"
       puts "About to sign #{p5p} with #{sign_cmd} in #{work_dir}"
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_cmd.squeeze(' '))
+      Pkg::Util::Net.remote_execute(ssh_host_string, sign_cmd.squeeze(' '))
       # pkgrecv with -a will pull packages out of the repo, so we need to do that too to actually get the packages we signed
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrecv -d #{signed_dir}/#{File.basename(p5p)} -a -s #{repo_dir} '*'")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrecv -d #{signed_dir}/#{File.basename(p5p)} -a -s #{repo_dir} '*'")
       begin
         # lets make sure we actually signed something?
         # **NOTE** if we're repeatedly trying to sign the same version this
         # might explode because I don't know how to reset the IPS cache.
         # Everything is amazing.
-        Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkg contents -m -g #{signed_dir}/#{File.basename(p5p)} '*' | grep '^signature '")
+        Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkg contents -m -g #{signed_dir}/#{File.basename(p5p)} '*' | grep '^signature '")
       rescue RuntimeError
         raise "Looks like #{File.basename(p5p)} was not signed correctly, quitting!"
       end
       # and pull the packages back.
       Pkg::Util::Net.rsync_from("#{signed_dir}/#{File.basename(p5p)}", rsync_host_string, File.dirname(p5p))
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -e '#{work_dir}' ] ; then sudo rm -r '#{work_dir}' ; fi")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "if [ -e '#{work_dir}' ] ; then sudo rm -r '#{work_dir}' ; fi")
     end
   end
 end