Attachment 10624 Details for Bug 51932 – crudesaml patch

[patch] crudesaml patch

0001-wip-test.patch (text/plain), 3.03 KB, created by Jürn Brodersen on 2021-02-19 10:28:00 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Jürn Brodersen

Created: 2021-02-19 10:28:00 CET

Size: 3.03 KB

patch

obsolete

>From a1c89aa9e98722af7c4c1273fd29d96d21b39eaf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?J=C3=BCrn=20Brodersen?= <brodersen@univention.de>
>Date: Fri, 14 Aug 2020 10:00:21 +0200
>Subject: [PATCH] wip-test
>Organization: Univention GmbH, Bremen, Germany
>
>---
> test/ucs-test/tests/09_updater/10online |  7 +++--
> test/ucs-test/tests/09_updater/pool.sh  | 38 +++++++++++++++++++++++++
> 2 files changed, 42 insertions(+), 3 deletions(-)
>
>diff --git a/test/ucs-test/tests/09_updater/10online b/test/ucs-test/tests/09_updater/10online
>index 376d2a8c4e..3cf4d1afce 100755
>--- a/test/ucs-test/tests/09_updater/10online
>+++ b/test/ucs-test/tests/09_updater/10online
>@@ -13,9 +13,10 @@ RETVAL=110 # Test fehlgeschlagen
> 
> setup_apache "${repoprefix}"
> 
>-mkpdir "${_version_version}-0" maintained "${ARCH}"
>-mkdeb "${pkgname}" 1 "${ARCH}" "${DIR}"
>-mkpkg "${DIR}"
>+mkpdir5 "ucs${major}${minor}0"
>+mkdeb "${pkgname}" 1 "${ARCH}" "${DIR}/${pkgname::1}"
>+mkpkg5 "${DIR}" "${DIR}/../dists/ucs${major}${minor}0/main/binary-amd64"
>+tree "${DIR}/.."
> 
> config_repo repository/online=no
> 
>diff --git a/test/ucs-test/tests/09_updater/pool.sh b/test/ucs-test/tests/09_updater/pool.sh
>index 53c1d2168f..e0ae6361bd 100644
>--- a/test/ucs-test/tests/09_updater/pool.sh
>+++ b/test/ucs-test/tests/09_updater/pool.sh
>@@ -286,6 +286,13 @@ mkpdir () { # Create pool directory ${dir}
> 	return 0
> }
> 
>+mkpdir5 () {
>+	DIR="${REPODIR}/pool"
>+	mkdir -p "${DIR}"
>+	mkdir -p "${REPODIR}/dists/${1}"
>+	return 0
>+}
>+
> mkdeb () { # Create dummy package [name [version [arch [dir [postinst]]]]]
> 	local name="${1:-test}"
> 	local version="${2:-1}"
>@@ -310,6 +317,7 @@ mkdeb () { # Create dummy package [name [version [arch [dir [postinst]]]]]
> 	chmod 755 "${BASEDIR}/${name}-${version}/DEBIAN/postinst"
> 	DEB="${BASEDIR}/${name}_${version}_${arch}.deb"
> 	dpkg-deb -b "${BASEDIR}/${name}-${version}" "${DEB}" >&3 2>&3
>+	mkdir -p "${dir}"
> 	[ -z "${dir}" ] || cp "${DEB}" "${dir}/"
> }
> 
>@@ -374,6 +382,36 @@ mkpkg () { # Create Package files for ${1}. Optional arguments go to dpkg-scanpa
> 	cd "${OLDPWD}" || return $?
> }
> 
>+mkpkg5 () { # Create Package files for ${1} and save them to ${2}. Optional arguments go to dpkg-scanpackages.
>+	local dir="${1:-${DIR}}"
>+	shift
>+	local version="${1:-500}"
>+	shift
>+	local arch="${1:-amd64}"
>+	shift
>+	local packagesdir="${1:-${dir}/../dists/ucs${version}/main/binary-${arch}}"
>+	shift
>+	mkdir -p "${packagesdir}"
>+	cd "${dir}/.." || return $?
>+	local subdir="${dir#${PWD}/}"
>+	dpkg-scanpackages "${@}" "${subdir}" > "${packagesdir}/Packages" 2>&3
>+	xz -k "${packagesdir}/Packages"
>+	cd "${OLDPWD}" || return $?
>+	mkgpg
>+	cd "${packagesdir}/../.." || return $?
>+	rm -f Release Release.tmp Release.gpg
>+	apt-ftparchive \
>+		-o "APT::FTPArchive::Release::Origin=Univention" \
>+		-o "APT::FTPArchive::Release::Label=Univention" \
>+		-o "APT::FTPArchive::Release::Version=${subdir%%/*}" \
>+		-o "APT::FTPArchive::Release::Codename=${subdir}" \
>+		release . >Release.tmp 2>&3
>+	mv Release.tmp Release
>+
>+	gpgsign Release
>+	cd "${OLDPWD}" || return $?
>+}
>+
> gpgsign () { # sign file
> 	mkgpg
> 	local out sign
>-- 
>2.25.1
>

Actions: View | Diff

Attachments on bug 51932: 10467 | 10468 | 10469 | 10624 | 10625