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 #33894.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

9 files changed, 24 insertions, 8 deletions

diff --git a/Library/Formula/iodine.rb b/Library/Formula/iodine.rb
index e08782a9d..15d603e8f 100644
--- a/Library/Formula/iodine.rb
+++ b/Library/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/Library/Formula/miredo.rb b/Library/Formula/miredo.rb
index c4e8145d9..2937bbde1 100644
--- a/Library/Formula/miredo.rb
+++ b/Library/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/Library/Formula/openvpn.rb b/Library/Formula/openvpn.rb
index a8815ec52..7bbaa6ba4 100644
--- a/Library/Formula/openvpn.rb
+++ b/Library/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 @@ class Openvpn < Formula
   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/Library/Formula/peervpn.rb b/Library/Formula/peervpn.rb
index 266581ec7..37ed58bd1 100644
--- a/Library/Formula/peervpn.rb
+++ b/Library/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/Library/Formula/shrewsoft-vpn-client.rb b/Library/Formula/shrewsoft-vpn-client.rb
index 5b93d46da..28859a7f5 100644
--- a/Library/Formula/shrewsoft-vpn-client.rb
+++ b/Library/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/Library/Formula/vpnc.rb b/Library/Formula/vpnc.rb
index 986512605..d7174362d 100644
--- a/Library/Formula/vpnc.rb
+++ b/Library/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
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 1641c71e6..b7bd1376b 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -120,6 +120,7 @@ class DependencyCollector
     when :python3    then Python3Dependency.new(tags)
     when :java       then JavaDependency.new(tags)
     when :osxfuse    then OsxfuseDependency.new(tags)
+    when :tuntap     then TuntapDependency.new(tags)
     # Tiger's ld is too old to properly link some software
     when :ld64       then LD64Dependency.new if MacOS.version < :leopard
     when :ant        then ant_dep(spec, tags)
diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index 7dcd5039f..d387d3871 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -6,6 +6,7 @@ require 'requirements/maximum_macos_requirement'
 require 'requirements/mpi_dependency'
 require 'requirements/osxfuse_dependency'
 require 'requirements/python_dependency'
+require 'requirements/tuntap_dependency'
 require 'requirements/unsigned_kext_requirement'
 require 'requirements/x11_dependency'
 
diff --git a/Library/Homebrew/requirements/tuntap_dependency.rb b/Library/Homebrew/requirements/tuntap_dependency.rb
new file mode 100644
index 000000000..cf306b5cd
--- /dev/null
+++ b/Library/Homebrew/requirements/tuntap_dependency.rb
@@ -0,0 +1,13 @@
+require "requirement"
+
+class TuntapDependency < Requirement
+  fatal true
+  default_formula "tuntap"
+  satisfy { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
+
+  def self.binary_tuntap_installed?
+    File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext")
+    File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tun.plist")
+    File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tap.plist")
+  end
+end