From 75fab0414df006c4bc565da055b632f81008c279 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 24 Aug 2022 09:06:16 +0200 Subject: [PATCH 1/2] mirrors: remove fosshost repos Fosshost will unfortunately decommission the hosting service for FOSS projects from 28th of August. Let's use grimler mirror as default mirror until we have set up a new main host. Fosshost announcement: https://cdn.discordapp.com/attachments/742089740643205174/1011718189903786054/23_Aug_CEO_Memo_-_Tenants_Update.pdf --- mirrors/Makefile.am | 13 ++++++------- mirrors/default | 8 ++++---- mirrors/europe/grimler.se | 6 ------ mirrors/north_america/packages.termux.dev | 6 ------ 4 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 mirrors/europe/grimler.se delete mode 100644 mirrors/north_america/packages.termux.dev diff --git a/mirrors/Makefile.am b/mirrors/Makefile.am index e8f0a39..a78472e 100644 --- a/mirrors/Makefile.am +++ b/mirrors/Makefile.am @@ -9,19 +9,18 @@ mirrors.cbrx.io packages.nscdn.top pkgdata_CHINA_MIRRORS = mirrors.tuna.tsinghua.edu.cn \ mirror.iscas.ac.cn mirrors.nju.edu.cn mirrors.pku.edu.cn \ mirrors.ustc.edu.cn mirrors.hit.edu.cn mirrors.bfsu.edu.cn \ -mirrors.aliyun.com mirrors.cqupt.edu.cn mirrors.dgut.edu.cn \ -mirror.nyist.edu.cn mirrors.njupt.edu.cn mirrors.sau.edu.cn \ +mirrors.aliyun.com mirrors.cqupt.edu.cn mirrors.dgut.edu.cn \ +mirror.nyist.edu.cn mirrors.njupt.edu.cn mirrors.sau.edu.cn \ mirrors.scau.edu.cn mirrors.sdu.edu.cn mirrors.sustech.edu.cn # Mirrors in Europe -pkgdata_EUROPE_MIRRORS = grimler.se termux.librehat.com mirror.mwt.me \ -termux.mentality.rip mirrors.sahilister.in cdn.lumito.net \ +pkgdata_EUROPE_MIRRORS = termux.librehat.com mirror.mwt.me \ +termux.mentality.rip mirrors.sahilister.in cdn.lumito.net \ termux.astra.in.ua # Mirrors in North America -pkgdata_NORTH_AMERICA_MIRRORS = packages.termux.dev \ -plug-mirror.rcac.purdue.edu dl.kcubeterm.com mirrors.utermux.dev \ -mirror.mwt.me +pkgdata_NORTH_AMERICA_MIRRORS = plug-mirror.rcac.purdue.edu \ +dl.kcubeterm.com mirrors.utermux.dev mirror.mwt.me # Mirrors in Russia pkgdata_RUSSIA_MIRRORS = mirror.mephi.ru mirror.surf diff --git a/mirrors/default b/mirrors/default index 24795ac..e1aa6d0 100644 --- a/mirrors/default +++ b/mirrors/default @@ -1,6 +1,6 @@ # This file is sourced by pkg -# Cached (by cloudflare) variant of packages.termux.dev +# Mirror by grimler, hosted in the Netherlands WEIGHT=10 -MAIN="https://packages-cf.termux.dev/apt/termux-main" -ROOT="https://packages-cf.termux.dev/apt/termux-root" -X11="https://packages-cf.termux.dev/apt/termux-x11" +MAIN="https://grimler.se/termux/termux-main" +ROOT="https://grimler.se/termux/termux-root" +X11="https://grimler.se/termux/termux-x11" diff --git a/mirrors/europe/grimler.se b/mirrors/europe/grimler.se deleted file mode 100644 index 3ae6ea5..0000000 --- a/mirrors/europe/grimler.se +++ /dev/null @@ -1,6 +0,0 @@ -# This file is sourced by pkg -# Mirror by grimler, hosted in the Netherlands -WEIGHT=4 -MAIN="https://grimler.se/termux/termux-main" -ROOT="https://grimler.se/termux/termux-root" -X11="https://grimler.se/termux/termux-x11" diff --git a/mirrors/north_america/packages.termux.dev b/mirrors/north_america/packages.termux.dev deleted file mode 100644 index 01db004..0000000 --- a/mirrors/north_america/packages.termux.dev +++ /dev/null @@ -1,6 +0,0 @@ -# This file is sourced by pkg -# Main fosshost repo, hosted in Utah, US -WEIGHT=4 -MAIN="https://packages.termux.dev/apt/termux-main" -ROOT="https://packages.termux.dev/apt/termux-root" -X11="https://packages.termux.dev/apt/termux-x11" From 708d0d81dd1f1481e35f762ea1736a22a29f4972 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 24 Aug 2022 09:13:49 +0200 Subject: [PATCH 2/2] termux-change-repo: remove special handling of packages.termux.dev Since that repo will no longer exist from 28th of August. --- scripts/termux-change-repo.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/termux-change-repo.in b/scripts/termux-change-repo.in index c62cab6..59f0f65 100644 --- a/scripts/termux-change-repo.in +++ b/scripts/termux-change-repo.in @@ -95,12 +95,9 @@ select_individual_mirror() { # Choose default mirror per default MIRRORS=("$(get_mirror_url "${MIRROR_BASE_DIR}/default")" "$(get_mirror_description "${MIRROR_BASE_DIR}/default")" "on") - # Special handling of packages.termux.dev mirror to put it on top: - MIRRORS+=("$(get_mirror_url "${MIRROR_BASE_DIR}/north_america/packages.termux.dev")" "$(get_mirror_description "${MIRROR_BASE_DIR}/north_america/packages.termux.dev")" "off") + for mirror in ${mirrors[@]}; do - if [ "$mirror" != "packages.termux.dev" ]; then - MIRRORS+=("$(get_mirror_url "$mirror")" "$(get_mirror_description "$mirror")" "off") - fi + MIRRORS+=("$(get_mirror_url "$mirror")" "$(get_mirror_description "$mirror")" "off") done local TEMPFILE="$(mktemp @TERMUX_PREFIX@/tmp/mirror.XXXXXX)"