From d14686b0bdc0b2418300c5d34d5f13c19988f020 Mon Sep 17 00:00:00 2001
From: Erich Eckner <erich.eckner.ext@bestsecret.com>
Date: Mon, 22 May 2023 16:12:55 +0200
Subject: build-packages: do not try to download sources from archlinux - we
 don't have a repo anymore

---
 bin/build-packages      | 49 +------------------------------------------------
 conf/slave.conf.example |  2 +-
 lib/load-configuration  |  2 +-
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/bin/build-packages b/bin/build-packages
index 485d19a..9e41951 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -74,8 +74,6 @@ usage() {
   >&2 echo '    clean the chroot before building'
   >&2 echo '  :haskell_without_check:'
   >&2 echo '    try with :without_check: iff this is a haskell-*, python-* or python2-* package'
-  >&2 echo '  :mirrored_source:'
-  >&2 echo '    compile from source tarbal from sources.archlinux.org if possible'
   >&2 echo '  :mirrored_source_by_hash:'
   >&2 echo '    download sources from sources.archlinux32.org by hash if possible'
   >&2 echo '  :on_x86_64:'
@@ -584,53 +582,8 @@ while [ "${count}" -ne 0 ] && \
             verifysource_trial=$((verifysource_trial + 1))
           fi
 
-          # try to download source from sources.archlinux.org/sources/$repo/$source
-          if [ ${verifysource_trial} -eq 3 ]; then
-            if echo "${straw}" | \
-              grep -qF ':mirrored_source:'; then
-              source_name=$(
-                makepkg --printsrcinfo | \
-                  sed -n '
-                    /^\s*\(epoch\|pkg\(base\|ver\|rel\)\) = /{s|^\s\+||;p}
-                    /^pkgname = /q
-                  ' | \
-                  sed '
-                    s|^pkgbase = \(.*\)$|0 \1-|
-                    s|^epoch = \(.*\)$|1 \1:|
-                    s|^pkgver = \(.*\)$|2 \1-|
-                    s|^pkgrel = \([^.]*\)\(\..*\)\?$|3 \1.src.tar.gz|
-                  ' | \
-                  sort -k1n,1 | \
-                  sed '
-                    s|^[0-9] ||
-                    :a
-                      N
-                      s|\n[0-9] \(\S\+\)$|\1|
-                    ta
-                  '
-              )
-              if wget -q --timeout=15 -nc -nd "https://sources.archlinux.org/sources/${git_repo}/${source_name}"; then
-                # shellcheck disable=SC2046
-                tar -zst --overwrite \
-                  -f "${source_name}" \
-                  --exclude PKGBUILD \
-                  $(
-                    if [ -n "${PKGBUILD_mod}" ]; then
-                      git -C "${repo_paths__archlinux32}/${PKGBUILD_mod%/*}" archive "${mod_git_revision}" -- . | \
-                        tar -t | \
-                        sed 's/^/--exclude /'
-                    fi
-                  ) \
-                  --strip-components=1 \
-                  || true
-                continue
-              fi
-            fi
-            verifysource_trial=$((verifysource_trial + 1))
-          fi
-
           # try to download source from sources.archlinux32.org by its hash
-          if [ ${verifysource_trial} -eq 4 ]; then
+          if [ ${verifysource_trial} -eq 3 ]; then
             if echo "${straw}" | \
               grep -qF ':mirrored_source_by_hash:'; then
               if download_sources_by_hash; then
diff --git a/conf/slave.conf.example b/conf/slave.conf.example
index 5f4cf92..c72f10d 100755
--- a/conf/slave.conf.example
+++ b/conf/slave.conf.example
@@ -24,7 +24,7 @@
 # what should be tried in what order to somehow repair a broken build
 #straws_that_might_repair_failing_builds=$(
 #  printf '%s\n' \
-#    ':mirrored_source:mirrored_source_by_hash:' \
+#    ':mirrored_source_by_hash:' \
 #    ':clean_chroot:haskell_without_check:' \
 #    ':with_build_support:' \
 #    ':with_build_support:clean_chroot:'
diff --git a/lib/load-configuration b/lib/load-configuration
index a339acf..22b6608 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -99,7 +99,7 @@ source_by_hash_mirror='https://sources.archlinux32.org/'
 # what should be tried in what order to somehow repair a broken build
 straws_that_might_repair_failing_builds=$(
   printf '%s\n' \
-    ':mirrored_source:mirrored_source_by_hash:' \
+    ':mirrored_source_by_hash:' \
     ':clean_chroot:haskell_without_check:' \
     ':with_build_support:' \
     ':with_build_support:clean_chroot:'
-- 
cgit v1.2.3-54-g00ecf