From bd2decdfe99855fb416fd97db88a7308674f531e Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Sat, 29 Dec 2018 12:27:27 +0100
Subject: [PATCH 1/3] ruby 2.6.0

---
 .ruby-version | 2 +-
 .travis.yml   | 1 +
 Dockerfile    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index aedc15bb0c..e70b4523ae 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.3
+2.6.0
diff --git a/.travis.yml b/.travis.yml
index c2df146c71..25b232881a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ rvm:
   - '2.3.8'
   - '2.4.5'
   - '2.5.3'
+  - '2.6.0'
 
 env:
   - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'
diff --git a/Dockerfile b/Dockerfile
index a6b4b2ebf5..22843626a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.3-alpine3.7 AS builder
+FROM ruby:2.6.0-alpine3.8 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
@@ -37,7 +37,7 @@ RUN apk add --no-cache \
     && chmod -R a+r /usr/local/bundle
 
 
-FROM ruby:2.5.3-alpine3.7
+FROM ruby:2.6.0-alpine3.8
 LABEL maintainer="Rapid7"
 
 ENV APP_HOME=/usr/src/metasploit-framework

From bd17b605dbc68067508004d029423f753fe7dcb8 Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Tue, 5 Feb 2019 17:57:38 +0100
Subject: [PATCH 2/3] update to ruby 2.6.1 and alpine 3.9

---
 .ruby-version | 2 +-
 .travis.yml   | 2 +-
 Dockerfile    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index e70b4523ae..6a6a3d8e35 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.0
+2.6.1
diff --git a/.travis.yml b/.travis.yml
index 25b232881a..6cf2181a8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
   - '2.3.8'
   - '2.4.5'
   - '2.5.3'
-  - '2.6.0'
+  - '2.6.1'
 
 env:
   - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'
diff --git a/Dockerfile b/Dockerfile
index 22843626a1..01a738ef5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6.0-alpine3.8 AS builder
+FROM ruby:2.6.1-alpine3.9 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
@@ -16,7 +16,7 @@ RUN apk add --no-cache \
       bison \
       build-base \
       ruby-dev \
-      libressl-dev \
+      openssl-dev \
       readline-dev \
       sqlite-dev \
       postgresql-dev \
@@ -37,7 +37,7 @@ RUN apk add --no-cache \
     && chmod -R a+r /usr/local/bundle
 
 
-FROM ruby:2.6.0-alpine3.8
+FROM ruby:2.6.1-alpine3.9
 LABEL maintainer="Rapid7"
 
 ENV APP_HOME=/usr/src/metasploit-framework

From c68c44c818a8edd89bc5644d47ca8f8c3c4e9534 Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Tue, 12 Feb 2019 19:12:54 +0100
Subject: [PATCH 3/3] remove bigdecimal warning

---
 lib/msf/core.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/msf/core.rb b/lib/msf/core.rb
index 35a702d3b1..a699f307a2 100644
--- a/lib/msf/core.rb
+++ b/lib/msf/core.rb
@@ -13,6 +13,17 @@
 # Include backported features for older versions of Ruby
 require 'backports'
 
+# Remove bigdecimal warning - start
+# https://github.com/ruby/bigdecimal/pull/115
+# https://github.com/rapid7/metasploit-framework/pull/11184#issuecomment-461971266
+# TODO: remove when upgrading from rails 4.x
+require 'bigdecimal'
+
+def BigDecimal.new(*args, **kwargs)
+  BigDecimal(*args, **kwargs)
+end
+# Remove bigdecimal warning - end
+
 # The framework-core depends on Rex
 require 'rex'
 require 'rex/ui'