From 67d17e9a6da79b178a6ff30bae8ed0f5512c5dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 5 Dec 2024 00:00:34 +0000 Subject: [PATCH] choose-mirror: use git Mirrors.masterlist source. --- helpers/DATA/choose-mirror/rev_Makefile.patch | 2 +- helpers/make-choose-mirror | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/helpers/DATA/choose-mirror/rev_Makefile.patch b/helpers/DATA/choose-mirror/rev_Makefile.patch index eab1a6d..0f38b63 100644 --- a/helpers/DATA/choose-mirror/rev_Makefile.patch +++ b/helpers/DATA/choose-mirror/rev_Makefile.patch @@ -5,7 +5,7 @@ diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Ma STRIP=strip # Derivative distributions may want to change these. --#MIRRORLISTURL=https://anonscm.debian.org/git/mirror/mirror-masterlist.git/plain/Mirrors.masterlist +-#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist -MASTERLIST=Mirrors.masterlist.trisquel +MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist +MASTERLIST=Mirrors.masterlist diff --git a/helpers/make-choose-mirror b/helpers/make-choose-mirror index 7f3dc8c..dcfc217 100644 --- a/helpers/make-choose-mirror +++ b/helpers/make-choose-mirror @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2022 Luis Guzmán +# Copyright (C) 2024 Luis Guzmán # Copyright (C) 2009-2018 Ruben Rodriguez # # This program is free software; you can redistribute it and/or modify @@ -18,14 +18,15 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 +VERSION=6 EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' REPOKEY=0E98404D386FA1D9 NETINST=true . ./config -patch --no-backup-if-mismatch -R -p1 < $DATA/rev_Makefile.patch -patch --no-backup-if-mismatch -R -p1 < $DATA/rev_choose-mirror-bin.templates-in.patch +Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist" +patch_Rp1 $DATA/rev_Makefile.patch +patch_Rp1 $DATA/rev_choose-mirror-bin.templates-in.patch sed -i '/oldstable/d; /testing/d; @@ -40,7 +41,7 @@ replace "/debian/" "/trisquel/" . sed -i 's|Mirrors.masterlist|Mirrors.masterlist.trisquel|' mirrorlist rm Mirrors.masterlist -wget https://archive.trisquel.org/trisquel/Mirrors.masterlist -o /dev/null -O Mirrors.masterlist.trisquel +wget https://gitlab.trisquel.org/trisquel/$Mirrors_masterlist_git -o /dev/null -O Mirrors.masterlist.trisquel changelog "Rebranded and adapted for Trisquel" package