choose-mirror: use git Mirrors.masterlist source.

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

helpers/make-choose-mirror

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
+#    Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
 #    Copyright (C) 2009-2018  Ruben Rodriguez <ruben@gnu.org>
 #
 #    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