Merge branch homebrew/master into linuxbrew/master

Conflicts: Formula/gitversion.rb Formula/nginx.rb Formula/php.rb Formula/[email protected] Formula/skaffold.rb Formula/t1utils.rb Formula/xrootd.rb Formula/you-get.rb Formula/zabbix.rb
a1ip · Oct 30, 2020 · c315c4b · c315c4b
2 parents fce7d78 + b27c3a0
commit c315c4b
Show file tree

Hide file tree

Showing 40 changed files with 129 additions and 119 deletions.
diff --git a/Formula/alsa-lib.rb b/Formula/alsa-lib.rb
@@ -1,7 +1,7 @@
 class AlsaLib < Formula
   desc "Provides audio and MIDI functionality to the Linux operating system"
   homepage "https://www.alsa-project.org/"
-  url "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.1.2.tar.bz2"
+  url "https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.2.tar.bz2"
   sha256 "958e260e3673f1f6ff6b2d2c0df3fc2e469bea5b2957163ce96ce17f23e87943"
   license "LGPL-2.1-or-later"
 

diff --git a/Formula/antiword.rb b/Formula/antiword.rb
@@ -2,6 +2,7 @@ class Antiword < Formula
   desc "Utility to read Word (.doc) files"
   homepage "http://www.winfield.demon.nl/"
   url "http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz"
+  mirror "https://fossies.org/linux/misc/old/antiword-0.37.tar.gz"
   sha256 "8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac"
 
   livecheck do

diff --git a/Formula/ape.rb b/Formula/ape.rb
@@ -1,6 +1,6 @@
 class Ape < Formula
   desc "Ajax Push Engine"
-  homepage "http://www.ape-project.org/"
+  homepage "https://web.archive.org/web/20200810042306/www.ape-project.org/"
   url "https://github.com/APE-Project/APE_Server/archive/v1.1.2.tar.gz"
   sha256 "c5f6ec0740f20dd5eb26c223149fc4bade3daadff02a851e2abb7e00be97db42"
   license "GPL-2.0"

diff --git a/Formula/cortex.rb b/Formula/cortex.rb
@@ -5,6 +5,11 @@ class Cortex < Formula
   sha256 "eba55bdb420d91da7c6cfc056172cb613298d3429439c175f044d58da4e0ecf7"
   license "Apache-2.0"
 
