From 3553fd197b070589eeb656d1d5dc55ae77d68087 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 2 Jul 2021 10:04:24 +0200 Subject: [PATCH] pacman-mirrors: add a universal mirrorlist file for all mingw repos --- pacman-mirrors/PKGBUILD | 37 ++++++++++++++++--------------- pacman-mirrors/mirrorlist.clang32 | 30 ------------------------- pacman-mirrors/mirrorlist.clang64 | 30 ------------------------- pacman-mirrors/mirrorlist.mingw | 30 +++++++++++++++++++++++++ pacman-mirrors/mirrorlist.mingw32 | 30 ------------------------- pacman-mirrors/mirrorlist.mingw64 | 30 ------------------------- pacman-mirrors/mirrorlist.ucrt64 | 30 ------------------------- 7 files changed, 49 insertions(+), 168 deletions(-) delete mode 100644 pacman-mirrors/mirrorlist.clang32 delete mode 100644 pacman-mirrors/mirrorlist.clang64 create mode 100644 pacman-mirrors/mirrorlist.mingw delete mode 100644 pacman-mirrors/mirrorlist.mingw32 delete mode 100644 pacman-mirrors/mirrorlist.mingw64 delete mode 100644 pacman-mirrors/mirrorlist.ucrt64 diff --git a/pacman-mirrors/PKGBUILD b/pacman-mirrors/PKGBUILD index 1e23328b..b0846fa5 100644 --- a/pacman-mirrors/PKGBUILD +++ b/pacman-mirrors/PKGBUILD @@ -1,26 +1,19 @@ # Maintainer: Ray Donnelly pkgname=pacman-mirrors -pkgver=20210627 -pkgrel=2 +pkgver=20210702 +pkgrel=1 pkgdesc="MSYS2 mirror list for use by pacman" arch=('any') url="https://www.msys2.org/dev/mirrors/" license=('GPL') source=(mirrorlist.msys - mirrorlist.mingw32 - mirrorlist.mingw64 - mirrorlist.ucrt64 - mirrorlist.clang64 - mirrorlist.clang32) + mirrorlist.mingw) sha256sums=('1264eadb0824b9d9e1ae797c5ec962aa3101ca465ed3256422c8ef2bb72bc580' - '296efdc283dafb5bee365eb6b66556604f80bb1caf7562c1c844a6202afa6870' - '90b35c5e2da48751115187b365b9fe9e764f7196a5e6c2f1d0eff3432618f58f' - 'd2af391d40fa38bd069526202e4456e7a3ffaa0b0c8e97d3fcf7c6d4a8e973fa' - '62858a96eb0177093206c42c3f11cf44a2c482f7eb0f75b7cd1626ee5becac49' - '20087ffc8afee8654a3d7f9eb623e23f45447b2dc3aaa661c6e35c2b62f3fef8') + '9c28815f465a382ce564936f99ca8ed6727a9063a0611f335709964b7502f7b3') backup=( - 'etc/pacman.d/mirrorlist.msys' + 'etc/pacman.d/mirrorlist.msys' + 'etc/pacman.d/mirrorlist.mingw' 'etc/pacman.d/mirrorlist.mingw32' 'etc/pacman.d/mirrorlist.mingw64' 'etc/pacman.d/mirrorlist.ucrt64' @@ -30,9 +23,17 @@ backup=( package() { mkdir -p ${pkgdir}/etc/pacman.d install -m644 ${srcdir}/mirrorlist.msys ${pkgdir}/etc/pacman.d/ - install -m644 ${srcdir}/mirrorlist.mingw32 ${pkgdir}/etc/pacman.d/ - install -m644 ${srcdir}/mirrorlist.mingw64 ${pkgdir}/etc/pacman.d/ - install -m644 ${srcdir}/mirrorlist.ucrt64 ${pkgdir}/etc/pacman.d/ - install -m644 ${srcdir}/mirrorlist.clang64 ${pkgdir}/etc/pacman.d/ - install -m644 ${srcdir}/mirrorlist.clang32 ${pkgdir}/etc/pacman.d/ + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/ + + # For backwards compatibility + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/mirrorlist.mingw32 + sed -s 's|$repo|i686|g' -i ${pkgdir}/etc/pacman.d/mirrorlist.mingw32 + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/mirrorlist.mingw64 + sed -s 's|$repo|x86_64|g' -i ${pkgdir}/etc/pacman.d/mirrorlist.mingw64 + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/mirrorlist.ucrt64 + sed -s 's|$repo|ucrt64|g' -i ${pkgdir}/etc/pacman.d/mirrorlist.ucrt64 + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/mirrorlist.clang64 + sed -s 's|$repo|clang64|g' -i ${pkgdir}/etc/pacman.d/mirrorlist.clang64 + install -m644 ${srcdir}/mirrorlist.mingw ${pkgdir}/etc/pacman.d/mirrorlist.clang32 + sed -s 's|$repo|clang32|g' -i ${pkgdir}/etc/pacman.d/mirrorlist.clang32 } diff --git a/pacman-mirrors/mirrorlist.clang32 b/pacman-mirrors/mirrorlist.clang32 deleted file mode 100644 index 47b7d791..00000000 --- a/pacman-mirrors/mirrorlist.clang32 +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.msys2.org/dev/mirrors - -## Primary -Server = https://mirror.msys2.org/mingw/clang32/ -Server = https://repo.msys2.org/mingw/clang32/ - -## Tier 1 -Server = https://mirror.yandex.ru/mirrors/msys2/mingw/clang32/ -Server = https://download.nus.edu.sg/mirror/msys2/mingw/clang32/ -Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/clang32/ -Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/clang32/ -Server = https://ftp.osuosl.org/pub/msys2/mingw/clang32/ -Server = https://mirror.clarkson.edu/msys2/mingw/clang32/ -Server = https://mirror.selfnet.de/msys2/mingw/clang32/ -Server = https://mirror.ufro.cl/msys2/mingw/clang32/ -Server = https://mirrors.dotsrc.org/msys2/mingw/clang32/ -Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/clang32/ -Server = https://mirrors.ustc.edu.cn/msys2/mingw/clang32/ - -## Tier 2 -Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/clang32/ -Server = https://fastmirror.pp.ua/msys2/mingw/clang32/ -Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/clang32/ -Server = https://mirror.jmu.edu/pub/msys2/mingw/clang32/ -Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/clang32/ -Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang32/ -Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/clang32/ -Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/clang32/ -Server = https://mirrors.bit.edu.cn/msys2/mingw/clang32/ -Server = https://repo.casualgamer.ca/mingw/clang32/ diff --git a/pacman-mirrors/mirrorlist.clang64 b/pacman-mirrors/mirrorlist.clang64 deleted file mode 100644 index e55783cd..00000000 --- a/pacman-mirrors/mirrorlist.clang64 +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.msys2.org/dev/mirrors - -## Primary -Server = https://mirror.msys2.org/mingw/clang64/ -Server = https://repo.msys2.org/mingw/clang64/ - -## Tier 1 -Server = https://mirror.yandex.ru/mirrors/msys2/mingw/clang64/ -Server = https://download.nus.edu.sg/mirror/msys2/mingw/clang64/ -Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/clang64/ -Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/clang64/ -Server = https://ftp.osuosl.org/pub/msys2/mingw/clang64/ -Server = https://mirror.clarkson.edu/msys2/mingw/clang64/ -Server = https://mirror.selfnet.de/msys2/mingw/clang64/ -Server = https://mirror.ufro.cl/msys2/mingw/clang64/ -Server = https://mirrors.dotsrc.org/msys2/mingw/clang64/ -Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/clang64/ -Server = https://mirrors.ustc.edu.cn/msys2/mingw/clang64/ - -## Tier 2 -Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/clang64/ -Server = https://fastmirror.pp.ua/msys2/mingw/clang64/ -Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/clang64/ -Server = https://mirror.jmu.edu/pub/msys2/mingw/clang64/ -Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/clang64/ -Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang64/ -Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/clang64/ -Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/clang64/ -Server = https://mirrors.bit.edu.cn/msys2/mingw/clang64/ -Server = https://repo.casualgamer.ca/mingw/clang64/ diff --git a/pacman-mirrors/mirrorlist.mingw b/pacman-mirrors/mirrorlist.mingw new file mode 100644 index 00000000..eba6f69d --- /dev/null +++ b/pacman-mirrors/mirrorlist.mingw @@ -0,0 +1,30 @@ +# See https://www.msys2.org/dev/mirrors + +## Primary +Server = https://mirror.msys2.org/mingw/$repo/ +Server = https://repo.msys2.org/mingw/$repo/ + +## Tier 1 +Server = https://mirror.yandex.ru/mirrors/msys2/mingw/$repo/ +Server = https://download.nus.edu.sg/mirror/msys2/mingw/$repo/ +Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/$repo/ +Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/$repo/ +Server = https://ftp.osuosl.org/pub/msys2/mingw/$repo/ +Server = https://mirror.clarkson.edu/msys2/mingw/$repo/ +Server = https://mirror.selfnet.de/msys2/mingw/$repo/ +Server = https://mirror.ufro.cl/msys2/mingw/$repo/ +Server = https://mirrors.dotsrc.org/msys2/mingw/$repo/ +Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.ustc.edu.cn/msys2/mingw/$repo/ + +## Tier 2 +Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/$repo/ +Server = https://fastmirror.pp.ua/msys2/mingw/$repo/ +Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/$repo/ +Server = https://mirror.jmu.edu/pub/msys2/mingw/$repo/ +Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/$repo/ +Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/$repo/ +Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/$repo/ +Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.bit.edu.cn/msys2/mingw/$repo/ +Server = https://repo.casualgamer.ca/mingw/$repo/ diff --git a/pacman-mirrors/mirrorlist.mingw32 b/pacman-mirrors/mirrorlist.mingw32 deleted file mode 100644 index 9b4ccb07..00000000 --- a/pacman-mirrors/mirrorlist.mingw32 +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.msys2.org/dev/mirrors - -## Primary -Server = https://mirror.msys2.org/mingw/i686/ -Server = https://repo.msys2.org/mingw/i686/ - -## Tier 1 -Server = https://mirror.yandex.ru/mirrors/msys2/mingw/i686/ -Server = https://download.nus.edu.sg/mirror/msys2/mingw/i686/ -Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/i686/ -Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/i686/ -Server = https://ftp.osuosl.org/pub/msys2/mingw/i686/ -Server = https://mirror.clarkson.edu/msys2/mingw/i686/ -Server = https://mirror.selfnet.de/msys2/mingw/i686/ -Server = https://mirror.ufro.cl/msys2/mingw/i686/ -Server = https://mirrors.dotsrc.org/msys2/mingw/i686/ -Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/i686/ -Server = https://mirrors.ustc.edu.cn/msys2/mingw/i686/ - -## Tier 2 -Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/ -Server = https://fastmirror.pp.ua/msys2/mingw/i686/ -Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/i686/ -Server = https://mirror.jmu.edu/pub/msys2/mingw/i686/ -Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/i686/ -Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/i686/ -Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/i686/ -Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/i686/ -Server = https://mirrors.bit.edu.cn/msys2/mingw/i686/ -Server = https://repo.casualgamer.ca/mingw/i686/ diff --git a/pacman-mirrors/mirrorlist.mingw64 b/pacman-mirrors/mirrorlist.mingw64 deleted file mode 100644 index ea953ed1..00000000 --- a/pacman-mirrors/mirrorlist.mingw64 +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.msys2.org/dev/mirrors - -## Primary -Server = https://mirror.msys2.org/mingw/x86_64/ -Server = https://repo.msys2.org/mingw/x86_64/ - -## Tier 1 -Server = https://mirror.yandex.ru/mirrors/msys2/mingw/x86_64/ -Server = https://download.nus.edu.sg/mirror/msys2/mingw/x86_64/ -Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/x86_64/ -Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/x86_64/ -Server = https://ftp.osuosl.org/pub/msys2/mingw/x86_64/ -Server = https://mirror.clarkson.edu/msys2/mingw/x86_64/ -Server = https://mirror.selfnet.de/msys2/mingw/x86_64/ -Server = https://mirror.ufro.cl/msys2/mingw/x86_64/ -Server = https://mirrors.dotsrc.org/msys2/mingw/x86_64/ -Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/x86_64/ -Server = https://mirrors.ustc.edu.cn/msys2/mingw/x86_64/ - -## Tier 2 -Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/x86_64/ -Server = https://fastmirror.pp.ua/msys2/mingw/x86_64/ -Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/x86_64/ -Server = https://mirror.jmu.edu/pub/msys2/mingw/x86_64/ -Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/x86_64/ -Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/x86_64/ -Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/x86_64/ -Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/x86_64/ -Server = https://mirrors.bit.edu.cn/msys2/mingw/x86_64/ -Server = https://repo.casualgamer.ca/mingw/x86_64/ diff --git a/pacman-mirrors/mirrorlist.ucrt64 b/pacman-mirrors/mirrorlist.ucrt64 deleted file mode 100644 index f5a8affe..00000000 --- a/pacman-mirrors/mirrorlist.ucrt64 +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.msys2.org/dev/mirrors - -## Primary -Server = https://mirror.msys2.org/mingw/ucrt64/ -Server = https://repo.msys2.org/mingw/ucrt64/ - -## Tier 1 -Server = https://mirror.yandex.ru/mirrors/msys2/mingw/ucrt64/ -Server = https://download.nus.edu.sg/mirror/msys2/mingw/ucrt64/ -Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/ucrt64/ -Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/ucrt64/ -Server = https://ftp.osuosl.org/pub/msys2/mingw/ucrt64/ -Server = https://mirror.clarkson.edu/msys2/mingw/ucrt64/ -Server = https://mirror.selfnet.de/msys2/mingw/ucrt64/ -Server = https://mirror.ufro.cl/msys2/mingw/ucrt64/ -Server = https://mirrors.dotsrc.org/msys2/mingw/ucrt64/ -Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/ucrt64/ -Server = https://mirrors.ustc.edu.cn/msys2/mingw/ucrt64/ - -## Tier 2 -Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/ucrt64/ -Server = https://fastmirror.pp.ua/msys2/mingw/ucrt64/ -Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/ucrt64/ -Server = https://mirror.jmu.edu/pub/msys2/mingw/ucrt64/ -Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/ucrt64/ -Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/ucrt64/ -Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/ucrt64/ -Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/ucrt64/ -Server = https://mirrors.bit.edu.cn/msys2/mingw/ucrt64/ -Server = https://repo.casualgamer.ca/mingw/ucrt64/