From 02db85b545432f08bb22429a71d4b0feda2ef3c5 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 28 Feb 2022 17:38:04 +0100
Subject: [PATCH] chore: update DIGEST process to reflect upstream name changes

---
 configure            |  2 +-
 scripts/functions.sh | 10 +++++-----
 scripts/main.sh      |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index ccd8e44..d3e8e72 100755
--- a/configure
+++ b/configure
@@ -364,7 +364,7 @@ function load_default_config() {
 	GENTOO_MIRROR="https://mirror.eu.oneandone.net/linux/distributions/gentoo/gentoo"
 	GENTOO_ARCH="amd64"
 
-	SELECT_MIRRORS=true
+	SELECT_MIRRORS=false
 	SELECT_MIRRORS_LARGE_FILE=false
 
 	ADDITIONAL_PACKAGES=()
diff --git a/scripts/functions.sh b/scripts/functions.sh
index b73dc3c..072a139 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -792,7 +792,7 @@ function download_stage3() {
 	else
 		einfo "Downloading $STAGE3_BASENAME tarball"
 		download "$STAGE3_RELEASES/${CURRENT_STAGE3}" "${CURRENT_STAGE3}"
-		download "$STAGE3_RELEASES/${CURRENT_STAGE3}.DIGESTS.asc" "${CURRENT_STAGE3}.DIGESTS.asc"
+		download "$STAGE3_RELEASES/${CURRENT_STAGE3}.asc" "${CURRENT_STAGE3}.asc"
 
 		# Import gentoo keys
 		einfo "Importing gentoo gpg key"
@@ -803,14 +803,14 @@ function download_stage3() {
 			|| die "Could not import gentoo gpg key"
 
 		# Verify DIGESTS signature
-		einfo "Verifying DIGEST.asc signature"
-		gpg --quiet --verify "${CURRENT_STAGE3}.DIGESTS.asc" \
-			|| die "Signature of '${CURRENT_STAGE3}.DIGESTS.asc' invalid!"
+		einfo "Verifying tarball signature"
+		gpg --quiet --verify "${CURRENT_STAGE3}.asc" \
+			|| die "Signature of '${CURRENT_STAGE3}.asc' invalid!"
 
 		# Check hashes
 		einfo "Verifying tarball integrity"
 		# Replace any absolute paths in the digest file with just the stage3 basename, so it will be found by rhash
-		rhash -P --check <(grep -B 1 'tar.xz$' "${CURRENT_STAGE3}.DIGESTS.asc" | sed -e 's/  .*stage3-/  stage3-/') \
+		rhash -P --check <(grep -B 1 'tar.xz$' "${CURRENT_STAGE3}.DIGESTS" | sed -e 's/  .*stage3-/  stage3-/') \
 			|| die "Checksum mismatch!"
 
 		# Create verification file in case the script is restarted
diff --git a/scripts/main.sh b/scripts/main.sh
index 0c6a1e9..28eb013 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -90,6 +90,8 @@ function configure_portage() {
 		einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS"
 		echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \
 			|| die "Could not modify /etc/portage/make.conf"
+		chmod 644 /etc/portage/make.conf \
+			|| die "Could not chmod 644 /etc/portage/make.conf"
 	fi
 }