Attachment 202758 Details for Bug 236436 – sysutils/ansible: Switch to security/py-cryptography where possible

sysutils/ansible: Switch to security/py-cryptography where possible

patch-sysutils_ansible-2.7.8_1.txt (text/plain), 2.28 KB, created by John W. O'Brien on 2019-03-10 01:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2019-03-10 01:38:15 UTC

Size: 2.28 KB

patch

obsolete

>Index: sysutils/ansible/Makefile
>===================================================================
>--- sysutils/ansible/Makefile	(revision 495171)
>+++ sysutils/ansible/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ansible
> PORTVERSION?=	2.7.8
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	sysutils python
> MASTER_SITES=	http://releases.ansible.com/ansible/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -17,7 +17,6 @@
> 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
> TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
>@@ -28,6 +27,12 @@
> 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
> 
>+.if ${PORTVERSION:M2\.[4567]\.*}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
>+.elif ${PORTVERSION:M2\.*}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
>+.endif
>+
> CONFLICTS?=	ansible1-* \
> 		ansible23-* \
> 		ansible24-* \
>Index: sysutils/ansible24/Makefile
>===================================================================
>--- sysutils/ansible24/Makefile	(revision 495171)
>+++ sysutils/ansible24/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTVERSION=	2.4.6.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> PKGNAMESUFFIX=	24
> 
> CONFLICTS=	ansible-* \
>Index: sysutils/ansible25/Makefile
>===================================================================
>--- sysutils/ansible25/Makefile	(revision 495171)
>+++ sysutils/ansible25/Makefile	(working copy)
>@@ -1,6 +1,7 @@
> # $FreeBSD$
> 
> PORTVERSION=	2.5.15
>+PORTREVISION=	1
> PKGNAMESUFFIX=	25
> 
> CONFLICTS=	ansible-* \
>Index: sysutils/ansible26/Makefile
>===================================================================
>--- sysutils/ansible26/Makefile	(revision 495171)
>+++ sysutils/ansible26/Makefile	(working copy)
>@@ -1,6 +1,7 @@
> # $FreeBSD$
> 
> PORTVERSION=	2.6.14
>+PORTREVISION=	1
> PKGNAMESUFFIX=	26
> 
> CONFLICTS=	ansible-* \

Actions: View

Attachments on bug 236436: 202758