aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeech <beech@FreeBSD.org>2012-12-17 04:22:15 +0800
committerbeech <beech@FreeBSD.org>2012-12-17 04:22:15 +0800
commitb70b2e9cffeec0e142da65ecb36059d5b563cc07 (patch)
tree0d48335c17fe0c7c4e4d5d4ab251ff6b891f4a14
parent3ec7186fa032ff0ef6fc6b623e26ffdcd9bb9ce0 (diff)
downloadfreebsd-ports-gnome-b70b2e9cffeec0e142da65ecb36059d5b563cc07.tar.gz
freebsd-ports-gnome-b70b2e9cffeec0e142da65ecb36059d5b563cc07.tar.zst
freebsd-ports-gnome-b70b2e9cffeec0e142da65ecb36059d5b563cc07.zip
- Update to 0.11.0
PR: ports/174439 Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
-rw-r--r--sysutils/salt/Makefile10
-rw-r--r--sysutils/salt/distinfo4
-rw-r--r--sysutils/salt/files/pkg-message.in15
-rw-r--r--sysutils/salt/pkg-plist67
4 files changed, 78 insertions, 18 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index b0fd6a1d39cc..785404b33d67 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= salt
-PORTVERSION= 0.10.5
+PORTVERSION= 0.11.0
CATEGORIES= sysutils python
-MASTER_SITES= https://github.com/downloads/saltstack/salt/
+MASTER_SITES= http://pypi.python.org/packages/source/s/salt/
MAINTAINER= christer.edwards@gmail.com
COMMENT= Distributed remote execution and configuration management system
@@ -42,7 +42,7 @@ MAN1= salt-call.1 \
MAN7= salt.7
post-patch:
-.for file in conf/minion.template conf/master.template doc/man/salt-key.1 \
+.for file in conf/minion conf/master doc/man/salt-key.1 \
doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
salt/cli/__init__.py salt/__init__.py salt/config.py salt/client.py \
@@ -54,8 +54,8 @@ post-patch:
post-install:
${MKDIR} ${ETCDIR}
- ${INSTALL_DATA} ${WRKSRC}/conf/master.template ${PREFIX}/etc/salt/master.sample
- ${INSTALL_DATA} ${WRKSRC}/conf/minion.template ${PREFIX}/etc/salt/minion.sample
+ ${INSTALL_DATA} ${WRKSRC}/conf/master ${PREFIX}/etc/salt/master.sample
+ ${INSTALL_DATA} ${WRKSRC}/conf/minion ${PREFIX}/etc/salt/minion.sample
@${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/doc/man/,} ${MANPREFIX}/man/man1/
@${INSTALL_MAN} ${WRKSRC}/doc/man/${MAN7} ${MANPREFIX}/man/man7/
@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index aabcd5441427..c5a33968d822 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-0.10.5.tar.gz) = 16350dea427e9216adfa48a184fe99b302dacf6b2afbb96b792734046d80c9c9
-SIZE (salt-0.10.5.tar.gz) = 793582
+SHA256 (salt-0.11.0.tar.gz) = d5ecc48ff6c9a81686db59921e1b24e1c876f889214e7865f95d646ab572a3de
+SIZE (salt-0.11.0.tar.gz) = 846339
diff --git a/sysutils/salt/files/pkg-message.in b/sysutils/salt/files/pkg-message.in
index b9c6423d2ea4..8e282ba9fe95 100644
--- a/sysutils/salt/files/pkg-message.in
+++ b/sysutils/salt/files/pkg-message.in
@@ -1,21 +1,20 @@
-==============================================
+===================================================================================================
To configure a Salt Master, do the following:
- o Copy %%PREFIX%%/etc/salt/master.sample
- to %%PREFIX%%/etc/salt/master
+ o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
o Update to meet your needs
o Set salt_master_enable="YES" in rc.conf
-----------------------------------------------
+---------------------------------------------------------------------------------------------------
To configure a Salt Minion, do the following:
- o Copy %%PREFIX%%/etc/salt/minion.sample
- to %%PREFIX%%/etc/salt/minion
- o Update config to point to your Salt Master
+ o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
+ o Update 'master: salt' to point to your Salt Master's hostname or IP
o Set salt_minion_enable="YES" in rc.conf
+ o Set salt_minion_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" in rc.conf
-=============================================
+===================================================================================================
diff --git a/sysutils/salt/pkg-plist b/sysutils/salt/pkg-plist
index acffe0148092..7a8466a61ef7 100644
--- a/sysutils/salt/pkg-plist
+++ b/sysutils/salt/pkg-plist
@@ -86,6 +86,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/aliases.py
%%PYTHON_SITELIBDIR%%/salt/modules/aliases.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/aliases.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/alternatives.py
+%%PYTHON_SITELIBDIR%%/salt/modules/alternatives.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/alternatives.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/apache.py
%%PYTHON_SITELIBDIR%%/salt/modules/apache.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/apache.pyo
@@ -152,6 +155,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/event.py
%%PYTHON_SITELIBDIR%%/salt/modules/event.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/event.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/extfs.py
+%%PYTHON_SITELIBDIR%%/salt/modules/extfs.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/extfs.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/file.py
%%PYTHON_SITELIBDIR%%/salt/modules/file.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/file.pyo
@@ -188,15 +194,21 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/groupadd.py
%%PYTHON_SITELIBDIR%%/salt/modules/groupadd.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/groupadd.pyo
-%%PYTHON_SITELIBDIR%%/salt/modules/grub.py
-%%PYTHON_SITELIBDIR%%/salt/modules/grub.pyc
-%%PYTHON_SITELIBDIR%%/salt/modules/grub.pyo
+%%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/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/iptables.py
+%%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/keyboard.py
+%%PYTHON_SITELIBDIR%%/salt/modules/keyboard.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/keyboard.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/keystone.py
%%PYTHON_SITELIBDIR%%/salt/modules/keystone.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/keystone.pyo
@@ -215,6 +227,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.py
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/locale.py
+%%PYTHON_SITELIBDIR%%/salt/modules/locale.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/locale.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/mdadm.py
%%PYTHON_SITELIBDIR%%/salt/modules/mdadm.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/mdadm.pyo
@@ -257,6 +272,12 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/pacman.py
%%PYTHON_SITELIBDIR%%/salt/modules/pacman.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/pacman.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/pam.py
+%%PYTHON_SITELIBDIR%%/salt/modules/pam.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/pam.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/parted.py
+%%PYTHON_SITELIBDIR%%/salt/modules/parted.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/parted.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/pecl.py
%%PYTHON_SITELIBDIR%%/salt/modules/pecl.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/pecl.pyo
@@ -266,6 +287,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/pip.py
%%PYTHON_SITELIBDIR%%/salt/modules/pip.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/pip.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/pkg_resource.py
+%%PYTHON_SITELIBDIR%%/salt/modules/pkg_resource.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/pkg_resource.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/pkgng.py
%%PYTHON_SITELIBDIR%%/salt/modules/pkgng.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/pkgng.pyo
@@ -369,6 +393,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/test.py
%%PYTHON_SITELIBDIR%%/salt/modules/test.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/test.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/timezone.py
+%%PYTHON_SITELIBDIR%%/salt/modules/timezone.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/timezone.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/tls.py
%%PYTHON_SITELIBDIR%%/salt/modules/tls.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/tls.pyo
@@ -426,6 +453,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/output/__init__.py
%%PYTHON_SITELIBDIR%%/salt/output/__init__.pyc
%%PYTHON_SITELIBDIR%%/salt/output/__init__.pyo
+%%PYTHON_SITELIBDIR%%/salt/output/grains.py
+%%PYTHON_SITELIBDIR%%/salt/output/grains.pyc
+%%PYTHON_SITELIBDIR%%/salt/output/grains.pyo
%%PYTHON_SITELIBDIR%%/salt/output/highstate.py
%%PYTHON_SITELIBDIR%%/salt/output/highstate.pyc
%%PYTHON_SITELIBDIR%%/salt/output/highstate.pyo
@@ -435,6 +465,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/output/key.py
%%PYTHON_SITELIBDIR%%/salt/output/key.pyc
%%PYTHON_SITELIBDIR%%/salt/output/key.pyo
+%%PYTHON_SITELIBDIR%%/salt/output/overstatestage.py
+%%PYTHON_SITELIBDIR%%/salt/output/overstatestage.pyc
+%%PYTHON_SITELIBDIR%%/salt/output/overstatestage.pyo
%%PYTHON_SITELIBDIR%%/salt/output/pprint_out.py
%%PYTHON_SITELIBDIR%%/salt/output/pprint_out.pyc
%%PYTHON_SITELIBDIR%%/salt/output/pprint_out.pyo
@@ -447,6 +480,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/output/yaml_out.py
%%PYTHON_SITELIBDIR%%/salt/output/yaml_out.pyc
%%PYTHON_SITELIBDIR%%/salt/output/yaml_out.pyo
+%%PYTHON_SITELIBDIR%%/salt/overstate.py
+%%PYTHON_SITELIBDIR%%/salt/overstate.pyc
+%%PYTHON_SITELIBDIR%%/salt/overstate.pyo
%%PYTHON_SITELIBDIR%%/salt/payload.py
%%PYTHON_SITELIBDIR%%/salt/payload.pyc
%%PYTHON_SITELIBDIR%%/salt/payload.pyo
@@ -507,6 +543,12 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/returners/mongo_return.py
%%PYTHON_SITELIBDIR%%/salt/returners/mongo_return.pyc
%%PYTHON_SITELIBDIR%%/salt/returners/mongo_return.pyo
+%%PYTHON_SITELIBDIR%%/salt/returners/mysql.py
+%%PYTHON_SITELIBDIR%%/salt/returners/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/mysql.pyo
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres.py
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/postgres.pyo
%%PYTHON_SITELIBDIR%%/salt/returners/redis_return.py
%%PYTHON_SITELIBDIR%%/salt/returners/redis_return.pyc
%%PYTHON_SITELIBDIR%%/salt/returners/redis_return.pyo
@@ -531,9 +573,21 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/runners/network.py
%%PYTHON_SITELIBDIR%%/salt/runners/network.pyc
%%PYTHON_SITELIBDIR%%/salt/runners/network.pyo
+%%PYTHON_SITELIBDIR%%/salt/runners/search.py
+%%PYTHON_SITELIBDIR%%/salt/runners/search.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/search.pyo
+%%PYTHON_SITELIBDIR%%/salt/runners/state.py
+%%PYTHON_SITELIBDIR%%/salt/runners/state.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/state.pyo
%%PYTHON_SITELIBDIR%%/salt/scripts.py
%%PYTHON_SITELIBDIR%%/salt/scripts.pyc
%%PYTHON_SITELIBDIR%%/salt/scripts.pyo
+%%PYTHON_SITELIBDIR%%/salt/search/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/search/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/search/__init__.pyo
+%%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.py
+%%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.pyc
+%%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.pyo
%%PYTHON_SITELIBDIR%%/salt/state.py
%%PYTHON_SITELIBDIR%%/salt/state.pyc
%%PYTHON_SITELIBDIR%%/salt/state.pyo
@@ -543,6 +597,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/states/alias.py
%%PYTHON_SITELIBDIR%%/salt/states/alias.pyc
%%PYTHON_SITELIBDIR%%/salt/states/alias.pyo
+%%PYTHON_SITELIBDIR%%/salt/states/alternatives.py
+%%PYTHON_SITELIBDIR%%/salt/states/alternatives.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/alternatives.pyo
%%PYTHON_SITELIBDIR%%/salt/states/cmd.py
%%PYTHON_SITELIBDIR%%/salt/states/cmd.pyc
%%PYTHON_SITELIBDIR%%/salt/states/cmd.pyo
@@ -690,6 +747,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/utils/mako.py
%%PYTHON_SITELIBDIR%%/salt/utils/mako.pyc
%%PYTHON_SITELIBDIR%%/salt/utils/mako.pyo
+%%PYTHON_SITELIBDIR%%/salt/utils/migrations.py
+%%PYTHON_SITELIBDIR%%/salt/utils/migrations.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/migrations.pyo
%%PYTHON_SITELIBDIR%%/salt/utils/minions.py
%%PYTHON_SITELIBDIR%%/salt/utils/minions.pyc
%%PYTHON_SITELIBDIR%%/salt/utils/minions.pyo
@@ -738,6 +798,7 @@ bin/salt-syndic
@dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
@dirrm %%PYTHON_SITELIBDIR%%/salt/utils
@dirrm %%PYTHON_SITELIBDIR%%/salt/tops
+@dirrm %%PYTHON_SITELIBDIR%%/salt/search
@dirrm %%PYTHON_SITELIBDIR%%/salt/states
@dirrm %%PYTHON_SITELIBDIR%%/salt/runners
@dirrm %%PYTHON_SITELIBDIR%%/salt/returners