Merge branch 'patch-1'

cacher.spec

@@ -90,9 +90,11 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
-* Mon Nov 21 2022 unman <unman@thirdeyesecurity.org> - 1.9NEWNEW
+* Sun Jan 29 2023 unman <unman@thirdeyesecurity.org> - 1.9
 - Change packaging so that upgrade will update mirror lists and config
 - Update fedora mirror list
+- Update configuration to handle issues with fedora repositories
+- Use baseurl in rpmfusion repositories
 - Include anacron
 * Mon Aug 22 2022 unman <unman@thirdeyesecurity.org> - 1.8
 - Stop rewriting for Whonix templates

cacher/acng.conf

@@ -60,7 +60,8 @@ Port:8082
 # installation using information collected on the system.
 # Examples:
 #Remap-debrep: https://deb.debian.org http://deb.debian.org  file:deb_mirrors.gz /debian ; file:backends_debian # Debian Archives
-Remap-alxrep: file:archlx_mirrors /archlinux # ; file:backend_archlx # Arch Linux
+#Remap-alxrep: file:archlx_mirrors /archlinux # ; file:backend_archlx # Arch Linux
+Remap-alxrep: file:archlx_mirrors /archlinux 
 Remap-debrep: https://deb.debian.org http://deb.debian.org  file:deb_mirrors.gz /debian 
 Remap-fedora: file:fedora_mirrors # Fedora Linux
 Remap-uburep: file:ubuntu_mirrors /ubuntu ; file:backends_ubuntu # Ubuntu Archives
@@ -220,7 +221,7 @@ ExThreshold: 4
 #
 PfilePatternEx: .*yaml.gz$|.*fedora.*arch=x86_64$|.*f35&arch=x86_64|.*f36&arch=x86_64|.*f37&arch=x86_64
 # VfilePatternEx:
-VfilePatternEx: .*fedora.*updateinfo.*xml.zck$|^/\?release=[0-9]+&arch=.*|.*/RPM-GPG-KEY.*|.*\?repo=fedora|.*pkg.tar.zst.sig
+VfilePatternEx: .*fedora.*updateinfo.*xml.zck$|^/\?release=[0-9]+&arch=.*|.*/RPM-GPG-KEY.*|.*\?repo=fedora|.*pkg.tar.zst.sig|.*archlinux.*sha256sums.txt|.*archlinux/iso.*tar.gz.sig
 # SPfilePatternEx:
 # SVfilePatternEx:
 # WfilePatternEx:
@@ -303,7 +304,8 @@ VfilePatternEx: .*fedora.*updateinfo.*xml.zck$|^/\?release=[0-9]+&arch=.*|.*/RPM
 #
 # Example:
 # DontCache: .*.local.university.int
-DontCache: .*fedora.*updates.*updateinfo.xml.zck
+DontCache: .*fedora.*updates.*updateinfo.xml.zck .*updates/3*/.*repomd.xml
+#DontCache: .*fedora.*updates.*updateinfo.xml.zck
 
 # Default permission set of freshly created files and directories, as octal
 # numbers (see chmod(1) for details).

cacher/fedora_mirrors

@@ -1,31 +1,29 @@
 http://archive.linux.duke.edu/pub/fedora/linux/
+http://fedora.cu.be/linux/
 http://distrib-coffee.ipsl.jussieu.fr/pub/linux/fedora/linux/
-http://dl.fedoraproject.org  
 http://download-cc-rdu01.fedoraproject.org/pub/fedora/linux/
 http://download-ib01.fedoraproject.org/pub/fedora/linux
 http://download.fedoraproject.org/pub/fedora/linux/
 http://fedora-mirror01.rbc.ru/pub/fedora/linux/
 http://fedora.blizoo.mk/fedora/linux/
-http://fedora.cu.be
+http://fedora.ip-connect.info/linux/
-http://fedora.ip-connect.info
+http://fedora.ip-connect.vn.ua/linux/
-http://fedora.ipacct.com
+http://fedora.ipacct.com/fedora/linux/
 http://fedora.is.co.za/linux/
 http://fedora.mirror.angkasa.id/pub/fedora/linux/
 http://fedora.mirror.constant.com
 http://fedora.mirror.digitalpacific.com.au/linux/
-http://fedora.mirror.garr.it
 http://fedora.mirror.iweb.com/linux/
-http://fedora.mirror.liteserver.nl
+http://fedora.mirror.liteserver.nl/
 http://fedora.mirror.root.lu/
 http://fedora.mirror.tn/pub/fedora/linux/
-http://fedora.mirror.wearetriple.com
+http://fedora.mirror.wearetriple.com/linux/
 http://fedora.mirrors.pair.com/linux/
 http://fedora.mirrors.telekom.ro/pub/fedora/linux/
-http://fedora.mirrorservice.org
 http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/
+http://forksystems.mm.fcix.net/fedora/linux/
 http://fr2.rpmfind.net/linux/fedora/linux/
 http://free.nchc.org.tw/fedora/linux/
-http://ftp-nyc.osuosl.org
 http://ftp-stud.hs-esslingen.de/pub/fedora/linux/
 http://ftp.acc.umu.se/mirror/fedora/linux/
 http://ftp.byfly.by/pub/fedoraproject.org/linux/
@@ -55,10 +53,11 @@ http://ftp.uni-stuttgart.de/epel/
 http://ftp.upjs.sk/pub/fedora/linux/
 http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora-projects/fedora/linux/
 http://ftp.yzu.edu.tw/Linux/Fedora/linux/
