From 466f3b066539529f83ea1cb6eeacf4deabc9c876 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 4 Nov 2014 04:01:10 +0000 Subject: [PATCH] tuntap: recommend upstream signed binary. We have an upstream signed binary available! Big big love to Mattias for this. This PR converts all the existing tuntap dependencies into binary-friendly tuntap dependencies, and adds a tuntap dependency to requirements to look for the kexts. Closes Homebrew/homebrew#33894. Signed-off-by: Mike McQuaid --- Formula/iodine.rb | 2 +- Formula/miredo.rb | 2 +- Formula/openvpn.rb | 7 ++++--- Formula/peervpn.rb | 2 +- Formula/shrewsoft-vpn-client.rb | 2 +- Formula/vpnc.rb | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Formula/iodine.rb b/Formula/iodine.rb index e08782a9dcd1a..15d603e8fc37c 100644 --- a/Formula/iodine.rb +++ b/Formula/iodine.rb @@ -12,7 +12,7 @@ class Iodine < Formula sha1 "1afe02179eaa83f66382eaf296023c574e351f79" => :lion end - depends_on "tuntap" + depends_on :tuntap def install system "make", "install", "prefix=#{prefix}" diff --git a/Formula/miredo.rb b/Formula/miredo.rb index c4e8145d9ee10..2937bbde180bf 100644 --- a/Formula/miredo.rb +++ b/Formula/miredo.rb @@ -5,7 +5,7 @@ class Miredo < Formula url "http://www.remlab.net/files/miredo/miredo-1.2.6.tar.xz" sha1 "630c84e9919952f6f4792ceda54a12e0aef43bbf" - depends_on "tuntap" + depends_on :tuntap depends_on "judy" patch :DATA diff --git a/Formula/openvpn.rb b/Formula/openvpn.rb index a8815ec524f12..7bbaa6ba48865 100644 --- a/Formula/openvpn.rb +++ b/Formula/openvpn.rb @@ -14,7 +14,7 @@ class Openvpn < Formula end depends_on "lzo" - depends_on "tuntap" + depends_on :tuntap depends_on "openssl" def install @@ -41,8 +41,9 @@ def install end def caveats; <<-EOS.undent - Make sure to follow the directions given by `brew info tuntap` - before trying to use OpenVPN. + If you have installed the Tuntap dependency as a source package you will + need to follow the instructions found in `brew info tuntap`. If you have + installed the binary Tuntap package, no further action is necessary. For OpenVPN to work as a server, you will need to create configuration file in #{etc}/openvpn, samples can be found in #{share}/doc/openvpn diff --git a/Formula/peervpn.rb b/Formula/peervpn.rb index 266581ec71f16..37ed58bd1b393 100644 --- a/Formula/peervpn.rb +++ b/Formula/peervpn.rb @@ -7,7 +7,7 @@ class Peervpn < Formula sha1 "45f815445a2d654e2da56de965633743d25f3468" depends_on "openssl" - depends_on "tuntap" + depends_on :tuntap patch :DATA if MacOS.version == :snow_leopard diff --git a/Formula/shrewsoft-vpn-client.rb b/Formula/shrewsoft-vpn-client.rb index 5b93d46da01e5..28859a7f5db98 100644 --- a/Formula/shrewsoft-vpn-client.rb +++ b/Formula/shrewsoft-vpn-client.rb @@ -20,7 +20,7 @@ class ShrewsoftVpnClient < Formula depends_on "cmake" => :build depends_on "openssl" - depends_on "tuntap" + depends_on :tuntap depends_on "qt" if build.with? "gui" def install diff --git a/Formula/vpnc.rb b/Formula/vpnc.rb index 986512605c195..d7174362d6bf6 100644 --- a/Formula/vpnc.rb +++ b/Formula/vpnc.rb @@ -11,7 +11,7 @@ class Vpnc < Formula depends_on "libgcrypt" depends_on "libgpg-error" depends_on "gnutls" - depends_on "tuntap" + depends_on :tuntap fails_with :llvm do build 2334