Merge branch 'dev' into dev-stable

FascodeNet · Dec 29, 2020 · bcf92d0 · bcf92d0
2 parents 45efede + 90bcb8a
commit bcf92d0
Show file tree

Hide file tree

Showing 10 changed files with 250 additions and 248 deletions.
diff --git a/channels/cinnamon/airootfs.i686/etc/pacman.conf b/channels/cinnamon/airootfs.i686/etc/pacman.conf
@@ -87,43 +87,43 @@ Include = /etc/pacman.d/mirrorlist-alter
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [core]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [community]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.

diff --git a/channels/i3/airootfs.i686/etc/pacman.conf b/channels/i3/airootfs.i686/etc/pacman.conf
@@ -87,43 +87,43 @@ Include = /etc/pacman.d/mirrorlist-alter
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [core]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [community]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 # [hayao]
 # This is Yamada Hayao's personal repository.

diff --git a/channels/lxde/airootfs.i686/etc/pacman.conf b/channels/lxde/airootfs.i686/etc/pacman.conf
@@ -87,43 +87,43 @@ Include = /etc/pacman.d/mirrorlist-alter
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [core]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [community]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.

diff --git a/channels/plasma/airootfs.i686/etc/pacman.conf b/channels/plasma/airootfs.i686/etc/pacman.conf
@@ -87,43 +87,43 @@ Include = /etc/pacman.d/mirrorlist-alter
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [core]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [community]
 Include = /etc/pacman.d/mirrorlist
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.

diff --git a/channels/releng/pacman-i486.conf b/channels/releng/pacman-i486.conf
@@ -76,38 +76,39 @@ Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
 #Server = https://repo.dyama.net/$repo/$arch
 
 #[testing]
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [core]
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [extra]
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 #[community-testing]
-#Server = https://32.arlm.tyzoid.com/$arch/$repo/
-#Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-#Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-#Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 [community]
-Server = https://32.arlm.tyzoid.com/$arch/$repo/
-Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo/
-Server = http://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
-Server = https://mirror.clarkson.edu/archlinux32/$arch/$repo/
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.