Merge branch homebrew/master into linuxbrew/master

Conflicts: Formula/[email protected] Formula/yara.rb
dirker · Feb 23, 2019 · b199177 · b199177
2 parents c224d8e + 871dd9a
commit b199177
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 27 deletions.
diff --git a/Formula/petsc-complex.rb b/Formula/petsc-complex.rb
@@ -1,14 +1,13 @@
 class PetscComplex < Formula
   desc "Portable, Extensible Toolkit for Scientific Computation (complex)"
   homepage "https://www.mcs.anl.gov/petsc/"
-  url "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.9.3.tar.gz"
-  sha256 "8828fe1221f038d78a8eee3325cdb22ad1055a2f0671871815ee9f47365f93bb"
-  revision 1
+  url "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.10.3.tar.gz"
+  sha256 "f03650ea5592313dd2b8be7ae9cc498369da660185b58f9e98689a9bc355e982"
 
   bottle do
-    sha256 "b113b3d241bc68e0fd51ea56ef94d78a0833d0d41158f2cd39e8510f5cddbd69" => :mojave
-    sha256 "d7980bb61e3ef91e02981da9455a2c17e07cbae647467128b152aaf59834163c" => :high_sierra
-    sha256 "66d5f2aea2efc4cd1a05b141cf4d7c81aab9cbc01db4cf0506387dfb38eb7297" => :sierra
+    sha256 "02847e6c9dd9f824fe2ef4a704a6f0f20bf4aa971b66964e0ea86c5cbba3edab" => :mojave
+    sha256 "b42c6bc5a2271ce672b9bfb7e25c47812086070f3856057e5a9f9437d97c7f6e" => :high_sierra
+    sha256 "19cae6309c500a8cee88340e555ac3a5fc4252467bdf153b4ea35488347a45f8" => :sierra
   end
 
   depends_on "hdf5"
@@ -35,7 +34,7 @@ def install
   end
 
   test do
-    test_case = "#{share}/petsc/examples/ksp/ksp/examples/tutorials/ex1.c"
+    test_case = "#{share}/petsc/examples/src/ksp/ksp/examples/tutorials/ex1.c"
     system "mpicc", test_case, "-I#{include}", "-L#{lib}", "-lpetsc", "-o", "test"
     output = shell_output("./test")
     # This PETSc example prints several lines of output. The last line contains

diff --git a/Formula/petsc.rb b/Formula/petsc.rb
@@ -1,14 +1,13 @@
 class Petsc < Formula
   desc "Portable, Extensible Toolkit for Scientific Computation (real)"
   homepage "https://www.mcs.anl.gov/petsc/"
-  url "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.9.3.tar.gz"
-  sha256 "8828fe1221f038d78a8eee3325cdb22ad1055a2f0671871815ee9f47365f93bb"
-  revision 1
+  url "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.10.3.tar.gz"
+  sha256 "f03650ea5592313dd2b8be7ae9cc498369da660185b58f9e98689a9bc355e982"
 
   bottle do
-    sha256 "6e66ec170be825e239934665ef4cf7c29a15c80fa45b9f5416a2f035c858a4cb" => :mojave
-    sha256 "c24a7548da334ed9bac84119647d9ed4694c4c2f3078b5e6641806f1e2a9fc40" => :high_sierra
-    sha256 "7cb880e11b7da9784e3c8e2b9057090b9cacd8726f91bf5239f8f29366ef8017" => :sierra
+    sha256 "7a9684f27979ea878803363064fd351785a13c7c965f4cd6192c533f959ee412" => :mojave
+    sha256 "be00f6375f9f074284ab8c45ae2a147d5f285899bd90de946159b2e13cb0bd51" => :high_sierra
+    sha256 "e146b027cdda9d419476135b4a58a3b2a784d60cb0a0395663ef8f8ba1a58002" => :sierra
   end
 
   depends_on "hdf5"
@@ -35,7 +34,7 @@ def install
   end
 
   test do
