From a0561a397b5e543658a7adb76c822fd2327698e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Wed, 14 Dec 2016 16:30:13 +0100
Subject: Updates file, libz, npth, Xproto, xtrans, libX11, Xrender, dash,
 diffutils, dos2unix, gawk, grep, make, man-db, mksh, openssh, patch, tar, The
 Silver Searcher, whois, and zsh. build.sh, etc/build.usage: adds -i (ignore
 SHA256 hash mismatches.) build.sh, build/pkg.build, subr/pkg.subr: skip
 `clean' build target unless explicitly specified.
 patches/man-db-2.7.6.1.local.patch: added.

---
 subr/pkg.subr | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'subr')

diff --git a/subr/pkg.subr b/subr/pkg.subr
index 0654c4aa..315bbfdd 100644
--- a/subr/pkg.subr
+++ b/subr/pkg.subr
@@ -17,7 +17,11 @@ fetch() {
 	if [ -n "${_f_sha256sum_src}" ]; then
 		set -- $(openssl dgst -sha256 ${_f_url_dst}); shift $((${#}-1));
 		if [ "${_f_sha256sum_dst:=${1}}" != "${_f_sha256sum_src}" ]; then
-			log_msg failexit "Error: hash mismatch for URL \`${_f_url}' (is: ${_f_sha256sum_dst}, should be: ${_f_sha256sum_src}.)";
+			if [ ${ARG_IGNORE_SHA256SUMS:-0} -eq 0 ]; then
+				log_msg failexit "Error: hash mismatch for URL \`${_f_url}' (is: ${_f_sha256sum_dst}, should be: ${_f_sha256sum_src}.)";
+			else
+				log_msg warn "Warning: hash mismatch for URL \`${_f_url}' (is: ${_f_sha256sum_dst}, should be: ${_f_sha256sum_src}.)";
+			fi;
 		fi;
 	fi;
 	touch ${_f_url_dst}.fetched;
@@ -47,13 +51,19 @@ fetch_git() {
 is_build_script_done() {
 	if [ "${1}" != "clean" ]\
 	&& [ "${ARG_RESTART}" = "ALL" ]; then
-		return 1;		# Build
+		return 1;			# Build
 	elif match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC}; then
-		if [ -n "${ARG_RESTART_AT}" ]			\
-		&& ! match_list "${ARG_RESTART_AT}" , "${1}"; then
-			return 0;	# Skip
+		if [ -n "${ARG_RESTART_AT}" ]; then
+			if [ "${1}" != "clean" ]\
+			&& [ "${ARG_RESTART_AT}" = "ALL" ]; then
+				return 1;	# Build
+			elif match_list "${ARG_RESTART_AT}" , "${1}"; then
+				return 1;	# Build
+			else
+				return 0;	# Skip
+			fi;
 		else
-			return 1;	# Build
+			return 1;		# Build
 		fi;
 	elif [ -f ${WORKDIR}/.${2:-${BUILD_PACKAGE_LC}}.${1} ]; then
 		return 0;		# Skip
-- 
cgit v1.2.3