Date: Mon, 1 Oct 2012 22:02:20 GMT From: Denis Generalov <gd@rambler-co.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172258: [UPDATE] sysutils/salt to 0.10.3 Message-ID: <201210012202.q91M2K3n050583@red.freebsd.org> Resent-Message-ID: <201210012210.q91MA1pD032479@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172258 >Category: ports >Synopsis: [UPDATE] sysutils/salt to 0.10.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 01 22:10:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Denis Generalov >Release: FreeBSD 9.0-STABLE amd64 >Organization: Rambler >Environment: FreeBSD tyl.rambler.ramblermedia.com 9.0-STABLE FreeBSD 9.0-STABLE #1: Tue Feb 14 22:57:58 MSK 2012 root@tyl2.park.rambler.ru:/usr/obj/usr/src/sys/GENERIC amd64 >Description: *) Update from 0.10.2 to 0.10.3 *) Remove indirect dependency. Salt does'nt directly depends on zmq. *) Clean obsolete change setup.py at port-patch target. >How-To-Repeat: >Fix: see patch attached Patch attached with submission follows: Diff mode was set to CVS, but there's no CVS subdirectory Trying /usr/ports ... found ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/sysutils/salt/Makefile ./Makefile --- /usr/ports/sysutils/salt/Makefile 2012-09-12 19:09:02.000000000 +0400 +++ ./Makefile 2012-10-02 01:35:51.000000000 +0400 @@ -6,7 +6,7 @@ # PORTNAME= salt -PORTVERSION= 0.10.2 +PORTVERSION= 0.10.3 CATEGORIES= sysutils python MASTER_SITES= https://github.com/downloads/saltstack/salt/ @@ -15,7 +15,6 @@ LICENSE= AL2 -LIB_DEPENDS= zmq:${PORTSDIR}/devel/zmq RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.9:${PORTSDIR}/devel/py-pyzmq \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \ @@ -55,8 +54,6 @@ @${REINPLACE_CMD} -e 's|/etc/salt|${PREFIX}/etc/salt|' \ -e 's|/srv/salt|${PREFIX}/etc/salt/states|' ${WRKSRC}/${file} .endfor - @${REINPLACE_CMD} -e "s|'install_requires|'data_files': [],'install_requires|" \ - ${WRKSRC}/setup.py post-install: ${MKDIR} ${ETCDIR} diff -ruN --exclude=CVS /usr/ports/sysutils/salt/distinfo ./distinfo --- /usr/ports/sysutils/salt/distinfo 2012-09-12 19:09:02.000000000 +0400 +++ ./distinfo 2012-10-02 01:23:16.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (salt-0.10.2.tar.gz) = c875cfd3c614363f6188fb1aa223688948f8088b9eae938700dfe1aa65aa758a -SIZE (salt-0.10.2.tar.gz) = 586638 +SHA256 (salt-0.10.3.tar.gz) = e2a3aac7f7fcafbaafbf6e9f754de0109847abcb11cf43c7c6c9167c6b98bc84 +SIZE (salt-0.10.3.tar.gz) = 663522 diff -ruN --exclude=CVS /usr/ports/sysutils/salt/files/patch-setup.py ./files/patch-setup.py --- /usr/ports/sysutils/salt/files/patch-setup.py 2012-09-12 19:09:02.000000000 +0400 +++ ./files/patch-setup.py 2012-10-02 01:29:47.000000000 +0400 @@ -1,6 +1,6 @@ ---- work/salt-0.10.2/setup.py.orig 2012-07-16 20:33:03.000000000 -0600 -+++ setup.py 2012-07-31 20:53:47.983862084 -0600 -@@ -71,7 +71,7 @@ +--- setup.py.orig 2012-10-01 01:49:12.000000000 +0400 ++++ setup.py 2012-10-02 01:29:03.000000000 +0400 +@@ -76,7 +76,7 @@ if 'SYSCONFDIR' in os.environ: etc_path = os.environ['SYSCONFDIR'] else: @@ -9,7 +9,7 @@ libraries = ['ws2_32'] if sys.platform == 'win32' else [] -@@ -115,7 +115,7 @@ +@@ -120,7 +120,7 @@ 'salt.utils', ], 'package_data': {'salt.modules': ['rh_ip/*.jinja']}, @@ -18,7 +18,7 @@ ['doc/man/salt-master.1', 'doc/man/salt-key.1', 'doc/man/salt.1', -@@ -125,9 +125,8 @@ +@@ -130,9 +130,8 @@ 'doc/man/salt-run.1', 'doc/man/salt-minion.1', ]), @@ -26,6 +26,6 @@ + ('man/man7', ['doc/man/salt.7']), ], - 'install_requires': requirements, - } - - if with_setuptools: + # The dynamic module loading in salt.modules makes this + # package zip unsafe. + 'zip_safe': False diff -ruN --exclude=CVS /usr/ports/sysutils/salt/pkg-plist ./pkg-plist --- /usr/ports/sysutils/salt/pkg-plist 2012-09-12 19:09:02.000000000 +0400 +++ ./pkg-plist 2012-10-02 01:43:04.000000000 +0400 @@ -56,6 +56,9 @@ %%PYTHON_SITELIBDIR%%/salt/grains/extra.py %%PYTHON_SITELIBDIR%%/salt/grains/extra.pyc %%PYTHON_SITELIBDIR%%/salt/grains/extra.pyo +%%PYTHON_SITELIBDIR%%/salt/grains/opts.py +%%PYTHON_SITELIBDIR%%/salt/grains/opts.pyc +%%PYTHON_SITELIBDIR%%/salt/grains/opts.pyo %%PYTHON_SITELIBDIR%%/salt/loader.py %%PYTHON_SITELIBDIR%%/salt/loader.pyc %%PYTHON_SITELIBDIR%%/salt/loader.pyo @@ -83,6 +86,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/archive.py %%PYTHON_SITELIBDIR%%/salt/modules/archive.pyc %%PYTHON_SITELIBDIR%%/salt/modules/archive.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/at.py +%%PYTHON_SITELIBDIR%%/salt/modules/at.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/at.pyo %%PYTHON_SITELIBDIR%%/salt/modules/augeas_cfg.py %%PYTHON_SITELIBDIR%%/salt/modules/augeas_cfg.pyc %%PYTHON_SITELIBDIR%%/salt/modules/augeas_cfg.pyo @@ -95,6 +101,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/butterkvm.py %%PYTHON_SITELIBDIR%%/salt/modules/butterkvm.pyc %%PYTHON_SITELIBDIR%%/salt/modules/butterkvm.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/ca.py +%%PYTHON_SITELIBDIR%%/salt/modules/ca.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/ca.pyo %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.py %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyc %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyo @@ -122,9 +131,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/disk.py %%PYTHON_SITELIBDIR%%/salt/modules/disk.pyc %%PYTHON_SITELIBDIR%%/salt/modules/disk.pyo -%%PYTHON_SITELIBDIR%%/salt/modules/django.py -%%PYTHON_SITELIBDIR%%/salt/modules/django.pyc -%%PYTHON_SITELIBDIR%%/salt/modules/django.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/djangomod.py +%%PYTHON_SITELIBDIR%%/salt/modules/djangomod.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/djangomod.pyo %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.py %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.pyc %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.pyo @@ -185,6 +194,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/mdadm.py %%PYTHON_SITELIBDIR%%/salt/modules/mdadm.pyc %%PYTHON_SITELIBDIR%%/salt/modules/mdadm.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/mongodb.py +%%PYTHON_SITELIBDIR%%/salt/modules/mongodb.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/mongodb.pyo %%PYTHON_SITELIBDIR%%/salt/modules/monit.py %%PYTHON_SITELIBDIR%%/salt/modules/monit.pyc %%PYTHON_SITELIBDIR%%/salt/modules/monit.pyo @@ -218,6 +230,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/pacman.py %%PYTHON_SITELIBDIR%%/salt/modules/pacman.pyc %%PYTHON_SITELIBDIR%%/salt/modules/pacman.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/pecl.py +%%PYTHON_SITELIBDIR%%/salt/modules/pecl.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/pecl.pyo %%PYTHON_SITELIBDIR%%/salt/modules/pillar.py %%PYTHON_SITELIBDIR%%/salt/modules/pillar.pyc %%PYTHON_SITELIBDIR%%/salt/modules/pillar.pyo @@ -254,13 +269,13 @@ %%PYTHON_SITELIBDIR%%/salt/modules/reg.py %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyc %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.py +%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyo %%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/conf.jinja %%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/network.jinja %%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/rh5_eth.jinja %%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/rh6_eth.jinja -%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.py -%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyc -%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyo %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.py %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.pyc %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.pyo @@ -279,6 +294,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/shadow.py %%PYTHON_SITELIBDIR%%/salt/modules/shadow.pyc %%PYTHON_SITELIBDIR%%/salt/modules/shadow.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/smf.py +%%PYTHON_SITELIBDIR%%/salt/modules/smf.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/smf.pyo %%PYTHON_SITELIBDIR%%/salt/modules/solr.py %%PYTHON_SITELIBDIR%%/salt/modules/solr.pyc %%PYTHON_SITELIBDIR%%/salt/modules/solr.pyo @@ -294,6 +312,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/status.py %%PYTHON_SITELIBDIR%%/salt/modules/status.pyc %%PYTHON_SITELIBDIR%%/salt/modules/status.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/supervisord.py +%%PYTHON_SITELIBDIR%%/salt/modules/supervisord.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/supervisord.pyo %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyo @@ -345,9 +366,9 @@ %%PYTHON_SITELIBDIR%%/salt/modules/yumpkg5.py %%PYTHON_SITELIBDIR%%/salt/modules/yumpkg5.pyc %%PYTHON_SITELIBDIR%%/salt/modules/yumpkg5.pyo -%%PYTHON_SITELIBDIR%%/salt/modules/zfs.py -%%PYTHON_SITELIBDIR%%/salt/modules/zfs.pyc -%%PYTHON_SITELIBDIR%%/salt/modules/zfs.pyo +%%PYTHON_SITELIBDIR%%/salt/modules/zpool.py +%%PYTHON_SITELIBDIR%%/salt/modules/zpool.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/zpool.pyo %%PYTHON_SITELIBDIR%%/salt/modules/zypper.py %%PYTHON_SITELIBDIR%%/salt/modules/zypper.pyc %%PYTHON_SITELIBDIR%%/salt/modules/zypper.pyo @@ -360,12 +381,18 @@ %%PYTHON_SITELIBDIR%%/salt/pillar/__init__.py %%PYTHON_SITELIBDIR%%/salt/pillar/__init__.pyc %%PYTHON_SITELIBDIR%%/salt/pillar/__init__.pyo +%%PYTHON_SITELIBDIR%%/salt/pillar/cmd_json.py +%%PYTHON_SITELIBDIR%%/salt/pillar/cmd_json.pyc +%%PYTHON_SITELIBDIR%%/salt/pillar/cmd_json.pyo %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yaml.py %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yaml.pyc %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yaml.pyo %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.py %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.pyc %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.pyo +%%PYTHON_SITELIBDIR%%/salt/pillar/mongo.py +%%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyc +%%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyo %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.py %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyc %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyo @@ -453,6 +480,9 @@ %%PYTHON_SITELIBDIR%%/salt/states/group.py %%PYTHON_SITELIBDIR%%/salt/states/group.pyc %%PYTHON_SITELIBDIR%%/salt/states/group.pyo +%%PYTHON_SITELIBDIR%%/salt/states/hg.py +%%PYTHON_SITELIBDIR%%/salt/states/hg.pyc +%%PYTHON_SITELIBDIR%%/salt/states/hg.pyo %%PYTHON_SITELIBDIR%%/salt/states/host.py %%PYTHON_SITELIBDIR%%/salt/states/host.pyc %%PYTHON_SITELIBDIR%%/salt/states/host.pyo @@ -462,6 +492,12 @@ %%PYTHON_SITELIBDIR%%/salt/states/module.py %%PYTHON_SITELIBDIR%%/salt/states/module.pyc %%PYTHON_SITELIBDIR%%/salt/states/module.pyo +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_database.py +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_database.pyc +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_database.pyo +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_user.py +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_user.pyc +%%PYTHON_SITELIBDIR%%/salt/states/mongodb_user.pyo %%PYTHON_SITELIBDIR%%/salt/states/mount.py %%PYTHON_SITELIBDIR%%/salt/states/mount.pyc %%PYTHON_SITELIBDIR%%/salt/states/mount.pyo @@ -477,6 +513,9 @@ %%PYTHON_SITELIBDIR%%/salt/states/network.py %%PYTHON_SITELIBDIR%%/salt/states/network.pyc %%PYTHON_SITELIBDIR%%/salt/states/network.pyo +%%PYTHON_SITELIBDIR%%/salt/states/pecl.py +%%PYTHON_SITELIBDIR%%/salt/states/pecl.pyc +%%PYTHON_SITELIBDIR%%/salt/states/pecl.pyo %%PYTHON_SITELIBDIR%%/salt/states/pip.py %%PYTHON_SITELIBDIR%%/salt/states/pip.pyc %%PYTHON_SITELIBDIR%%/salt/states/pip.pyo @@ -507,6 +546,9 @@ %%PYTHON_SITELIBDIR%%/salt/states/ssh_known_hosts.py %%PYTHON_SITELIBDIR%%/salt/states/ssh_known_hosts.pyc %%PYTHON_SITELIBDIR%%/salt/states/ssh_known_hosts.pyo +%%PYTHON_SITELIBDIR%%/salt/states/supervisord.py +%%PYTHON_SITELIBDIR%%/salt/states/supervisord.pyc +%%PYTHON_SITELIBDIR%%/salt/states/supervisord.pyo %%PYTHON_SITELIBDIR%%/salt/states/sysctl.py %%PYTHON_SITELIBDIR%%/salt/states/sysctl.pyc %%PYTHON_SITELIBDIR%%/salt/states/sysctl.pyo @@ -531,6 +573,9 @@ %%PYTHON_SITELIBDIR%%/salt/utils/event.py %%PYTHON_SITELIBDIR%%/salt/utils/event.pyc %%PYTHON_SITELIBDIR%%/salt/utils/event.pyo +%%PYTHON_SITELIBDIR%%/salt/utils/filebuffer.py +%%PYTHON_SITELIBDIR%%/salt/utils/filebuffer.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/filebuffer.pyo %%PYTHON_SITELIBDIR%%/salt/utils/find.py %%PYTHON_SITELIBDIR%%/salt/utils/find.pyc %%PYTHON_SITELIBDIR%%/salt/utils/find.pyo @@ -540,9 +585,9 @@ %%PYTHON_SITELIBDIR%%/salt/utils/jinja.py %%PYTHON_SITELIBDIR%%/salt/utils/jinja.pyc %%PYTHON_SITELIBDIR%%/salt/utils/jinja.pyo -%%PYTHON_SITELIBDIR%%/salt/utils/parser.py -%%PYTHON_SITELIBDIR%%/salt/utils/parser.pyc -%%PYTHON_SITELIBDIR%%/salt/utils/parser.pyo +%%PYTHON_SITELIBDIR%%/salt/utils/parsers.py +%%PYTHON_SITELIBDIR%%/salt/utils/parsers.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/parsers.pyo %%PYTHON_SITELIBDIR%%/salt/utils/process.py %%PYTHON_SITELIBDIR%%/salt/utils/process.pyc %%PYTHON_SITELIBDIR%%/salt/utils/process.pyo ===> Done >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210012202.q91M2K3n050583>