Resolv needs vendoring too

Author: deivid-rodriguez

.rubocop.yml

@@ -10,6 +10,7 @@ AllCops:
     - lib/rubygems/resolver/molinillo/**/*
     - lib/rubygems/tsort/**/*
     - lib/rubygems/timeout/**/*
+    - lib/rubygems/resolv/**/*
     - lib/rubygems/optparse/**/*
     - lib/rubygems/net-protocol/**/*
     - lib/rubygems/net-http/**/*

Manifest.txt

@@ -480,6 +480,7 @@ lib/rubygems/request_set/lockfile.rb
 lib/rubygems/request_set/lockfile/parser.rb
 lib/rubygems/request_set/lockfile/tokenizer.rb
 lib/rubygems/requirement.rb
+lib/rubygems/resolv/lib/resolv.rb
 lib/rubygems/resolver.rb
 lib/rubygems/resolver/activation_request.rb
 lib/rubygems/resolver/api_set.rb

Rakefile

@@ -260,6 +260,24 @@ if File.exist?("tool/automatiek.rake")
         subsublib.vendor_lib = "lib/rubygems/timeout"
         subsublib.license_path = "License.txt"
       end
+
+      sublib.dependency("resolv") do |subsublib|
+        subsublib.version = "v0.2.2"
+        subsublib.download = { github: "https://github.com/ruby/resolv" }
+        subsublib.namespace = "Resolv"
+        subsublib.prefix = "Gem"
+        subsublib.vendor_lib = "lib/rubygems/resolv"
+        subsublib.license_path = "License.txt"
+
+        subsublib.dependency("timeout") do |ssslib|
+          ssslib.version = "v0.4.1"
+          ssslib.download = { github: "https://github.com/ruby/timeout" }
+          ssslib.namespace = "Timeout"
+          ssslib.prefix = "Gem"
+          ssslib.vendor_lib = "lib/rubygems/timeout"
+          ssslib.license_path = "License.txt"
+        end
+      end
     end
   end
 end

lib/rubygems/net-http/lib/net/http.rb

@@ -22,7 +22,7 @@
 
 require_relative '../../../net-protocol/lib/net/protocol'
 require 'uri'
-require 'resolv'
+require_relative '../../../resolv/lib/resolv'
 autoload :OpenSSL, 'openssl'
 
 module Gem::Net   #:nodoc:
@@ -1652,7 +1652,7 @@ def connect
 
         # Server Name Indication (SNI) RFC 3546/6066
         case @address
-        when Resolv::IPv4::Regex, Resolv::IPv6::Regex
+        when Gem::Resolv::IPv4::Regex, Gem::Resolv::IPv6::Regex
           # don't set SNI, as IP addresses in SNI is not valid
           # per RFC 6066, section 3.