Attachment 191785 Details for Bug 226893 – Adds support for TAG_OVERRIDE environment variable

[patch] Adds support for TAG_OVERRIDE environment variable

freebsd-update.sh-patch (text/plain), 1.71 KB, created by Derek on 2018-03-24 14:17:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek

Created: 2018-03-24 14:17:10 UTC

Size: 1.71 KB

patch

obsolete

>--- freebsd-update.sh.orig	2018-03-21 16:40:57.314568277 -0400
>+++ freebsd-update.sh	2018-03-21 16:34:33.763594683 -0400
>@@ -1117,19 +1117,24 @@
> 
> # Fetch metadata signature, aka "tag".
> fetch_tag () {
>-	echo -n "Fetching metadata signature "
>-	echo ${NDEBUG} "for ${RELNUM} from ${SERVERNAME}... "
>-	rm -f latest.ssl
>-	fetch ${QUIETFLAG} http://${SERVERNAME}/${FETCHDIR}/latest.ssl	\
>-	    2>${QUIETREDIR} || true
>-	if ! [ -r latest.ssl ]; then
>-		echo "failed."
>-		return 1
>-	fi
>+	if [ -z "$1" ]; then
>+		echo -n "Fetching metadata signature "
>+		echo ${NDEBUG} "for ${RELNUM} from ${SERVERNAME}... "
>+		rm -f latest.ssl
>+		fetch ${QUIETFLAG} http://${SERVERNAME}/${FETCHDIR}/latest.ssl	\
>+		    2>${QUIETREDIR} || true
>+		if ! [ -r latest.ssl ]; then
>+			echo "failed."
>+			return 1
>+		fi
> 
>-	openssl rsautl -pubin -inkey pub.ssl -verify		\
>-	    < latest.ssl > tag.new 2>${QUIETREDIR} || true
>-	rm latest.ssl
>+		openssl rsautl -pubin -inkey pub.ssl -verify		\
>+		    < latest.ssl > tag.new 2>${QUIETREDIR} || true
>+		rm latest.ssl
>+	else
>+		echo "Using metadata signature from environment TAG_OVERRIDE."
>+		echo "$1" > tag.new
>+	fi
> 
> 	if ! [ `wc -l < tag.new` = 1 ] ||
> 	    ! grep -qE	\
>@@ -2073,7 +2078,7 @@
> 
> 	# Try to fetch the metadata index signature ("tag") until we run
> 	# out of available servers; and sanity check the downloaded tag.
>-	while ! fetch_tag; do
>+	while ! fetch_tag "$TAG_OVERRIDE"; do
> 		fetch_pick_server || return 1
> 	done
> 	fetch_tagsanity || return 1
>@@ -2540,7 +2545,7 @@
> 
> 	# Try to fetch the NEW metadata index signature ("tag") until we run
> 	# out of available servers; and sanity check the downloaded tag.
>-	while ! fetch_tag; do
>+	while ! fetch_tag "$TAG_OVERRIDE"; do
> 		fetch_pick_server || return 1
> 	done
>

Actions: View | Diff

Attachments on bug 226893: 191785