From 2176226ab1cb5887264f10e7bbb4557b1c087285 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith84@gmail.com>
Date: Tue, 2 Jun 2020 15:27:18 -0700
Subject: [PATCH] Pin FFI to < 1.13 for now

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile              |  3 +++
 Gemfile.lock         |  7 ++++---
 omnibus/Gemfile.lock | 10 +++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index e56bc9b0c..e71487c09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,6 +42,9 @@ end
 group(:omnibus_package) do
   gem "appbundler"
 
+  # ffi 1.13 crashes on windows
+  gem "ffi", "< 1.13"
+
   # Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef
   # gems to Rubygems now, so letting this float on latest should always give us the latest
   # stable release. May have to re-pin around major version bumping time, or during patch
diff --git a/Gemfile.lock b/Gemfile.lock
index b1b7b8004..cfb5e4a7d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -393,9 +393,9 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     fauxhai (7.4.0)
       net-ssh
-    ffi (1.13.0)
-    ffi (1.13.0-x64-mingw32)
-    ffi (1.13.0-x86-mingw32)
+    ffi (1.12.2)
+    ffi (1.12.2-x64-mingw32)
+    ffi (1.12.2-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-rzmq (2.0.7)
@@ -996,6 +996,7 @@ DEPENDENCIES
   dep_selector
   ed25519
   fauxhai (~> 7.4)
+  ffi (< 1.13)
   ffi-libarchive
   ffi-rzmq-core
   foodcritic (>= 16.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index d0970137c..0d6e8f944 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -29,19 +29,19 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.13)
+    artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.322.0)
-    aws-sdk-core (3.97.0)
+    aws-partitions (1.323.0)
+    aws-sdk-core (3.97.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.32.0)
+    aws-sdk-kms (1.33.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.67.0)
+    aws-sdk-s3 (1.67.1)
       aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)