-    test_case = "#{pkgshare}/examples/ksp/ksp/examples/tutorials/ex1.c"
+    test_case = "#{pkgshare}/examples/src/ksp/ksp/examples/tutorials/ex1.c"
     system "mpicc", test_case, "-I#{include}", "-L#{lib}", "-lpetsc", "-o", "test"
     output = shell_output("./test")
     # This PETSc example prints several lines of output. The last line contains

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -1,14 +1,13 @@
 class PhpAT71 < Formula
   desc "General-purpose scripting language"
   homepage "https://secure.php.net/"
-  url "https://php.net/get/php-7.1.25.tar.xz/from/this/mirror"
-  sha256 "0fd8dad1903cd0b2d615a1fe4209f99e53b7292403c8ffa1919c0f4dd1eada88"
+  url "https://php.net/get/php-7.1.26.tar.xz/from/this/mirror"
+  sha256 "10b7ae634c12852fae52a22dc2262e5f12418ad59fd20da2d00d71a212235d31"
 
   bottle do
-    sha256 "46df1961981fe57c163921f5ac363c1bcf2063993f654c45e7f7c731683bae56" => :mojave
-    sha256 "deee221834493c7dd87c0759c9ab3916f499a9761bb036270736b240f85c50f1" => :high_sierra
-    sha256 "fb1973b3ce2b9dde48ddd330052a25e72e37be13cd601b8a326bfc508db117ee" => :sierra
-    sha256 "8adcadc6773e4b763ab7c6ded3b335541c7bfeae709d531ca1ba951c79b3102b" => :x86_64_linux
+    sha256 "dbf95aea6a9d8a7ec374bb639f25d1cd6a4b89aa6d7228a4d4e5d7c6450b6dae" => :mojave
+    sha256 "be85308f59f525c7f81d9378195d04896c94728f5938325ef27fb189df39aec5" => :high_sierra
+    sha256 "71d49d3653487e3b93b3c90bc1aed65c4365642833163ddd0dc46d3222f279f2" => :sierra
   end
 
   keg_only :versioned_formula

diff --git a/Formula/yara.rb b/Formula/yara.rb
@@ -1,17 +1,15 @@
 class Yara < Formula
   desc "Malware identification and classification tool"
   homepage "https://github.com/VirusTotal/yara/"
-  url "https://github.com/VirusTotal/yara/archive/v3.8.1.tar.gz"
-  sha256 "283527711269354d3c60e2705f7f74b1f769d2d35ddba8f7f9ce97d0fd5cb1ca"
-  revision 2
+  url "https://github.com/VirusTotal/yara/archive/v3.9.0.tar.gz"
+  sha256 "ebe7fab0abadb90449a62afbd24e196e18b177efe71ffd8bf22df95c5386f64d"
   head "https://github.com/VirusTotal/yara.git"
 
   bottle do
     cellar :any
-    sha256 "c4e6608a2e5205b63d835b8344a813872631e4b0a65cb77408c8bef5cf35ece7" => :mojave
-    sha256 "f940993d4adfd540b0b4efcb5e924b3f9313b471654087b8d607a20baeb1e64f" => :high_sierra
-    sha256 "13f645957749f69a02800f53fcd52f49e9e83ee9c94fbf396481578991ded68a" => :sierra
-    sha256 "20e5a3b66ff3e1a4d19bc33b3073b9bc4c0df7d0cefcf0f761a8510873e5bb32" => :x86_64_linux
+    sha256 "ac12e1278c753e1a79cb3fdd4fad8df6c01026c0aa159089182a65dd688ca483" => :mojave
+    sha256 "ed092caa3603842d4f9daa48a36d173d79504ef6e22b7af85b8576dc75fca55f" => :high_sierra
+    sha256 "03f2077af95ec05e06bb09c704089e6c4c63fffcd06437fda01bcd2fea0d97d9" => :sierra
   end
 
   depends_on "autoconf" => :build