packaging 0.99.54 → 0.99.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/packaging/sign/msi.rb +13 -11
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b1f8d059fd1199cd2b0df2e68c191f903f52f56c0d60ef083c2f7e9476b70b04
|
|
4
|
+
data.tar.gz: 2e6c03f62b704ffea9412d893aebf7ab475a1e558bf6c55a5b7ed4d6ab53328f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 84a75378e6c859ca37fdcb0ae446ff59d6d133ce33f6f6408410f98c30912c3a30b222ed1eda4e78f82c172a1942c6e9c0ad1efb6665267dcc68b86e329dad73
|
|
7
|
+
data.tar.gz: 071bbcb91fc3f46fa390c87d41c1c56adb5c48dafbb54f6a43981c71471530cb96eb94ca32f0a51f761fb9991083af0b6ff4ece26edc5537f9fd6cfb792b1fbd
|
data/lib/packaging/sign/msi.rb
CHANGED
|
@@ -8,11 +8,11 @@ module Pkg::Sign::Msi
|
|
|
8
8
|
rsync_host_string = "-e 'ssh #{use_identity}' Administrator@#{Pkg::Config.msi_signing_server}"
|
|
9
9
|
|
|
10
10
|
work_dir = "Windows/Temp/#{Pkg::Util.rand_string}"
|
|
11
|
+
Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}")
|
|
11
12
|
msis = Dir.glob("#{target_dir}/windows*/**/*.msi")
|
|
12
|
-
msis.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
end
|
|
13
|
+
Pkg::Util::Net.rsync_to(msis.join(" "), rsync_host_string, "/cygdrive/c/#{work_dir}",
|
|
14
|
+
extra_flags: ["--ignore-existing --relative"])
|
|
15
|
+
|
|
16
16
|
# Please Note:
|
|
17
17
|
# We are currently adding two signatures to the msi.
|
|
18
18
|
#
|
|
@@ -64,8 +64,10 @@ module Pkg::Sign::Msi
|
|
|
64
64
|
# Once we no longer support Windows 8/Windows Vista, we can remove the
|
|
65
65
|
# first Sha1 signature.
|
|
66
66
|
sign_command = <<-CMD
|
|
67
|
-
for
|
|
68
|
-
|
|
67
|
+
for msipath in #{msis.join(" ")}; do
|
|
68
|
+
msi="$(basename $msipath)"
|
|
69
|
+
msidir="C:/#{work_dir}/$(dirname $msipath)"
|
|
70
|
+
if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "$msidir/$msi" ; then
|
|
69
71
|
echo "$msi is already signed, skipping . . ." ;
|
|
70
72
|
else
|
|
71
73
|
tries=5
|
|
@@ -80,8 +82,8 @@ for msi in #{msis.map { |d| File.dirname(d) + "/" + File.basename(d) }.join(" ")
|
|
|
80
82
|
-pkcs12 "#{Pkg::Config.msi_signing_cert}" \
|
|
81
83
|
-pass "#{Pkg::Config.msi_signing_cert_pw}" \
|
|
82
84
|
-t "$timeserver" \
|
|
83
|
-
-in "
|
|
84
|
-
-out "
|
|
85
|
+
-in "$msidir/$msi" \
|
|
86
|
+
-out "$msidir/signed-$msi")
|
|
85
87
|
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
|
86
88
|
done;
|
|
87
89
|
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
|
@@ -98,8 +100,8 @@ for msi in #{msis.map { |d| File.dirname(d) + "/" + File.basename(d) }.join(" ")
|
|
|
98
100
|
-pkcs12 "#{Pkg::Config.msi_signing_cert}" \
|
|
99
101
|
-pass "#{Pkg::Config.msi_signing_cert_pw}" \
|
|
100
102
|
-ts "$timeserver" \
|
|
101
|
-
-in "
|
|
102
|
-
-out "
|
|
103
|
+
-in "$msidir/signed-$msi" \
|
|
104
|
+
-out "$msidir/$msi")
|
|
103
105
|
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
|
104
106
|
done;
|
|
105
107
|
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
|
@@ -112,7 +114,7 @@ CMD
|
|
|
112
114
|
|
|
113
115
|
Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_command, false, '', false)
|
|
114
116
|
msis.each do | msi |
|
|
115
|
-
Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{
|
|
117
|
+
Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{msi}", rsync_host_string, File.dirname(msi))
|
|
116
118
|
end
|
|
117
119
|
Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -d '/cygdrive/c/#{work_dir}' ]; then rm -rf '/cygdrive/c/#{work_dir}'; fi")
|
|
118
120
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: packaging
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.99.
|
|
4
|
+
version: 0.99.55
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet Labs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-01-
|
|
11
|
+
date: 2020-01-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|