Merge branch 'master' into lukeshu/xbslukeshu/xbs

# Conflicts:
#	config

5 files changed, 25 insertions, 20 deletions

diff --git a/config b/config
index 75eae37..a9b1a09 100644
--- a/config
+++ b/config
@@ -11,11 +11,12 @@ esac
 
 FTP_BASE="/srv/repo/main"
 PKGREPOS=()
-# PKGREPOS=(
-# 	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
-# 	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
-# 	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
-# 	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
+#PKGREPOS=(
+#	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
+#	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
+#	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
+#	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'pcr-testing' 'kernels'
+#	'cross' 'java' 'unmaintained')
 PKGPOOL=''
 SRCPOOL=''
 
diff --git a/config.local.parabola b/config.local.parabola
index 648dfbb..6b00abe 100644
--- a/config.local.parabola
+++ b/config.local.parabola
@@ -6,7 +6,8 @@ PKGREPOS=(
 	libre-multilib{,-testing}
 	# Community project repos
 	{nonsystemd,nonprism}{,-testing}
-	pcr kernels cross java
+	pcr{,-testing} kernels cross java
+	unmaintained
 	# User repos
 	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
 )
diff --git a/db-import-archlinux-pkg b/db-import-archlinux-pkg
index aae7862..17fa38d 100755
--- a/db-import-archlinux-pkg
+++ b/db-import-archlinux-pkg
@@ -89,12 +89,9 @@ init() {
 
 			# Remove blacklisted packages and count them
 			# TODO capture all removed packages for printing on debug mode
-			msg2 "Removing blacklisted packages from %s database..." .db
+			msg2 "Removing blacklisted packages from %s and %s databases..." .db .files
 			LC_ALL=C repo-remove "${db_file}" "${blacklist[@]}" \
 			|& sed -n 's/-> Removing/	&/p'
-			msg2 "Removing blacklisted packages from %s database..." .files
-			LC_ALL=C repo-remove "${files_file}" "${blacklist[@]}" \
-			|& sed -n 's/-> Removing/	&/p'
 			# Get db contents
 			db=($(get_repo_content "${db_file}"))
 
diff --git a/db-import-archlinux.conf b/db-import-archlinux.conf
index fdf7a6a..8361121 100644
--- a/db-import-archlinux.conf
+++ b/db-import-archlinux.conf
@@ -1,4 +1,4 @@
-ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
+ARCHREPOS=('core' 'extra' 'testing' 'community' 'community-testing' 'multilib' 'multilib-testing')
 ARCHPKGPOOLS=(pool/{packages,community})
 ARCHSRCPOOLS=(sources/{packages,community})
 ARCHARCHES=(i686 x86_64)
diff --git a/db-import-archlinuxarm-pkg b/db-import-archlinuxarm-pkg
index 8d8cb3d..ef8c810 100755
--- a/db-import-archlinuxarm-pkg
+++ b/db-import-archlinuxarm-pkg
@@ -6,10 +6,9 @@
 # * Get repo.db from an Arch-like repo
 # * Generate a list of available packages
 # * Create sync whitelist (based on package blacklist)
-# * Get packages
-# * Check package signatures
-# * Check database signatures
-# * Sync repo => repo
+# * Get packages and signatures
+# * Create new repo.db with them
+# * Sync repo.db => repo.db
 
 # TODO
 # * make a tarball of files used for forensics
@@ -89,12 +88,9 @@ init() {
 
 			# Remove blacklisted packages and count them
 			# TODO capture all removed packages for printing on debug mode
-			msg2 "Removing blacklisted packages from %s database..." .db
+			msg2 "Removing blacklisted packages from %s and %s databases..." .db .files
 			LC_ALL=C repo-remove "${db_file}" "${blacklist[@]}" \
 			|& sed -n 's/-> Removing/	&/p'
-			msg2 "Removing blacklisted packages from %s database..." .files
-			LC_ALL=C repo-remove "${files_file}" "${blacklist[@]}" \
-			|& sed -n 's/-> Removing/	&/p'
 			# Get db contents
 			db=($(get_repo_content "${db_file}"))
 
@@ -121,6 +117,16 @@ init() {
 				"rsync://${mirror}/${mirrorpath}/${_arch}/${_repo}/" \
 				"${FTP_BASE}/${PKGPOOLARM}/"
 
+			# Avoid sloppy upstream databases with corrupt package descriptions,
+			# exclude .sig files from consideration.
+			msg2 "Adding whitelisted packages to clean %s and %s databases..." .db .files
+			# Optional, repo-add overwrites entries by default
+			rm "$db_file" "$files_file"
+			LC_ALL=C repo-add "$db_file" \
+				$(sed "s|^|${FTP_BASE}/${PKGPOOLARM}/|; s|$|${PKGEXT}|" \
+					"/tmp/${_repo}-${_arch}.whitelist") \
+			|& sed -n 's/==> Adding/	-> Adding/p'
+
 			msg "Putting databases back in place"
 			rsync "${extra[@]}" --no-motd -rtlH \
 				--delay-updates \
@@ -129,7 +135,7 @@ init() {
 				"${FTP_BASE}/${_repo}/os/${_arch}/"
 
 			# Cleanup
-			unset db 
+			unset db
 		done
 	done