Pull strategy for downloading from research.att.com into core

4 files changed, 14 insertions, 43 deletions

diff --git a/Library/Formula/ksh.rb b/Library/Formula/ksh.rb
index 7c040abc4..6e1ca653f 100644
--- a/Library/Formula/ksh.rb
+++ b/Library/Formula/ksh.rb
@@ -1,21 +1,9 @@
 require "formula"
 
-class KshDownloadStrategy < NoUnzipCurlDownloadStrategy
-  # AT&T requires the following credentials to "assent" to the OSS license.
-  def credentials
-    "I.accept.www.opensource.org.licenses.eclipse:."
-  end
-
-  def curl(*args)
-    args << "-u" << credentials
-    super
-  end
-end
-
 class Ksh < Formula
   homepage "http://www.kornshell.com"
   url  "http://www2.research.att.com/~astopen/download/tgz/ast-ksh.2012-08-01.tgz",
-    :using => KshDownloadStrategy
+    :using => AttResearchDownloadStrategy
   sha1 "316428e9937806183a134aa1669dea40c3a73695"
   version "93u+" # Versioning scheme: + means "+ patches", - means "beta/alpha".
 
@@ -29,7 +17,7 @@ class Ksh < Formula
 
   resource "init" do
     url "http://www2.research.att.com/~astopen/download/tgz/INIT.2012-08-01.tgz",
-      :using => KshDownloadStrategy
+      :using => AttResearchDownloadStrategy
     sha1 "0b472a615db384fe707042baaa3347dc1aa1c81e"
   end
 
@@ -54,8 +42,8 @@ class Ksh < Formula
   end
 
   def caveats; <<-EOS.undent
-    We have agreed to the Eclipse Public License on your behalf.
-    If this is unacceptable for any reason, please uninstall.
+    We agreed to the Eclipse Public License 1.0 for you.
+    If this is unacceptable you should uninstall.
     EOS
   end
 end
diff --git a/Library/Formula/vcodex.rb b/Library/Formula/vcodex.rb
index e78c00c57..3b201a78b 100644
--- a/Library/Formula/vcodex.rb
+++ b/Library/Formula/vcodex.rb
@@ -1,21 +1,9 @@
 require 'formula'
 
-class VcodexDownloadStrategy < CurlDownloadStrategy
-  # downloading from AT&T requires using the following credentials
-  def credentials
-    'I accept www.opensource.org/licenses/eclipse:.'
-  end
-
-  def curl(*args)
-    args << '--user' << credentials
-    super
-  end
-end
-
 class Vcodex < Formula
   homepage 'http://www2.research.att.com/~astopen/download/ref/vcodex/vcodex.html'
   url 'http://www2.research.att.com/~astopen/download/tgz/vcodex.2013-05-31.tgz',
-      :using => VcodexDownloadStrategy
+      :using => AttResearchDownloadStrategy
   sha1 '0423ee95b13069dd617c5f7625484a92d5068ea0'
   version '2013-05-31'
 
diff --git a/Library/Formula/vmalloc.rb b/Library/Formula/vmalloc.rb
index af019b124..30b2eb03d 100644
--- a/Library/Formula/vmalloc.rb
+++ b/Library/Formula/vmalloc.rb
@@ -1,21 +1,9 @@
 require 'formula'
 
-class VmallocDownloadStrategy < CurlDownloadStrategy
-  # downloading from AT&T requires using the following credentials
-  def credentials
-    'I accept www.opensource.org/licenses/cpl:.'
-  end
-
-  def curl(*args)
-    args << '--user' << credentials
-    super
-  end
-end
-
 class Vmalloc < Formula
   homepage 'http://www2.research.att.com/sw/download/'
   url 'http://www2.research.att.com/~gsf/download/tgz/vmalloc.2005-02-01.tgz',
-      :using => VmallocDownloadStrategy
+    :using => AttResearchDownloadStrategy
   sha1 '13e45960831226b2b2ac93cdbe23d1d4c6e7eb38'
   version '2005-02-01'
 
@@ -38,7 +26,7 @@ class Vmalloc < Formula
   end
 
   def caveats; <<-EOS.undent
-    We agreed to the OSI Common Public License Version 1.0 for you.
+    We agreed to the Eclipse Public License 1.0 for you.
     If this is unacceptable you should uninstall.
     EOS
   end
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index be9f7187f..24128f6b2 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -415,6 +415,13 @@ class S3DownloadStrategy < CurlDownloadStrategy
   end
 end
 
+class AttResearchDownloadStrategy < CurlDownloadStrategy
+  def curl(*args)
+    args << "--user" << "I accept www.opensource.org/licenses/eclipse:."
+    super
+  end
+end
+
 class SubversionDownloadStrategy < VCSDownloadStrategy
   def initialize(name, resource)
     super