From 4fcedea4ae5fb8788c7ef0ddd907ed8b02d14a5b Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Tue, 9 Sep 2014 19:04:25 -0400
Subject: disallow packages without a valid PACKAGER

Shame.

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 db-functions | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index bb49894..7e1b3aa 100644
--- a/db-functions
+++ b/db-functions
@@ -297,6 +297,13 @@ getpkgarch() {
 	echo "$_ver"
 }
 
+check_packager() {
+	local _packager
+
+	_packager=$(_grep_pkginfo "$1" "packager")
+	[[ $_packager && $_packager != 'Unknown Packager' ]]
+}
+
 getpkgfile() {
 	if [[ ${#} -ne 1 ]]; then
 		error 'No canonical package found!'
-- 
cgit v1.2.3-2-g168b


From fbd17dc8edc59e3b5c67acafebfcdda73e409e00 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 7 Feb 2016 09:47:03 +0100
Subject: Remove separate creation of file databases

With pacman 5.0 repo-add and repo-remove handle file databases by default.
---
 db-functions | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 7e1b3aa..667ac8d 100644
--- a/db-functions
+++ b/db-functions
@@ -169,7 +169,6 @@ trap cleanup EXIT
 repo_lock () {
 	local LOCKDIR="$TMPDIR/.repolock.$1.$2"
 	local DBLOCKFILE="${FTP_BASE}/${1}/os/${2}/${1}${DBEXT}.lck"
-	local FILESLOCKFILE="${FTP_BASE}/${1}/os/${2}/${1}${FILESEXT}.lck"
 	local _count
 	local _trial
 	local _timeout
@@ -181,10 +180,6 @@ repo_lock () {
 		error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat $DBLOCKFILE)"
 		return 1
 	fi
-	if [ -f "${FILESLOCKFILE}" ]; then
-		error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat ${FILESLOCKFILE})"
-		return 1
-	fi
 
 	if [ $# -eq 2 ]; then
 		_lockblock=true
@@ -508,8 +503,6 @@ arch_repo_add() {
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
 	/usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \
 		|| error "repo-add ${repo}${DBEXT} ${pkgs[@]}"
-	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \
-		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 
@@ -521,7 +514,6 @@ arch_repo_remove() {
 	local arch=$2
 	local pkgs=(${@:3})
 	local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}"
-	local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}"
 
 	if [ ! -f "${dbfile}" ]; then
 		error "No database found at '${dbfile}'"
@@ -529,8 +521,6 @@ arch_repo_remove() {
 	fi
 	/usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} \
 		|| error "repo-remove ${dbfile} ${pkgs[@]}"
-	/usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \
-		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
 
 	REPO_MODIFIED=1
-- 
cgit v1.2.3-2-g168b


From 282bf65c81e278b9237b4c202d325642bc0aa1a3 Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Mon, 8 Feb 2016 14:26:23 +0100
Subject: disallow packages not built in a chroot

double shame!
This will detect both, packages with missing .BUILDINFO (built in
non updated environments) and packages that are not built in a
chroot at all (indicated by non default builddir).

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 db-functions | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 667ac8d..3101c0c 100644
--- a/db-functions
+++ b/db-functions
@@ -230,6 +230,13 @@ _grep_pkginfo() {
 	echo "${_ret#${2} = }"
 }
 
+# usage: _grep_buildinfo pkgfile pattern
+_grep_buildinfo() {
+	local _ret
+
+	_ret="$(/usr/bin/bsdtar -xOqf "$1" .BUILDINFO | grep -m 1 "^${2} = ")"
+	echo "${_ret#${2} = }"
+}
 
 # Get the package base or name as fallback
 getpkgbase() {
@@ -299,6 +306,17 @@ check_packager() {
 	[[ $_packager && $_packager != 'Unknown Packager' ]]
 }
 
+check_buildinfo() {
+	/usr/bin/bsdtar -tf "$1" .BUILDINFO >/dev/null 2>&1
+}
+
+check_builddir() {
+	local _builddir
+
+	_builddir=$(_grep_buildinfo "$1" "builddir")
+	[[ $_builddir && $_builddir = '/build' ]]
+}
+
 getpkgfile() {
 	if [[ ${#} -ne 1 ]]; then
 		error 'No canonical package found!'
-- 
cgit v1.2.3-2-g168b


From 7850874b1ef1b18de585be108e3be899d95a3a2a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 12:07:09 -0400
Subject: Fix quoting around variables, especially arrays.

Other than pure quoting, this involved:
 - swapping */@ for array access in a few places
 - fiddling with printf in a pipeline
 - replacing `$(echo ${array[@]})` with `${array[*]}`
 - replacing `echo $(...)` with `...`

When searching for these things, I used the command:

    grep -Prn --exclude-dir=.git '(?<!["=]|\[\[ |\[\[ -[zn] )\$(?!{?#|\(|\? )'

and ignored a bunch of false positives.
---
 db-functions | 109 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 54 insertions(+), 55 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 3101c0c..39173f3 100644
--- a/db-functions
+++ b/db-functions
@@ -12,7 +12,7 @@ set_umask () {
 }
 
 restore_umask () {
-	umask $UMASK >/dev/null
+	umask "$UMASK" >/dev/null
 }
 
 # just like mv -f, but we touch the file and then copy the content so
@@ -81,7 +81,7 @@ in_array() {
 	[[ -z $1 ]] && return 1 # Not Found
 	local item
 	for item in "$@"; do
-		[[ $item = $needle ]] && return 0 # Found
+		[[ $item = "$needle" ]] && return 0 # Found
 	done
 	return 1 # Not Found
 }
@@ -93,16 +93,16 @@ in_array() {
 get_full_version() {
 	if [[ $1 -eq 0 ]]; then
 		# zero epoch case, don't include it in version
-		echo $2-$3
+		echo "$2-$3"
 	else
-		echo $1:$2-$3
+		echo "$1:$2-$3"
 	fi
 }
 
 script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
-		local _owner="$(/usr/bin/stat -c %U $LOCKDIR)"
+		local _owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
 		error "Script ${0##*/} is already locked by $_owner."
 		exit 1
 	else
@@ -130,12 +130,12 @@ cleanup() {
 	local arch
 
 	trap - EXIT INT QUIT TERM
-	for l in ${LOCKS[@]}; do
+	for l in "${LOCKS[@]}"; do
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
 			msg "Removing left over lock from [${repo}] (${arch})"
-			repo_unlock $repo $arch
+			repo_unlock "$repo" "$arch"
 		fi
 	done
 	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
@@ -148,7 +148,7 @@ cleanup() {
 		date +%s > "${FTP_BASE}/lastupdate"
 	fi
 
-	[ "$1" ] && exit $1
+	[ "$1" ] && exit "$1"
 }
 
 abort() {
@@ -191,9 +191,9 @@ repo_lock () {
 	fi
 
 	_count=0
-	while [ $_count -le $_trial ] || $_lockblock ; do
+	while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
-			_owner="$(/usr/bin/stat -c %U $LOCKDIR)"
+			_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
 			warning "Repo [${1}] (${2}) is already locked by $_owner. "
 			msg2 "Retrying in $LOCK_DELAY seconds..."
 		else
@@ -201,7 +201,7 @@ repo_lock () {
 			set_umask
 			return 0
 		fi
-		sleep $LOCK_DELAY
+		sleep "$LOCK_DELAY"
 		let _count=$_count+1
 	done
 
@@ -324,45 +324,45 @@ getpkgfile() {
 	elif [ ! -f "${1}" ]; then
 		error "Package ${1} not found!"
 		exit 1
-	elif ${REQUIRE_SIGNATURE} && [ ! -f "${1}.sig" ]; then
+	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
 		error "Package signature ${1}.sig not found!"
 		exit 1
 	fi
 
-	echo ${1}
+	echo "${1}"
 }
 
 getpkgfiles() {
 	local f
-	if [ ! -z "$(echo ${@%\.*} | sed "s/ /\n/g" | sort | uniq -D)" ]; then
+	if [ ! -z "$(printf '%s\n' "${@%\.*}" | sort | uniq -D)" ]; then
 		error 'Duplicate packages found!'
 		exit 1
 	fi
 
-	for f in ${@}; do
+	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
 			error "Package ${f} not found!"
 			exit 1
-		elif ${REQUIRE_SIGNATURE} && [ ! -f "${f}.sig" ]; then
+		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
 			error "Package signature ${f}.sig not found!"
 			exit 1
 		fi
 	done
 
-	echo ${@}
+	echo "${@}"
 }
 
 check_pkgfile() {
 	local pkgfile=$1
 
-	local pkgname="$(getpkgname ${pkgfile})"
+	local pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgver="$(getpkgver ${pkgfile})"
+	local pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgarch="$(getpkgarch ${pkgfile})"
+	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
-	in_array "${pkgarch}" ${ARCHES[@]} 'any' || return 1
+	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
 
 	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
@@ -373,17 +373,17 @@ check_pkgfile() {
 
 check_pkgsvn() {
 	local pkgfile="${1}"
-	local _pkgbase="$(getpkgbase ${pkgfile})"
+	local _pkgbase="$(getpkgbase "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgname="$(getpkgname ${pkgfile})"
+	local _pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgver="$(getpkgver ${pkgfile})"
+	local _pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local _pkgarch="$(getpkgarch ${pkgfile})"
+	local _pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 	local repo="${2}"
 
-	in_array "${repo}" ${PKGREPOS[@]} || return 1
+	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
 	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
 		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
@@ -392,11 +392,11 @@ check_pkgsvn() {
 		[ $? -ge 1 ] && return 1
 	fi
 
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")"
 	[ "${svnver}" == "${_pkgver}" ] || return 1
 
-	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-	in_array "${_pkgname}" ${svnnames[@]} || return 1
+	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
+	in_array "${_pkgname}" "${svnnames[@]}" || return 1
 
 	return 0
 }
@@ -404,7 +404,7 @@ check_pkgsvn() {
 check_splitpkgs() {
 	local repo="${1}"
 	shift
-	local pkgfiles=(${@})
+	local pkgfiles=("${@}")
 	local pkgfile
 	local pkgdir
 	local svnname
@@ -412,11 +412,11 @@ check_splitpkgs() {
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
 
-	for pkgfile in ${pkgfiles[@]}; do
+	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
-		local _pkgbase="$(getpkgbase ${pkgfile})"
-		local _pkgname="$(getpkgname ${pkgfile})"
-		local _pkgarch="$(getpkgarch ${pkgfile})"
+		local _pkgbase="$(getpkgbase "${pkgfile}")"
+		local _pkgname="$(getpkgname "${pkgfile}")"
+		local _pkgarch="$(getpkgarch "${pkgfile}")"
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
@@ -427,9 +427,8 @@ check_splitpkgs() {
 			[ $? -ge 1 ] && return 1
 		fi
 
-		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-		for svnname in ${svnnames[@]}; do
-			echo "${svnname}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
+		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
+		printf '%s\n' in "${svnnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
 		done
 	done
 	popd >/dev/null
@@ -449,11 +448,11 @@ check_splitpkgs() {
 check_pkgrepos() {
 	local pkgfile=$1
 
-	local pkgname="$(getpkgname ${pkgfile})"
+	local pkgname="$(getpkgname "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgver="$(getpkgver ${pkgfile})"
+	local pkgver="$(getpkgver "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
-	local pkgarch="$(getpkgarch ${pkgfile})"
+	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
@@ -467,8 +466,8 @@ check_pkgrepos() {
 #usage: chk_license ${license[@]}"
 chk_license() {
 	local l
-	for l in ${@}; do
-		in_array ${l} ${ALLOWED_LICENSES[@]} && return 0
+	for l in "${@}"; do
+		in_array "${l}" "${ALLOWED_LICENSES[@]}" && return 0
 	done
 
 	return 1
@@ -480,16 +479,16 @@ check_repo_permission() {
 	[ ${#PKGREPOS[@]} -eq 0 ] && return 1
 	[ -z "${PKGPOOL}" ] && return 1
 
-	in_array "${repo}" ${PKGREPOS[@]} || return 1
+	in_array "${repo}" "${PKGREPOS[@]}" || return 1
 
 	[ -w "$FTP_BASE/${PKGPOOL}" ] || return 1
 
 	local arch
-	for arch in ${ARCHES}; do
+	for arch in "${ARCHES}"; do
 		local dir="${FTP_BASE}/${repo}/os/${arch}/"
 		[ -w "${dir}" ] || return 1
-		[ -f "${dir}"${repo}${DBEXT} -a ! -w "${dir}"${repo}${DBEXT} ] && return 1
-		[ -f "${dir}"${repo}${FILESEXT} -a ! -w "${dir}"${repo}${FILESEXT} ] && return 1
+		[ -f "${dir}${repo}"${DBEXT} -a ! -w "${dir}${repo}"${DBEXT} ] && return 1
+		[ -f "${dir}${repo}"${FILESEXT} -a ! -w "${dir}${repo}"${FILESEXT} ] && return 1
 	done
 
 	return 0
@@ -503,9 +502,9 @@ set_repo_permission() {
 
 	if [ -w "${dbfile}" ]; then
 		local group=$(/usr/bin/stat --printf='%G' "$(dirname "${dbfile}")")
-		chgrp $group "${dbfile}" || error "Could not change group of ${dbfile} to $group"
-		chgrp $group "${filesfile}" || error "Could not change group of ${filesfile} to $group"
-		chmod g+w "${dbfile}" || error "Could not set write permission for group $group to ${dbfile}"
+		chgrp "$group" "${dbfile}"    || error "Could not change group of ${dbfile} to $group"
+		chgrp "$group" "${filesfile}" || error "Could not change group of ${filesfile} to $group"
+		chmod g+w "${dbfile}"    || error "Could not set write permission for group $group to ${dbfile}"
 		chmod g+w "${filesfile}" || error "Could not set write permission for group $group to ${filesfile}"
 	else
 		error "You don't have permission to change ${dbfile}"
@@ -515,12 +514,12 @@ set_repo_permission() {
 arch_repo_add() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
-	/usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \
-		|| error "repo-add ${repo}${DBEXT} ${pkgs[@]}"
+	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" \
+		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 
@@ -530,15 +529,15 @@ arch_repo_add() {
 arch_repo_remove() {
 	local repo=$1
 	local arch=$2
-	local pkgs=(${@:3})
+	local pkgs=("${@:3}")
 	local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}"
 
 	if [ ! -f "${dbfile}" ]; then
 		error "No database found at '${dbfile}'"
 		return 1
 	fi
-	/usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} \
-		|| error "repo-remove ${dbfile} ${pkgs[@]}"
+	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" \
+		|| error "repo-remove ${dbfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 
 	REPO_MODIFIED=1
-- 
cgit v1.2.3-2-g168b


From 6638878c5eb6d5116580d06cc3042a5e9beacb7e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 20:33:06 -0400
Subject: Use printf-formatters instead of string interpolation on msg, error,
 etc.

---
 db-functions | 51 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 39173f3..9845e45 100644
--- a/db-functions
+++ b/db-functions
@@ -103,7 +103,7 @@ script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 		local _owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-		error "Script ${0##*/} is already locked by $_owner."
+		error "Script %s is already locked by %s." "${0##*/}" "$_owner"
 		exit 1
 	else
 		set_umask
@@ -114,7 +114,7 @@ script_lock() {
 script_unlock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Script ${0##*/} was not locked!"
+		warning "Script %s was not locked!" "${0##*/}"
 		restore_umask
 		return 1
 	else
@@ -134,12 +134,12 @@ cleanup() {
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
-			msg "Removing left over lock from [${repo}] (${arch})"
+			msg "Removing left over lock from [%s] (%s)" "${repo}" "${arch}"
 			repo_unlock "$repo" "$arch"
 		fi
 	done
 	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
-		msg "Removing left over lock from ${0##*/}"
+		msg "Removing left over lock from %s" "${0##*/}"
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
@@ -177,7 +177,7 @@ repo_lock () {
 
 	# This is the lock file used by repo-add and repo-remove
 	if [ -f "${DBLOCKFILE}" ]; then
-		error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat $DBLOCKFILE)"
+		error "Repo [%s] (%s) is already locked by repo-{add,remove} process %s" "$1" "$2" "$(<"$DBLOCKFILE")"
 		return 1
 	fi
 
@@ -194,8 +194,8 @@ repo_lock () {
 	while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 			_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-			warning "Repo [${1}] (${2}) is already locked by $_owner. "
-			msg2 "Retrying in $LOCK_DELAY seconds..."
+			warning "Repo [%s] (%s) is already locked by %s." "${1}" "${2}" "$_owner"
+			msg2 "Retrying in %d seconds..." "$LOCK_DELAY"
 		else
 			LOCKS[${#LOCKS[*]}]="$1.$2"
 			set_umask
@@ -205,14 +205,14 @@ repo_lock () {
 		let _count=$_count+1
 	done
 
-	error "Repo [${1}] (${2}) is already locked by $_owner. Giving up!"
+	error "Repo [%s] (%s) is already locked by %s. Giving up!" "${1}" "${2}" "$_owner"
 	return 1
 }
 
 repo_unlock () { #repo_unlock <repo-name> <arch>
 	local LOCKDIR="$TMPDIR/.repolock.$1.$2"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Repo lock [${1}] (${2}) was not locked!"
+		warning "Repo lock [%s] (%s) was not locked!" "${1}" "${2}"
 		restore_umask
 		return 1
 	else
@@ -267,7 +267,7 @@ getpkgname() {
 
 	_name="$(_grep_pkginfo "$1" "pkgname")"
 	if [ -z "$_name" ]; then
-		error "Package '$1' has no pkgname in the PKGINFO. Fail!"
+		error "Package '%s' has no pkgname in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -280,7 +280,7 @@ getpkgver() {
 
 	_ver="$(_grep_pkginfo "$1" "pkgver")"
 	if [ -z "$_ver" ]; then
-		error "Package '$1' has no pkgver in the PKGINFO. Fail!"
+		error "Package '%s' has no pkgver in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -292,7 +292,7 @@ getpkgarch() {
 
 	_ver="$(_grep_pkginfo "$1" "arch")"
 	if [ -z "$_ver" ]; then
-		error "Package '$1' has no arch in the PKGINFO. Fail!"
+		error "Package '%s' has no arch in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -322,10 +322,10 @@ getpkgfile() {
 		error 'No canonical package found!'
 		exit 1
 	elif [ ! -f "${1}" ]; then
-		error "Package ${1} not found!"
+		error "Package %s not found!" "${1}"
 		exit 1
 	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
-		error "Package signature ${1}.sig not found!"
+		error "Package signature %s not found!" "${1}.sig"
 		exit 1
 	fi
 
@@ -341,10 +341,10 @@ getpkgfiles() {
 
 	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
-			error "Package ${f} not found!"
+			error "Package %s not found!" "${f}"
 			exit 1
 		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
-			error "Package signature ${f}.sig not found!"
+			error "Package signature %s not found!" "${f}.sig"
 			exit 1
 		fi
 	done
@@ -428,8 +428,7 @@ check_splitpkgs() {
 		fi
 
 		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
-		printf '%s\n' in "${svnnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
-		done
+		printf '%s\n' "${svnnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
 	done
 	popd >/dev/null
 
@@ -502,12 +501,12 @@ set_repo_permission() {
 
 	if [ -w "${dbfile}" ]; then
 		local group=$(/usr/bin/stat --printf='%G' "$(dirname "${dbfile}")")
-		chgrp "$group" "${dbfile}"    || error "Could not change group of ${dbfile} to $group"
-		chgrp "$group" "${filesfile}" || error "Could not change group of ${filesfile} to $group"
-		chmod g+w "${dbfile}"    || error "Could not set write permission for group $group to ${dbfile}"
-		chmod g+w "${filesfile}" || error "Could not set write permission for group $group to ${filesfile}"
+		chgrp "$group" "${dbfile}"    || error "Could not change group of %s to %s" "${dbfile}"    "$group"
+		chgrp "$group" "${filesfile}" || error "Could not change group of %s to %s" "${filesfile}" "$group"
+		chmod g+w "${dbfile}"    || error "Could not set write permission for group %s to %s" "$group" "${dbfile}"
+		chmod g+w "${filesfile}" || error "Could not set write permission for group %s to %s" "$group" "${filesfile}"
 	else
-		error "You don't have permission to change ${dbfile}"
+		error "You don't have permission to change %s" "${dbfile}"
 	fi
 }
 
@@ -519,7 +518,7 @@ arch_repo_add() {
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
 	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" \
-		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
+		|| error '%s' "repo-add ${repo}${DBEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 
@@ -533,11 +532,11 @@ arch_repo_remove() {
 	local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}"
 
 	if [ ! -f "${dbfile}" ]; then
-		error "No database found at '${dbfile}'"
+		error "No database found at '%s'" "${dbfile}"
 		return 1
 	fi
 	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" \
-		|| error "repo-remove ${dbfile} ${pkgs[*]}"
+		|| error '%s' "repo-remove ${dbfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 
 	REPO_MODIFIED=1
-- 
cgit v1.2.3-2-g168b


From 6262754028e750dbbacd1d68618bf5553d78f3cd Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 14:45:58 -0400
Subject: Use += instead of jumping through hoops.

The += operator was introduced in Bash 3.1, and was already used in some
places in dbscripts, but not everywhere.

For normal strings, this isn't a big deal, but appending to an array
without using += is nasty.
---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 9845e45..f00ed55 100644
--- a/db-functions
+++ b/db-functions
@@ -197,7 +197,7 @@ repo_lock () {
 			warning "Repo [%s] (%s) is already locked by %s." "${1}" "${2}" "$_owner"
 			msg2 "Retrying in %d seconds..." "$LOCK_DELAY"
 		else
-			LOCKS[${#LOCKS[*]}]="$1.$2"
+			LOCKS+=("$1.$2")
 			set_umask
 			return 0
 		fi
-- 
cgit v1.2.3-2-g168b


From d6e88e1a3fcddb4ef1717174e88d9a9f0a386357 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 17 Jan 2014 13:06:53 -0500
Subject: Export TMPDIR, and use mktemp -t instead of making it part of the
 template

---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index f00ed55..5fe86b6 100644
--- a/db-functions
+++ b/db-functions
@@ -25,7 +25,7 @@ mv_acl() {
 }
 
 # set up general environment
-WORKDIR=$(mktemp -d "${TMPDIR}/${0##*/}.XXXXXXXXXX")
+WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
 if [ -n "${SVNUSER}" ]; then
 	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
 	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
-- 
cgit v1.2.3-2-g168b


From 8700e09c4d2ff0a20d5fa3789a6309078bc1ccb6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 12:18:02 -0400
Subject: Use `grep &>/dev/null` instead of `grep -q` when operating on piped
 stdin.

`grep -q` may exit as soon as it finds a match; this is a good optimization
for when the input is a file.  However, if the input is the output of
another program, then that other program will receive SIGPIPE, and further
writes will fail.  When this happens, it might (bsdtar does) print a
message about a "write error" to stderr.  Which is going to confuse and
alarm the user.

I'll add that this is not purely hypothetical--it has happened to me while
running the test suite.
---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 5fe86b6..4eebf4a 100644
--- a/db-functions
+++ b/db-functions
@@ -364,7 +364,7 @@ check_pkgfile() {
 
 	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
 
-	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
+	if echo "${pkgfile##*/}" | grep "${pkgname}-${pkgver}-${pkgarch}" &>/dev/null; then
 		return 0
 	else
 		return 1
-- 
cgit v1.2.3-2-g168b


From a2891a08c0cde48d966b037503c24b0d8f5b5f6d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 02:07:26 -0400
Subject: Add "#!/hint/bash" to the beginning of several files.

It is a method of notifying text-editors that a file is in Bash syntax
without giving it a propper shebang (which would be confusing, as it
would suggest that the file should be executable), as well as working
across virtually all text-editors (unlike "-*- Mode: Bash -*-" or
whatever).
---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 4eebf4a..aebfb34 100644
--- a/db-functions
+++ b/db-functions
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/hint/bash
 
 # Some PKGBUILDs need CARCH to be set
 CARCH="x86_64"
-- 
cgit v1.2.3-2-g168b


From fce7610461f8970ea09c8915a83307a5750bcce9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 May 2015 18:13:39 -0400
Subject: db-functions: Fix check_repo_permission checking all architectures

It mistakenly looped over just the first element of the ARCHES array,
instead of the entire array.  This meant that it only checked the
permissions for one architecture.
---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index aebfb34..62d0d72 100644
--- a/db-functions
+++ b/db-functions
@@ -483,7 +483,7 @@ check_repo_permission() {
 	[ -w "$FTP_BASE/${PKGPOOL}" ] || return 1
 
 	local arch
-	for arch in "${ARCHES}"; do
+	for arch in "${ARCHES[@]}"; do
 		local dir="${FTP_BASE}/${repo}/os/${arch}/"
 		[ -w "${dir}" ] || return 1
 		[ -f "${dir}${repo}"${DBEXT} -a ! -w "${dir}${repo}"${DBEXT} ] && return 1
-- 
cgit v1.2.3-2-g168b


From 854507251904e830272b068175df3f691c337576 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 25 May 2015 01:19:43 -0600
Subject: db-functions: use librelib instead of having copies here

---
 db-functions | 68 +++++++-----------------------------------------------------
 1 file changed, 7 insertions(+), 61 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 62d0d72..4a97e0b 100644
--- a/db-functions
+++ b/db-functions
@@ -34,57 +34,13 @@ fi
 LOCKS=()
 REPO_MODIFIED=0
 
-# check if messages are to be printed using color
-unset ALL_OFF BOLD BLUE GREEN RED YELLOW
-if [[ -t 2 ]]; then
-	ALL_OFF="$(tput sgr0)"
-	BOLD="$(tput bold)"
-	BLUE="${BOLD}$(tput setaf 4)"
-	GREEN="${BOLD}$(tput setaf 2)"
-	RED="${BOLD}$(tput setaf 1)"
-	YELLOW="${BOLD}$(tput setaf 3)"
-fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-	local mesg=$1; shift
-	printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg() {
-	local mesg=$1; shift
-	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-msg2() {
-	local mesg=$1; shift
-	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
-}
-
-warning() {
-	local mesg=$1; shift
-	printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-	local mesg=$1; shift
-	printf "${RED}==> ERROR${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-##
-#  usage : in_array( $needle, $haystack )
-# return : 0 - found
-#          1 - not found
-##
-in_array() {
-	local needle=$1; shift
-	[[ -z $1 ]] && return 1 # Not Found
-	local item
-	for item in "$@"; do
-		[[ $item = "$needle" ]] && return 0 # Found
-	done
-	return 1 # Not Found
-}
+# Used: plain, msg, msg2, warning, error, in_array, abort, die
+# Overwritten: get_full_version, cleanup
+# Ignored: stat_busy, stat_done,
+#          setup_workdir, trap_abort, trap_exit,
+#          lock, slock, lock_close
+#          pkgver_equal, find_cached_package, check_root
+. "$(librelib common)"
 
 ##
 #  usage : get_full_version( $epoch, $pkgver, $pkgrel )
@@ -151,16 +107,6 @@ cleanup() {
 	[ "$1" ] && exit "$1"
 }
 
-abort() {
-	msg 'Aborting...'
-	cleanup 0
-}
-
-die() {
-	error "$*"
-	cleanup 1
-}
-
 trap abort INT QUIT TERM HUP
 trap cleanup EXIT
 
-- 
cgit v1.2.3-2-g168b


From be03c311fedf4532ea6ac4d14b4becf5c7dc150e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 11:52:56 -0400
Subject: db-functions: get CARCH from makepkg.conf

---
 db-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 4a97e0b..5a304e6 100644
--- a/db-functions
+++ b/db-functions
@@ -1,7 +1,7 @@
 #!/hint/bash
 
 # Some PKGBUILDs need CARCH to be set
-CARCH="x86_64"
+CARCH=$(. "$(librelib conf.sh)"; load_files makepkg; echo "$CARCH")
 
 # Useful functions
 UMASK=""
-- 
cgit v1.2.3-2-g168b


From 9705ba8a148d03dfd4c2184f3a1f13ee373eb826 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 12:08:55 -0400
Subject: Use the librelib version of get_full_version

---
 db-functions | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 5a304e6..217e62f 100644
--- a/db-functions
+++ b/db-functions
@@ -34,27 +34,14 @@ fi
 LOCKS=()
 REPO_MODIFIED=0
 
-# Used: plain, msg, msg2, warning, error, in_array, abort, die
-# Overwritten: get_full_version, cleanup
+# Used: plain, msg, msg2, warning, error, in_array, get_full_version, abort, die
+# Overwritten: cleanup
 # Ignored: stat_busy, stat_done,
 #          setup_workdir, trap_abort, trap_exit,
 #          lock, slock, lock_close
 #          pkgver_equal, find_cached_package, check_root
 . "$(librelib common)"
 
-##
-#  usage : get_full_version( $epoch, $pkgver, $pkgrel )
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-##
-get_full_version() {
-	if [[ $1 -eq 0 ]]; then
-		# zero epoch case, don't include it in version
-		echo "$2-$3"
-	else
-		echo "$1:$2-$3"
-	fi
-}
-
 script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
@@ -338,7 +325,7 @@ check_pkgsvn() {
 		[ $? -ge 1 ] && return 1
 	fi
 
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")"
+	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; get_full_version)"
 	[ "${svnver}" == "${_pkgver}" ] || return 1
 
 	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo "${pkgname[@]}"))
-- 
cgit v1.2.3-2-g168b