config: Upgrade IPFire 3 repositories to new URLs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/contrib/config/distros/ipfire3.conf b/contrib/config/distros/ipfire3.conf
index eeb69b8dc13311aa4b0b4818e3f75bd68f52e677..dcc218bb64cabb4268f1e5d4cc315a58753ef93f 100644 (file)
--- a/contrib/config/distros/ipfire3.conf
+++ b/contrib/config/distros/ipfire3.conf
@@ -18,53 +18,40 @@ source_dl   = https://source.ipfire.org/source-3.x/
 requires       = pakfire-build, gcc, filesystem, ccache, /bin/bash, filesystem, coreutils, util-linux, diffutils, make, gcc, kernel-headers, tar, patch, xz, gzip, bzip2, strace, less, vim
 
 [repo:stable]
-description    = IPFire 3 - Stable Repository
-baseurl                = https://pakfire.ipfire.org/repositories/ipfire3/stable/%{arch}
-mirrors                = https://pakfire.ipfire.org/distro/ipfire3/repo/stable/mirrorlist?arch=%{arch}
-priority       = 100
-key                    =
-       -----BEGIN PGP PUBLIC KEY BLOCK-----
-       Version: GnuPG v1.4.11 (GNU/Linux)
-
-       mQGiBEozzewRBADVYqIEjWkjeOXTN4I16dlW+cT156gvFdSB40NXXjI8UMwz+2+V
-       zFBSfuPsJX/9fI/DAAko4NX6rp5VCFSjCpU3GON6eL4AYFLOoJofZ8JqYkXUFJg+
-       MpgZDg4MOv/uUjyCLyhd3TMJuDEGjpFUJaq3xSXUEGhzzwRjyQEjwt2ZmwCg7QZh
-       ioU7LYNqDWWyXHDwyJqn3+ED/3peZKfnSvvnfTLFMYqh67fMi03UQsCPuok6YsLQ
-       Y4SfC8L4+lNjQqbibV4j8wV6BCCnUmwqu+yZYnLwk1G3/kX8PQiBTLOXa3d31Reb
-       YZdSr6cUaOoItWKmFirbEzIK5ZXxqE3hjNxcSGWUFmbwPU5nyI88wMntoK2hSS/d
-       UkBfA/oCVCykMKM3KsCWdjRr3hPZj+UrkGmTHoNA2TQoUa+V6jVZicxWRhTNEXqf
-       e/nQp4Hw62eFQpAFANwAzuAA6mdrXO+e/K7iJ2kAVhlgI52SaV+3jfZFgKT2cwTH
-       kKeVuUsH4V6seXheCYyNcKi3dTQU+UoIHcS8RqrB5s9OIKESQLQ/SVBGaXJlLTMg
-       S2V5IChJUEZpcmUgMyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGtleS0zQGlwZmly
-       ZS5vcmc+iGYEExECACYFAkozzewCGwMFCRLMAwAGCwkIBwMCBBUCCAMEFgIDAQIe
-       AQIXgAAKCRCnntN+V1xD6heoAJ9y6BjcphLw0Cf60Jjch/tKERXUbQCfUM81S5Xp
-       RCbzkLzMHbOuE424dgO5Ag0ESjPN8BAIAMg/VtjdVx1HKgK9olEa4BdJMV5quv1S
-       oI4hON2NXqoxslgmoKf9A31neplhzNl6JRocHgDT8giJcFo8w4hcSY77gW15X8Sd
-       Cqd3Ew5paLQ1fSQgW2TzxhoVFpGJuNXhpo/1ngRyrJuw6a5TDNH8jZA8wtvxvpBe
-       TE5RfvyTcDZdUp9YLJ7Lo9JYLX3/zipiUmdbZ010v0VhRsQUT8vvvPa5fND2yoSW
-       ozUDZy1BlNvKTYc3vZgYyzh57IYsaXrzGSnQ8YV/84x+Ntr+Sar7OpD7l44arTA9
-       Z78oIMsdyQ+xYRCM98Of5LGggAxxSpGqnG4JOUIoxsHnVAR4p9Cn5Z8AAwUH/ivZ
-       uG9g25YhviuDe9tNZAdIzgrKvSMM3VsJb9YHX9uiO6m7X05XWgYgz4Ey80chRwDf
-       JV792fAclb3c62iK2sLWBTAMWHu0Y9Pho2613OCKEtBBbqYP0jsLdiozsgLkYA5w
-       Fz46gtb6n4/oxrMNsrLlSSDJJ7kt3n9n9kNcku5dQkXiUZu7wEkve2PqAgYY52zR
-       zZWR1E0Uyd4YACoHasjaoySYPMyMGo+uM3AW/Bdvsr58zTtk/Z2tSjh0Qq4gVF0c
-       LFYeRsALM9bJztE5yQ1lxw+pnPQ/4vbVyBvrism6ZFw691Uyc05lnsaBGt5Xx438
-       Kr/LeZCRw5EPb6yIQxGITwQYEQIADwUCSjPN8AIbDAUJEswDAAAKCRCnntN+V1xD
-       6ih4AKCQtZOM2HdGR+m2Nn/jsjuIlaYEDACfdgKrra2M3Z3DDuoGwi2Ped5py6Q=
-       =O2qO
+description = IPFire 3 - stable
+baseurl = https://pakfire.ipfire.org/files/repos/ipfire-3/stable/%{arch}
+key = -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+       mDMEYz7fsBYJKwYBBAHaRw8BAQdAMUYyJQXKrnlsViCjj1agdvc9Eqy7oBCbHEwG
+       DTWqwi20HVRFU1QgS0VZIDEgPHRlc3RAZXhhbXBsZS5jb20+iJAEExYIADgWIQSE
+       LXEYwTH8JA3eTnYzr2Ww5NtZTgUCYz7fsAIbAwULCQgHAgYVCgkICwIEFgIDAQIe
+       AQIXgAAKCRAzr2Ww5NtZTgsdAQCxNyqb6GAbANw4iSAbA/hs7IY4xXoLg7Dv6c8R
+       862nJwEAvrYHUfORe2DchRmSZEMX29aJV0S49n+75ytQUMECCw8=
+       =2y1q
        -----END PGP PUBLIC KEY BLOCK-----
 
