aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorDominyk Tiller2014-10-15 23:42:46 +0100
committerJack Nagel2014-10-16 00:09:00 -0500
commitf2103e246f1d7c58b7f7aba54f4c7683f2459c24 (patch)
treebf24a4e2ae831af728e9ac5efa6586555ea0e555 /Library
parent5e865042c5c312d87c64948c6759b11c1c2cef64 (diff)
downloadhomebrew-f2103e246f1d7c58b7f7aba54f4c7683f2459c24.tar.bz2
openssl: poodle fixes
Part 2 of the earlier merged POODLE fixes. It seems a few of the bottles are acting up about the new change, so this revisions those. If you build from source the problems go away, so new bottles it is. I’ve also had to change the mirror on the OpenSSL formula as it turns out Debian haven’t set their mirror up for the latest version yet. Revisions to Python, Python3, Tor, Ruby & Freeradius-server as all are being confirmed to be causing issues for others and reproducible. Tor needs to be bumped for every OpenSSL revision because it kicks up this error: ``` Oct 15 23:19:38.295 [warn] OpenSSL version from headers does not match the version we're running with. If you get weird crashes, that might be why. (Compiled with 1000109f: OpenSSL 1.0.1i 6 Aug 2014; running with 100010af: OpenSSL 1.0.1j 15 Oct 2014). ``` And similar with freeradius-server. Closes #33197. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/freeradius-server.rb2
-rw-r--r--Library/Formula/openssl.rb2
-rw-r--r--Library/Formula/python.rb8
-rw-r--r--Library/Formula/python3.rb3
-rw-r--r--Library/Formula/ruby.rb35
-rw-r--r--Library/Formula/tor.rb3
6 files changed, 28 insertions, 25 deletions
diff --git a/Library/Formula/freeradius-server.rb b/Library/Formula/freeradius-server.rb
index 16204c5b9..e9a1f396b 100644
--- a/Library/Formula/freeradius-server.rb
+++ b/Library/Formula/freeradius-server.rb
@@ -4,7 +4,7 @@ class FreeradiusServer < Formula
homepage "http://freeradius.org/"
url "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-2.2.5.tar.gz"
sha1 "4d18ed8ff3fde4a29112ecc07f175b774ed5f702"
- revision 1
+ revision 2
devel do
url "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.4.tar.bz2"
diff --git a/Library/Formula/openssl.rb b/Library/Formula/openssl.rb
index 429bdbe4f..85f0085a1 100644
--- a/Library/Formula/openssl.rb
+++ b/Library/Formula/openssl.rb
@@ -3,7 +3,7 @@ require "formula"
class Openssl < Formula
homepage "https://openssl.org"
url "https://www.openssl.org/source/openssl-1.0.1j.tar.gz"
- mirror "https://mirrors.kernel.org/debian/pool/main/o/openssl/openssl_1.0.1j.orig.tar.gz"
+ mirror "https://raw.githubusercontent.com/DomT4/LibreMirror/master/OpenSSL/openssl-1.0.1j.tar.gz"
sha256 "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3"
bottle do
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 2e8d48b53..575ca70d9 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -1,11 +1,11 @@
require "formula"
class Python < Formula
- homepage "http://www.python.org"
- head "http://hg.python.org/cpython", :using => :hg, :branch => "2.7"
- url "http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz"
+ homepage "https://www.python.org"
+ head "https://hg.python.org/cpython", :using => :hg, :branch => "2.7"
+ url "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz"
sha1 "511960dd78451a06c9df76509635aeec05b2051a"
- revision 1
+ revision 2
bottle do
revision 2
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index 799c6fa9f..5daebd336 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -4,6 +4,7 @@ class Python3 < Formula
homepage "https://www.python.org/"
url "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz"
sha1 "0727d8a8498733baabe6f51632b9bab0cbaa9ada"
+ revision 1
bottle do
sha1 "fd271aeeff5971fc8570b368603f85d551041df7" => :mavericks
@@ -13,7 +14,7 @@ class Python3 < Formula
VER="3.4" # The <major>.<minor> is used so often.
- head "http://hg.python.org/cpython", :using => :hg, :branch => VER
+ head "https://hg.python.org/cpython", :using => :hg, :branch => VER
option :universal
option "quicktest", "Run `make quicktest` after the build"
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index b3321d11c..a4e622e63 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -1,9 +1,10 @@
-require 'formula'
+require "formula"
class Ruby < Formula
- homepage 'https://www.ruby-lang.org/'
+ homepage "https://www.ruby-lang.org/"
url "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.3.tar.bz2"
sha256 "36ce72f84ae4129f6cc66e33077a79d87b018ea7bf1dbc3d353604bf006f76d6"
+ revision 1
bottle do
sha1 "34c2401deda99d4eebce57cb8322b023f3c444da" => :mavericks
@@ -12,23 +13,23 @@ class Ruby < Formula
end
head do
- url 'http://svn.ruby-lang.org/repos/ruby/trunk/'
+ url "http://svn.ruby-lang.org/repos/ruby/trunk/"
depends_on "autoconf" => :build
end
option :universal
- option 'with-suffix', 'Suffix commands with "21"'
- option 'with-doc', 'Install documentation'
- option 'with-tcltk', 'Install with Tcl/Tk support'
-
- depends_on 'pkg-config' => :build
- depends_on 'readline' => :recommended
- depends_on 'gdbm' => :optional
- depends_on 'gmp' => :optional
- depends_on 'libffi' => :optional
- depends_on 'libyaml'
- depends_on 'openssl'
- depends_on :x11 if build.with? 'tcltk'
+ option "with-suffix", "Suffix commands with '21'"
+ option "with-doc", "Install documentation"
+ option "with-tcltk", "Install with Tcl/Tk support"
+
+ depends_on "pkg-config" => :build
+ depends_on "readline" => :recommended
+ depends_on "gdbm" => :optional
+ depends_on "gmp" => :optional
+ depends_on "libffi" => :optional
+ depends_on "libyaml"
+ depends_on "openssl"
+ depends_on :x11 if build.with? "tcltk"
fails_with :llvm do
build 2326
@@ -70,7 +71,7 @@ class Ruby < Formula
system "./configure", *args
system "make"
- system "make install"
+ system "make", "install"
# Customize rubygems to look/install in the global gem directory
# instead of in the Cellar, making gems last across reinstalls
@@ -142,7 +143,7 @@ class Ruby < Formula
end
test do
- output = `#{bin}/ruby -e 'puts "hello"'`
+ output = `#{bin}/ruby -e "puts 'hello'"`
assert_equal "hello\n", output
assert_equal 0, $?.exitstatus
end
diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb
index 7b50f9c99..42f84961b 100644
--- a/Library/Formula/tor.rb
+++ b/Library/Formula/tor.rb
@@ -4,6 +4,7 @@ class Tor < Formula
homepage "https://www.torproject.org/"
url "https://www.torproject.org/dist/tor-0.2.4.24.tar.gz"
sha256 "99b15c6858c04e93a31d3ae90dd69f5021faa2237da93a24fbd246f4f1670ad1"
+ revision 1
bottle do
sha1 "67271d2324c78f04e83408d408bb32024fbc5741" => :mavericks
@@ -32,7 +33,7 @@ class Tor < Formula
"--prefix=#{prefix}",
"--sysconfdir=#{etc}",
"--with-openssl-dir=#{Formula["openssl"].opt_prefix}"
- system "make install"
+ system "make", "install"
if build.stable?
# (tor-ctrl removed in v0.2.5.5.)