Attachment 219094 Details for Bug 250626 – Patch file

[patch] Patch file

ansible.patch (text/plain), 4.48 KB, created by Samy Mahmoudi on 2020-10-26 07:42:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samy Mahmoudi

Created: 2020-10-26 07:42:55 UTC

Size: 4.48 KB

patch

obsolete

>Index: sysutils/ansible/Makefile
>===================================================================
>--- sysutils/ansible/Makefile	(rÃ©vision 553067)
>+++ sysutils/ansible/Makefile	(copie de travail)
>@@ -1,11 +1,12 @@
> # $FreeBSD$
> 
>-PORTNAME=	ansible
>-PORTVERSION?=	2.9.7
>-PORTREVISION?=	0
>-CATEGORIES=	sysutils python
>-MASTER_SITES=	http://releases.ansible.com/ansible/
>-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+PORTNAME=		ansible
>+PORTVERSION?=		2.10.2
>+PORTREVISION?=		0
>+DISTVERSIONPREFIX=	base-
>+CATEGORIES=		sysutils python
>+MASTER_SITES=		https://pypi.python.org/packages/source/a/ansible-base/
>+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	lifanov@FreeBSD.org
> COMMENT=	Radically simple IT automation
>@@ -28,22 +29,26 @@
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
> 
>-CONFLICTS?=	ansible1-* \
>-		ansible23-* \
>-		ansible24-* \
>-		ansible25-* \
>-		ansible27-* \
>-		ansible26-* \
>-		ansible27-* \
>-		ansible28-*
>+USES?=		cpe python shebangfix
>+USE_PYTHON=	distutils autoplist concurrent
> 
>-EXTRA_PATCHES?=
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> NO_ARCH=	yes
>-USES?=		cpe python shebangfix
>-USE_PYTHON=	distutils autoplist concurrent
> CPE_VENDOR=	ansibleworks
> 
>+CONFLICTS?=	*ansible1-* \
>+		*ansible23-* \
>+		*ansible24-* \
>+		*ansible25-* \
>+		*ansible27-* \
>+		*ansible26-* \
>+		*ansible27-* \
>+		*ansible28-* \
>+		*ansible29-*
>+
>+EXTRA_PATCHES?=
>+
> SHEBANG_FILES?=	\
> 		test/lib/ansible_test/_data/injector/python.py \
> 		test/lib/ansible_test/_data/versions.py \
>@@ -71,6 +76,8 @@
> 		test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
> 		test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
> 		test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
>+		test/lib/ansible_test/_data/sanity/code-smell/changelog.py \
>+		test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py \
> 		test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
> 		test/lib/ansible_test/_data/sanity/compile/compile.py \
> 		test/lib/ansible_test/_data/sanity/validate-modules/main.py
>@@ -90,8 +97,6 @@
> 
> PORTEXAMPLES=	ansible.cfg hosts
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>-
> post-patch:
> 	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
> 		-e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \
>@@ -114,11 +119,11 @@
> 	# python autoplist doesn't add this file in plist
> 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
> 
>-TEST_WRKSRC=${WRKSRC}/test
>-
>-do-test:
>+# TEST_WRKSRC=${WRKSRC}/test
>+#
>+#do-test:
> #	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v
>-	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
>-	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v
>+#	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
>+#	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v
> 
> .include <bsd.port.mk>
>Index: sysutils/ansible/distinfo
>===================================================================
>--- sysutils/ansible/distinfo	(rÃ©vision 553067)
>+++ sysutils/ansible/distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1588106713
>-SHA256 (ansible-2.9.7.tar.gz) = 7222ce925536a25b2912364e13b03a3e21dbf2f96799ebff304f48509324de7b
>-SIZE (ansible-2.9.7.tar.gz) = 14215538
>+TIMESTAMP = 1603670603
>+SHA256 (ansible-base-2.10.2.tar.gz) = c79fe108e13b286bad21734208624aaef9dabb49bb4211b13bc96d88829e22ab
>+SIZE (ansible-base-2.10.2.tar.gz) = 6023200
>Index: sysutils/ansible/files/pkg-message.in
>===================================================================
>--- sysutils/ansible/files/pkg-message.in	(rÃ©vision 553067)
>+++ sysutils/ansible/files/pkg-message.in	(copie de travail)
>@@ -13,18 +13,18 @@
> }
> {
> message: <<EOD
>-Ansible has been updated to 2.8. Please follow the porting guide
>+Ansible has been updated to 2.10. Please follow the porting guide
> to update the rulesets:
> 
>-https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.8.html
>+https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.10.html
> 
>-If you wish to stay with 2.7 version, you can switch
>-to new sysutils/ansible27 port, which tracks stable 2.7 branch:
>+If you wish to stay with version 2.9, you can switch to the
>+new port sysutils/ansible29, which tracks the stable 2.9 branch:
> 
>-# pkg set -n ansible:ansible27
>+# pkg set -n ansible:ansible29
> 
> EOD
>-maximum_version: "2.8"
>+maximum_version: "2.10"
> type: upgrade
> }
> ]

Actions: View | Diff

Attachments on bug 250626: 219093 | 219094