Don't link Homebrew OpenSSL, use env vars

aneeshusa · aneeshusa · commit 520adf237c42 · 2016-09-24T00:27:02.000-04:00
OpenSSL is a "keg-only crate", which Homebrew 1.0.0 won't link because
```
we may end up linking against the insecure, deprecated system OpenSSL
while using the headers from Homebrew's openssl.
```

Instead, use the `OPENSSL_INCLUDE_DIR` and `OPENSSL_LIB_DIR` to
explicitly pass the paths to the Homebrew OpenSSL. Note that these paths
are currently hardcoded because they are unlikely to change.

For some reason, Homebrew was reporting this error on its stderr
but Salt was not picking it up as and failing the state - possibly
because the exit status seems to have been 0.

saltfs-migration: Run `brew unlink --dry-run openssl` on the Mac
builders, then `brew unlink openssl` once confirming the output is as
expected. This will unlink openssl on the existing builders.
diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
@@ -64,6 +64,8 @@ def without(self, to_unset):
     'CARGO_HOME': '/Users/servo/.cargo',
     'CCACHE': '/usr/local/bin/ccache',
     'SERVO_CACHE_DIR': '/Users/servo/.servo',
+    'OPENSSL_INCLUDE_DIR': '/usr/local/opt/openssl/include',
+    'OPENSSL_LIB_DIR': '/usr/local/opt/openssl/lib',
 })
 
 
diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls
@@ -62,14 +62,6 @@ homebrew-link-autoconf:
     - require:
       - pkg: servo-dependencies
       - module: servo-darwin-homebrew-versions-dependencies
-
-homebrew-link-openssl:
-  cmd.run:
-    - name: 'brew link --force openssl'
-    - runas: {{ homebrew.user }}
-    - creates: /usr/local/Library/LinkedKegs/openssl
-    - require:
-      - pkg: servo-dependencies
 {% else %}
 multiverse:
   pkgrepo.managed:
