From 798db4d1d5237a031a847faa62ea43ba12505911 Mon Sep 17 00:00:00 2001
From: Georg Kahest <teadur@users.noreply.github.com>
Date: Fri, 10 Jun 2016 14:29:23 +0300
Subject: [PATCH 1/2] nokogiri security update

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index d990fa2cb..06b82dce2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'rails-settings-cached',     '0.4.1' # for settings
 
 # html-xml
 gem 'haml-rails', '0.9.0' # haml for views
-gem 'nokogiri',   '1.6.7.2' # For XML parsing
+gem 'nokogiri',   '1.6.8' # For XML parsing
 
 # style
 gem 'sass-rails',     '5.0.3'   # sass style
diff --git a/Gemfile.lock b/Gemfile.lock
index 577bbbf20..d779fe3ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,7 +316,7 @@ GEM
     mina (0.3.1)
       open4 (~> 1.3.4)
       rake
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     monetize (1.1.0)
       money (~> 6.5.0)
@@ -332,8 +332,9 @@ GEM
     nenv (0.2.0)
     netrc (0.11.0)
     newrelic_rpm (3.12.0.288)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     nori (2.6.0)
     notiffany (0.0.7)
       nenv (~> 0.1)
@@ -348,6 +349,7 @@ GEM
     phantomjs (1.9.8.0)
     phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
+    pkg-config (1.1.7)
     poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -619,7 +621,7 @@ DEPENDENCIES
   mina (= 0.3.1)
   money-rails (= 1.4.1)
   newrelic_rpm (= 3.12.0.288)
-  nokogiri (= 1.6.7.2)
+  nokogiri (= 1.6.8)
   nprogress-rails (= 0.1.6.7)
   paper_trail!
   pdfkit (= 0.6.2)

From 999c161c8ec052272dc64c3d11dcda6fdaaa2585 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Mon, 13 Jun 2016 13:17:01 +0300
Subject: [PATCH 2/2] Story#120095555 - glue nameserver may have IPv4 or IPv6

---
 app/models/domain.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index 5959cbb90..76cb23ff0 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -478,9 +478,11 @@ class Domain < ActiveRecord::Base
   def validate_nameserver_ips
     nameservers.to_a.reject(&:marked_for_destruction?).each do |ns|
       next unless ns.hostname.end_with?(".#{name}")
-      next if ns.ipv4.present?
+      next if ns.ipv4.present? || ns.ipv6.present?
+
       errors.add(:nameservers, :invalid) if errors[:nameservers].blank?
       ns.errors.add(:ipv4, :blank)
+      ns.errors.add(:ipv6, :blank)
     end
   end