Updated mirror lists

helpers/make-choose-mirror

 #!/bin/sh
 #
-#    Copyright (C) 2009-2010  Rubén Rodríguez <ruben@gnu.org>
+#    Copyright (C) 2009-2018  Ruben Rodriguez <ruben@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 NETINST=true
 . ./config
 
@@ -31,7 +31,7 @@ rpl $UPSTREAM $CODENAME . -R
 rpl Mirrors.masterlist.ubuntu Mirrors.masterlist.trisquel . -R
 
 rm Mirrors.masterlist.ubuntu
-wget http://archive.trisquel.info/trisquel/Mirrors.masterlist -o /dev/null -O Mirrors.masterlist.trisquel
+wget https://archive.trisquel.info/trisquel/Mirrors.masterlist -o /dev/null -O Mirrors.masterlist.trisquel
 
 changelog "Rebranded and adapted for Trisquel"
 compile

helpers/make-python-apt

 #!/bin/sh
 #
-#    Copyright (C) 2008-2016 Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,40 +17,32 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 COMPONENT=main
 
 . ./config
 
 cat << EOF > data/templates/Trisquel.mirrors
-#LOC:ES
-http://es.archive.trisquel.info/trisquel/
-ftp://es.archive.trisquel.info/trisquel/
 #LOC:FR
-http://fr.archive.trisquel.info/trisquel/
-ftp://fr.archive.trisquel.info/trisquel/
-#LOC:NL
-http://nl.archive.trisquel.info/trisquel/
+https://archive.trisquel.info/trisquel/
+#LOC:US
+https://mirror.fsf.org/trisquel/
+http://mirrors.knoesis.org/trisquel/packages
+https://mirrors.ocf.berkeley.edu/trisquel/
 #LOC:IN
 http://in.archive.trisquel.info/trisquel/
-ftp://in.archive.trisquel.info/trisquel/
-#LOC:US
-http://us.archive.trisquel.info/trisquel/
-#LOC:CN
-http://cn.archive.trisquel.info/trisquel/
 #LOC:EC
-http://mirror.cedia.org.ec/trisquel.packages
-ftp://mirror.cedia.org.ec/trisquel.packages
+https://mirror.cedia.org.ec/trisquel.packages
 #LOC:RO
 http://mirrors.serverhost.ro/trisquel/packages
+#LOC:CN
+https://mirrors.ustc.edu.cn/trisquel
 #LOC:ES
-http://ftp.caliu.cat/pub/distribucions/trisquel/packages
-#LOC:US
-http://mirrors.knoesis.org/trisquel/packages
-#LOC:DE
-http://eu.mirror.gnu.dk/pub/trisquel
-#LOC:FR
-http://mirror.trisquel.de/packages
+https://ftp.caliu.cat/pub/distribucions/trisquel/packages
+#LOC:TW
+https://ftp.yzu.edu.tw/Linux/trisquel.packages/
+#LOC:SE
+https://ftp.acc.umu.se/mirror/trisquel/packages/
 EOF
 
 cat << EOF > data/templates/Trisquel.info.in
@@ -58,7 +50,7 @@ _ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/chan
 
 Suite: $CODENAME
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 MatchURI: archive.trisquel.info/trisquel
 MirrorsFile: Trisquel.mirrors
 _Description: Trisquel $REVISION '$CODENAME'
@@ -69,7 +61,7 @@ _CompDescriptionLong: Officially supported
 Suite: $CODENAME-security
 ParentSuite: $CODENAME
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 MatchURI: archive.trisquel.info/trisquel
 _Description: Important security updates
 

helpers/make-ubiquity

@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 
 . ./config
 
@@ -41,7 +41,7 @@ sed 's/, ubuntu-artwork//' debian/control -i
 
 export DEB_BUILD_OPTIONS=nocheck
 
-# Fix update issues on clean installations: http://trisquel.info/es/forum/update-issues-clean-install
+# Fix update issues on clean installations: https://trisquel.info/es/forum/update-issues-clean-install
 sed 's:\(targetdb)\):\1\n        os.system("sudo chmod 644 /target/var/cache/debconf/config.dat"):' bin/ubiquity -i
 
 # Fix https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1080701
@@ -64,7 +64,7 @@ set -e
 
 file="\$1"
 
-FASTEST=http://es.archive.trisquel.info/trisquel/
+FASTEST=https://archive.trisquel.info/trisquel/
 SPEED=1000000000000
 
 for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