+#mirrors = https://pakfire.ipfire.org/distros/ipfire-3/repos/stable/mirrorlist?arch=%{arch}
+priority = 500
+
 [repo:testing]
-description    = IPFire 3 - This is a repository for testing stuff
-baseurl                = https://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
-mirrors                = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
-priority       = 200
+description = IPFire 3 - testing
+baseurl = https://pakfire.ipfire.org/files/repos/ipfire-3/testing/%{arch}
+key = -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+       mDMEYz7fsBYJKwYBBAHaRw8BAQdAMUYyJQXKrnlsViCjj1agdvc9Eqy7oBCbHEwG
+       DTWqwi20HVRFU1QgS0VZIDEgPHRlc3RAZXhhbXBsZS5jb20+iJAEExYIADgWIQSE
+       LXEYwTH8JA3eTnYzr2Ww5NtZTgUCYz7fsAIbAwULCQgHAgYVCgkICwIEFgIDAQIe
+       AQIXgAAKCRAzr2Ww5NtZTgsdAQCxNyqb6GAbANw4iSAbA/hs7IY4xXoLg7Dv6c8R
+       862nJwEAvrYHUfORe2DchRmSZEMX29aJV0S49n+75ytQUMECCw8=
+       =2y1q
+       -----END PGP PUBLIC KEY BLOCK-----
+
+priority = 100
 
-[repo:unstable]
-description    = IPFire 3 - Unstable Repository
-baseurl                = https://pakfire.ipfire.org/repositories/ipfire3/unstable/%{arch}
-mirrors                = https://pakfire.ipfire.org/distro/ipfire3/repo/unstable/mirrorlist?arch=%{arch}
-priority       = 300
+[repo:bootstrap]
+description = Bootstrap Repository
+baseurl     = https://people.ipfire.org/~ms/bootstrap/%{arch}/
+priority    = 1000
 
 [repo:local]
 description = IPFire 3 - Locally Built Packages