From f96ad033f9ab7a310135312a9bd16197a7e55d14 Mon Sep 17 00:00:00 2001 From: Saundr21 Date: Wed, 21 Aug 2024 16:11:25 +0100 Subject: [PATCH 1/2] Remove instances of buster build from pipeline --- .github/workflows/build-packages.yml | 9 ----- .gitlab-ci.yml | 10 ----- debian/misc/backport | 2 - debian/misc/build-anon-sources | 4 +- operations/anon-debian-repo.hcl | 58 +++++----------------------- 5 files changed, 10 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index da93a52d93..51b404b544 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -88,15 +88,6 @@ jobs: suite: bullseye arch: arm64 runner: arm64 - # Debian Buster - - os: debian - suite: buster - arch: amd64 - runner: ubuntu-latest - - os: debian - suite: buster - arch: arm64 - runner: arm64 # Ubuntu Noble - os: ubuntu suite: noble diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e0c7ec842..13dd941674 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,16 +217,6 @@ debian-disable-relay: script: - ./scripts/ci/ci-driver.sh -##### -# GPL licensed mode, enables pow module -debian-gpl: - image: debian:buster - <<: *debian-template - variables: - GPL: "yes" - script: - - ./scripts/ci/ci-driver.sh - ##### # NSS check on debian debian-nss: diff --git a/debian/misc/backport b/debian/misc/backport index 8c4537ea92..6fb344f3e8 100755 --- a/debian/misc/backport +++ b/debian/misc/backport @@ -37,7 +37,6 @@ squeeze d6.squeeze 1 wheezy d7.wheezy 1 jessie d8.jessie 1 stretch d9.stretch 1 -buster d10.buster 1 bullseye d11.bullseye 1 bookworm d12.bookworm 1 trixie d13.trixie 1 @@ -47,7 +46,6 @@ squeeze-bpo bpo6 1 squeeze-backports wheezy-bpo bpo7 1 wheezy-backports jessie-bpo bpo8 1 jessie-backports stretch-bpo bpo9 1 stretch-backports -buster-bpo bpo10 1 buster-backports bullseye-bpo bpo11 1 bullseye-backports bookworm-bpo bpo12 1 bookworm-backports trixie-bpo bpo13 1 trixie-backports diff --git a/debian/misc/build-anon-sources b/debian/misc/build-anon-sources index 47da4acda4..b7803bb40f 100755 --- a/debian/misc/build-anon-sources +++ b/debian/misc/build-anon-sources @@ -148,9 +148,7 @@ backport_all() { # buster ################################################# - bp1 $pkg $dir $sid_debian_version buster - (cd $dir; remove_runit) - bp2 $pkg $dir $origtar + # null # bullseye ################################################# diff --git a/operations/anon-debian-repo.hcl b/operations/anon-debian-repo.hcl index 54f3d3b8e7..6c394219a2 100644 --- a/operations/anon-debian-repo.hcl +++ b/operations/anon-debian-repo.hcl @@ -170,53 +170,53 @@ fetchers: repo: ator-protocol assets_regexp: ^anon.+-dev-.+\.deb labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_stage_github_releases owner: ATOR-Development repo: ator-protocol assets_regexp: ^anon.+-stage-.+\.deb labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_beta_github_releases owner: ATOR-Development repo: ator-protocol assets_regexp: ^anon.+-beta-.+\.deb labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_live_github_releases owner: ATOR-Development repo: ator-protocol assets_regexp: ^anon.+-live-.+\.deb labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' nginx_access_log: - name: anon_dev_debian_repo access_log_path: "/alloc/data/access.log" access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-dev.+\.deb HTTP\/1\.1" 200' labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_stage_debian_repo access_log_path: "/alloc/data/access.log" access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-stage.+\.deb HTTP\/1\.1" 200' labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_beta_debian_repo access_log_path: "/alloc/data/access.log" access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-beta.+\.deb HTTP\/1\.1" 200' labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' - name: anon_live_debian_repo access_log_path: "/alloc/data/access.log" access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-live.+\.deb HTTP\/1\.1" 200' labels: - os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb' + os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb' arch: '(amd64|arm64)\.deb' EOH destination = "local/exporter.yml" @@ -307,14 +307,6 @@ Components: main Description: Anon Debian Bullseye Live SignWith: YES -Origin: Anon -Label: Anon -Codename: anon-live-buster -Architectures: amd64 arm64 source -Components: main -Description: Anon Debian Buster Live -SignWith: YES - Origin: Anon Label: Anon Codename: anon-live-noble @@ -367,14 +359,6 @@ Components: main Description: Anon Debian Bullseye Beta SignWith: YES -Origin: Anon -Label: Anon -Codename: anon-beta-buster -Architectures: amd64 arm64 source -Components: main -Description: Anon Debian Buster Beta -SignWith: YES - Origin: Anon Label: Anon Codename: anon-beta-noble @@ -427,14 +411,6 @@ Components: main Description: Anon Debian Bullseye Stage SignWith: YES -Origin: Anon -Label: Anon -Codename: anon-stage-buster -Architectures: amd64 arm64 source -Components: main -Description: Anon Debian Buster Stage -SignWith: YES - Origin: Anon Label: Anon Codename: anon-stage-noble @@ -487,14 +463,6 @@ Components: main Description: Anon Debian Bullseye Dev SignWith: YES -Origin: Anon -Label: Anon -Codename: anon-dev-buster -Architectures: amd64 arm64 source -Components: main -Description: Anon Debian Buster Dev -SignWith: YES - Origin: Anon Label: Anon Codename: anon-dev-noble @@ -547,14 +515,6 @@ Components: main Description: Anon Debian Bullseye Unstable Dev SignWith: YES -Origin: Anon -Label: Anon -Codename: anon-unstable-dev-buster -Architectures: amd64 arm64 source -Components: main -Description: Anon Debian Buster Unstable Dev -SignWith: YES - Origin: Anon Label: Anon Codename: anon-unstable-dev-noble @@ -600,7 +560,7 @@ SignWith: YES Name: incoming IncomingDir: /data/debian/incoming TempDir: /tmp -Allow: anon-live-bookworm anon-live-bullseye anon-live-buster anon-live-noble anon-live-lunar anon-live-jammy anon-live-focal anon-beta-bookworm anon-beta-bullseye anon-beta-buster anon-beta-noble anon-beta-lunar anon-beta-jammy anon-beta-focal anon-stage-bookworm anon-stage-bullseye anon-stage-buster anon-stage-noble anon-stage-lunar anon-stage-jammy anon-stage-focal anon-dev-bookworm anon-dev-bullseye anon-dev-buster anon-dev-noble anon-dev-lunar anon-dev-jammy anon-dev-focal anon-unstable-dev-bookworm anon-unstable-dev-bullseye anon-unstable-dev-buster anon-unstable-dev-noble anon-unstable-dev-lunar anon-unstable-dev-jammy anon-unstable-dev-focal +Allow: anon-live-bookworm anon-live-bullseye anon-live-noble anon-live-lunar anon-live-jammy anon-live-focal anon-beta-bookworm anon-beta-bullseye anon-beta-noble anon-beta-lunar anon-beta-jammy anon-beta-focal anon-stage-bookworm anon-stage-bullseye anon-stage-noble anon-stage-lunar anon-stage-jammy anon-stage-focal anon-dev-bookworm anon-dev-bullseye anon-dev-noble anon-dev-lunar anon-dev-jammy anon-dev-focal anon-unstable-dev-bookworm anon-unstable-dev-bullseye anon-unstable-dev-noble anon-unstable-dev-lunar anon-unstable-dev-jammy anon-unstable-dev-focal Cleanup: on_deny on_error unused_files EOH destination = "local/incoming" From 95920b99473a97b6876049f7ad683c0109ff797d Mon Sep 17 00:00:00 2001 From: Yurii Kovalchuk <103324562+yumirkov@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:54:45 +0300 Subject: [PATCH 2/2] ATOR-406 - Fix DA fingerprint (#84) --- src/app/config/auth_dirs_dev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/auth_dirs_dev.inc b/src/app/config/auth_dirs_dev.inc index 7ca34644b3..9340ca53cc 100644 --- a/src/app/config/auth_dirs_dev.inc +++ b/src/app/config/auth_dirs_dev.inc @@ -1,6 +1,6 @@ "AnyoneDmzDev orport=9001 " "v3ident=B4962270303E4566EF7326A0B3E57FE32EC0859E " - "88.99.219.105:9030 148206F447039632ACC1BFE35C57E6106CF6E5E3", + "88.99.219.105:9030 CDC5115240E378E40AB01F156217AEF5C8135729", "AnyoneFalDev orport=9001 " "v3ident=7C8C4C3BB0A20AFFC82BB483950A6520B8B1930B " "176.9.29.53:9030 4B509397F5D55A8DEE015AAE062F787182A90849",