From ca005cb8245e7e12ad808d78d49bce3953e1153c Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@github.com>
Date: Tue, 5 Jul 2016 11:02:16 +1000
Subject: [PATCH] doctor: check for beta XQuartz releases
Beta versions of XQuartz have address sanitization enabled, which
breaks some software at runtime, including wine.
Closes Homebrew/homebrew-core#2481.
Closes #459.
Signed-off-by: Misty De Meo <mistydemeo@github.com>
---
Library/Homebrew/extend/os/mac/diagnostic.rb | 12 ++++++++++++
Library/Homebrew/test/test_diagnostic.rb | 5 +++++
2 files changed, 17 insertions(+)
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 37c1efdc2f..00a297d34b 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -312,6 +312,18 @@ module Homebrew
https://xquartz.macosforge.org
EOS
end
+
+ def check_for_beta_xquartz
+ return unless MacOS::XQuartz.version.include? "beta"
+
+ <<-EOS.undent
+ The following beta release of XQuartz is installed: #{MacOS::XQuartz.version}
+
+ XQuartz beta releases include address sanitization, and do not work with
+ all software; notably, wine will not work with beta releases of XQuartz.
+ We recommend only installing stable releases of XQuartz.
+ EOS
+ end
end
end
end
diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test_diagnostic.rb
index ef82da6dc7..0e0d110e7e 100644
--- a/Library/Homebrew/test/test_diagnostic.rb
+++ b/Library/Homebrew/test/test_diagnostic.rb
@@ -226,4 +226,9 @@ class DiagnosticChecksTest < Homebrew::TestCase
end
end
end
+
+ def test_check_for_beta_xquartz
+ MacOS::XQuartz.stubs(:version).returns("2.7.10_beta2")
+ assert_match "The following beta release of XQuartz is installed: 2.7.10_beta2", @checks.check_for_beta_xquartz
+ end
end
--
GitLab