packaging 0.99.34 → 0.99.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/sign/msi.rb +48 -42
- data/spec/fixtures/config/ext/build_defaults.yaml +1 -1
- data/spec/fixtures/config/ext/project_data.yaml +1 -1
- metadata +19 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 96cc35674bee0a3c3ca29176ad645ea76dfa493d34ebc555f2a167f60362f5ca
|
4
|
+
data.tar.gz: 2c2868423e895361f84c81fa643f55e35acc08095c0396019758cd835bacbf57
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d7d96ecf671d935aa409bcb6be995bf60c14331727a30e4ab94ab3032a573383a5172ab2fbe55160a7c66fad58588cfca2885242004606988a7456b1e501c703
|
7
|
+
data.tar.gz: 84522235b00d2d1e1ea66a26f0da5c14315e95407b5b97d1ea5a8f275960868452a059332c6953b51cf4aa6051a70a6f4b25dc53e9d7f16a183e2f8dd06d332d
|
data/lib/packaging/sign/msi.rb
CHANGED
@@ -62,48 +62,54 @@ module Pkg::Sign::Msi
|
|
62
62
|
#
|
63
63
|
# Once we no longer support Windows 8/Windows Vista, we can remove the
|
64
64
|
# first Sha1 signature.
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
65
|
+
sign_command = <<-CMD
|
66
|
+
for msi in #{msis.map { |d| File.basename(d) }.join(" ")}; do
|
67
|
+
if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "C:/#{work_dir}/$msi" ; then
|
68
|
+
echo "$msi is already signed, skipping . . ." ;
|
69
|
+
else
|
70
|
+
tries=5
|
71
|
+
sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
|
72
|
+
http://timestamp.globalsign.com/scripts/timstamp.dll
|
73
|
+
http://www.startssl.com/timestamp)
|
74
|
+
for timeserver in "${sha1Servers[@]}"; do
|
75
|
+
for ((try=1; try<=$tries; try++)) do
|
76
|
+
ret=$(/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe sign \
|
77
|
+
-n "Puppet" -i "http://www.puppet.com" \
|
78
|
+
-h sha1 \
|
79
|
+
-pkcs12 "#{Pkg::Config.msi_signing_cert}" \
|
80
|
+
-pass "#{Pkg::Config.msi_signing_cert_pw}" \
|
81
|
+
-t "$timeserver" \
|
82
|
+
-in "C:/#{work_dir}/$msi" \
|
83
|
+
-out "C:/#{work_dir}/signed-$msi")
|
84
|
+
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
85
|
+
done;
|
86
|
+
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
87
|
+
done;
|
88
|
+
echo $ret
|
89
|
+
if [[ $ret != *"Succeeded"* ]]; then exit 1; fi
|
90
|
+
sha256Servers=(http://sha256timestamp.ws.symantec.com/sha256/timestamp
|
91
|
+
http://timestamp.comodoca.com?td=sha256)
|
92
|
+
for timeserver in "${sha256Servers[@]}"; do
|
93
|
+
for ((try=1; try<=$tries; try++)) do
|
94
|
+
ret=$(/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe sign \
|
95
|
+
-n "Puppet" -i "http://www.puppet.com" \
|
96
|
+
-nest -h sha256 \
|
97
|
+
-pkcs12 "#{Pkg::Config.msi_signing_cert}" \
|
98
|
+
-pass "#{Pkg::Config.msi_signing_cert_pw}" \
|
99
|
+
-ts "$timeserver" \
|
100
|
+
-in "C:/#{work_dir}/signed-$msi" \
|
101
|
+
-out "C:/#{work_dir}/$msi")
|
102
|
+
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
103
|
+
done;
|
104
|
+
if [[ $ret == *"Succeeded"* ]]; then break; fi
|
105
|
+
done;
|
106
|
+
echo $ret
|
107
|
+
if [[ $ret != *"Succeeded"* ]]; then exit 1; fi
|
108
|
+
fi
|
109
|
+
done
|
110
|
+
CMD
|
111
|
+
|
112
|
+
Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_command, false, '', false)
|
107
113
|
msis.each do | msi |
|
108
114
|
Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{File.basename(msi)}", rsync_host_string, File.dirname(msi))
|
109
115
|
end
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../params.yaml
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../params.yaml
|
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.35
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-06-
|
11
|
+
date: 2019-06-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -225,34 +225,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
225
225
|
- !ruby/object:Gem::Version
|
226
226
|
version: '0'
|
227
227
|
requirements: []
|
228
|
-
|
229
|
-
rubygems_version: 2.7.6
|
228
|
+
rubygems_version: 3.0.3
|
230
229
|
signing_key:
|
231
230
|
specification_version: 4
|
232
231
|
summary: Puppet Labs' packaging automation
|
233
232
|
test_files:
|
234
233
|
- spec/lib/packaging/paths_spec.rb
|
234
|
+
- spec/lib/packaging/gem_spec.rb
|
235
|
+
- spec/lib/packaging/repo_spec.rb
|
236
|
+
- spec/lib/packaging/platforms_spec.rb
|
237
|
+
- spec/lib/packaging/tar_spec.rb
|
238
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
235
239
|
- spec/lib/packaging/sign_spec.rb
|
240
|
+
- spec/lib/packaging/artifactory_spec.rb
|
241
|
+
- spec/lib/packaging/deb_spec.rb
|
242
|
+
- spec/lib/packaging/retrieve_spec.rb
|
236
243
|
- spec/lib/packaging/config_spec.rb
|
244
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
245
|
+
- spec/lib/packaging/util/jenkins_spec.rb
|
237
246
|
- spec/lib/packaging/util/execution_spec.rb
|
238
|
-
- spec/lib/packaging/util/
|
239
|
-
- spec/lib/packaging/util/
|
247
|
+
- spec/lib/packaging/util/ship_spec.rb
|
248
|
+
- spec/lib/packaging/util/net_spec.rb
|
240
249
|
- spec/lib/packaging/util/git_spec.rb
|
241
|
-
- spec/lib/packaging/util/
|
242
|
-
- spec/lib/packaging/util/rake_utils_spec.rb
|
250
|
+
- spec/lib/packaging/util/misc_spec.rb
|
243
251
|
- spec/lib/packaging/util/gpg_spec.rb
|
252
|
+
- spec/lib/packaging/util/rake_utils_spec.rb
|
253
|
+
- spec/lib/packaging/util/os_spec.rb
|
244
254
|
- spec/lib/packaging/util/git_tag_spec.rb
|
255
|
+
- spec/lib/packaging/util/version_spec.rb
|
245
256
|
- spec/lib/packaging/util/file_spec.rb
|
246
|
-
- spec/lib/packaging/util/net_spec.rb
|
247
|
-
- spec/lib/packaging/util/misc_spec.rb
|
248
|
-
- spec/lib/packaging/util/ship_spec.rb
|
249
|
-
- spec/lib/packaging/repo_spec.rb
|
250
|
-
- spec/lib/packaging/tar_spec.rb
|
251
|
-
- spec/lib/packaging/retrieve_spec.rb
|
252
|
-
- spec/lib/packaging/platforms_spec.rb
|
253
|
-
- spec/lib/packaging/deb_spec.rb
|
254
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
255
|
-
- spec/lib/packaging/rpm/repo_spec.rb
|
256
|
-
- spec/lib/packaging/gem_spec.rb
|
257
|
-
- spec/lib/packaging/artifactory_spec.rb
|
258
257
|
- spec/lib/packaging_spec.rb
|