+http://ftp-chi.osuosl.org/pub/fedora/linux
 http://kdeforge2.unl.edu/mirrors/fedora/linux/
 http://linux.mirrors.es.net/fedora/
 http://mirror.1000mbps.com/fedora/linux/
-http://mirror.23m.com
+http://mirror.23m.com/fedora/linux/
 http://mirror.23media.de/fedora/linux/
 http://mirror.aarnet.edu.au/pub/fedora/linux/
 http://mirror.bytemark.co.uk/fedora/epel/
@@ -73,12 +72,14 @@ http://mirror.csclub.uwaterloo.ca/fedora/linux/
 http://mirror.datacenter.by/pub/fedoraproject.org/linux/
 http://mirror.de.leaseweb.net/fedora/linux/
 http://mirror.dogado.de/fedora/linux/
+http://mirror.dst.ca/fedora-linux/fedora/linux/
 http://mirror.easyspeedy.com/fedora/
 http://mirror.epn.edu.ec/fedora/linux/
 http://mirror.etf.bg.ac.rs/fedora/
 http://mirror.euserv.net/linux/fedora/linux/
 http://mirror.globo.com/fedora/linux/
 http://mirror.i3d.net/pub/fedora/linux/
+http://mirror.ihost.md/fedora/
 http://mirror.in2p3.fr/pub/fedora/linux/
 http://mirror.infonline.de/fedora/linux/
 http://mirror.init7.net/fedora/fedora/linux/
@@ -87,10 +88,12 @@ http://mirror.karneval.cz/pub/linux/fedora/linux/
 http://mirror.lagoon.nc/pub/fedora/linux/
 http://mirror.library.ucy.ac.cy/linux/fedora/linux/
 http://mirror.linux-ia64.org/fedora/linux/
+http://mirror.math.princeton.edu/pub/fedora/linux/
 http://mirror.metrocast.net/fedora/linux/
 http://mirror.mrjester.net/fedora/linux/
 http://mirror.netcologne.de/fedora/linux/
 http://mirror.netsite.dk/fedora/linux/
+http://mirror.netzwerge.de/fedora/linux/
 http://mirror.nexcess.net/fedora/
 http://mirror.nl.leaseweb.net/fedora/linux/
 http://mirror.nonstop.co.il/fedora/linux/
@@ -104,16 +107,19 @@ http://mirror.rise.ph/fedora/linux/
 http://mirror.rnet.missouri.edu/fedora/linux/
 http://mirror.seas.harvard.edu/fedora/linux/
 http://mirror.sfo12.us.leaseweb.net/fedora/linux/
+http://mirror.siena.edu/fedora/linux/
 http://mirror.slu.cz/fedora/linux/
 http://mirror.smartmedia.net.id/fedora/linux/
 http://mirror.steadfast.net/fedora/
 http://mirror.steadfastnet.com/epel/
+http://mirror.stjschools.org/fedora/linux/
 http://mirror.switch.ch/ftp/mirror/fedora/linux/
 http://mirror.szerverem.hu/fedora/linux/
 http://mirror.telepoint.bg/fedora/
 http://mirror.umd.edu/fedora/linux/
 http://mirror.upb.edu.co/fedora/linux/
 http://mirror.us.leaseweb.net/fedora/linux/
+http://mirror.usi.edu/pub/fedora/linux/
 http://mirror.uta.edu.ec/fedora/linux/
 http://mirror.utexas.edu/fedora/linux/
 http://mirror.uv.es/mirror/fedora/linux/
@@ -121,11 +127,11 @@ http://mirror.veriteknik.net.tr/fedora/linux/
 http://mirror.vorboss.net/fedora/linux/
 http://mirror.vpsnet.com/fedora/linux/
 http://mirror.vutbr.cz/fedora/
+http://mirror.xenyth.net/fedora/linux/
 http://mirror.yandex.ru/fedora/linux/
 http://mirror2.totbb.net/fedora/linux/
 http://mirrors.cat.pdx.edu/fedora/linux/
 http://mirrors.dotsrc.org/fedora/linux/
-http://mirrors.fedoraproject.org
 http://mirrors.ircam.fr/pub/fedora/linux/
 http://mirrors.kernel.org/fedora/
 http://mirrors.lug.mtu.edu/fedora/linux/
@@ -134,17 +140,21 @@ http://mirrors.n-ix.net/fedora/linux/
 http://mirrors.nav.ro/fedora/linux/
 http://mirrors.netix.net/fedora/linux/
 http://mirrors.nic.cz/fedora/linux/
+http://mirrors.rit.edu/fedora/fedora/linux
 http://mirrors.syringanetworks.net/fedora/linux/
 http://mirrors.uni-ruse.bg/fedora/linux/
 http://mirrors.xmission.com/fedora/linux/
-http://mirrors.xtom.de
+http://mirrors.xtom.de/fedora/
 http://muug.ca/mirror/fedora/linux/
+http://opencolo.mm.fcix.net/fedora/linux/
 http://opensource.nchc.org.tw/fedora/linux/
-http://packages.oit.ncsu.edu
 http://pubmirror1.math.uh.edu/fedora-buffet/fedora/linux/
 http://pubmirror2.math.uh.edu/fedora-buffet/fedora/linux/
+http://repo.fedora.md/fedora/linux/
 http://ucmirror.canterbury.ac.nz/linux/fedora/linux/
+http://veronanetworks.mm.fcix.net/fedora/linux/
 http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/fedora/linux/
-http://www.fedora.is/fedora/linux/
+http://www.fedora.is/fedora/
 http://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/
 http://www.nic.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/
+http://ziply.mm.fcix.net/fedora/linux/