From 95ca6fb3769783daf65521212da15dcdf8bb35f2 Mon Sep 17 00:00:00 2001 From: Mauro Regli Date: Wed, 10 May 2023 15:24:00 +0200 Subject: [PATCH] Fix: Replace security.debian.org with archive --- system/t04_mirror/CreateMirror19Test_gold | 6 +++--- .../t04_mirror/CreateMirror19Test_mirror_show | 2 +- system/t04_mirror/CreateMirror20Test_gold | 18 +++++++++--------- system/t04_mirror/CreateMirror22Test_gold | 6 +++--- .../t04_mirror/CreateMirror22Test_mirror_show | 2 +- system/t04_mirror/CreateMirror24Test_gold | 6 +++--- system/t04_mirror/EditMirror5Test_gold | 2 +- system/t04_mirror/EditMirror5Test_mirror_show | 2 +- system/t04_mirror/ShowMirror4Test_gold | 2 +- system/t04_mirror/ShowMirror8Test_gold | 2 +- system/t04_mirror/create.py | 14 +++++++------- system/t04_mirror/edit.py | 2 +- system/t04_mirror/show.py | 4 ++-- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/system/t04_mirror/CreateMirror19Test_gold b/system/t04_mirror/CreateMirror19Test_gold index 97eae908..47436129 100644 --- a/system/t04_mirror/CreateMirror19Test_gold +++ b/system/t04_mirror/CreateMirror19Test_gold @@ -1,9 +1,9 @@ -Downloading http://security.debian.org/dists/stretch/updates/InRelease... -Success downloading http://security.debian.org/dists/stretch/updates/InRelease +Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease... +Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease gpgv: RSA key ID 331F7F50 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) " gpgv: RSA key ID E562B32A gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) " -Mirror [mirror19]: http://security.debian.org/ stretch/updates [src] successfully added. +Mirror [mirror19]: http://archive.debian.org/debian-security/ stretch/updates [src] successfully added. You can run 'aptly mirror update mirror19' to download repository contents. diff --git a/system/t04_mirror/CreateMirror19Test_mirror_show b/system/t04_mirror/CreateMirror19Test_mirror_show index 4a1f27e9..9c775381 100644 --- a/system/t04_mirror/CreateMirror19Test_mirror_show +++ b/system/t04_mirror/CreateMirror19Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror19 -Archive Root URL: http://security.debian.org/ +Archive Root URL: http://archive.debian.org/debian-security/ Distribution: stretch/updates Components: main Architectures: i386 diff --git a/system/t04_mirror/CreateMirror20Test_gold b/system/t04_mirror/CreateMirror20Test_gold index 0099d586..b4c40cbb 100644 --- a/system/t04_mirror/CreateMirror20Test_gold +++ b/system/t04_mirror/CreateMirror20Test_gold @@ -1,9 +1,9 @@ -Downloading http://security.debian.org/dists/stretch/updates/InRelease... -Error downloading http://security.debian.org/dists/stretch/updates/InRelease: http://security.debian.org/dists/stretch/updates/InRelease: Get "http://security.debian.org/dists/stretch/updates/InRelease": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... -Retrying 0 http://security.debian.org/dists/stretch/updates/InRelease... -Giving up on http://security.debian.org/dists/stretch/updates/InRelease... -Downloading http://security.debian.org/dists/stretch/updates/Release... -Error downloading http://security.debian.org/dists/stretch/updates/Release: http://security.debian.org/dists/stretch/updates/Release: Get "http://security.debian.org/dists/stretch/updates/Release": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... -Retrying 0 http://security.debian.org/dists/stretch/updates/Release... -Giving up on http://security.debian.org/dists/stretch/updates/Release... -ERROR: unable to fetch mirror: http://security.debian.org/dists/stretch/updates/Release: Get http://security.debian.org/dists/stretch/updates/Release: http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused +Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease... +Error downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease: http://archive.debian.org/debian-security/dists/stretch/updates/InRelease: Get "http://archive.debian.org/debian-security/dists/stretch/updates/InRelease": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... +Retrying 0 http://archive.debian.org/debian-security/dists/stretch/updates/InRelease... +Giving up on http://archive.debian.org/debian-security/dists/stretch/updates/InRelease... +Downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release... +Error downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release: http://archive.debian.org/debian-security/dists/stretch/updates/Release: Get "http://archive.debian.org/debian-security/dists/stretch/updates/Release": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... +Retrying 0 http://archive.debian.org/debian-security/dists/stretch/updates/Release... +Giving up on http://archive.debian.org/debian-security/dists/stretch/updates/Release... +ERROR: unable to fetch mirror: http://archive.debian.org/debian-security/dists/stretch/updates/Release: Get http://archive.debian.org/debian-security/dists/stretch/updates/Release: http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused diff --git a/system/t04_mirror/CreateMirror22Test_gold b/system/t04_mirror/CreateMirror22Test_gold index dc74de6a..8779bd2b 100644 --- a/system/t04_mirror/CreateMirror22Test_gold +++ b/system/t04_mirror/CreateMirror22Test_gold @@ -1,5 +1,5 @@ -Downloading http://security.debian.org/dists/stretch/updates/Release... -Success downloading http://security.debian.org/dists/stretch/updates/Release +Downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release... +Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release -Mirror [mirror22]: http://security.debian.org/ stretch/updates successfully added. +Mirror [mirror22]: http://archive.debian.org/debian-security/ stretch/updates successfully added. You can run 'aptly mirror update mirror22' to download repository contents. diff --git a/system/t04_mirror/CreateMirror22Test_mirror_show b/system/t04_mirror/CreateMirror22Test_mirror_show index 54e7268b..8d143a32 100644 --- a/system/t04_mirror/CreateMirror22Test_mirror_show +++ b/system/t04_mirror/CreateMirror22Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror22 -Archive Root URL: http://security.debian.org/ +Archive Root URL: http://archive.debian.org/debian-security/ Distribution: stretch/updates Components: main Architectures: amd64, arm64, armel, armhf, i386 diff --git a/system/t04_mirror/CreateMirror24Test_gold b/system/t04_mirror/CreateMirror24Test_gold index 4ca1af86..27f35f70 100644 --- a/system/t04_mirror/CreateMirror24Test_gold +++ b/system/t04_mirror/CreateMirror24Test_gold @@ -1,9 +1,9 @@ -Downloading http://security.debian.org/dists/stretch/updates/InRelease... -Success downloading http://security.debian.org/dists/stretch/updates/InRelease +Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease... +Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease gpgv: RSA key ID 331F7F50 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) " gpgv: RSA key ID E562B32A gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) " -Mirror [mirror24]: http://security.debian.org/ stretch/updates successfully added. +Mirror [mirror24]: http://archive.debian.org/debian-security/ stretch/updates successfully added. You can run 'aptly mirror update mirror24' to download repository contents. diff --git a/system/t04_mirror/EditMirror5Test_gold b/system/t04_mirror/EditMirror5Test_gold index 7b872740..898eed5a 100644 --- a/system/t04_mirror/EditMirror5Test_gold +++ b/system/t04_mirror/EditMirror5Test_gold @@ -1 +1 @@ -Mirror [mirror5]: http://security.debian.org/ stretch/updates successfully updated. +Mirror [mirror5]: http://archive.debian.org/debian-security/ stretch/updates successfully updated. diff --git a/system/t04_mirror/EditMirror5Test_mirror_show b/system/t04_mirror/EditMirror5Test_mirror_show index 685e8fff..3efc0d22 100644 --- a/system/t04_mirror/EditMirror5Test_mirror_show +++ b/system/t04_mirror/EditMirror5Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror5 -Archive Root URL: http://security.debian.org/ +Archive Root URL: http://archive.debian.org/debian-security/ Distribution: stretch/updates Components: main Architectures: amd64, arm64, armel, armhf, i386 diff --git a/system/t04_mirror/ShowMirror4Test_gold b/system/t04_mirror/ShowMirror4Test_gold index c531b649..c552a921 100644 --- a/system/t04_mirror/ShowMirror4Test_gold +++ b/system/t04_mirror/ShowMirror4Test_gold @@ -1,5 +1,5 @@ Name: mirror4 -Archive Root URL: http://security.debian.org/ +Archive Root URL: http://archive.debian.org/debian-security/ Distribution: stretch/updates Components: main Architectures: amd64, arm64, armel, armhf, i386 diff --git a/system/t04_mirror/ShowMirror8Test_gold b/system/t04_mirror/ShowMirror8Test_gold index dedfcd19..a951895e 100644 --- a/system/t04_mirror/ShowMirror8Test_gold +++ b/system/t04_mirror/ShowMirror8Test_gold @@ -1,7 +1,7 @@ { "UUID": "548dbdb6-75d6-42ac-80de-d6aff8012f83", "Name": "mirror4", - "ArchiveRoot": "http://security.debian.org/", + "ArchiveRoot": "http://archive.debian.org/debian-security/", "Distribution": "stretch/updates", "Components": [ "main" diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 2af8a99c..f4db5096 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -237,7 +237,7 @@ class CreateMirror19Test(BaseTest): """ fixtureGpg = True - runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://security.debian.org/ stretch/updates main" + runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://archive.debian.org/debian-security/ stretch/updates main" def outputMatchPrepare(self, s): return re.sub(r'Signature made .* using', '', s) @@ -258,7 +258,7 @@ class CreateMirror20Test(BaseTest): fixtureGpg = True configOverride = {"max-tries": 1} - runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ stretch/updates main" + runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://archive.debian.org/debian-security/ stretch/updates main" environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"} expectedCode = 1 @@ -270,8 +270,8 @@ class CreateMirror20Test(BaseTest): ).replace( 'proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137' ).replace( - 'Get http://security.debian.org/dists/stretch/updates/Release:', - 'Get "http://security.debian.org/dists/stretch/updates/Release":' + 'Get http://archive.debian.org/debian-security/dists/stretch/updates/Release:', + 'Get "http://archive.debian.org/debian-security/dists/stretch/updates/Release":' ) @@ -302,7 +302,7 @@ class CreateMirror22Test(BaseTest): """ create mirror: mirror with filter """ - runCmd = "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror22 http://security.debian.org/ stretch/updates main" + runCmd = "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror22 http://archive.debian.org/debian-security/ stretch/updates main" def check(self): def removeDates(s): @@ -317,7 +317,7 @@ class CreateMirror23Test(BaseTest): """ create mirror: mirror with wrong filter """ - runCmd = "aptly mirror create -ignore-signatures -filter='nginx | ' mirror23 http://security.debian.org/ stretch/updates main" + runCmd = "aptly mirror create -ignore-signatures -filter='nginx | ' mirror23 http://archive.debian.org/debian-security/ stretch/updates main" expectedCode = 1 @@ -325,7 +325,7 @@ class CreateMirror24Test(BaseTest): """ create mirror: disable config value with option """ - runCmd = "aptly mirror create -ignore-signatures=false -keyring=aptlytest.gpg mirror24 http://security.debian.org/ stretch/updates main" + runCmd = "aptly mirror create -ignore-signatures=false -keyring=aptlytest.gpg mirror24 http://archive.debian.org/debian-security/ stretch/updates main" fixtureGpg = True def outputMatchPrepare(self, s): diff --git a/system/t04_mirror/edit.py b/system/t04_mirror/edit.py index dd1b7491..0b6f6d7d 100644 --- a/system/t04_mirror/edit.py +++ b/system/t04_mirror/edit.py @@ -49,7 +49,7 @@ class EditMirror5Test(BaseTest): edit mirror: remove filter """ fixtureCmds = [ - "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror5 http://security.debian.org/ stretch/updates main", + "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror5 http://archive.debian.org/debian-security/ stretch/updates main", ] runCmd = "aptly mirror edit -filter= mirror5" diff --git a/system/t04_mirror/show.py b/system/t04_mirror/show.py index 07770574..2f5d07f4 100644 --- a/system/t04_mirror/show.py +++ b/system/t04_mirror/show.py @@ -35,7 +35,7 @@ class ShowMirror4Test(BaseTest): show mirror: mirror with filter """ fixtureCmds = [ - "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ stretch/updates main" + "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://archive.debian.org/debian-security/ stretch/updates main" ] runCmd = "aptly mirror show mirror4" @@ -75,7 +75,7 @@ class ShowMirror8Test(BaseTest): show mirror: mirror with filter """ fixtureCmds = [ - "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ stretch/updates main" + "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://archive.debian.org/debian-security/ stretch/updates main" ] runCmd = "aptly mirror show -json mirror4"