Attachment 132955 Details for Bug 177326 – file.diff

[patch] file.diff

file.diff (text/plain), 11.96 KB, created by Christer Edwards on 2013-03-24 02:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2013-03-24 02:00:00 UTC

Size: 11.96 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/py-salt/Makefile py-salt-0.14.0/Makefile
>--- /usr/ports/sysutils/py-salt/Makefile	2013-03-23 00:04:41.000000000 -0600
>+++ py-salt-0.14.0/Makefile	2013-03-23 17:51:49.000000000 -0600
>@@ -2,7 +2,7 @@
> # $FreeBSD: sysutils/py-salt/Makefile 314999 2013-03-23 06:04:41Z rm $
> 
> PORTNAME=	salt
>-PORTVERSION=	0.13.3
>+PORTVERSION=	0.14.0
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN /usr/ports/sysutils/py-salt/distinfo py-salt-0.14.0/distinfo
>--- /usr/ports/sysutils/py-salt/distinfo	2013-03-23 00:04:41.000000000 -0600
>+++ py-salt-0.14.0/distinfo	2013-03-23 17:51:53.000000000 -0600
>@@ -1,2 +1,2 @@
>-SHA256 (salt-0.13.3.tar.gz) = c0281cd1549356d38f67492b741225d6ba3d9b3dc01addfdadf07867078e460b
>-SIZE (salt-0.13.3.tar.gz) = 1019952
>+SHA256 (salt-0.14.0.tar.gz) = 219b3b1a81407ba107a22754753ef882369df697da5b0ac74cfbbf67a702c664
>+SIZE (salt-0.14.0.tar.gz) = 3343825
>diff -ruN /usr/ports/sysutils/py-salt/pkg-plist py-salt-0.14.0/pkg-plist
>--- /usr/ports/sysutils/py-salt/pkg-plist	2013-03-14 02:15:46.000000000 -0600
>+++ py-salt-0.14.0/pkg-plist	2013-03-23 18:07:18.000000000 -0600
>@@ -161,6 +161,12 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/djangomod.py
> %%PYTHON_SITELIBDIR%%/salt/modules/djangomod.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/djangomod.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsmasq.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsmasq.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsmasq.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsutil.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsutil.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/dnsutil.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.py
> %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.pyo
>@@ -218,15 +224,24 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/grub_legacy.py
> %%PYTHON_SITELIBDIR%%/salt/modules/grub_legacy.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/grub_legacy.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/guestfs.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/guestfs.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/guestfs.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/hg.py
> %%PYTHON_SITELIBDIR%%/salt/modules/hg.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/hg.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/hosts.py
> %%PYTHON_SITELIBDIR%%/salt/modules/hosts.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/hosts.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/img.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/img.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/img.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/iptables.py
> %%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/key.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/key.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/key.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/keyboard.py
> %%PYTHON_SITELIBDIR%%/salt/modules/keyboard.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/keyboard.pyo
>@@ -263,6 +278,9 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/locate.py
> %%PYTHON_SITELIBDIR%%/salt/modules/locate.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/locate.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/logrotate.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/logrotate.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/logrotate.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.py
> %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.pyo
>@@ -281,6 +299,9 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/mount.py
> %%PYTHON_SITELIBDIR%%/salt/modules/mount.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/mount.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/munin.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/munin.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/munin.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/mysql.py
> %%PYTHON_SITELIBDIR%%/salt/modules/mysql.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/mysql.pyo
>@@ -293,6 +314,9 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/nginx.py
> %%PYTHON_SITELIBDIR%%/salt/modules/nginx.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/nginx.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/npm.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/npm.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/npm.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/nova.py
> %%PYTHON_SITELIBDIR%%/salt/modules/nova.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/nova.pyo
>@@ -356,6 +380,15 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/pw_user.py
> %%PYTHON_SITELIBDIR%%/salt/modules/pw_user.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/pw_user.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_img.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_img.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_img.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_nbd.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_nbd.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/qemu_nbd.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/quota.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/quota.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/quota.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.py
> %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.pyo
>@@ -381,6 +414,9 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/rvm.py
> %%PYTHON_SITELIBDIR%%/salt/modules/rvm.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/rvm.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/s3.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/s3.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/s3.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.py
> %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.pyo
>@@ -435,6 +471,9 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.py
> %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.pyo
>+%%PYTHON_SITELIBDIR%%/salt/modules/system.py
>+%%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
>+%%PYTHON_SITELIBDIR%%/salt/modules/system.pyo
> %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
> %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyo
>@@ -519,6 +558,12 @@
> %%PYTHON_SITELIBDIR%%/salt/output/nested.py
> %%PYTHON_SITELIBDIR%%/salt/output/nested.pyc
> %%PYTHON_SITELIBDIR%%/salt/output/nested.pyo
>+%%PYTHON_SITELIBDIR%%/salt/output/no_out.py
>+%%PYTHON_SITELIBDIR%%/salt/output/no_out.pyc
>+%%PYTHON_SITELIBDIR%%/salt/output/no_out.pyo
>+%%PYTHON_SITELIBDIR%%/salt/output/no_return.py
>+%%PYTHON_SITELIBDIR%%/salt/output/no_return.pyc
>+%%PYTHON_SITELIBDIR%%/salt/output/no_return.pyo
> %%PYTHON_SITELIBDIR%%/salt/output/overstatestage.py
> %%PYTHON_SITELIBDIR%%/salt/output/overstatestage.pyc
> %%PYTHON_SITELIBDIR%%/salt/output/overstatestage.pyo
>@@ -531,6 +576,9 @@
> %%PYTHON_SITELIBDIR%%/salt/output/txt.py
> %%PYTHON_SITELIBDIR%%/salt/output/txt.pyc
> %%PYTHON_SITELIBDIR%%/salt/output/txt.pyo
>+%%PYTHON_SITELIBDIR%%/salt/output/virt_query.py
>+%%PYTHON_SITELIBDIR%%/salt/output/virt_query.pyc
>+%%PYTHON_SITELIBDIR%%/salt/output/virt_query.pyo
> %%PYTHON_SITELIBDIR%%/salt/output/yaml_out.py
> %%PYTHON_SITELIBDIR%%/salt/output/yaml_out.pyc
> %%PYTHON_SITELIBDIR%%/salt/output/yaml_out.pyo
>@@ -549,12 +597,21 @@
> %%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/cobbler.py
>+%%PYTHON_SITELIBDIR%%/salt/pillar/cobbler.pyc
>+%%PYTHON_SITELIBDIR%%/salt/pillar/cobbler.pyo
> %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.py
> %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.pyc
> %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.pyo
>+%%PYTHON_SITELIBDIR%%/salt/pillar/libvirt.py
>+%%PYTHON_SITELIBDIR%%/salt/pillar/libvirt.pyc
>+%%PYTHON_SITELIBDIR%%/salt/pillar/libvirt.pyo
> %%PYTHON_SITELIBDIR%%/salt/pillar/mongo.py
> %%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyc
> %%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyo
>+%%PYTHON_SITELIBDIR%%/salt/pillar/puppet.py
>+%%PYTHON_SITELIBDIR%%/salt/pillar/puppet.pyc
>+%%PYTHON_SITELIBDIR%%/salt/pillar/puppet.pyo
> %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.py
> %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.pyc
> %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.pyo
>@@ -612,6 +669,9 @@
> %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.py
> %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.pyc
> %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.pyo
>+%%PYTHON_SITELIBDIR%%/salt/returners/sentry_return.py
>+%%PYTHON_SITELIBDIR%%/salt/returners/sentry_return.pyc
>+%%PYTHON_SITELIBDIR%%/salt/returners/sentry_return.pyo
> %%PYTHON_SITELIBDIR%%/salt/returners/smtp_return.py
> %%PYTHON_SITELIBDIR%%/salt/returners/smtp_return.pyc
> %%PYTHON_SITELIBDIR%%/salt/returners/smtp_return.pyo
>@@ -627,6 +687,9 @@
> %%PYTHON_SITELIBDIR%%/salt/runners/cache.py
> %%PYTHON_SITELIBDIR%%/salt/runners/cache.pyc
> %%PYTHON_SITELIBDIR%%/salt/runners/cache.pyo
>+%%PYTHON_SITELIBDIR%%/salt/runners/doc.py
>+%%PYTHON_SITELIBDIR%%/salt/runners/doc.pyc
>+%%PYTHON_SITELIBDIR%%/salt/runners/doc.pyo
> %%PYTHON_SITELIBDIR%%/salt/runners/fileserver.py
> %%PYTHON_SITELIBDIR%%/salt/runners/fileserver.pyc
> %%PYTHON_SITELIBDIR%%/salt/runners/fileserver.pyo
>@@ -648,9 +711,9 @@
> %%PYTHON_SITELIBDIR%%/salt/runners/state.py
> %%PYTHON_SITELIBDIR%%/salt/runners/state.pyc
> %%PYTHON_SITELIBDIR%%/salt/runners/state.pyo
>-%%PYTHON_SITELIBDIR%%/salt/runners/sysmod.py
>-%%PYTHON_SITELIBDIR%%/salt/runners/sysmod.pyc
>-%%PYTHON_SITELIBDIR%%/salt/runners/sysmod.pyo
>+%%PYTHON_SITELIBDIR%%/salt/runners/virt.py
>+%%PYTHON_SITELIBDIR%%/salt/runners/virt.pyc
>+%%PYTHON_SITELIBDIR%%/salt/runners/virt.pyo
> %%PYTHON_SITELIBDIR%%/salt/runners/winrepo.py
> %%PYTHON_SITELIBDIR%%/salt/runners/winrepo.pyc
> %%PYTHON_SITELIBDIR%%/salt/runners/winrepo.pyo
>@@ -714,6 +777,9 @@
> %%PYTHON_SITELIBDIR%%/salt/states/layman.py
> %%PYTHON_SITELIBDIR%%/salt/states/layman.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/layman.pyo
>+%%PYTHON_SITELIBDIR%%/salt/states/libvirt.py
>+%%PYTHON_SITELIBDIR%%/salt/states/libvirt.pyc
>+%%PYTHON_SITELIBDIR%%/salt/states/libvirt.pyo
> %%PYTHON_SITELIBDIR%%/salt/states/locale.py
> %%PYTHON_SITELIBDIR%%/salt/states/locale.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/locale.pyo
>@@ -744,6 +810,9 @@
> %%PYTHON_SITELIBDIR%%/salt/states/network.py
> %%PYTHON_SITELIBDIR%%/salt/states/network.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/network.pyo
>+%%PYTHON_SITELIBDIR%%/salt/states/npm.py
>+%%PYTHON_SITELIBDIR%%/salt/states/npm.pyc
>+%%PYTHON_SITELIBDIR%%/salt/states/npm.pyo
> %%PYTHON_SITELIBDIR%%/salt/states/pecl.py
> %%PYTHON_SITELIBDIR%%/salt/states/pecl.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/pecl.pyo
>@@ -804,6 +873,9 @@
> %%PYTHON_SITELIBDIR%%/salt/states/timezone.py
> %%PYTHON_SITELIBDIR%%/salt/states/timezone.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/timezone.pyo
>+%%PYTHON_SITELIBDIR%%/salt/states/tomcat.py
>+%%PYTHON_SITELIBDIR%%/salt/states/tomcat.pyc
>+%%PYTHON_SITELIBDIR%%/salt/states/tomcat.pyo
> %%PYTHON_SITELIBDIR%%/salt/states/user.py
> %%PYTHON_SITELIBDIR%%/salt/states/user.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/user.pyo
>@@ -816,9 +888,15 @@
> %%PYTHON_SITELIBDIR%%/salt/tops/__init__.py
> %%PYTHON_SITELIBDIR%%/salt/tops/__init__.pyc
> %%PYTHON_SITELIBDIR%%/salt/tops/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/salt/tops/cobbler.py
>+%%PYTHON_SITELIBDIR%%/salt/tops/cobbler.pyc
>+%%PYTHON_SITELIBDIR%%/salt/tops/cobbler.pyo
> %%PYTHON_SITELIBDIR%%/salt/tops/ext_nodes.py
> %%PYTHON_SITELIBDIR%%/salt/tops/ext_nodes.pyc
> %%PYTHON_SITELIBDIR%%/salt/tops/ext_nodes.pyo
>+%%PYTHON_SITELIBDIR%%/salt/tops/mongo.py
>+%%PYTHON_SITELIBDIR%%/salt/tops/mongo.pyc
>+%%PYTHON_SITELIBDIR%%/salt/tops/mongo.pyo
> %%PYTHON_SITELIBDIR%%/salt/utils/__init__.py
> %%PYTHON_SITELIBDIR%%/salt/utils/__init__.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/__init__.pyo
>@@ -864,6 +942,9 @@
> %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.py
> %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.pyo
>+%%PYTHON_SITELIBDIR%%/salt/utils/s3.py
>+%%PYTHON_SITELIBDIR%%/salt/utils/s3.pyc
>+%%PYTHON_SITELIBDIR%%/salt/utils/s3.pyo
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.py
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyo
>@@ -885,6 +966,9 @@
> %%PYTHON_SITELIBDIR%%/salt/utils/winservice.py
> %%PYTHON_SITELIBDIR%%/salt/utils/winservice.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/winservice.pyo
>+%%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.py
>+%%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.pyc
>+%%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.pyo
> %%PYTHON_SITELIBDIR%%/salt/utils/yamlloader.py
> %%PYTHON_SITELIBDIR%%/salt/utils/yamlloader.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/yamlloader.pyo

Actions: View | Diff

Attachments on bug 177326: 132955