Skip to content

Address vulnerabilities and fix xcode check #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewhuynh merged 13 commits into from
Sep 28, 2020
Merged

Address vulnerabilities and fix xcode check #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ac41c58
Merge pull request #3 from andrewhuynh/chef-client-14.13.11
andrewhuynh Oct 10, 2019
64bb7da
CVE-2020-8130 patching
andrewhuynh Apr 1, 2020
c4c8c22
Merge pull request #4 from andrewhuynh/CVE-2020-8130
andrewhuynh Apr 1, 2020
f9c53aa
GHSA-q58g-455p-8vw9 patching
andrewhuynh Apr 1, 2020
366f39d
Merge pull request #5 from andrewhuynh/GHSA-q58g-455p-8vw9
andrewhuynh Apr 1, 2020
0e0f3a0
Merge branch 'master' into master
andrewhuynh Apr 1, 2020
f656efc
fix the command to determine xcode's install folder
andrewhuynh Sep 28, 2020
dba2f66
CVE-2020-10663 fixing vulnerability with json
andrewhuynh Sep 28, 2020
d59d816
CVE-2020-8130 patching
andrewhuynh Apr 1, 2020
c51f61a
GHSA-q58g-455p-8vw9 patching
andrewhuynh Apr 1, 2020
eb40df7
Merge branch 'master' of https://github.com/andrewhuynh/workup into m…
andrewhuynh Sep 28, 2020
e7ee7a8
Merge pull request #6 from andrewhuynh/fix-xcode-check
andrewhuynh Sep 28, 2020
d7092d2
Merge pull request #7 from andrewhuynh/patch-json-vulnerability
andrewhuynh Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ for i in {1..3}; do
# .dist code in Apple's SUS catalog
touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
# find the CLI Tools update
OSX_VERSION=$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')
XCODE_PATTERN="Command Line.*${OSX_VERSION}"
OSX_VERSION=$(sw_vers -productVersion | awk -F'.' '{print $1""$2}')
XCODE_PATTERN="com.apple.pkg.CLTools_SDK_macOS${OSX_VERSION}"
XCODE_INSTALLER=$(softwareupdate -l |
grep "\*.*${XCODE_PATTERN}" |
head -n 1 |
Expand Down
6 changes: 3 additions & 3 deletions omnibus/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ GEM
coderay (1.1.1)
diff-lcs (1.3)
docker-api (1.33.2)
excon (>= 0.38.0)
excon (>= 0.71.0)
json
erubis (2.7.0)
excon (0.54.0)
excon (>= 0.71.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (>= 1.9.24)
Expand Down Expand Up @@ -117,7 +117,7 @@ GEM
train (>= 0.22.0, < 1.0)
ipaddress (0.8.3)
jmespath (1.3.1)
json (2.0.3)
json (2.3.0)
kitchen-inspec (0.17.0)
hashie (~> 3.4)
inspec (>= 0.34.0, < 2.0.0)
Expand Down
2 changes: 1 addition & 1 deletion workup.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_development_dependency 'bundler', '~> 1.12'
spec.add_development_dependency 'rake', '~> 11.2'
spec.add_development_dependency 'rake', '>= 12.3.3'
spec.add_development_dependency 'rubocop', '~> 0.49.0'
spec.add_development_dependency 'rspec', '~> 3.0'

Expand Down