@@ -105,7 +105,7 @@ sed 's/ports.ubuntu.com/archive.trisquel.info/g; s/ubuntu-ports/trisquel/g; s/ub
 sed 's/CC.ports.ubuntu.com/archive.trisquel.info/g; s/.ports.ubuntu.com/archive.trisquel.info/g' -i ./d-i/source/choose-mirror/choose-mirror.c ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
 
 # Set Mirrors.masterlist
-wget http://archive.trisquel.info/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist
+wget https://archive.trisquel.info/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist
 sed '/Location/d; /Comment/d;' -i ./d-i/source/choose-mirror/Mirrors.masterlist
 cp ./d-i/source/choose-mirror/Mirrors.masterlist ./d-i/source/choose-mirror/Mirrors.masterlist.trisquel
 rm ./d-i/source/choose-mirror/Mirrors.masterlist.ubuntu
@@ -199,8 +199,8 @@ for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports
 do
     WD=d-i/source/apt-setup/release-files/archive.trisquel.info/$DIST
     mkdir $WD -p
-    wget -r -l1 -np http://archive.trisquel.info/trisquel/dists/$DIST/Release -O $WD/Release
-    wget -r -l1 -np http://archive.trisquel.info/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg
+    wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release -O $WD/Release
+    wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg
 done
 
 # Postinstall hacks

helpers/make-ubuntu-release-upgrader

@@ -23,7 +23,7 @@
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 # The "obsoletes" list from ubuntu has been removed
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -56,7 +56,7 @@ ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/%s
 
 Suite: $CODENAME
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 Description: Trisquel $CODENAME
 Component: main
 Enabled: 1
@@ -64,7 +64,7 @@ CompDescription: Trisquel GNU/linux packages
 
 Suite: $CODENAME-security
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 Description: Trisquel $CODENAME Security Updates
 Component: main
 Enabled: 1
@@ -72,7 +72,7 @@ CompDescription: Trisquel GNU/linux packages
 
 Suite: $CODENAME-updates
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 Description: Trisquel $CODENAME Updates
 Component: main
 Enabled: 1
@@ -80,10 +80,10 @@ CompDescription: Trisquel GNU/linux packages
 
 Suite: $CODENAME-backports
 RepositoryType: deb
-BaseURI: http://archive.trisquel.info/trisquel/
+BaseURI: https://archive.trisquel.info/trisquel/
 Description: Trisquel $CODENAME Backports
 Component: main
-Enabled: 1
+Enabled: 0
 CompDescription: Trisquel GNU/linux packages
 EOF
 
@@ -212,23 +212,17 @@ EOF
 
 rm data/mirrors.cfg
 cat << EOF > data/mirrors.cfg
-http://archive.trisquel.info/trisquel/
-ftp://archive.trisquel.info/trisquel/
-http://es.archive.trisquel.info/trisquel/
-ftp://es.archive.trisquel.info/trisquel/
-http://fr.archive.trisquel.info/trisquel/
-ftp://fr.archive.trisquel.info/trisquel/
-http://nl.archive.trisquel.info/trisquel/
-ftp://nl.archive.trisquel.info/trisquel/
-http://us.archive.trisquel.info/trisquel/
+https://archive.trisquel.info/trisquel/
+https://mirror.fsf.org/trisquel/
+http://mirrors.knoesis.org/trisquel/packages
+https://mirrors.ocf.berkeley.edu/trisquel/
 http://in.archive.trisquel.info/trisquel/
-ftp://in.archive.trisquel.info/trisquel/
-http://mirror.cedia.org.ec/trisquel.packages/
-http://mirrors.serverhost.ro/trisquel/packages/
-http://cn.archive.trisquel.info/trisquel/
-http://ftp.caliu.cat/pub/distribucions/trisquel/packages
-http://mirrors.knoesis.org/trisquel/packages/
-http://mirrors.ukfast.co.uk/sites/trisquel.info/
+https://mirror.cedia.org.ec/trisquel.packages
+http://mirrors.serverhost.ro/trisquel/packages
+https://mirrors.ustc.edu.cn/trisquel
+https://ftp.caliu.cat/pub/distribucions/trisquel/packages
+https://ftp.yzu.edu.tw/Linux/trisquel.packages/
+https://ftp.acc.umu.se/mirror/trisquel/packages/
 EOF
 
 rm data/DistUpgrade.cfg*