Version 20191227

We need to modify the matching of valid package files to support formats
like zstd. Let's try to use an eager approach instead of a simple
whitelist in order to be functional for arbitrary formats that may be
introduced in the future without the need to adjust any code.

Allow any single fragment word as compression type but filter out known
non-package content like signature files.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>

Makefile

@@ -1,4 +1,4 @@
-V=20191130
+V=20191227
 
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man

lib/common.sh

@@ -142,7 +142,7 @@ find_cached_package() {
 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue
 
-		for pkg in "$dir"/*.pkg.tar?(.?z); do
+		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
 			[[ -f $pkg ]] || continue
 
 			# avoid adding duplicates of the same inode
@@ -152,7 +152,7 @@ find_cached_package() {
 
 			# split apart package filename into parts
 			pkgbasename=${pkg##*/}
-			pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
+			pkgbasename=${pkgbasename%.pkg.tar*}
 
 			arch=${pkgbasename##*-}
 			pkgbasename=${pkgbasename%-"$arch"}

makechrootpkg.in

@@ -387,17 +387,28 @@ if (( ret != 0 )); then
 else
 	if (( run_checkpkg )); then
 		msg "Running checkpkg"
-		remotepkgs=($(pacman -Syddp --logfile /dev/null "${pkgnames[@]}"|grep '://'))
+
+		# sync off-site databases for up-to-date queries
+		trap 'rm -rf $dbpath; cleanup' EXIT INT TERM QUIT
+		dbpath=$(mktemp -d --tmpdir makechrootpkg-database.XXXXXXXXXX)
+		mkdir -p "$dbpath"
+		pacman -Sy --dbpath "$dbpath" --logfile /dev/null
+
+		# query current package locations
+		remotepkgs=($(pacman -Sddp --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"))
 		if (( $? )); then
 			warning "Skipped checkpkg due to missing repo packages"
 			exit 0
 		fi
-		for remotepkg in ${remotepkgs[@]}; do
+
+		# download package files if any non-local location exists
+		for remotepkg in "${remotepkgs[@]}"; do
 			[[ $remotepkg == file://* ]] && continue
 			msg2 "Downloading current versions"
-			pacman --noconfirm -Swdd --logfile /dev/null "${pkgnames[@]}"
+			pacman --noconfirm -Swdd --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"
 			break
 		done
+
 		msg2 "Checking packages"
 		sudo -u "$makepkg_user" checkpkg --rmdir --warn
 	fi

makepkg-x86_64.conf

@@ -132,7 +132,7 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -z -q -)
+COMPRESSZST=(zstd -c -T0 --ultra -20 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
@@ -143,7 +143,7 @@ COMPRESSLZ=(lzip -c -f)
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.xz'
+PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'
 
 # vim: set ft=sh ts=2 sw=2 et:

makerepropkg.in

@@ -59,7 +59,7 @@ get_pkgfile() {
     local pkgname=${pkgfilebase%-*-*-*}
     local pkgfile ext
 
-    for ext in .xz .zstd ''; do
+    for ext in .xz .zst ''; do
         pkgfile=${pkgfilebase}.pkg.tar${ext}
 
         for c in "${cache_dirs[@]}"; do

offload-build

@@ -116,4 +116,6 @@ if (( ${#files[@]} )); then
     printf '%s\n' '' '-> copying files...'
     load_makepkg_config
     scp "${files[@]/#/$server:}" "${PKGDEST:-${PWD}}/"
+else
+    exit 1
 fi