Merge branch 'master' into lukeshu/xbs

# Conflicts:
#	config
#	cron-jobs/db-cleanup
#	db-check-nonfree
#	db-import-archlinux-any-to-ours
#	db-import-archlinux-pkg
#	db-import-archlinux-src
#	test/lib/common.inc
#	test/test.d/create-filelists.sh
#	test/test.d/db-update.sh
#	test/test.d/testing2x.sh

1 files changed, 47 insertions, 0 deletions

diff --git a/db-check-nonfree b/db-check-nonfree
new file mode 100755
index 0000000..ea123fa
--- /dev/null
+++ b/db-check-nonfree
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-check-nonfree.conf"
+. "$(dirname "$(readlink -e "$0")")/db-functions"
+
+if [ $# -ge 1 ]; then
+	error "Calling %s with a specific repository is not supported" "${0##*/}"
+	exit 1
+fi
+
+# TODO: this might lock too much (architectures)
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
+		repo_lock "${repo}" "${pkgarch}" || exit 1
+	done
+done
+
+msg "Check nonfree in repo:"
+nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u))
+for repo in "${ARCHREPOS[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
+		msg2 "%s %s" "$repo" "$pkgarch"
+		if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
+			continue
+		fi
+		unset dbpkgs
+		unset cleanpkgs
+		cleanpkgs=()
+		dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort -u ))
+		for pkgname in "${dbpkgs[@]}"; do
+			if in_array "${pkgname}" "${nonfree[@]}"; then
+				cleanpkgs+=("${pkgname}")
+			fi
+		done
+		if [ ${#cleanpkgs[@]} -ge 1 ]; then
+			msg2 "Nonfree: %s" "${cleanpkgs[*]}"
+			arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
+		fi
+	done
+done
+
+for repo in "${repos[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
+		repo_unlock "${repo}" "${pkgarch}"
+	done
+done