Attachment 235890 Details for Bug 264816 – proposed patch to update to 1.2.1 and add self-tests and "make test" support

[patch] proposed patch to update to 1.2.1 and add self-tests and "make test" support

0001-archivers-py-borgbackup-update-to-1.2.1-and-add-self.patch (text/plain), 4.71 KB, created by Matthias Andree on 2022-08-13 22:03:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2022-08-13 22:03:31 UTC

Size: 4.71 KB

patch

obsolete

>From 48416dc298000888c292cdc1b083629ce6932db2 Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sat, 13 Aug 2022 23:58:49 +0200
>Subject: [PATCH] archivers/py-borgbackup: update to 1.2.1 and add self-tests
>
>---
> archivers/py-borgbackup/Makefile | 43 ++++++++++++++++++++++++++------
> archivers/py-borgbackup/distinfo |  6 ++---
> 2 files changed, 39 insertions(+), 10 deletions(-)
>
>diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
>index ec020d2659a9..d01bc531c79d 100644
>--- a/archivers/py-borgbackup/Makefile
>+++ b/archivers/py-borgbackup/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	borgbackup
>-DISTVERSION=	1.1.18
>-PORTREVISION=	1
>+DISTVERSION=	1.2.1
> CATEGORIES=	archivers python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,13 +10,20 @@ COMMENT=	Deduplicating backup program
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR}
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR}
> LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
> 		libzstd.so:archivers/zstd \
> 		libxxhash.so:devel/xxhash
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR}
>-
>-USES=		python ssl
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR}
>+MAKE_ENV=	BORG_OPENSSL_PREFIX=${OPENSSLBASE}
>+TEST_DEPENDS=	${RUN_DEPENDS} \
>+		${PYTHON_PKGNAMEPREFIX}tox>3.2:devel/py-tox@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
>+USES=		pkgconfig python:3.8+ ssl
> USE_PYTHON=	autoplist distutils
> 
> OPTIONS_DEFINE=		FUSE
>@@ -26,9 +32,32 @@ OPTIONS_DEFAULT=	FUSE
> FUSE_DESC=	Support to mount locally borg backup files
> FUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llfuse>0:devel/py-llfuse@${PY_FLAVOR}
> 
>+_BORGENV=BORG_PASSPHRASE=secret123 PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
> post-install:
>-	${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/borg -V
> 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/ -name "*.so" \
> 		-exec ${STRIP_CMD} {} \;
>+	@${ECHO_MSG} "----> running borg smoke tests"
>+	${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/borg -V
>+	${RM} -r ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg init --encryption=repokey ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg key export ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg create ${WRKDIR}/borgrepo::test1 ${WRKSRC}
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg create ${WRKDIR}/borgrepo::test2 ${WRKSRC} ${STAGEDIR}
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg info ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg prune --keep-last 1 ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo
>+	${ECHO_CMD} YES \
>+	| ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --repair ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg compact --progress ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg check --verify-data ${WRKDIR}/borgrepo
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg extract --dry-run --progress ${WRKDIR}/borgrepo::test2
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg export-tar ${WRKDIR}/borgrepo::test2 - >/dev/null
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg list ${WRKDIR}/borgrepo
>+	# long output - ${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg list ${WRKDIR}/borgrepo::test2 | ${GREP} -v ^d
>+	${SETENV} ${_BORGENV} ${STAGEDIR}${PREFIX}/bin/borg info ${WRKDIR}/borgrepo
>+
>+do-test:
>+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${_BORGENV} tox-${PYTHON_VER} -e ${PY_FLAVOR} -vv
> 
> .include <bsd.port.mk>
>diff --git a/archivers/py-borgbackup/distinfo b/archivers/py-borgbackup/distinfo
>index 7c1661cd8c31..4527a4070b23 100644
>--- a/archivers/py-borgbackup/distinfo
>+++ b/archivers/py-borgbackup/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1654597105
>-SHA256 (borgbackup-1.1.18.tar.gz) = 5cba5fe7db4d08944b467ec11efc017687a512b0d98ccf0ad1aa9c4329665275
>-SIZE (borgbackup-1.1.18.tar.gz) = 3854385
>+TIMESTAMP = 1660417707
>+SHA256 (borgbackup-1.2.1.tar.gz) = 9f9ce2d1923cb33a147ee6d08177d860974567721b1142fca67914a02e64c633
>+SIZE (borgbackup-1.2.1.tar.gz) = 4017050
>-- 
>2.37.2
>

Actions: View | Diff

Attachments on bug 264816: 235890 | 235891 | 235892 | 235893