Page MenuHomeFreeBSD

D10165.id27382.diff
No OneTemporary

D10165.id27382.diff

Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -5,6 +5,20 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170412:
+ AFFECTS: users of sysutils/ansible
+ AUTHOR: lifanov@FreeBSD.org
+
+ The default value for ansible_python_interpreter has been changed
+ to match the upstream /usr/bin/python. If managing FreeBSD systems,
+ adjust the hosts database to explicitly set a valid python interpreter:
+
+ [freebsd]
+ host1
+
+ [freebsd_vars]
+ ansible_python_interpreter=/usr/local/bin/python2.7
+
20170411:
AFFECTS: users of security/libressl
AUTHOR: brnrd@FreeBSD.org
Index: head/sysutils/ansible/Makefile
===================================================================
--- head/sysutils/ansible/Makefile
+++ head/sysutils/ansible/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ansible
-PORTVERSION?= 2.2.2.0
+PORTVERSION?= 2.3.0.0
PORTREVISION?= 0
CATEGORIES= sysutils python
MASTER_SITES= http://releases.ansible.com/ansible/
@@ -16,21 +16,19 @@
RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr
NO_ARCH= yes
-USES?= cpe python shebangfix
+USES?= cpe python
USE_PYTHON= autoplist distutils
-python_CMD= ${LOCALBASE}/bin/python
-SHEBANG_FILES+= lib/ansible/modules/core/*/*.py \
- lib/ansible/modules/core/*/*/*.py \
- lib/ansible/modules/extras/*/*.py \
- lib/ansible/modules/extras/*/*/*.py
CPE_VENDOR= ansibleworks
SUB_FILES= pkg-message
+SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
-PLIST_FILES+= man/man1/ansible-doc.1.gz \
+PLIST_FILES+= man/man1/ansible-console.1.gz \
+ man/man1/ansible-doc.1.gz \
man/man1/ansible-galaxy.1.gz \
man/man1/ansible-playbook.1.gz \
man/man1/ansible-pull.1.gz \
@@ -39,11 +37,7 @@
PORTEXAMPLES= ansible.cfg hosts
-OPTIONS_DEFINE= DOCS EXAMPLES NETADDR
-OPTIONS_DEFAULT=NETADDR
-
-NETADDR_DESC= Dependency on py-netaddr for ipaddr() filter
-NETADDR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr
+OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
.for f in bin/ansible docs/man/man1/* examples/* lib/ansible/*.py \
Index: head/sysutils/ansible/distinfo
===================================================================
--- head/sysutils/ansible/distinfo
+++ head/sysutils/ansible/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490707549
-SHA256 (ansible-2.2.2.0.tar.gz) = efd9c574168ac1916dd57f7c88d4dd2e13ef816af0ee49a8d34c77567886e4c2
-SIZE (ansible-2.2.2.0.tar.gz) = 2510182
+TIMESTAMP = 1492010911
+SHA256 (ansible-2.3.0.0.tar.gz) = 299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458
+SIZE (ansible-2.3.0.0.tar.gz) = 4251730
Index: head/sysutils/ansible/files/pkg-message.in
===================================================================
--- head/sysutils/ansible/files/pkg-message.in
+++ head/sysutils/ansible/files/pkg-message.in
@@ -8,22 +8,15 @@
%%EXAMPLESDIR%%/ansible.cfg
To use Ansible to control FreeBSD hosts, you need to
-install the lang/python package on remote machines.
-
-To use Ansible to control systems other than FreeBSD,
-set the Python interpreter in the host database for
-that system. Example:
+install the lang/python package on remote machines
+and set up a path to the python interpreter. Example:
[freebsd]
host1
host2
- [centos]
- host3
- host4
-
- [centos:vars]
- ansible_python_interpreter=/usr/bin/python
+ [freebsd:vars]
+ ansible_python_interpreter=%%PYTHON_CMD%%
Python notes:

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 8, 9:21 PM (18 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36258896
Default Alt Text
D10165.id27382.diff (3 KB)

Event Timeline