+  livecheck do
+    url "https://github.com/cortexproject/cortex/releases/latest"
+    regex(%r{href=.*?/tag/v?(\d+(?:\.\d+)+)["' >]}i)
+  end
+
   bottle do
     cellar :any_skip_relocation
     sha256 "c306a615e62d64102f4a9bd3a8a7fd9fd48f227cebb51ae605b585b35b36e341" => :catalina

diff --git a/Formula/cpl.rb b/Formula/cpl.rb
@@ -2,6 +2,7 @@ class Cpl < Formula
   desc "ISO-C libraries for developing astronomical data-reduction tasks"
   homepage "https://www.eso.org/sci/software/cpl/index.html"
   url "ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-7.1.2.tar.gz"
+  mirror "https://src.fedoraproject.org/repo/pkgs/cpl/cpl-7.1.2.tar.gz/sha512/0835917153fdcf4e7908f9261e143dc54fe7b50dc7903c2041a23a1984554b94a99584def70a792d9fe44a42830bc2baee397635ce922848d514a580be59348a/cpl-7.1.2.tar.gz"
   sha256 "b6d20752420e2333e86d9a08c24a08057351a9fef97c32f5894e63fbfece463a"
   revision 6
 

diff --git a/Formula/ctop.rb b/Formula/ctop.rb
@@ -3,14 +3,15 @@ class Ctop < Formula
   homepage "https://bcicen.github.io/ctop/"
   url "https://github.com/bcicen/ctop.git",
     tag:      "v0.7.4",
-    revision: "5b2d180f6007fb2a8387d0e821f3b80bcfc9a1cb"
+    revision: "426dd2c9854786bdfba7a55272256502849ccfb5"
   license "MIT"
 
   bottle do
     cellar :any_skip_relocation
-    sha256 "c6e714eb31bdaba6389494a4df3fb88f44a0c549f35ab91db4084a2be425c988" => :catalina
-    sha256 "6f770da2bb6f915aa4a39d6cd0788f601c86a693eafe37071da7e13fa9d3910b" => :mojave
-    sha256 "6fb6e94dd381f3313d964b81a3490c3025fb9e654945a22c5cb5c7705b8a5bf8" => :high_sierra
+    rebuild 1
+    sha256 "b84f39cf98350fdf2da48be62726e88c1b2d2aa9e5723793eac9c933390a3f14" => :catalina
+    sha256 "8daf376c6606f7c5ed72c12a5f9693f2783300b4357e83e340ea66dc49337e83" => :mojave
+    sha256 "624485ec30dde2d321702f37ca0506f91c4480ed1fe3d89e23c69c8996e26149" => :high_sierra
   end
 
   depends_on "go" => :build

diff --git a/Formula/dvc.rb b/Formula/dvc.rb
@@ -3,8 +3,8 @@ class Dvc < Formula
 
   desc "Git for data science projects"
   homepage "https://dvc.org"
-  url "https://github.com/iterative/dvc/archive/1.9.0.tar.gz"
-  sha256 "e02cdb918a5d47ce25f85b278efe3be8b3759785a176027a69523f631a7c1fb3"
+  url "https://github.com/iterative/dvc/archive/1.9.1.tar.gz"
+  sha256 "9488698a341719a5ea2baf3635871715c83c7b72081f81119ece8ce2b0a54ffd"
   license "Apache-2.0"
 
   livecheck do
@@ -14,9 +14,9 @@ class Dvc < Formula
 
   bottle do
     cellar :any
-    sha256 "b407a157cb7bd040fcc4116275d31f950b23595f6a95dd11e1376bcccd65eb41" => :catalina
-    sha256 "4d96704911fddd3b62167ab5ea7dc32c95c78bb4fbdc27f70615c93710e572cc" => :mojave
-    sha256 "ddfd4376a3c4dd8ccd53990a54e0e7a0268c09cfcd2305589490e73af75e6004" => :high_sierra
+    sha256 "d2ef06a7a28bf319c760958a451acb3dbda370dfd7eb045d7df35c3a3414e052" => :catalina
+    sha256 "b605eb003466dcee64ab53ada4b7bb9ec20dac685b417920b22336155aecb825" => :mojave
+    sha256 "807755d4a91d0fc6ac45f5193c61374e3050db441bb2e265629aed92efc51789" => :high_sierra
   end
 
   depends_on "pkg-config" => :build

diff --git a/Formula/fnm.rb b/Formula/fnm.rb
@@ -1,8 +1,8 @@
 class Fnm < Formula
   desc "Fast and simple Node.js version manager"
   homepage "https://fnm.vercel.app"
-  url "https://github.com/Schniz/fnm/archive/v1.22.4.tar.gz"
-  sha256 "36db29208285d94e271809fc9ae8df9e5e51bcb1dbfc3fa7a2d3e5daeb873204"
+  url "https://github.com/Schniz/fnm/archive/v1.22.5.tar.gz"
+  sha256 "79e988081a6be0df5bd1166666b63c230a77b62cd0a3a0e63289d13179d7f9ad"
   license "GPL-3.0-only"
   head "https://github.com/Schniz/fnm.git"
 
@@ -13,9 +13,9 @@ class Fnm < Formula
 
   bottle do
     cellar :any_skip_relocation
-    sha256 "6fcc2543c804fb12bdc67c97ed36e614d194b633ba167e1429ea3eb1c5ee2db7" => :catalina
-    sha256 "ec18cec1cf9b7c66a2d536649a73ac8951a6d092808fbf44d446aa40f9fa548b" => :mojave
-    sha256 "856837b496e77c6dfd5dd9b59382de0e93ea2f1a73617557a4edd1cada394958" => :high_sierra
+    sha256 "1bdb065c668202354082100cca945573022aa9b59e6e75e2068c952dfab697da" => :catalina
+    sha256 "9199d057fb6fc24da81b55253780f14251d86cb75019fbba30833ea2eca4d0e8" => :mojave
+    sha256 "ca941e17a0e0cc4095c41aa25ad90597c447b12ebfddeab681a3ed8d289bffcb" => :high_sierra
   end
 
   depends_on "rust" => :build

diff --git a/Formula/gitversion.rb b/Formula/gitversion.rb
@@ -1,15 +1,15 @@
 class Gitversion < Formula
   desc "Easy semantic versioning for projects using Git"
   homepage "https://gitversion.net"
-  url "https://github.com/GitTools/GitVersion/archive/5.3.7.tar.gz"
-  sha256 "70c6f867e4a85325ba1e54211fd014d9b3ec9be43bb828393e1f0d6a5e33cefb"
+  url "https://github.com/GitTools/GitVersion/archive/5.5.0.tar.gz"
+  sha256 "d4570bf2d08a49dd469f35159c7365333b24cd07d04ab9f00e628371949fb757"
   license "MIT"
 
   bottle do
     cellar :any
-    sha256 "807c000e45f4e0933fbc4295b55ce83ce4174bfb74a34c141fa2a42f863dc592" => :catalina
-    sha256 "bfb552cda166ba379fb8dbf5a4e0d2689959f4c21bd94a5da5872e37143babe8" => :mojave
-    sha256 "c88bbdf084a9bcd227d4e1f66b851aad65692e6d630bda57e703a6af925391d4" => :high_sierra
+    sha256 "aafbdba40a99693085eb43b73c1901ec25c5ce60f87bfe195becbb88ab70d907" => :catalina
+    sha256 "cd9169e8c0a4624f0cfb9c1c919d864726cad064856ba7c53da6e7e49fc7253a" => :mojave
+    sha256 "6fa6fbe0eb6dd8a7d226e655199321ffca584d78ab85fcb9c29ee9b1499076eb" => :high_sierra
   end
 
   depends_on "dotnet"
@@ -35,12 +35,14 @@ def install
 
     (testpath/"test.txt").write("test")
     system "git", "init"
+    system "git", "config", "user.name", "Test"
+    system "git", "config", "user.email", "[email protected]"
     system "git", "add", "test.txt"
     unless OS.mac?
       system "git", "config", "user.email", "[email protected]"
       system "git", "config", "user.name", "Your Name"
     end
-    system "git", "commit", "-q", "--author='Test <[email protected]>'", "--message='Test'"
+    system "git", "commit", "-q", "--message='Test'"
     assert_match '"FullSemVer":"0.1.0+0"', shell_output("#{bin}/gitversion -output json")
   end
 end
diff --git a/Formula/jove.rb b/Formula/jove.rb
@@ -1,7 +1,7 @@
 class Jove < Formula
   desc "Emacs-style editor with vi-like memory, CPU, and size requirements"
   homepage "https://directory.fsf.org/wiki/Jove"
-  url "http://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/jove4.16.0.73.tgz"
+  url "https://www.cs.toronto.edu/pub/hugh/jove-dev/jove4.16.0.73.tgz"
   mirror "https://ftp.openbsd.org/pub/OpenBSD/distfiles/jove4.16.0.73.tgz"
   sha256 "9c9e202607f5972c382098d10b63c815ac01e578f432626c982e6aa65000c630"
 

diff --git a/Formula/libdiscid.rb b/Formula/libdiscid.rb
@@ -2,11 +2,12 @@ class Libdiscid < Formula
   desc "C library for creating MusicBrainz and freedb disc IDs"
   homepage "https://musicbrainz.org/doc/libdiscid"
   url "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.6.2.tar.gz"
+  mirror "https://ftp.osuosl.org/pub/musicbrainz/libdiscid/libdiscid-0.6.2.tar.gz"
   sha256 "f9e443ac4c0dd4819c2841fcc82169a46fb9a626352cdb9c7f65dd3624cd31b9"
   license "LGPL-2.1"
 
   livecheck do
-    url "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/"
+    url "https://ftp.osuosl.org/pub/musicbrainz/libdiscid/"
     regex(/href=.*?libdiscid[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 

diff --git a/Formula/libmill.rb b/Formula/libmill.rb
@@ -2,6 +2,7 @@ class Libmill < Formula
   desc "Go-style concurrency in C"
   homepage "http://libmill.org/"
   url "http://libmill.org/libmill-1.18.tar.gz"
+  mirror "https://github.com/sustrik/libmill/raw/gh-pages/libmill-1.8.tar.gz"
   sha256 "12e538dbee8e52fd719a9a84004e0aba9502a6e62cd813223316a1e45d49577d"
   license "MIT"
   head "https://github.com/sustrik/libmill.git"

diff --git a/Formula/logtalk.rb b/Formula/logtalk.rb
@@ -6,6 +6,11 @@ class Logtalk < Formula
   sha256 "4c9149dc8b9c57e9cb78cbdb98fb8d9701ff2772fbc996a7e28c309324ef678b"
   license "Apache-2.0"
 
+  livecheck do
+    url "https://logtalk.org/download.html"
+    regex(/Latest stable version:.*?v?(\d+(?:\.\d+)+)/i)
+  end
+
   bottle do
     cellar :any_skip_relocation
     sha256 "6a178878387076d1b5df4ae68696be29f4a9a16ebb6046dd611085d96c362ae9" => :catalina

diff --git a/Formula/midnight-commander.rb b/Formula/midnight-commander.rb
@@ -2,11 +2,12 @@ class MidnightCommander < Formula
   desc "Terminal-based visual file manager"
   homepage "https://www.midnight-commander.org/"
   url "https://www.midnight-commander.org/downloads/mc-4.8.25.tar.xz"
+  mirror "https://ftp.osuosl.org/pub/midnightcommander/mc-4.8.25.tar.xz"
   sha256 "ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a"
   license "GPL-3.0"
 
   livecheck do
-    url "http://ftp.midnight-commander.org"
+    url "https://ftp.osuosl.org/pub/midnightcommander/"
     regex(/href=.*?mc[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 

diff --git a/Formula/mkvtomp4.rb b/Formula/mkvtomp4.rb
@@ -8,6 +8,11 @@ class Mkvtomp4 < Formula
   license "MIT"
   revision 2
 
+  livecheck do
+    url :stable
+    regex(/^mkvtomp4[._-]v?(\d+(?:\.\d+)+)$/i)
+  end
+
   bottle do
     cellar :any_skip_relocation
     sha256 "87db5af32a6a707a10c11280169dff12f9df3874f93428e49aa14cbfd88eb313" => :catalina

diff --git a/Formula/mytop.rb b/Formula/mytop.rb
@@ -1,7 +1,7 @@
 class Mytop < Formula
   desc "Top-like query monitor for MySQL"
-  homepage "http://www.mysqlfanboy.com/mytop-3/"
-  url "http://www.mysqlfanboy.com/mytop-3/mytop-1.9.1.tar.gz"
+  homepage "https://web.archive.org/web/20200221154243/www.mysqlfanboy.com/mytop-3/"
+  url "https://web.archive.org/web/20150602163826/www.mysqlfanboy.com/mytop-3/mytop-1.9.1.tar.gz"
   mirror "https://deb.debian.org/debian/pool/main/m/mytop/mytop_1.9.1.orig.tar.gz"
   sha256 "179d79459d0013ab9cea2040a41c49a79822162d6e64a7a85f84cdc44828145e"
   revision 8

diff --git a/Formula/nginx.rb b/Formula/nginx.rb
@@ -3,8 +3,8 @@ class Nginx < Formula
   homepage "https://nginx.org/"
   # Use "mainline" releases only (odd minor version number), not "stable"
   # See https://www.nginx.com/blog/nginx-1-12-1-13-released/ for why
-  url "https://nginx.org/download/nginx-1.19.3.tar.gz"
-  sha256 "91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0"
+  url "https://nginx.org/download/nginx-1.19.4.tar.gz"
+  sha256 "61df546927905a0d624f9396bb7a8bc7ca7fd26522ce9714d56a78b73284000e"
   license "BSD-2-Clause"
   head "https://hg.nginx.org/nginx/", using: :hg
 
@@ -14,10 +14,9 @@ class Nginx < Formula
   end
 
   bottle do
-    sha256 "4642d6fefcdda58a88085a85f44c8ab050006249107aea3865379d0b8c2f7663" => :catalina
-    sha256 "e1e69396a87602a769b12fc90a150b09354120c78d3d3eaeebe625e54ff4902e" => :mojave
-    sha256 "7725a0a0baf20219902c402b7057c80ef879fa5002cc653678bd5ddfae92e043" => :high_sierra
-    sha256 "753e27a8616bcb8399410114415036926f85e67cb2d02ed03797ce3f5d671e76" => :x86_64_linux
+    sha256 "ba06157261435dbc64d363398480866855f7cb2ad0296138fcce864abf570aaf" => :catalina
+    sha256 "7e99a7583a9ca640e06d9d6a608ec1c0d5ab6374485ba631c7d556dcd5e1a7f8" => :mojave
+    sha256 "8fd77f248cf8a66c88334cde60b862d50d73d101987e080598477d6da301abfe" => :high_sierra
   end
 
   depends_on "[email protected]"

diff --git a/Formula/node-build.rb b/Formula/node-build.rb
@@ -1,8 +1,8 @@
 class NodeBuild < Formula
   desc "Install NodeJS versions"
   homepage "https://github.com/nodenv/node-build"
-  url "https://github.com/nodenv/node-build/archive/v4.9.14.tar.gz"
-  sha256 "fffbf0ffe2389804568e5756dc17bf57a25354944d76864976f6a54825c72e2a"
+  url "https://github.com/nodenv/node-build/archive/v4.9.15.tar.gz"
+  sha256 "045b7cf8bf9a102e7a016dc431fd3100248c823fd3e45ff601fe3b9056a8b62d"
   license "MIT"
   head "https://github.com/nodenv/node-build.git"
 

diff --git a/Formula/parrot.rb b/Formula/parrot.rb
@@ -6,6 +6,7 @@ class Parrot < Formula
 
   stable do
     url "http://ftp.parrot.org/releases/supported/8.1.0/parrot-8.1.0.tar.bz2"
+    mirror "https://ftp.osuosl.org/pub/parrot/releases/supported/8.1.0/parrot-8.1.0.tar.bz2"
     sha256 "caf356acab64f4ea50595a846808e81d0be8ada8267afbbeb66ddb3c93cb81d3"
 
     # remove at 8.2.0, already in HEAD

diff --git a/Formula/passenger.rb b/Formula/passenger.rb
@@ -4,14 +4,14 @@ class Passenger < Formula
   url "https://github.com/phusion/passenger/releases/download/release-6.0.6/passenger-6.0.6.tar.gz"
   sha256 "fbf89ebfacc079bdf6466567eabc9eb741a5abd8f230133311f7a40fff763842"
   license "MIT"
-  revision 2
+  revision 3
   head "https://github.com/phusion/passenger.git", branch: "stable-6.0"
 
   bottle do
     cellar :any
-    sha256 "d2276b41d2d3fbcbf98627083a47ea507ec87902f10caf08b5992297ba8b0e41" => :catalina
-    sha256 "3051d187b0aa3d6099819447899d25fe0cbe55997d453823be7102b9a9df90c5" => :mojave
-    sha256 "c5e5ec2ca304fde4469c076c3959435680fd40b9ca4a0e2b6ca6c27851ceef19" => :high_sierra
+    sha256 "981be00766b5ccf5d3aba017f8b86437d0647273fa0538a2e28af1f9f1b16e5a" => :catalina
+    sha256 "0d85e5e8181c01f157bc29203aa52b0ca5a98bce240f3a6ac5304992ef881bbe" => :mojave
+    sha256 "ce06d73e514abe034e7e3e73bbb0a2a71f92fcb9453e04c071514da53b5c0af7" => :high_sierra
   end
 
   # to build nginx module

diff --git a/Formula/php.rb b/Formula/php.rb
@@ -2,9 +2,9 @@ class Php < Formula
   desc "General-purpose scripting language"
   homepage "https://www.php.net/"
   # Should only be updated if the new version is announced on the homepage, https://www.php.net/
-  url "https://www.php.net/distributions/php-7.4.11.tar.xz"
-  mirror "https://fossies.org/linux/www/php-7.4.11.tar.xz"
-  sha256 "5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce"
+  url "https://www.php.net/distributions/php-7.4.12.tar.xz"
+  mirror "https://fossies.org/linux/www/php-7.4.12.tar.xz"
+  sha256 "e82d2bcead05255f6b7d2ff4e2561bc334204955820cabc2457b5239fde96b76"
   license "PHP-3.01"
 
   livecheck do
@@ -13,10 +13,9 @@ class Php < Formula
   end
 
   bottle do
-    sha256 "494b05d2febe3bee62d4a8005be46a393f2543698f5b4f03d91d1973465f718a" => :catalina
-    sha256 "65d655c96ef35ef6f40209b0b1773226da890cb8cb900a1641f6a1206e18b8b4" => :mojave
-    sha256 "907959a1d23ddada77d2e201ff4e18d594017478aa3415ca075486ebf9d46046" => :high_sierra
-    sha256 "ac02937d2d4c925609829fa1769c1119715967bdfc9277ccf6bd7d852fd7913c" => :x86_64_linux
+    sha256 "d39510178db7866bc6a7b857c379e3ddf091f5bfdde9f9ae5c895baa507d685b" => :catalina
+    sha256 "315b551456d25cf1fee37a302ac9fa80ccbc3ba138282db0cca29f6526395fec" => :mojave
+    sha256 "ae650360d6b704a2d96bdaaf2bd9d87512629ef6a442ec6480a828a53de91318" => :high_sierra
   end
 
   head do

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -2,16 +2,15 @@ class PhpAT73 < Formula
   desc "General-purpose scripting language"
   homepage "https://www.php.net/"
   # Should only be updated if the new version is announced on the homepage, https://www.php.net/
-  url "https://www.php.net/distributions/php-7.3.23.tar.xz"
-  mirror "https://fossies.org/linux/www/php-7.3.23.tar.xz"
-  sha256 "2bdd36176f318f451fb3942bf1e935aabb3c2786cac41a9080f084ad6390e034"
+  url "https://www.php.net/distributions/php-7.3.24.tar.xz"
+  mirror "https://fossies.org/linux/www/php-7.3.24.tar.xz"
+  sha256 "78b0b417a147ab7572c874334d11654e3c61ec5b3f2170098e5db02fb0c89888"
   license "PHP-3.01"
 
   bottle do
-    sha256 "3bc9673e3f240fa3ad2351ab0a645bde05a6681187d967985149aeae6e42e3c7" => :catalina
-    sha256 "f41cacf733ec64dd801196f377f89d544b22943a5eea7c0379a2d51f0a3c0b7f" => :mojave
-    sha256 "cdebfd637f6260359df06e5357c8966ec8e474037001f22ff7698ac6410b83b0" => :high_sierra
-    sha256 "26c50c3bfc8c793b3b8bfa49b331bf73ab9de1064f821486089af32007c92ef5" => :x86_64_linux
+    sha256 "29b42a38b6bedf97c76862dbb62529204f37722023cefc5f003d6ed9a80661f8" => :catalina
+    sha256 "5b6a98cd74dcba4b24270849e090507f9de3a73e5d2aacd840ee9bf51ec1f781" => :mojave
+    sha256 "d04aff49e077579a8161480a6f7cbc1196570cda5097b795a2b1a3d7911697ac" => :high_sierra
   end
 
   keg_only :versioned_formula
@@ -51,13 +50,6 @@ class PhpAT73 < Formula
   uses_from_macos "libxslt"
   uses_from_macos "zlib"
 
-  # Fix build issues with Xcode 12.
-  # see https://bugs.php.net/bug.php?id=80171
-  patch do
-    url "https://github.com/php/php-src/commit/aa405b7da270595d349d0596ad31305a41d4b1c0.patch?full_index=1"
-    sha256 "4c51e35fd936a7f3f5613c72e6395b9afa8f569061c00849683e09e8fe986a0f"
-  end
-
   # PHP build system incorrectly links system libraries
   # see https://github.com/php/php-src/pull/3472
   patch :DATA if OS.mac?

diff --git a/Formula/popt.rb b/Formula/popt.rb
@@ -2,10 +2,11 @@ class Popt < Formula
   desc "Library like getopt(3) with a number of enhancements"
   homepage "https://github.com/rpm-software-management/popt"
   url "http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz"
+  mirror "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-1.18.tar.gz"
   sha256 "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1"
   license "MIT"
 
-  # The stable archive is found at http://ftp.rpm.org/popt/releases/popt-1.x/
+  # The stable archive is found at https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/
   # but it's unclear whether this would be a reliable check in the long term.
   # We're simply checking the Git repository tags for the moment, as we
   # shouldn't encounter problems with this method.

diff --git a/Formula/proftpd.rb b/Formula/proftpd.rb
@@ -1,7 +1,7 @@
 class Proftpd < Formula
   desc "Highly configurable GPL-licensed FTP server software"
   homepage "http://www.proftpd.org/"
-  url "ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7a.tar.gz"
+  url "https://github.com/proftpd/proftpd/archive/v1.3.7a.tar.gz"
   mirror "https://fossies.org/linux/misc/proftpd-1.3.7a.tar.gz"
   mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/proftpd/proftpd-1.3.7a.tar.gz"
   sha256 "8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -55,6 +55,7 @@ class PythonAT39 < Formula
   link_overwrite "bin/wheel3"
   link_overwrite "share/man/man1/python3.1"
   link_overwrite "lib/pkgconfig/python3.pc"
+  link_overwrite "lib/pkgconfig/python3-embed.pc"
   link_overwrite "Frameworks/Python.framework/Headers"
   link_overwrite "Frameworks/Python.framework/Python"
   link_overwrite "Frameworks/Python.framework/Resources"

diff --git a/Formula/rc.rb b/Formula/rc.rb
@@ -1,7 +1,7 @@
 class Rc < Formula
   desc "Implementation of the AT&T Plan 9 shell"
   homepage "http://doc.cat-v.org/plan_9/4th_edition/papers/rc"
-  url "http://static.tobold.org/rc/rc-1.7.4.tar.gz"
+  url "https://web.archive.org/web/20200227085442/static.tobold.org/rc/rc-1.7.4.tar.gz"
   mirror "https://src.fedoraproject.org/repo/extras/rc/rc-1.7.4.tar.gz/f99732d7a8be3f15f81e99c3af46dc95/rc-1.7.4.tar.gz"
   sha256 "5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8"