From 671643053d1751c7264bb5282a9ce170855b4c35 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 6 Nov 2011 10:32:55 +0100
Subject: archbuild: Always use recent makepkg.conf and pacman.conf; Run namcap
 by default

---
 archbuild.in         | 23 ++++++++++++++++-------
 pacman-extra.conf    |  2 +-
 pacman-multilib.conf |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/archbuild.in b/archbuild.in
index e3e5f13..502654c 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -53,25 +53,34 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	done
 	exec 9>&-
 
+	# FIXME: temporary workaround until pacman 4.0 moves to [core]
+	if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then
+		pacman_conf=$(mktemp)
+		cp "@pkgdatadir@/pacman-${repo}.conf" "${pacman_conf}"
+		sed -r 's/^#(SigLevel = Never)/\1/' -i "${pacman_conf}"
+	else
+		pacman_conf="@pkgdatadir@/pacman-${repo}.conf"
+	fi
+
 	rm -rf "${chroots}/${repo}-${arch}"
 	mkdir -p "${chroots}/${repo}-${arch}"
 	setarch "${arch}" mkarchroot \
-		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-C "${pacman_conf}" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}"
 
 	# FIXME: temporary workaround until pacman 4.0 moves to [core]
-	case $repo in
-		core|extra|community|multilib)
-			sed -r '/^SigLevel.*/d' -i "${chroots}/${repo}-${arch}/root/etc/pacman.conf"
-		;;
-	esac
+	if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then
+		cp "@pkgdatadir@/pacman-${repo}.conf" "${chroots}/${repo}-${arch}/root/etc/pacman.conf"
+	fi
 else
 	setarch ${arch} mkarchroot \
 		-u \
+		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root"
 fi
 
 msg "Building in chroot for [${repo}] (${arch})..."
-setarch "${arch}" makechrootpkg -c -r "${chroots}/${repo}-${arch}"
+setarch "${arch}" makechrootpkg -c -n -r "${chroots}/${repo}-${arch}"
diff --git a/pacman-extra.conf b/pacman-extra.conf
index 828e2bd..c0b7771 100644
--- a/pacman-extra.conf
+++ b/pacman-extra.conf
@@ -48,7 +48,7 @@ Architecture = auto
 # trusted.
 #SigLevel = Optional TrustAll
 # Disable signature checks for now
-SigLevel = Never
+#SigLevel = Never
 
 #
 # REPOSITORIES
diff --git a/pacman-multilib.conf b/pacman-multilib.conf
index 709361e..5dada55 100644
--- a/pacman-multilib.conf
+++ b/pacman-multilib.conf
@@ -48,7 +48,7 @@ Architecture = auto
 # trusted.
 #SigLevel = Optional TrustAll
 # Disable signature checks for now
-SigLevel = Never
+#SigLevel = Never
 
 #
 # REPOSITORIES
-- 
cgit v1.2.3-70-g09d2