From 2b7bb0c6b7aa4f7a43c82db1cf9a18d27600c62e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 18 Dec 2011 14:16:30 +0100
Subject: Validate package signatures on db-update

---
 db-functions | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index a3e2168..7c4a7fe 100644
--- a/db-functions
+++ b/db-functions
@@ -466,6 +466,21 @@ check_repo_permission() {
 	return 0
 }
 
+check_pkgsig() {
+	local signature=$1
+	local ret=1
+	local fd="$(mktemp --tmpdir="${WORKDIR}")"
+
+	exec 4>"${fd}"
+	gpg --homedir /etc/pacman.d/gnupg/ --status-fd 4 --verify "${signature}" >/dev/null 2>&1
+	exec 4>&-
+	if grep -q TRUST_FULLY "${fd}"; then
+		ret=0
+	fi
+
+	return $ret
+}
+
 set_repo_permission() {
 	local repo=$1
 	local arch=$2
-- 
cgit v1.2.3-2-g168b


From 5c7220a4aa370d1f726eb27d99d8f9294646433d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 19 Dec 2011 14:40:07 +0100
Subject: Avoid calls to basename

---
 db-functions | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 7c4a7fe..3100e31 100644
--- a/db-functions
+++ b/db-functions
@@ -16,7 +16,7 @@ restore_umask () {
 }
 
 # set up general environment
-WORKDIR=$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX)
+WORKDIR=$(mktemp -d /tmp/${0##*/}.XXXXXXXXXX)
 LOCKS=()
 
 # check if messages are to be printed using color
@@ -85,10 +85,10 @@ get_full_version() {
 }
 
 script_lock() {
-	local LOCKDIR="$TMPDIR/.scriptlock.$(basename $0)"
+	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 		local _owner="$(/usr/bin/stat -c %U $LOCKDIR)"
-		error "Script $(basename $0) is already locked by $_owner."
+		error "Script ${0##*/} is already locked by $_owner."
 		exit 1
 	else
 		set_umask
@@ -97,9 +97,9 @@ script_lock() {
 }
 
 script_unlock() {
-	local LOCKDIR="$TMPDIR/.scriptlock.$(basename $0)"
+	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Script $(basename $0) was not locked!"
+		warning "Script ${0##*/} was not locked!"
 		restore_umask
 		return 1
 	else
@@ -123,8 +123,8 @@ cleanup() {
 			repo_unlock $repo $arch
 		fi
 	done
-	if [ -d "$TMPDIR/.scriptlock.$(basename $0)" ]; then
-		msg "Removing left over lock from $(basename $0)"
+	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
+		msg "Removing left over lock from ${0##*/}"
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
@@ -324,7 +324,7 @@ check_pkgfile() {
 
 	in_array "${pkgarch}" ${ARCHES[@]} 'any' || return 1
 
-	if echo "$(basename ${pkgfile})" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
+	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
 	else
 		return 1
@@ -418,8 +418,8 @@ check_pkgrepos() {
 
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-	[ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile})" ] && return 1
-	[ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile}).sig" ] && return 1
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
 
 	local repo
 	local arch
@@ -427,8 +427,8 @@ check_pkgrepos() {
 		for arch in ${ARCHES[@]}; do
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile})" ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile}).sig" ] && return 1
+			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
+			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
 		done
 	done
 
-- 
cgit v1.2.3-2-g168b


From 31c1ebb69681e9b9b9d17795210f6bbd24ee2381 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 26 Mar 2012 11:26:41 +0200
Subject: Use gpg status-file instead of status-fd

---
 db-functions | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 3100e31..1b77035 100644
--- a/db-functions
+++ b/db-functions
@@ -471,9 +471,7 @@ check_pkgsig() {
 	local ret=1
 	local fd="$(mktemp --tmpdir="${WORKDIR}")"
 
-	exec 4>"${fd}"
-	gpg --homedir /etc/pacman.d/gnupg/ --status-fd 4 --verify "${signature}" >/dev/null 2>&1
-	exec 4>&-
+	gpg --homedir /etc/pacman.d/gnupg/ --status-file "${fd}" --verify "${signature}" >/dev/null 2>&1
 	if grep -q TRUST_FULLY "${fd}"; then
 		ret=0
 	fi
-- 
cgit v1.2.3-2-g168b


From 180e655748dc6fd8c62ca7fa269e4f614ac1e8ca Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 29 Apr 2012 09:18:52 +0200
Subject: Respect TMPDIR config when creating the working directory

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

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 1b77035..c992fe5 100644
--- a/db-functions
+++ b/db-functions
@@ -16,7 +16,7 @@ restore_umask () {
 }
 
 # set up general environment
-WORKDIR=$(mktemp -d /tmp/${0##*/}.XXXXXXXXXX)
+WORKDIR=$(mktemp -d "${TMPDIR}/${0##*/}.XXXXXXXXXX")
 LOCKS=()
 
 # check if messages are to be printed using color
-- 
cgit v1.2.3-2-g168b


From fe19d9cff1cb41ed8456e4cce7be474599cbf503 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 10 Jun 2012 12:02:50 +0200
Subject: Remove support for packages that are not in the package pool

---
 db-functions | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index c992fe5..de5e8b8 100644
--- a/db-functions
+++ b/db-functions
@@ -421,17 +421,6 @@ check_pkgrepos() {
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
 
-	local repo
-	local arch
-	for repo in ${PKGREPOS[@]}; do
-		for arch in ${ARCHES[@]}; do
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
-		done
-	done
-
 	return 0
 }
 
-- 
cgit v1.2.3-2-g168b


From 332346d06375c1272bee6dce2c91d31a027fe212 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 5 Aug 2012 12:19:28 +0200
Subject: grep has been moved to /usr

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

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index de5e8b8..e0d693b 100644
--- a/db-functions
+++ b/db-functions
@@ -211,7 +211,7 @@ repo_unlock () { #repo_unlock <repo-name> <arch>
 _grep_pkginfo() {
 	local _ret
 
-	_ret="$(/usr/bin/bsdtar -xOqf "$1" .PKGINFO | /bin/grep -m 1 "^${2} = ")"
+	_ret="$(/usr/bin/bsdtar -xOqf "$1" .PKGINFO | grep -m 1 "^${2} = ")"
 	echo "${_ret#${2} = }"
 }
 
-- 
cgit v1.2.3-2-g168b


From a539598c640caa92e2b1967949836d73c5264036 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 3 Oct 2012 14:50:03 +0200
Subject: Use pacman-key to check signatures as it now uses a correct exit
 value

---
 db-functions | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index e0d693b..e3485d3 100644
--- a/db-functions
+++ b/db-functions
@@ -455,19 +455,6 @@ check_repo_permission() {
 	return 0
 }
 
-check_pkgsig() {
-	local signature=$1
-	local ret=1
-	local fd="$(mktemp --tmpdir="${WORKDIR}")"
-
-	gpg --homedir /etc/pacman.d/gnupg/ --status-file "${fd}" --verify "${signature}" >/dev/null 2>&1
-	if grep -q TRUST_FULLY "${fd}"; then
-		ret=0
-	fi
-
-	return $ret
-}
-
 set_repo_permission() {
 	local repo=$1
 	local arch=$2
-- 
cgit v1.2.3-2-g168b


From b2952784db9995ecc21d3a770530a19394234d3b Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Oct 2012 14:32:39 +0200
Subject: Add the possibility to run all svn commands with a different user

* A SVNUSER can be configured in the config file
* This user needs to be able to call svn without a password
---
 db-functions | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index e3485d3..b9d0d2f 100644
--- a/db-functions
+++ b/db-functions
@@ -347,7 +347,7 @@ check_pkgsvn() {
 
 	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
 		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-		svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
+		arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
 			"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
 		[ $? -ge 1 ] && return 1
 	fi
@@ -382,7 +382,7 @@ check_splitpkgs() {
 
 		if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
 			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-			svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
+			arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
 				"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
 			[ $? -ge 1 ] && return 1
 		fi
@@ -504,3 +504,11 @@ arch_repo_remove() {
 		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
 }
+
+arch_svn() {
+	if [ -z "${SVNUSER}" ]; then
+		/usr/bin/svn "${@}"
+	else
+		sudo -u "${SVNUSER}" -- /usr/bin/svn "${@}"
+	fi
+}
-- 
cgit v1.2.3-2-g168b


From 868adfa4049fcb136d8b7aaaa347b9ffd918c7b9 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 4 Nov 2012 19:04:38 +0100
Subject: Grant the SVNUSER access to the working directory

---
 db-functions | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index b9d0d2f..b3a4293 100644
--- a/db-functions
+++ b/db-functions
@@ -17,6 +17,11 @@ restore_umask () {
 
 # set up general environment
 WORKDIR=$(mktemp -d "${TMPDIR}/${0##*/}.XXXXXXXXXX")
+if [ -n "${SVNUSER}" ]; then
+	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
+	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
+	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
+fi
 LOCKS=()
 
 # check if messages are to be printed using color
@@ -509,6 +514,6 @@ arch_svn() {
 	if [ -z "${SVNUSER}" ]; then
 		/usr/bin/svn "${@}"
 	else
-		sudo -u "${SVNUSER}" -- /usr/bin/svn "${@}"
+		sudo -u "${SVNUSER}" -- /usr/bin/svn --username "${USER}" "${@}"
 	fi
 }
-- 
cgit v1.2.3-2-g168b


From 5ba4756a52e8f1280d4dbcff62dec4a4aeb47d1c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 12 Jun 2013 19:32:48 -0600
Subject: Don't make assumptions about the host architecture.

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

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index b3a4293..4029abf 100644
--- a/db-functions
+++ b/db-functions
@@ -1,7 +1,7 @@
 #!/bin/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 9ea7be252eb359fa8d42eb74897b216158736f56 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 12 Jun 2013 19:52:00 -0600
Subject: fix TMPDIR

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

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 4029abf..01629bc 100644
--- a/db-functions
+++ b/db-functions
@@ -16,7 +16,7 @@ restore_umask () {
 }
 
 # 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 5c72f37618b77e7c7ebcab2c998e7be468c34e02 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 15 Jun 2013 13:57:06 -0600
Subject: db-functions: use common.sh

---
 db-functions | 58 +++++++---------------------------------------------------
 1 file changed, 7 insertions(+), 51 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 01629bc..523e872 100644
--- a/db-functions
+++ b/db-functions
@@ -24,57 +24,13 @@ if [ -n "${SVNUSER}" ]; then
 fi
 LOCKS=()
 
-# 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
+# Overwritten: get_full_version,
+#              cleanup, abort, die
+# Ignored: stat_busy, stat_done,
+#          setup_workdir, trab_abort, trap_exit,
+#          lock, slock, lock_close
+. $(librelib common)
 
 ##
 #  usage : get_full_version( $epoch, $pkgver, $pkgrel )
-- 
cgit v1.2.3-2-g168b


From 33b8cb611363102e23972cf3914a03d65cb3cad8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 17 Jun 2013 23:59:15 -0600
Subject: use xbs, not svn

---
 db-functions | 49 +++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 523e872..c98b26f 100644
--- a/db-functions
+++ b/db-functions
@@ -17,11 +17,6 @@ restore_umask () {
 
 # set up general environment
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
-if [ -n "${SVNUSER}" ]; then
-	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
-	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
-fi
 LOCKS=()
 
 # Used: plain, msg, msg2, warning, error, in_array
@@ -292,7 +287,7 @@ check_pkgfile() {
 	fi
 }
 
-check_pkgsvn() {
+check_pkgxbs() {
 	local pkgfile="${1}"
 	local _pkgbase="$(getpkgbase ${pkgfile})"
 	[ $? -ge 1 ] && return 1
@@ -306,18 +301,11 @@ check_pkgsvn() {
 
 	in_array "${repo}" ${PKGREPOS[@]} || return 1
 
-	if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-		mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-		arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-			"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-		[ $? -ge 1 ] && return 1
-	fi
-
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
-	[ "${svnver}" == "${_pkgver}" ] || return 1
+	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
-	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}"; echo ${pkgname[@]}))
-	in_array "${_pkgname}" ${svnnames[@]} || return 1
+	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+	in_array "${_pkgname}" ${xbsnames[@]} || return 1
 
 	return 0
 }
@@ -328,7 +316,7 @@ check_splitpkgs() {
 	local pkgfiles=(${@})
 	local pkgfile
 	local pkgdir
-	local svnname
+	local xbsname
 
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
@@ -341,16 +329,9 @@ check_splitpkgs() {
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
 		echo "${_pkgname}" >> "${repo}/${_pkgarch}/${_pkgbase}/staging"
 
-		if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then
-			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}"
-			arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \
-				"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null
-			[ $? -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 xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
+		for xbsname in ${xbsnames[@]}; do
+			echo "${xbsname}" >> "${repo}/${_pkgarch}/${_pkgbase}/xbs"
 		done
 	done
 	popd >/dev/null
@@ -358,8 +339,8 @@ check_splitpkgs() {
 	for pkgdir in "${WORKDIR}/check_splitpkgs/${repo}"/*/*; do
 		[ ! -d "${pkgdir}" ] && continue
 		sort -u "${pkgdir}/staging" -o "${pkgdir}/staging"
-		sort -u "${pkgdir}/svn" -o "${pkgdir}/svn"
-		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/svn")" ]; then
+		sort -u "${pkgdir}/xbs" -o "${pkgdir}/xbs"
+		if [ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/xbs")" ]; then
 			return 1
 		fi
 	done
@@ -465,11 +446,3 @@ arch_repo_remove() {
 		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
 }
-
-arch_svn() {
-	if [ -z "${SVNUSER}" ]; then
-		/usr/bin/svn "${@}"
-	else
-		sudo -u "${SVNUSER}" -- /usr/bin/svn --username "${USER}" "${@}"
-	fi
-}
-- 
cgit v1.2.3-2-g168b


From 761b56dcffedc6e484d38c74267810e491add951 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 16 Jun 2013 22:06:51 -0600
Subject: touch up

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

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index c98b26f..dabb22b 100644
--- a/db-functions
+++ b/db-functions
@@ -369,8 +369,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
@@ -382,7 +382,7 @@ 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
 
-- 
cgit v1.2.3-2-g168b


From 7034eed1f7ceec379b34f8dd782fb986c7165ad4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 29 Jun 2013 00:45:43 -0600
Subject: use the get_full_version from libremessages (actually, common.sh)

It works properly when split packages have different versions.
---
 db-functions | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index dabb22b..f5e2b3d 100644
--- a/db-functions
+++ b/db-functions
@@ -19,27 +19,13 @@ restore_umask () {
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
 LOCKS=()
 
-# Used: plain, msg, msg2, warning, error, in_array
-# Overwritten: get_full_version,
-#              cleanup, abort, die
+# Used: plain, msg, msg2, warning, error, in_array, get_full_version
+# Overwritten: cleanup, abort, die
 # Ignored: stat_busy, stat_done,
 #          setup_workdir, trab_abort, trap_exit,
 #          lock, slock, lock_close
 . $(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
@@ -301,7 +287,7 @@ check_pkgxbs() {
 
 	in_array "${repo}" ${PKGREPOS[@]} || return 1
 
-	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) )"
+	local xbsver="$(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
 
 	local xbsnames=($(. "`xbs releasepath ${_pkgbase} ${repo} ${_pkgarch}`/PKGBUILD"; echo ${pkgname[@]}))
-- 
cgit v1.2.3-2-g168b


From fbce7db101feaba0d69bf185b54270c1aa6d65ab Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 19 Mar 2013 19:53:38 +0100
Subject: sourceballs: fix ACL issues on nymeria

ACLs from the WORKDIR were used, leading to problems as these weren't
world-readable. Fix follows ftpdir-cleanup.

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 db-functions | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index b3a4293..4a9a42a 100644
--- a/db-functions
+++ b/db-functions
@@ -15,6 +15,15 @@ restore_umask () {
 	umask $UMASK >/dev/null
 }
 
+# just like mv -f, but we touch the file and then copy the content so
+# default ACLs in the target dir will be applied
+mv_acl() {
+	rm -f "$2"
+	touch "$2"
+	cat "$1" >"$2" || return 1
+	rm -f "$1"
+}
+
 # set up general environment
 WORKDIR=$(mktemp -d "${TMPDIR}/${0##*/}.XXXXXXXXXX")
 if [ -n "${SVNUSER}" ]; then
-- 
cgit v1.2.3-2-g168b


From 0b43e8cdee1ee46ea79e4d089136e76e767b4d5b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 23 Jan 2013 23:03:35 +0100
Subject: Add lastupdate file

This allows for faster checking if an update might be needed and helps
to let reporead run when something changed.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 db-functions | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'db-functions')

diff --git a/db-functions b/db-functions
index 4a9a42a..bb49894 100644
--- a/db-functions
+++ b/db-functions
@@ -32,6 +32,7 @@ if [ -n "${SVNUSER}" ]; then
 	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
 fi
 LOCKS=()
+REPO_MODIFIED=0
 
 # check if messages are to be printed using color
 unset ALL_OFF BOLD BLUE GREEN RED YELLOW
@@ -142,6 +143,11 @@ cleanup() {
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
+
+	if (( REPO_MODIFIED )); then
+		date +%s > "${FTP_BASE}/lastupdate"
+	fi
+
 	[ "$1" ] && exit $1
 }
 
@@ -499,6 +505,8 @@ arch_repo_add() {
 		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
+
+	REPO_MODIFIED=1
 }
 
 arch_repo_remove() {
@@ -517,6 +525,8 @@ arch_repo_remove() {
 	/usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \
 		|| error "repo-remove ${filesfile} ${pkgs[@]}"
 	set_repo_permission "${repo}" "${arch}"
+
+	REPO_MODIFIED=1
 }
 
 arch_svn() {
-- 
cgit v1.2.3-2-g168b