D7653.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7653.diff
View Options

	Index: head/usr.sbin/portsnap/portsnap/portsnap.sh
	===================================================================
	--- head/usr.sbin/portsnap/portsnap/portsnap.sh
	+++ head/usr.sbin/portsnap/portsnap/portsnap.sh
	@@ -651,7 +651,7 @@
	# Verify a list of files
	fetch_snapshot_verify() {
	while read F; do
	- if [ "`gunzip -c snap/${F} \| ${SHA256} -q`" != ${F} ]; then
	+ if [ "`gunzip -c < snap/${F}.gz \| ${SHA256} -q`" != ${F} ]; then
	echo "snapshot corrupt."
	return 1
	fi
	@@ -686,7 +686,7 @@
	cut -f 2 -d '\|' tINDEX.new \| fetch_snapshot_verify \|\| return 1
	# Extract the index
	rm -f INDEX.new
	- gunzip -c snap/`look INDEX tINDEX.new \|
	+ gunzip -c < snap/`look INDEX tINDEX.new \|
	cut -f 2 -d '\|'`.gz > INDEX.new
	fetch_index_sanity \|\| return 1
	# Verify the snapshot contents
	@@ -782,7 +782,7 @@

	# Extract the index
	echo -n "Extracting index... " 1>${QUIETREDIR}
	- gunzip -c files/`look INDEX tINDEX.new \|
	+ gunzip -c < files/`look INDEX tINDEX.new \|
	cut -f 2 -d '\|'`.gz > INDEX.new
	fetch_index_sanity \|\| return 1

	@@ -902,7 +902,7 @@
	echo -n "$1 not provided by portsnap server; "
	echo "$2 not being generated."
	else
	- gunzip -c "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX \|
	+ gunzip -c < "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX \|
	cut -f 2 -d '\|'`.gz" \|
	cat - ${LOCALDESC} \|
	${MKINDEX} /dev/stdin > ${PORTSDIR}/$2