diff options
| author | imil <imil@pkgsrc.org> | 2014-03-30 12:31:17 +0000 |
|---|---|---|
| committer | imil <imil@pkgsrc.org> | 2014-03-30 12:31:17 +0000 |
| commit | 536f13c375c8c378ea93260a2e77feaf0f2b8d47 (patch) | |
| tree | 1dbde089f8c0475ed323bce007262066f260806f /sysutils/salt | |
| parent | ab505d5b68f2d049646cd745840f86103152e920 (diff) | |
| download | pkgsrc-536f13c375c8c378ea93260a2e77feaf0f2b8d47.tar.gz | |
Updated salt to 2014.1.1, numerous bug and security fixes
Details:
* http://docs.saltstack.com/en/latest/topics/releases/0.16.4.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.0.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.1.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.2.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.3.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.4.html
* http://docs.saltstack.com/en/latest/topics/releases/0.17.5.html
* http://docs.saltstack.com/en/latest/topics/releases/2014.1.1.html
Diffstat (limited to 'sysutils/salt')
| -rw-r--r-- | sysutils/salt/Makefile | 47 | ||||
| -rw-r--r-- | sysutils/salt/PLIST | 585 | ||||
| -rw-r--r-- | sysutils/salt/distinfo | 10 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-setup.py | 58 |
4 files changed, 600 insertions, 100 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 27bfdf5c858..66d277d3d08 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2014/01/27 18:41:15 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2014/03/30 12:31:17 imil Exp $ -DISTNAME= salt-0.16.3 +DISTNAME= salt-2014.1.1 CATEGORIES= sysutils MASTER_SITES= https://pypi.python.org/packages/source/s/salt/ @@ -17,24 +17,21 @@ DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 +BUILD_DEFS+= VARBASE + PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-m2crypto -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= post-patch -SUBST_MESSAGE.fix-paths=Fixing directory paths. -SUBST_FILES.fix-paths+= conf/* -SUBST_FILES.fix-paths+= doc/man/* -SUBST_FILES.fix-paths+= salt/client.py -SUBST_FILES.fix-paths+= salt/config.py -SUBST_FILES.fix-paths+= salt/modules/mysql.py -SUBST_FILES.fix-paths+= salt/modules/postgres.py -SUBST_FILES.fix-paths+= salt/modules/tls.py -SUBST_FILES.fix-paths+= salt/utils/parsers.py -SUBST_FILES.fix-paths+= salt/utils/migrations.py -SUBST_SED.fix-paths+= -e "s|/etc/salt|${PKG_SYSCONFDIR}|g" - -REPLACE_PYTHON+= salt/modules/munin.py -REPLACE_PYTHON+= salt/returners/sentry_return.py +PYSETUPINSTALLARGS+= --salt-root-dir=${PREFIX} +PYSETUPINSTALLARGS+= --salt-config-dir=${PKG_SYSCONFDIR} +PYSETUPINSTALLARGS+= --salt-cache-dir=${VARBASE}/cache/salt +PYSETUPINSTALLARGS+= --salt-sock-dir==${VARBASE}/run/salt +PYSETUPINSTALLARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states +PYSETUPINSTALLARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar +PYSETUPINSTALLARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master +PYSETUPINSTALLARGS+= --salt-logs-dir=${VARBASE}/log/salt +PYSETUPINSTALLARGS+= --salt-pidfile-dir=${VARBASE}/run + +REPLACE_PYTHON= *.py */*.py */*/*.py RCD_SCRIPTS+= salt_master salt_minion FILES_SUBST+= PYTHON=${PYTHONBIN:Q} @@ -46,6 +43,20 @@ INSTALLATION_DIRS+= ${EGDIR} CONF_FILES+= ${EGDIR}/master ${PKG_SYSCONFDIR}/master CONF_FILES+= ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion +OWN_DIRS+= ${PKG_SYSCONFDIR}/states ${PKG_SYSCONFDIR}/pillar +OWN_DIRS+= ${PKG_SYSCONFDIR}/salt-master +OWN_DIRS+= ${VARBASE}/cache/salt ${VARBASE}/run/salt +OWN_DIRS+= ${VARBASE}/log/salt + +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths=Fixing hardcoded paths +SUBST_FILES.fix-paths= conf/* +SUBST_FILES.fix-paths+= doc/man/* +SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g' +SUBST_SED.fix-paths+= -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g' +SUBST_SED.fix-paths+= -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g' + post-install: ${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/ ${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/ diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST index 9a809a39e14..719306e9f72 100644 --- a/sysutils/salt/PLIST +++ b/sysutils/salt/PLIST @@ -1,11 +1,13 @@ -@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:16 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/03/30 12:31:17 imil Exp $ bin/salt bin/salt-call +bin/salt-cloud bin/salt-cp bin/salt-key bin/salt-master bin/salt-minion bin/salt-run +bin/salt-ssh bin/salt-syndic ${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/salt/__init__.py @@ -14,12 +16,18 @@ ${PYSITELIB}/salt/__init__.pyo ${PYSITELIB}/salt/_compat.py ${PYSITELIB}/salt/_compat.pyc ${PYSITELIB}/salt/_compat.pyo +${PYSITELIB}/salt/_syspaths.py +${PYSITELIB}/salt/_syspaths.pyc +${PYSITELIB}/salt/_syspaths.pyo ${PYSITELIB}/salt/_version.py ${PYSITELIB}/salt/_version.pyc ${PYSITELIB}/salt/_version.pyo ${PYSITELIB}/salt/auth/__init__.py ${PYSITELIB}/salt/auth/__init__.pyc ${PYSITELIB}/salt/auth/__init__.pyo +${PYSITELIB}/salt/auth/auto.py +${PYSITELIB}/salt/auth/auto.pyc +${PYSITELIB}/salt/auth/auto.pyo ${PYSITELIB}/salt/auth/keystone.py ${PYSITELIB}/salt/auth/keystone.pyc ${PYSITELIB}/salt/auth/keystone.pyo @@ -29,6 +37,9 @@ ${PYSITELIB}/salt/auth/ldap.pyo ${PYSITELIB}/salt/auth/pam.py ${PYSITELIB}/salt/auth/pam.pyc ${PYSITELIB}/salt/auth/pam.pyo +${PYSITELIB}/salt/auth/stormpath_mod.py +${PYSITELIB}/salt/auth/stormpath_mod.pyc +${PYSITELIB}/salt/auth/stormpath_mod.pyo ${PYSITELIB}/salt/cli/__init__.py ${PYSITELIB}/salt/cli/__init__.pyc ${PYSITELIB}/salt/cli/__init__.pyo @@ -41,9 +52,127 @@ ${PYSITELIB}/salt/cli/caller.pyo ${PYSITELIB}/salt/cli/cp.py ${PYSITELIB}/salt/cli/cp.pyc ${PYSITELIB}/salt/cli/cp.pyo -${PYSITELIB}/salt/client.py -${PYSITELIB}/salt/client.pyc -${PYSITELIB}/salt/client.pyo +${PYSITELIB}/salt/client/__init__.py +${PYSITELIB}/salt/client/__init__.pyc +${PYSITELIB}/salt/client/__init__.pyo +${PYSITELIB}/salt/client/api.py +${PYSITELIB}/salt/client/api.pyc +${PYSITELIB}/salt/client/api.pyo +${PYSITELIB}/salt/client/ssh/__init__.py +${PYSITELIB}/salt/client/ssh/__init__.pyc +${PYSITELIB}/salt/client/ssh/__init__.pyo +${PYSITELIB}/salt/client/ssh/shell.py +${PYSITELIB}/salt/client/ssh/shell.pyc +${PYSITELIB}/salt/client/ssh/shell.pyo +${PYSITELIB}/salt/client/ssh/state.py +${PYSITELIB}/salt/client/ssh/state.pyc +${PYSITELIB}/salt/client/ssh/state.pyo +${PYSITELIB}/salt/client/ssh/wrapper/__init__.py +${PYSITELIB}/salt/client/ssh/wrapper/__init__.pyc +${PYSITELIB}/salt/client/ssh/wrapper/__init__.pyo +${PYSITELIB}/salt/client/ssh/wrapper/config.py +${PYSITELIB}/salt/client/ssh/wrapper/config.pyc +${PYSITELIB}/salt/client/ssh/wrapper/config.pyo +${PYSITELIB}/salt/client/ssh/wrapper/grains.py +${PYSITELIB}/salt/client/ssh/wrapper/grains.pyc +${PYSITELIB}/salt/client/ssh/wrapper/grains.pyo +${PYSITELIB}/salt/client/ssh/wrapper/pillar.py +${PYSITELIB}/salt/client/ssh/wrapper/pillar.pyc +${PYSITELIB}/salt/client/ssh/wrapper/pillar.pyo +${PYSITELIB}/salt/client/ssh/wrapper/state.py +${PYSITELIB}/salt/client/ssh/wrapper/state.pyc +${PYSITELIB}/salt/client/ssh/wrapper/state.pyo +${PYSITELIB}/salt/cloud/__init__.py +${PYSITELIB}/salt/cloud/__init__.pyc +${PYSITELIB}/salt/cloud/__init__.pyo +${PYSITELIB}/salt/cloud/cli.py +${PYSITELIB}/salt/cloud/cli.pyc +${PYSITELIB}/salt/cloud/cli.pyo +${PYSITELIB}/salt/cloud/clouds/__init__.py +${PYSITELIB}/salt/cloud/clouds/__init__.pyc +${PYSITELIB}/salt/cloud/clouds/__init__.pyo +${PYSITELIB}/salt/cloud/clouds/botocore_aws.py +${PYSITELIB}/salt/cloud/clouds/botocore_aws.pyc +${PYSITELIB}/salt/cloud/clouds/botocore_aws.pyo +${PYSITELIB}/salt/cloud/clouds/cloudstack.py +${PYSITELIB}/salt/cloud/clouds/cloudstack.pyc +${PYSITELIB}/salt/cloud/clouds/cloudstack.pyo +${PYSITELIB}/salt/cloud/clouds/digital_ocean.py +${PYSITELIB}/salt/cloud/clouds/digital_ocean.pyc +${PYSITELIB}/salt/cloud/clouds/digital_ocean.pyo +${PYSITELIB}/salt/cloud/clouds/ec2.py +${PYSITELIB}/salt/cloud/clouds/ec2.pyc +${PYSITELIB}/salt/cloud/clouds/ec2.pyo +${PYSITELIB}/salt/cloud/clouds/gce.py +${PYSITELIB}/salt/cloud/clouds/gce.pyc +${PYSITELIB}/salt/cloud/clouds/gce.pyo +${PYSITELIB}/salt/cloud/clouds/gogrid.py +${PYSITELIB}/salt/cloud/clouds/gogrid.pyc +${PYSITELIB}/salt/cloud/clouds/gogrid.pyo +${PYSITELIB}/salt/cloud/clouds/ibmsce.py +${PYSITELIB}/salt/cloud/clouds/ibmsce.pyc +${PYSITELIB}/salt/cloud/clouds/ibmsce.pyo +${PYSITELIB}/salt/cloud/clouds/joyent.py +${PYSITELIB}/salt/cloud/clouds/joyent.pyc +${PYSITELIB}/salt/cloud/clouds/joyent.pyo +${PYSITELIB}/salt/cloud/clouds/libcloud_aws.py +${PYSITELIB}/salt/cloud/clouds/libcloud_aws.pyc +${PYSITELIB}/salt/cloud/clouds/libcloud_aws.pyo +${PYSITELIB}/salt/cloud/clouds/linode.py +${PYSITELIB}/salt/cloud/clouds/linode.pyc +${PYSITELIB}/salt/cloud/clouds/linode.pyo +${PYSITELIB}/salt/cloud/clouds/msazure.py +${PYSITELIB}/salt/cloud/clouds/msazure.pyc +${PYSITELIB}/salt/cloud/clouds/msazure.pyo +${PYSITELIB}/salt/cloud/clouds/nova.py +${PYSITELIB}/salt/cloud/clouds/nova.pyc +${PYSITELIB}/salt/cloud/clouds/nova.pyo +${PYSITELIB}/salt/cloud/clouds/openstack.py +${PYSITELIB}/salt/cloud/clouds/openstack.pyc +${PYSITELIB}/salt/cloud/clouds/openstack.pyo +${PYSITELIB}/salt/cloud/clouds/parallels.py +${PYSITELIB}/salt/cloud/clouds/parallels.pyc +${PYSITELIB}/salt/cloud/clouds/parallels.pyo +${PYSITELIB}/salt/cloud/clouds/rackspace.py +${PYSITELIB}/salt/cloud/clouds/rackspace.pyc +${PYSITELIB}/salt/cloud/clouds/rackspace.pyo +${PYSITELIB}/salt/cloud/clouds/saltify.py +${PYSITELIB}/salt/cloud/clouds/saltify.pyc +${PYSITELIB}/salt/cloud/clouds/saltify.pyo +${PYSITELIB}/salt/cloud/clouds/softlayer.py +${PYSITELIB}/salt/cloud/clouds/softlayer.pyc +${PYSITELIB}/salt/cloud/clouds/softlayer.pyo +${PYSITELIB}/salt/cloud/clouds/softlayer_hw.py +${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyc +${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyo +${PYSITELIB}/salt/cloud/deploy/Arch-git.sh +${PYSITELIB}/salt/cloud/deploy/Arch.sh +${PYSITELIB}/salt/cloud/deploy/Debian-git.sh +${PYSITELIB}/salt/cloud/deploy/Debian.sh +${PYSITELIB}/salt/cloud/deploy/Fedora-git.sh +${PYSITELIB}/salt/cloud/deploy/Fedora.sh +${PYSITELIB}/salt/cloud/deploy/FreeBSD-git.sh +${PYSITELIB}/salt/cloud/deploy/FreeBSD.sh +${PYSITELIB}/salt/cloud/deploy/None.sh +${PYSITELIB}/salt/cloud/deploy/RHEL5-git.sh +${PYSITELIB}/salt/cloud/deploy/RHEL5.sh +${PYSITELIB}/salt/cloud/deploy/RHEL6-git.sh +${PYSITELIB}/salt/cloud/deploy/RHEL6.sh +${PYSITELIB}/salt/cloud/deploy/SmartOS.sh +${PYSITELIB}/salt/cloud/deploy/Ubuntu-git.sh +${PYSITELIB}/salt/cloud/deploy/Ubuntu.sh +${PYSITELIB}/salt/cloud/deploy/bootstrap-salt.sh +${PYSITELIB}/salt/cloud/deploy/curl-bootstrap-git.sh +${PYSITELIB}/salt/cloud/deploy/curl-bootstrap.sh +${PYSITELIB}/salt/cloud/deploy/python-bootstrap.sh +${PYSITELIB}/salt/cloud/deploy/wget-bootstrap-nocert.sh +${PYSITELIB}/salt/cloud/deploy/wget-bootstrap.sh +${PYSITELIB}/salt/cloud/exceptions.py +${PYSITELIB}/salt/cloud/exceptions.pyc +${PYSITELIB}/salt/cloud/exceptions.pyo +${PYSITELIB}/salt/cloud/libcloudfuncs.py +${PYSITELIB}/salt/cloud/libcloudfuncs.pyc +${PYSITELIB}/salt/cloud/libcloudfuncs.pyo ${PYSITELIB}/salt/config.py ${PYSITELIB}/salt/config.pyc ${PYSITELIB}/salt/config.pyo @@ -65,33 +194,66 @@ ${PYSITELIB}/salt/fileserver/__init__.pyo ${PYSITELIB}/salt/fileserver/gitfs.py ${PYSITELIB}/salt/fileserver/gitfs.pyc ${PYSITELIB}/salt/fileserver/gitfs.pyo +${PYSITELIB}/salt/fileserver/hgfs.py +${PYSITELIB}/salt/fileserver/hgfs.pyc +${PYSITELIB}/salt/fileserver/hgfs.pyo +${PYSITELIB}/salt/fileserver/minionfs.py +${PYSITELIB}/salt/fileserver/minionfs.pyc +${PYSITELIB}/salt/fileserver/minionfs.pyo ${PYSITELIB}/salt/fileserver/roots.py ${PYSITELIB}/salt/fileserver/roots.pyc ${PYSITELIB}/salt/fileserver/roots.pyo ${PYSITELIB}/salt/fileserver/s3fs.py ${PYSITELIB}/salt/fileserver/s3fs.pyc ${PYSITELIB}/salt/fileserver/s3fs.pyo +${PYSITELIB}/salt/fileserver/svnfs.py +${PYSITELIB}/salt/fileserver/svnfs.pyc +${PYSITELIB}/salt/fileserver/svnfs.pyo ${PYSITELIB}/salt/grains/__init__.py ${PYSITELIB}/salt/grains/__init__.pyc ${PYSITELIB}/salt/grains/__init__.pyo ${PYSITELIB}/salt/grains/core.py ${PYSITELIB}/salt/grains/core.pyc ${PYSITELIB}/salt/grains/core.pyo +${PYSITELIB}/salt/grains/external_ip.py +${PYSITELIB}/salt/grains/external_ip.pyc +${PYSITELIB}/salt/grains/external_ip.pyo ${PYSITELIB}/salt/grains/extra.py ${PYSITELIB}/salt/grains/extra.pyc ${PYSITELIB}/salt/grains/extra.pyo +${PYSITELIB}/salt/grains/junos.py +${PYSITELIB}/salt/grains/junos.pyc +${PYSITELIB}/salt/grains/junos.pyo ${PYSITELIB}/salt/grains/opts.py ${PYSITELIB}/salt/grains/opts.pyc ${PYSITELIB}/salt/grains/opts.pyo +${PYSITELIB}/salt/grains/rest_sample.py +${PYSITELIB}/salt/grains/rest_sample.pyc +${PYSITELIB}/salt/grains/rest_sample.pyo ${PYSITELIB}/salt/key.py ${PYSITELIB}/salt/key.pyc ${PYSITELIB}/salt/key.pyo ${PYSITELIB}/salt/loader.py ${PYSITELIB}/salt/loader.pyc ${PYSITELIB}/salt/loader.pyo -${PYSITELIB}/salt/log.py -${PYSITELIB}/salt/log.pyc -${PYSITELIB}/salt/log.pyo +${PYSITELIB}/salt/log/__init__.py +${PYSITELIB}/salt/log/__init__.pyc +${PYSITELIB}/salt/log/__init__.pyo +${PYSITELIB}/salt/log/handlers/__init__.py +${PYSITELIB}/salt/log/handlers/__init__.pyc +${PYSITELIB}/salt/log/handlers/__init__.pyo +${PYSITELIB}/salt/log/handlers/logstash_mod.py +${PYSITELIB}/salt/log/handlers/logstash_mod.pyc +${PYSITELIB}/salt/log/handlers/logstash_mod.pyo +${PYSITELIB}/salt/log/handlers/sentry_mod.py +${PYSITELIB}/salt/log/handlers/sentry_mod.pyc +${PYSITELIB}/salt/log/handlers/sentry_mod.pyo +${PYSITELIB}/salt/log/mixins.py +${PYSITELIB}/salt/log/mixins.pyc +${PYSITELIB}/salt/log/mixins.pyo +${PYSITELIB}/salt/log/setup.py +${PYSITELIB}/salt/log/setup.pyc +${PYSITELIB}/salt/log/setup.pyo ${PYSITELIB}/salt/master.py ${PYSITELIB}/salt/master.pyc ${PYSITELIB}/salt/master.pyo @@ -110,9 +272,9 @@ ${PYSITELIB}/salt/modules/alternatives.pyo ${PYSITELIB}/salt/modules/apache.py ${PYSITELIB}/salt/modules/apache.pyc ${PYSITELIB}/salt/modules/apache.pyo -${PYSITELIB}/salt/modules/apt.py -${PYSITELIB}/salt/modules/apt.pyc -${PYSITELIB}/salt/modules/apt.pyo +${PYSITELIB}/salt/modules/aptpkg.py +${PYSITELIB}/salt/modules/aptpkg.pyc +${PYSITELIB}/salt/modules/aptpkg.pyo ${PYSITELIB}/salt/modules/archive.py ${PYSITELIB}/salt/modules/archive.pyc ${PYSITELIB}/salt/modules/archive.pyo @@ -122,6 +284,9 @@ ${PYSITELIB}/salt/modules/at.pyo ${PYSITELIB}/salt/modules/augeas_cfg.py ${PYSITELIB}/salt/modules/augeas_cfg.pyc ${PYSITELIB}/salt/modules/augeas_cfg.pyo +${PYSITELIB}/salt/modules/aws_sqs.py +${PYSITELIB}/salt/modules/aws_sqs.pyc +${PYSITELIB}/salt/modules/aws_sqs.pyo ${PYSITELIB}/salt/modules/bluez.py ${PYSITELIB}/salt/modules/bluez.pyc ${PYSITELIB}/salt/modules/bluez.pyo @@ -137,9 +302,18 @@ ${PYSITELIB}/salt/modules/bsd_shadow.pyo ${PYSITELIB}/salt/modules/cassandra.py ${PYSITELIB}/salt/modules/cassandra.pyc ${PYSITELIB}/salt/modules/cassandra.pyo +${PYSITELIB}/salt/modules/chocolatey.py +${PYSITELIB}/salt/modules/chocolatey.pyc +${PYSITELIB}/salt/modules/chocolatey.pyo +${PYSITELIB}/salt/modules/cloud.py +${PYSITELIB}/salt/modules/cloud.pyc +${PYSITELIB}/salt/modules/cloud.pyo ${PYSITELIB}/salt/modules/cmdmod.py ${PYSITELIB}/salt/modules/cmdmod.pyc ${PYSITELIB}/salt/modules/cmdmod.pyo +${PYSITELIB}/salt/modules/composer.py +${PYSITELIB}/salt/modules/composer.pyc +${PYSITELIB}/salt/modules/composer.pyo ${PYSITELIB}/salt/modules/config.py ${PYSITELIB}/salt/modules/config.pyc ${PYSITELIB}/salt/modules/config.pyo @@ -158,12 +332,21 @@ ${PYSITELIB}/salt/modules/darwin_sysctl.pyo ${PYSITELIB}/salt/modules/data.py ${PYSITELIB}/salt/modules/data.pyc ${PYSITELIB}/salt/modules/data.pyo +${PYSITELIB}/salt/modules/ddns.py +${PYSITELIB}/salt/modules/ddns.pyc +${PYSITELIB}/salt/modules/ddns.pyo ${PYSITELIB}/salt/modules/debconfmod.py ${PYSITELIB}/salt/modules/debconfmod.pyc ${PYSITELIB}/salt/modules/debconfmod.pyo +${PYSITELIB}/salt/modules/debian_ip.py +${PYSITELIB}/salt/modules/debian_ip.pyc +${PYSITELIB}/salt/modules/debian_ip.pyo ${PYSITELIB}/salt/modules/debian_service.py ${PYSITELIB}/salt/modules/debian_service.pyc ${PYSITELIB}/salt/modules/debian_service.pyo +${PYSITELIB}/salt/modules/defaults.py +${PYSITELIB}/salt/modules/defaults.pyc +${PYSITELIB}/salt/modules/defaults.pyo ${PYSITELIB}/salt/modules/dig.py ${PYSITELIB}/salt/modules/dig.pyc ${PYSITELIB}/salt/modules/dig.pyo @@ -179,6 +362,9 @@ ${PYSITELIB}/salt/modules/dnsmasq.pyo ${PYSITELIB}/salt/modules/dnsutil.py ${PYSITELIB}/salt/modules/dnsutil.pyc ${PYSITELIB}/salt/modules/dnsutil.pyo +${PYSITELIB}/salt/modules/dockerio.py +${PYSITELIB}/salt/modules/dockerio.pyc +${PYSITELIB}/salt/modules/dockerio.pyo ${PYSITELIB}/salt/modules/dpkg.py ${PYSITELIB}/salt/modules/dpkg.pyc ${PYSITELIB}/salt/modules/dpkg.pyo @@ -212,6 +398,9 @@ ${PYSITELIB}/salt/modules/freebsdkmod.pyo ${PYSITELIB}/salt/modules/freebsdpkg.py ${PYSITELIB}/salt/modules/freebsdpkg.pyc ${PYSITELIB}/salt/modules/freebsdpkg.pyo +${PYSITELIB}/salt/modules/freebsdports.py +${PYSITELIB}/salt/modules/freebsdports.pyc +${PYSITELIB}/salt/modules/freebsdports.pyo ${PYSITELIB}/salt/modules/freebsdservice.py ${PYSITELIB}/salt/modules/freebsdservice.pyc ${PYSITELIB}/salt/modules/freebsdservice.pyo @@ -230,6 +419,9 @@ ${PYSITELIB}/salt/modules/git.pyo ${PYSITELIB}/salt/modules/glance.py ${PYSITELIB}/salt/modules/glance.pyc ${PYSITELIB}/salt/modules/glance.pyo +${PYSITELIB}/salt/modules/gnomedesktop.py +${PYSITELIB}/salt/modules/gnomedesktop.pyc +${PYSITELIB}/salt/modules/gnomedesktop.pyo ${PYSITELIB}/salt/modules/grains.py ${PYSITELIB}/salt/modules/grains.pyc ${PYSITELIB}/salt/modules/grains.pyo @@ -242,18 +434,30 @@ ${PYSITELIB}/salt/modules/grub_legacy.pyo ${PYSITELIB}/salt/modules/guestfs.py ${PYSITELIB}/salt/modules/guestfs.pyc ${PYSITELIB}/salt/modules/guestfs.pyo +${PYSITELIB}/salt/modules/hadoop.py +${PYSITELIB}/salt/modules/hadoop.pyc +${PYSITELIB}/salt/modules/hadoop.pyo ${PYSITELIB}/salt/modules/hg.py ${PYSITELIB}/salt/modules/hg.pyc ${PYSITELIB}/salt/modules/hg.pyo ${PYSITELIB}/salt/modules/hosts.py ${PYSITELIB}/salt/modules/hosts.pyc ${PYSITELIB}/salt/modules/hosts.pyo +${PYSITELIB}/salt/modules/htpasswd.py +${PYSITELIB}/salt/modules/htpasswd.pyc +${PYSITELIB}/salt/modules/htpasswd.pyo ${PYSITELIB}/salt/modules/img.py ${PYSITELIB}/salt/modules/img.pyc ${PYSITELIB}/salt/modules/img.pyo +${PYSITELIB}/salt/modules/incron.py +${PYSITELIB}/salt/modules/incron.pyc +${PYSITELIB}/salt/modules/incron.pyo ${PYSITELIB}/salt/modules/iptables.py ${PYSITELIB}/salt/modules/iptables.pyc ${PYSITELIB}/salt/modules/iptables.pyo +${PYSITELIB}/salt/modules/junos.py +${PYSITELIB}/salt/modules/junos.pyc +${PYSITELIB}/salt/modules/junos.pyo ${PYSITELIB}/salt/modules/key.py ${PYSITELIB}/salt/modules/key.pyc ${PYSITELIB}/salt/modules/key.pyo @@ -293,6 +497,18 @@ ${PYSITELIB}/salt/modules/locate.pyo ${PYSITELIB}/salt/modules/logrotate.py ${PYSITELIB}/salt/modules/logrotate.pyc ${PYSITELIB}/salt/modules/logrotate.pyo +${PYSITELIB}/salt/modules/lvs.py +${PYSITELIB}/salt/modules/lvs.pyc +${PYSITELIB}/salt/modules/lvs.pyo +${PYSITELIB}/salt/modules/lxc.py +${PYSITELIB}/salt/modules/lxc.pyc +${PYSITELIB}/salt/modules/lxc.pyo +${PYSITELIB}/salt/modules/mac_group.py +${PYSITELIB}/salt/modules/mac_group.pyc +${PYSITELIB}/salt/modules/mac_group.pyo +${PYSITELIB}/salt/modules/mac_user.py +${PYSITELIB}/salt/modules/mac_user.pyc +${PYSITELIB}/salt/modules/mac_user.pyo ${PYSITELIB}/salt/modules/makeconf.py ${PYSITELIB}/salt/modules/makeconf.pyc ${PYSITELIB}/salt/modules/makeconf.pyo @@ -302,9 +518,15 @@ ${PYSITELIB}/salt/modules/match.pyo ${PYSITELIB}/salt/modules/mdadm.py ${PYSITELIB}/salt/modules/mdadm.pyc ${PYSITELIB}/salt/modules/mdadm.pyo +${PYSITELIB}/salt/modules/memcached.py +${PYSITELIB}/salt/modules/memcached.pyc +${PYSITELIB}/salt/modules/memcached.pyo ${PYSITELIB}/salt/modules/mine.py ${PYSITELIB}/salt/modules/mine.pyc ${PYSITELIB}/salt/modules/mine.pyo +${PYSITELIB}/salt/modules/modjk.py +${PYSITELIB}/salt/modules/modjk.pyc +${PYSITELIB}/salt/modules/modjk.pyo ${PYSITELIB}/salt/modules/mongodb.py ${PYSITELIB}/salt/modules/mongodb.pyc ${PYSITELIB}/salt/modules/mongodb.pyo @@ -344,21 +566,27 @@ ${PYSITELIB}/salt/modules/nova.pyo ${PYSITELIB}/salt/modules/npm.py ${PYSITELIB}/salt/modules/npm.pyc ${PYSITELIB}/salt/modules/npm.pyo -${PYSITELIB}/salt/modules/nzbget.py -${PYSITELIB}/salt/modules/nzbget.pyc -${PYSITELIB}/salt/modules/nzbget.pyo +${PYSITELIB}/salt/modules/omapi.py +${PYSITELIB}/salt/modules/omapi.pyc +${PYSITELIB}/salt/modules/omapi.pyo ${PYSITELIB}/salt/modules/openbsdpkg.py ${PYSITELIB}/salt/modules/openbsdpkg.pyc ${PYSITELIB}/salt/modules/openbsdpkg.pyo ${PYSITELIB}/salt/modules/openbsdservice.py ${PYSITELIB}/salt/modules/openbsdservice.pyc ${PYSITELIB}/salt/modules/openbsdservice.pyo +${PYSITELIB}/salt/modules/openstack_config.py +${PYSITELIB}/salt/modules/openstack_config.pyc +${PYSITELIB}/salt/modules/openstack_config.pyo ${PYSITELIB}/salt/modules/osxdesktop.py ${PYSITELIB}/salt/modules/osxdesktop.pyc ${PYSITELIB}/salt/modules/osxdesktop.pyo ${PYSITELIB}/salt/modules/pacman.py ${PYSITELIB}/salt/modules/pacman.pyc ${PYSITELIB}/salt/modules/pacman.pyo +${PYSITELIB}/salt/modules/pagerduty.py +${PYSITELIB}/salt/modules/pagerduty.pyc +${PYSITELIB}/salt/modules/pagerduty.pyo ${PYSITELIB}/salt/modules/pam.py ${PYSITELIB}/salt/modules/pam.pyc ${PYSITELIB}/salt/modules/pam.pyo @@ -395,6 +623,9 @@ ${PYSITELIB}/salt/modules/postgres.pyo ${PYSITELIB}/salt/modules/poudriere.py ${PYSITELIB}/salt/modules/poudriere.pyc ${PYSITELIB}/salt/modules/poudriere.pyo +${PYSITELIB}/salt/modules/powerpath.py +${PYSITELIB}/salt/modules/powerpath.pyc +${PYSITELIB}/salt/modules/powerpath.pyo ${PYSITELIB}/salt/modules/ps.py ${PYSITELIB}/salt/modules/ps.pyc ${PYSITELIB}/salt/modules/ps.pyo @@ -425,35 +656,54 @@ ${PYSITELIB}/salt/modules/rabbitmq.pyo ${PYSITELIB}/salt/modules/rbenv.py ${PYSITELIB}/salt/modules/rbenv.pyc ${PYSITELIB}/salt/modules/rbenv.pyo +${PYSITELIB}/salt/modules/rdp.py +${PYSITELIB}/salt/modules/rdp.pyc +${PYSITELIB}/salt/modules/rdp.pyo ${PYSITELIB}/salt/modules/reg.py ${PYSITELIB}/salt/modules/reg.pyc ${PYSITELIB}/salt/modules/reg.pyo +${PYSITELIB}/salt/modules/rest_package.py +${PYSITELIB}/salt/modules/rest_package.pyc +${PYSITELIB}/salt/modules/rest_package.pyo +${PYSITELIB}/salt/modules/rest_sample.py +${PYSITELIB}/salt/modules/rest_sample.pyc +${PYSITELIB}/salt/modules/rest_sample.pyo +${PYSITELIB}/salt/modules/rest_service.py +${PYSITELIB}/salt/modules/rest_service.pyc +${PYSITELIB}/salt/modules/rest_service.pyo ${PYSITELIB}/salt/modules/ret.py ${PYSITELIB}/salt/modules/ret.pyc ${PYSITELIB}/salt/modules/ret.pyo ${PYSITELIB}/salt/modules/rh_ip.py ${PYSITELIB}/salt/modules/rh_ip.pyc ${PYSITELIB}/salt/modules/rh_ip.pyo -${PYSITELIB}/salt/modules/rh_ip/conf.jinja -${PYSITELIB}/salt/modules/rh_ip/network.jinja -${PYSITELIB}/salt/modules/rh_ip/rh5_eth.jinja -${PYSITELIB}/salt/modules/rh_ip/rh6_eth.jinja -${PYSITELIB}/salt/modules/rh_ip/route_eth.jinja ${PYSITELIB}/salt/modules/rh_service.py ${PYSITELIB}/salt/modules/rh_service.pyc ${PYSITELIB}/salt/modules/rh_service.pyo +${PYSITELIB}/salt/modules/riak.py +${PYSITELIB}/salt/modules/riak.pyc +${PYSITELIB}/salt/modules/riak.pyo ${PYSITELIB}/salt/modules/rpm.py ${PYSITELIB}/salt/modules/rpm.pyc ${PYSITELIB}/salt/modules/rpm.pyo +${PYSITELIB}/salt/modules/rsync.py +${PYSITELIB}/salt/modules/rsync.pyc +${PYSITELIB}/salt/modules/rsync.pyo ${PYSITELIB}/salt/modules/rvm.py ${PYSITELIB}/salt/modules/rvm.pyc ${PYSITELIB}/salt/modules/rvm.pyo ${PYSITELIB}/salt/modules/s3.py ${PYSITELIB}/salt/modules/s3.pyc ${PYSITELIB}/salt/modules/s3.pyo +${PYSITELIB}/salt/modules/saltcloudmod.py +${PYSITELIB}/salt/modules/saltcloudmod.pyc +${PYSITELIB}/salt/modules/saltcloudmod.pyo ${PYSITELIB}/salt/modules/saltutil.py ${PYSITELIB}/salt/modules/saltutil.pyc ${PYSITELIB}/salt/modules/saltutil.pyo +${PYSITELIB}/salt/modules/seed.py +${PYSITELIB}/salt/modules/seed.pyc +${PYSITELIB}/salt/modules/seed.pyo ${PYSITELIB}/salt/modules/selinux.py ${PYSITELIB}/salt/modules/selinux.pyc ${PYSITELIB}/salt/modules/selinux.pyo @@ -538,24 +788,48 @@ ${PYSITELIB}/salt/modules/useradd.pyo ${PYSITELIB}/salt/modules/virt.py ${PYSITELIB}/salt/modules/virt.pyc ${PYSITELIB}/salt/modules/virt.pyo -${PYSITELIB}/salt/modules/virtualenv.py -${PYSITELIB}/salt/modules/virtualenv.pyc -${PYSITELIB}/salt/modules/virtualenv.pyo +${PYSITELIB}/salt/modules/virtualenv_mod.py +${PYSITELIB}/salt/modules/virtualenv_mod.pyc +${PYSITELIB}/salt/modules/virtualenv_mod.pyo +${PYSITELIB}/salt/modules/win_autoruns.py +${PYSITELIB}/salt/modules/win_autoruns.pyc +${PYSITELIB}/salt/modules/win_autoruns.pyo ${PYSITELIB}/salt/modules/win_disk.py ${PYSITELIB}/salt/modules/win_disk.pyc ${PYSITELIB}/salt/modules/win_disk.pyo +${PYSITELIB}/salt/modules/win_dns_client.py +${PYSITELIB}/salt/modules/win_dns_client.pyc +${PYSITELIB}/salt/modules/win_dns_client.pyo ${PYSITELIB}/salt/modules/win_file.py ${PYSITELIB}/salt/modules/win_file.pyc ${PYSITELIB}/salt/modules/win_file.pyo +${PYSITELIB}/salt/modules/win_firewall.py +${PYSITELIB}/salt/modules/win_firewall.pyc +${PYSITELIB}/salt/modules/win_firewall.pyo ${PYSITELIB}/salt/modules/win_groupadd.py ${PYSITELIB}/salt/modules/win_groupadd.pyc ${PYSITELIB}/salt/modules/win_groupadd.pyo +${PYSITELIB}/salt/modules/win_ip.py +${PYSITELIB}/salt/modules/win_ip.pyc +${PYSITELIB}/salt/modules/win_ip.pyo ${PYSITELIB}/salt/modules/win_network.py ${PYSITELIB}/salt/modules/win_network.pyc ${PYSITELIB}/salt/modules/win_network.pyo +${PYSITELIB}/salt/modules/win_ntp.py +${PYSITELIB}/salt/modules/win_ntp.pyc +${PYSITELIB}/salt/modules/win_ntp.pyo +${PYSITELIB}/salt/modules/win_path.py +${PYSITELIB}/salt/modules/win_path.pyc +${PYSITELIB}/salt/modules/win_path.pyo ${PYSITELIB}/salt/modules/win_pkg.py ${PYSITELIB}/salt/modules/win_pkg.pyc ${PYSITELIB}/salt/modules/win_pkg.pyo +${PYSITELIB}/salt/modules/win_repo.py +${PYSITELIB}/salt/modules/win_repo.pyc +${PYSITELIB}/salt/modules/win_repo.pyo +${PYSITELIB}/salt/modules/win_servermanager.py +${PYSITELIB}/salt/modules/win_servermanager.pyc +${PYSITELIB}/salt/modules/win_servermanager.pyo ${PYSITELIB}/salt/modules/win_service.py ${PYSITELIB}/salt/modules/win_service.pyc ${PYSITELIB}/salt/modules/win_service.pyo @@ -568,18 +842,24 @@ ${PYSITELIB}/salt/modules/win_status.pyo ${PYSITELIB}/salt/modules/win_system.py ${PYSITELIB}/salt/modules/win_system.pyc ${PYSITELIB}/salt/modules/win_system.pyo +${PYSITELIB}/salt/modules/win_timezone.py +${PYSITELIB}/salt/modules/win_timezone.pyc +${PYSITELIB}/salt/modules/win_timezone.pyo ${PYSITELIB}/salt/modules/win_useradd.py ${PYSITELIB}/salt/modules/win_useradd.pyc ${PYSITELIB}/salt/modules/win_useradd.pyo ${PYSITELIB}/salt/modules/xapi.py ${PYSITELIB}/salt/modules/xapi.pyc ${PYSITELIB}/salt/modules/xapi.pyo +${PYSITELIB}/salt/modules/xmpp.py +${PYSITELIB}/salt/modules/xmpp.pyc +${PYSITELIB}/salt/modules/xmpp.pyo ${PYSITELIB}/salt/modules/yumpkg.py ${PYSITELIB}/salt/modules/yumpkg.pyc ${PYSITELIB}/salt/modules/yumpkg.pyo -${PYSITELIB}/salt/modules/yumpkg5.py -${PYSITELIB}/salt/modules/yumpkg5.pyc -${PYSITELIB}/salt/modules/yumpkg5.pyo +${PYSITELIB}/salt/modules/zcbuildout.py +${PYSITELIB}/salt/modules/zcbuildout.pyc +${PYSITELIB}/salt/modules/zcbuildout.pyo ${PYSITELIB}/salt/modules/zfs.py ${PYSITELIB}/salt/modules/zfs.pyc ${PYSITELIB}/salt/modules/zfs.pyo @@ -649,6 +929,9 @@ ${PYSITELIB}/salt/pillar/cmd_yaml.pyo ${PYSITELIB}/salt/pillar/cobbler.py ${PYSITELIB}/salt/pillar/cobbler.pyc ${PYSITELIB}/salt/pillar/cobbler.pyo +${PYSITELIB}/salt/pillar/django_orm.py +${PYSITELIB}/salt/pillar/django_orm.pyc +${PYSITELIB}/salt/pillar/django_orm.pyo ${PYSITELIB}/salt/pillar/git_pillar.py ${PYSITELIB}/salt/pillar/git_pillar.pyc ${PYSITELIB}/salt/pillar/git_pillar.pyo @@ -661,12 +944,21 @@ ${PYSITELIB}/salt/pillar/libvirt.pyo ${PYSITELIB}/salt/pillar/mongo.py ${PYSITELIB}/salt/pillar/mongo.pyc ${PYSITELIB}/salt/pillar/mongo.pyo +${PYSITELIB}/salt/pillar/mysql.py +${PYSITELIB}/salt/pillar/mysql.pyc +${PYSITELIB}/salt/pillar/mysql.pyo ${PYSITELIB}/salt/pillar/pillar_ldap.py ${PYSITELIB}/salt/pillar/pillar_ldap.pyc ${PYSITELIB}/salt/pillar/pillar_ldap.pyo ${PYSITELIB}/salt/pillar/puppet.py ${PYSITELIB}/salt/pillar/puppet.pyc ${PYSITELIB}/salt/pillar/puppet.pyo +${PYSITELIB}/salt/pillar/reclass_adapter.py +${PYSITELIB}/salt/pillar/reclass_adapter.pyc +${PYSITELIB}/salt/pillar/reclass_adapter.pyo +${PYSITELIB}/salt/pillar/virtkey.py +${PYSITELIB}/salt/pillar/virtkey.pyc +${PYSITELIB}/salt/pillar/virtkey.pyo ${PYSITELIB}/salt/renderers/__init__.py ${PYSITELIB}/salt/renderers/__init__.pyc ${PYSITELIB}/salt/renderers/__init__.pyo @@ -685,6 +977,9 @@ ${PYSITELIB}/salt/renderers/py.pyo ${PYSITELIB}/salt/renderers/pydsl.py ${PYSITELIB}/salt/renderers/pydsl.pyc ${PYSITELIB}/salt/renderers/pydsl.pyo +${PYSITELIB}/salt/renderers/pyobjects.py +${PYSITELIB}/salt/renderers/pyobjects.pyc +${PYSITELIB}/salt/renderers/pyobjects.pyo ${PYSITELIB}/salt/renderers/stateconf.py ${PYSITELIB}/salt/renderers/stateconf.pyc ${PYSITELIB}/salt/renderers/stateconf.pyo @@ -733,9 +1028,21 @@ ${PYSITELIB}/salt/returners/sentry_return.pyo ${PYSITELIB}/salt/returners/smtp_return.py ${PYSITELIB}/salt/returners/smtp_return.pyc ${PYSITELIB}/salt/returners/smtp_return.pyo +${PYSITELIB}/salt/returners/sqlite3_return.py +${PYSITELIB}/salt/returners/sqlite3_return.pyc +${PYSITELIB}/salt/returners/sqlite3_return.pyo ${PYSITELIB}/salt/returners/syslog_return.py ${PYSITELIB}/salt/returners/syslog_return.pyc ${PYSITELIB}/salt/returners/syslog_return.pyo +${PYSITELIB}/salt/roster/__init__.py +${PYSITELIB}/salt/roster/__init__.pyc +${PYSITELIB}/salt/roster/__init__.pyo +${PYSITELIB}/salt/roster/flat.py +${PYSITELIB}/salt/roster/flat.pyc +${PYSITELIB}/salt/roster/flat.pyo +${PYSITELIB}/salt/roster/scan.py +${PYSITELIB}/salt/roster/scan.pyc +${PYSITELIB}/salt/roster/scan.pyo ${PYSITELIB}/salt/runner.py ${PYSITELIB}/salt/runner.pyc ${PYSITELIB}/salt/runner.pyo @@ -745,30 +1052,51 @@ ${PYSITELIB}/salt/runners/__init__.pyo ${PYSITELIB}/salt/runners/cache.py ${PYSITELIB}/salt/runners/cache.pyc ${PYSITELIB}/salt/runners/cache.pyo +${PYSITELIB}/salt/runners/cloud.py +${PYSITELIB}/salt/runners/cloud.pyc +${PYSITELIB}/salt/runners/cloud.pyo ${PYSITELIB}/salt/runners/doc.py ${PYSITELIB}/salt/runners/doc.pyc ${PYSITELIB}/salt/runners/doc.pyo +${PYSITELIB}/salt/runners/error.py +${PYSITELIB}/salt/runners/error.pyc +${PYSITELIB}/salt/runners/error.pyo ${PYSITELIB}/salt/runners/fileserver.py ${PYSITELIB}/salt/runners/fileserver.pyc ${PYSITELIB}/salt/runners/fileserver.pyo +${PYSITELIB}/salt/runners/git_pillar.py +${PYSITELIB}/salt/runners/git_pillar.pyc +${PYSITELIB}/salt/runners/git_pillar.pyo ${PYSITELIB}/salt/runners/jobs.py ${PYSITELIB}/salt/runners/jobs.pyc ${PYSITELIB}/salt/runners/jobs.pyo ${PYSITELIB}/salt/runners/launchd.py ${PYSITELIB}/salt/runners/launchd.pyc ${PYSITELIB}/salt/runners/launchd.pyo +${PYSITELIB}/salt/runners/lxc.py +${PYSITELIB}/salt/runners/lxc.pyc +${PYSITELIB}/salt/runners/lxc.pyo ${PYSITELIB}/salt/runners/manage.py ${PYSITELIB}/salt/runners/manage.pyc ${PYSITELIB}/salt/runners/manage.pyo +${PYSITELIB}/salt/runners/mine.py +${PYSITELIB}/salt/runners/mine.pyc +${PYSITELIB}/salt/runners/mine.pyo ${PYSITELIB}/salt/runners/network.py ${PYSITELIB}/salt/runners/network.pyc ${PYSITELIB}/salt/runners/network.pyo +${PYSITELIB}/salt/runners/pillar.py +${PYSITELIB}/salt/runners/pillar.pyc +${PYSITELIB}/salt/runners/pillar.pyo ${PYSITELIB}/salt/runners/search.py ${PYSITELIB}/salt/runners/search.pyc ${PYSITELIB}/salt/runners/search.pyo ${PYSITELIB}/salt/runners/state.py ${PYSITELIB}/salt/runners/state.pyc ${PYSITELIB}/salt/runners/state.pyo +${PYSITELIB}/salt/runners/thin.py +${PYSITELIB}/salt/runners/thin.pyc +${PYSITELIB}/salt/runners/thin.pyo ${PYSITELIB}/salt/runners/virt.py ${PYSITELIB}/salt/runners/virt.pyc ${PYSITELIB}/salt/runners/virt.pyo @@ -796,18 +1124,45 @@ ${PYSITELIB}/salt/states/alias.pyo ${PYSITELIB}/salt/states/alternatives.py ${PYSITELIB}/salt/states/alternatives.pyc ${PYSITELIB}/salt/states/alternatives.pyo +${PYSITELIB}/salt/states/apt.py +${PYSITELIB}/salt/states/apt.pyc +${PYSITELIB}/salt/states/apt.pyo +${PYSITELIB}/salt/states/archive.py +${PYSITELIB}/salt/states/archive.pyc +${PYSITELIB}/salt/states/archive.pyo +${PYSITELIB}/salt/states/at.py +${PYSITELIB}/salt/states/at.pyc +${PYSITELIB}/salt/states/at.pyo +${PYSITELIB}/salt/states/augeas.py +${PYSITELIB}/salt/states/augeas.pyc +${PYSITELIB}/salt/states/augeas.pyo +${PYSITELIB}/salt/states/aws_sqs.py +${PYSITELIB}/salt/states/aws_sqs.pyc +${PYSITELIB}/salt/states/aws_sqs.pyo +${PYSITELIB}/salt/states/cloud.py +${PYSITELIB}/salt/states/cloud.pyc +${PYSITELIB}/salt/states/cloud.pyo ${PYSITELIB}/salt/states/cmd.py ${PYSITELIB}/salt/states/cmd.pyc ${PYSITELIB}/salt/states/cmd.pyo +${PYSITELIB}/salt/states/composer.py +${PYSITELIB}/salt/states/composer.pyc +${PYSITELIB}/salt/states/composer.pyo ${PYSITELIB}/salt/states/cron.py ${PYSITELIB}/salt/states/cron.pyc ${PYSITELIB}/salt/states/cron.pyo +${PYSITELIB}/salt/states/ddns.py +${PYSITELIB}/salt/states/ddns.pyc +${PYSITELIB}/salt/states/ddns.pyo ${PYSITELIB}/salt/states/debconfmod.py ${PYSITELIB}/salt/states/debconfmod.pyc ${PYSITELIB}/salt/states/debconfmod.pyo ${PYSITELIB}/salt/states/disk.py ${PYSITELIB}/salt/states/disk.pyc ${PYSITELIB}/salt/states/disk.pyo +${PYSITELIB}/salt/states/dockerio.py +${PYSITELIB}/salt/states/dockerio.pyc +${PYSITELIB}/salt/states/dockerio.pyo ${PYSITELIB}/salt/states/eselect.py ${PYSITELIB}/salt/states/eselect.pyc ${PYSITELIB}/salt/states/eselect.pyo @@ -820,6 +1175,9 @@ ${PYSITELIB}/salt/states/gem.pyo ${PYSITELIB}/salt/states/git.py ${PYSITELIB}/salt/states/git.pyc ${PYSITELIB}/salt/states/git.pyo +${PYSITELIB}/salt/states/gnomedesktop.py +${PYSITELIB}/salt/states/gnomedesktop.pyc +${PYSITELIB}/salt/states/gnomedesktop.pyo ${PYSITELIB}/salt/states/grains.py ${PYSITELIB}/salt/states/grains.pyc ${PYSITELIB}/salt/states/grains.pyo @@ -832,9 +1190,18 @@ ${PYSITELIB}/salt/states/hg.pyo ${PYSITELIB}/salt/states/host.py ${PYSITELIB}/salt/states/host.pyc ${PYSITELIB}/salt/states/host.pyo +${PYSITELIB}/salt/states/incron.py +${PYSITELIB}/salt/states/incron.pyc +${PYSITELIB}/salt/states/incron.pyo +${PYSITELIB}/salt/states/iptables.py +${PYSITELIB}/salt/states/iptables.pyc +${PYSITELIB}/salt/states/iptables.pyo ${PYSITELIB}/salt/states/keyboard.py ${PYSITELIB}/salt/states/keyboard.pyc ${PYSITELIB}/salt/states/keyboard.pyo +${PYSITELIB}/salt/states/keystone.py +${PYSITELIB}/salt/states/keystone.pyc +${PYSITELIB}/salt/states/keystone.pyo ${PYSITELIB}/salt/states/kmod.py ${PYSITELIB}/salt/states/kmod.pyc ${PYSITELIB}/salt/states/kmod.pyo @@ -850,12 +1217,24 @@ ${PYSITELIB}/salt/states/locale.pyo ${PYSITELIB}/salt/states/lvm.py ${PYSITELIB}/salt/states/lvm.pyc ${PYSITELIB}/salt/states/lvm.pyo +${PYSITELIB}/salt/states/lvs_server.py +${PYSITELIB}/salt/states/lvs_server.pyc +${PYSITELIB}/salt/states/lvs_server.pyo +${PYSITELIB}/salt/states/lvs_service.py +${PYSITELIB}/salt/states/lvs_service.pyc +${PYSITELIB}/salt/states/lvs_service.pyo ${PYSITELIB}/salt/states/makeconf.py ${PYSITELIB}/salt/states/makeconf.pyc ${PYSITELIB}/salt/states/makeconf.pyo ${PYSITELIB}/salt/states/mdadm.py ${PYSITELIB}/salt/states/mdadm.pyc ${PYSITELIB}/salt/states/mdadm.pyo +${PYSITELIB}/salt/states/memcached.py +${PYSITELIB}/salt/states/memcached.pyc +${PYSITELIB}/salt/states/memcached.pyo +${PYSITELIB}/salt/states/modjk_worker.py +${PYSITELIB}/salt/states/modjk_worker.pyc +${PYSITELIB}/salt/states/modjk_worker.pyo ${PYSITELIB}/salt/states/module.py ${PYSITELIB}/salt/states/module.pyc ${PYSITELIB}/salt/states/module.pyo @@ -883,12 +1262,21 @@ ${PYSITELIB}/salt/states/network.pyo ${PYSITELIB}/salt/states/npm.py ${PYSITELIB}/salt/states/npm.pyc ${PYSITELIB}/salt/states/npm.pyo +${PYSITELIB}/salt/states/ntp.py +${PYSITELIB}/salt/states/ntp.pyc +${PYSITELIB}/salt/states/ntp.pyo +${PYSITELIB}/salt/states/openstack_config.py +${PYSITELIB}/salt/states/openstack_config.pyc +${PYSITELIB}/salt/states/openstack_config.pyo +${PYSITELIB}/salt/states/pagerduty.py +${PYSITELIB}/salt/states/pagerduty.pyc +${PYSITELIB}/salt/states/pagerduty.pyo ${PYSITELIB}/salt/states/pecl.py ${PYSITELIB}/salt/states/pecl.pyc ${PYSITELIB}/salt/states/pecl.pyo -${PYSITELIB}/salt/states/pip.py -${PYSITELIB}/salt/states/pip.pyc -${PYSITELIB}/salt/states/pip.pyo +${PYSITELIB}/salt/states/pip_state.py +${PYSITELIB}/salt/states/pip_state.pyc +${PYSITELIB}/salt/states/pip_state.pyo ${PYSITELIB}/salt/states/pkg.py ${PYSITELIB}/salt/states/pkg.pyc ${PYSITELIB}/salt/states/pkg.pyo @@ -901,6 +1289,9 @@ ${PYSITELIB}/salt/states/pkgrepo.pyo ${PYSITELIB}/salt/states/portage_config.py ${PYSITELIB}/salt/states/portage_config.pyc ${PYSITELIB}/salt/states/portage_config.pyo +${PYSITELIB}/salt/states/ports.py +${PYSITELIB}/salt/states/ports.pyc +${PYSITELIB}/salt/states/ports.pyo ${PYSITELIB}/salt/states/postgres_database.py ${PYSITELIB}/salt/states/postgres_database.pyc ${PYSITELIB}/salt/states/postgres_database.pyo @@ -910,9 +1301,24 @@ ${PYSITELIB}/salt/states/postgres_group.pyo ${PYSITELIB}/salt/states/postgres_user.py ${PYSITELIB}/salt/states/postgres_user.pyc ${PYSITELIB}/salt/states/postgres_user.pyo +${PYSITELIB}/salt/states/powerpath.py +${PYSITELIB}/salt/states/powerpath.pyc +${PYSITELIB}/salt/states/powerpath.pyo +${PYSITELIB}/salt/states/process.py +${PYSITELIB}/salt/states/process.pyc +${PYSITELIB}/salt/states/process.pyo ${PYSITELIB}/salt/states/quota.py ${PYSITELIB}/salt/states/quota.pyc ${PYSITELIB}/salt/states/quota.pyo +${PYSITELIB}/salt/states/rabbitmq_cluster.py +${PYSITELIB}/salt/states/rabbitmq_cluster.pyc +${PYSITELIB}/salt/states/rabbitmq_cluster.pyo +${PYSITELIB}/salt/states/rabbitmq_plugin.py +${PYSITELIB}/salt/states/rabbitmq_plugin.pyc +${PYSITELIB}/salt/states/rabbitmq_plugin.pyo +${PYSITELIB}/salt/states/rabbitmq_policy.py +${PYSITELIB}/salt/states/rabbitmq_policy.pyc +${PYSITELIB}/salt/states/rabbitmq_policy.pyo ${PYSITELIB}/salt/states/rabbitmq_user.py ${PYSITELIB}/salt/states/rabbitmq_user.pyc ${PYSITELIB}/salt/states/rabbitmq_user.pyo @@ -922,9 +1328,18 @@ ${PYSITELIB}/salt/states/rabbitmq_vhost.pyo ${PYSITELIB}/salt/states/rbenv.py ${PYSITELIB}/salt/states/rbenv.pyc ${PYSITELIB}/salt/states/rbenv.pyo +${PYSITELIB}/salt/states/rdp.py +${PYSITELIB}/salt/states/rdp.pyc +${PYSITELIB}/salt/states/rdp.pyo +${PYSITELIB}/salt/states/reg.py +${PYSITELIB}/salt/states/reg.pyc +${PYSITELIB}/salt/states/reg.pyo ${PYSITELIB}/salt/states/rvm.py ${PYSITELIB}/salt/states/rvm.pyc ${PYSITELIB}/salt/states/rvm.pyo +${PYSITELIB}/salt/states/saltmod.py +${PYSITELIB}/salt/states/saltmod.pyc +${PYSITELIB}/salt/states/saltmod.pyo ${PYSITELIB}/salt/states/selinux.py ${PYSITELIB}/salt/states/selinux.pyc ${PYSITELIB}/salt/states/selinux.pyo @@ -940,6 +1355,9 @@ ${PYSITELIB}/salt/states/ssh_known_hosts.pyo ${PYSITELIB}/salt/states/stateconf.py ${PYSITELIB}/salt/states/stateconf.pyc ${PYSITELIB}/salt/states/stateconf.pyo +${PYSITELIB}/salt/states/status.py +${PYSITELIB}/salt/states/status.pyc +${PYSITELIB}/salt/states/status.pyo ${PYSITELIB}/salt/states/supervisord.py ${PYSITELIB}/salt/states/supervisord.pyc ${PYSITELIB}/salt/states/supervisord.pyo @@ -958,12 +1376,51 @@ ${PYSITELIB}/salt/states/tomcat.pyo ${PYSITELIB}/salt/states/user.py ${PYSITELIB}/salt/states/user.pyc ${PYSITELIB}/salt/states/user.pyo -${PYSITELIB}/salt/states/virtualenv.py -${PYSITELIB}/salt/states/virtualenv.pyc -${PYSITELIB}/salt/states/virtualenv.pyo +${PYSITELIB}/salt/states/virtualenv_mod.py +${PYSITELIB}/salt/states/virtualenv_mod.pyc +${PYSITELIB}/salt/states/virtualenv_mod.pyo +${PYSITELIB}/salt/states/win_dns_client.py +${PYSITELIB}/salt/states/win_dns_client.pyc +${PYSITELIB}/salt/states/win_dns_client.pyo +${PYSITELIB}/salt/states/win_firewall.py +${PYSITELIB}/salt/states/win_firewall.pyc +${PYSITELIB}/salt/states/win_firewall.pyo +${PYSITELIB}/salt/states/win_network.py +${PYSITELIB}/salt/states/win_network.pyc +${PYSITELIB}/salt/states/win_network.pyo +${PYSITELIB}/salt/states/win_path.py +${PYSITELIB}/salt/states/win_path.pyc +${PYSITELIB}/salt/states/win_path.pyo +${PYSITELIB}/salt/states/win_servermanager.py +${PYSITELIB}/salt/states/win_servermanager.pyc +${PYSITELIB}/salt/states/win_servermanager.pyo +${PYSITELIB}/salt/states/win_system.py +${PYSITELIB}/salt/states/win_system.pyc +${PYSITELIB}/salt/states/win_system.pyo +${PYSITELIB}/salt/states/xmpp.py +${PYSITELIB}/salt/states/xmpp.pyc +${PYSITELIB}/salt/states/xmpp.pyo +${PYSITELIB}/salt/states/zcbuildout.py +${PYSITELIB}/salt/states/zcbuildout.pyc +${PYSITELIB}/salt/states/zcbuildout.pyo +${PYSITELIB}/salt/syspaths.py +${PYSITELIB}/salt/syspaths.pyc +${PYSITELIB}/salt/syspaths.pyo ${PYSITELIB}/salt/template.py ${PYSITELIB}/salt/template.pyc ${PYSITELIB}/salt/template.pyo +${PYSITELIB}/salt/templates/debian_ip/conf.jinja +${PYSITELIB}/salt/templates/debian_ip/debian_eth.jinja +${PYSITELIB}/salt/templates/debian_ip/display-network.jinja +${PYSITELIB}/salt/templates/debian_ip/network.jinja +${PYSITELIB}/salt/templates/debian_ip/route_eth.jinja +${PYSITELIB}/salt/templates/rh_ip/conf.jinja +${PYSITELIB}/salt/templates/rh_ip/network.jinja +${PYSITELIB}/salt/templates/rh_ip/rh5_eth.jinja +${PYSITELIB}/salt/templates/rh_ip/rh6_eth.jinja +${PYSITELIB}/salt/templates/rh_ip/route_eth.jinja +${PYSITELIB}/salt/templates/virt/libvirt_domain.jinja +${PYSITELIB}/salt/templates/virt/libvirt_volume.jinja ${PYSITELIB}/salt/tops/__init__.py ${PYSITELIB}/salt/tops/__init__.pyc ${PYSITELIB}/salt/tops/__init__.pyo @@ -976,21 +1433,36 @@ ${PYSITELIB}/salt/tops/ext_nodes.pyo ${PYSITELIB}/salt/tops/mongo.py ${PYSITELIB}/salt/tops/mongo.pyc ${PYSITELIB}/salt/tops/mongo.pyo +${PYSITELIB}/salt/tops/reclass_adapter.py +${PYSITELIB}/salt/tops/reclass_adapter.pyc +${PYSITELIB}/salt/tops/reclass_adapter.pyo +${PYSITELIB}/salt/transport/__init__.py +${PYSITELIB}/salt/transport/__init__.pyc +${PYSITELIB}/salt/transport/__init__.pyo ${PYSITELIB}/salt/utils/__init__.py ${PYSITELIB}/salt/utils/__init__.pyc ${PYSITELIB}/salt/utils/__init__.pyo ${PYSITELIB}/salt/utils/atomicfile.py ${PYSITELIB}/salt/utils/atomicfile.pyc ${PYSITELIB}/salt/utils/atomicfile.pyo +${PYSITELIB}/salt/utils/cloud.py +${PYSITELIB}/salt/utils/cloud.pyc +${PYSITELIB}/salt/utils/cloud.pyo +${PYSITELIB}/salt/utils/context.py +${PYSITELIB}/salt/utils/context.pyc +${PYSITELIB}/salt/utils/context.pyo ${PYSITELIB}/salt/utils/debug.py ${PYSITELIB}/salt/utils/debug.pyc ${PYSITELIB}/salt/utils/debug.pyo -${PYSITELIB}/salt/utils/decorators.py -${PYSITELIB}/salt/utils/decorators.pyc -${PYSITELIB}/salt/utils/decorators.pyo +${PYSITELIB}/salt/utils/decorators/__init__.py +${PYSITELIB}/salt/utils/decorators/__init__.pyc +${PYSITELIB}/salt/utils/decorators/__init__.pyo ${PYSITELIB}/salt/utils/dictupdate.py ${PYSITELIB}/salt/utils/dictupdate.pyc ${PYSITELIB}/salt/utils/dictupdate.pyo +${PYSITELIB}/salt/utils/error.py +${PYSITELIB}/salt/utils/error.pyc +${PYSITELIB}/salt/utils/error.pyo ${PYSITELIB}/salt/utils/event.py ${PYSITELIB}/salt/utils/event.pyc ${PYSITELIB}/salt/utils/event.pyo @@ -1003,18 +1475,27 @@ ${PYSITELIB}/salt/utils/find.pyo ${PYSITELIB}/salt/utils/gzip_util.py ${PYSITELIB}/salt/utils/gzip_util.pyc ${PYSITELIB}/salt/utils/gzip_util.pyo +${PYSITELIB}/salt/utils/ipaddr.py +${PYSITELIB}/salt/utils/ipaddr.pyc +${PYSITELIB}/salt/utils/ipaddr.pyo ${PYSITELIB}/salt/utils/jinja.py ${PYSITELIB}/salt/utils/jinja.pyc ${PYSITELIB}/salt/utils/jinja.pyo ${PYSITELIB}/salt/utils/mako.py ${PYSITELIB}/salt/utils/mako.pyc ${PYSITELIB}/salt/utils/mako.pyo +${PYSITELIB}/salt/utils/master.py +${PYSITELIB}/salt/utils/master.pyc +${PYSITELIB}/salt/utils/master.pyo ${PYSITELIB}/salt/utils/migrations.py ${PYSITELIB}/salt/utils/migrations.pyc ${PYSITELIB}/salt/utils/migrations.pyo ${PYSITELIB}/salt/utils/minions.py ${PYSITELIB}/salt/utils/minions.pyc ${PYSITELIB}/salt/utils/minions.pyo +${PYSITELIB}/salt/utils/nb_popen.py +${PYSITELIB}/salt/utils/nb_popen.pyc +${PYSITELIB}/salt/utils/nb_popen.pyo ${PYSITELIB}/salt/utils/network.py ${PYSITELIB}/salt/utils/network.pyc ${PYSITELIB}/salt/utils/network.pyo @@ -1030,6 +1511,12 @@ ${PYSITELIB}/salt/utils/process.pyo ${PYSITELIB}/salt/utils/pydsl.py ${PYSITELIB}/salt/utils/pydsl.pyc ${PYSITELIB}/salt/utils/pydsl.pyo +${PYSITELIB}/salt/utils/pyobjects.py +${PYSITELIB}/salt/utils/pyobjects.pyc +${PYSITELIB}/salt/utils/pyobjects.pyo +${PYSITELIB}/salt/utils/reclass.py +${PYSITELIB}/salt/utils/reclass.pyc +${PYSITELIB}/salt/utils/reclass.pyo ${PYSITELIB}/salt/utils/s3.py ${PYSITELIB}/salt/utils/s3.pyc ${PYSITELIB}/salt/utils/s3.pyo @@ -1042,12 +1529,36 @@ ${PYSITELIB}/salt/utils/schedule.pyo ${PYSITELIB}/salt/utils/templates.py ${PYSITELIB}/salt/utils/templates.pyc ${PYSITELIB}/salt/utils/templates.pyo +${PYSITELIB}/salt/utils/thin.py +${PYSITELIB}/salt/utils/thin.pyc +${PYSITELIB}/salt/utils/thin.pyo ${PYSITELIB}/salt/utils/timed_subprocess.py ${PYSITELIB}/salt/utils/timed_subprocess.pyc ${PYSITELIB}/salt/utils/timed_subprocess.pyo +${PYSITELIB}/salt/utils/validate/__init__.py +${PYSITELIB}/salt/utils/validate/__init__.pyc +${PYSITELIB}/salt/utils/validate/__init__.pyo +${PYSITELIB}/salt/utils/validate/net.py +${PYSITELIB}/salt/utils/validate/net.pyc +${PYSITELIB}/salt/utils/validate/net.pyo +${PYSITELIB}/salt/utils/validate/path.py +${PYSITELIB}/salt/utils/validate/path.pyc +${PYSITELIB}/salt/utils/validate/path.pyo +${PYSITELIB}/salt/utils/validate/ssh.py +${PYSITELIB}/salt/utils/validate/ssh.pyc +${PYSITELIB}/salt/utils/validate/ssh.pyo +${PYSITELIB}/salt/utils/validate/user.py +${PYSITELIB}/salt/utils/validate/user.pyc +${PYSITELIB}/salt/utils/validate/user.pyo ${PYSITELIB}/salt/utils/verify.py ${PYSITELIB}/salt/utils/verify.pyc ${PYSITELIB}/salt/utils/verify.pyo +${PYSITELIB}/salt/utils/virt.py +${PYSITELIB}/salt/utils/virt.pyc +${PYSITELIB}/salt/utils/virt.pyo +${PYSITELIB}/salt/utils/vt.py +${PYSITELIB}/salt/utils/vt.pyc +${PYSITELIB}/salt/utils/vt.pyo ${PYSITELIB}/salt/utils/winapi.py ${PYSITELIB}/salt/utils/winapi.pyc ${PYSITELIB}/salt/utils/winapi.pyo @@ -1057,6 +1568,9 @@ ${PYSITELIB}/salt/utils/winservice.pyo ${PYSITELIB}/salt/utils/xmlutil.py ${PYSITELIB}/salt/utils/xmlutil.pyc ${PYSITELIB}/salt/utils/xmlutil.pyo +${PYSITELIB}/salt/utils/yamldumper.py +${PYSITELIB}/salt/utils/yamldumper.pyc +${PYSITELIB}/salt/utils/yamldumper.pyo ${PYSITELIB}/salt/utils/yamlloader.py ${PYSITELIB}/salt/utils/yamlloader.pyc ${PYSITELIB}/salt/utils/yamlloader.pyo @@ -1069,6 +1583,9 @@ ${PYSITELIB}/salt/wheel/__init__.pyo ${PYSITELIB}/salt/wheel/config.py ${PYSITELIB}/salt/wheel/config.pyc ${PYSITELIB}/salt/wheel/config.pyo +${PYSITELIB}/salt/wheel/error.py +${PYSITELIB}/salt/wheel/error.pyc +${PYSITELIB}/salt/wheel/error.pyo ${PYSITELIB}/salt/wheel/file_roots.py ${PYSITELIB}/salt/wheel/file_roots.pyc ${PYSITELIB}/salt/wheel/file_roots.pyo @@ -1079,11 +1596,13 @@ ${PYSITELIB}/salt/wheel/pillar_roots.py ${PYSITELIB}/salt/wheel/pillar_roots.pyc ${PYSITELIB}/salt/wheel/pillar_roots.pyo man/man1/salt-call.1 +man/man1/salt-cloud.1 man/man1/salt-cp.1 man/man1/salt-key.1 man/man1/salt-master.1 man/man1/salt-minion.1 man/man1/salt-run.1 +man/man1/salt-ssh.1 man/man1/salt-syndic.1 man/man1/salt.1 man/man7/salt.7 diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 7a752780a41..c51c37ffeb6 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2013/08/17 18:30:02 imil Exp $ +$NetBSD: distinfo,v 1.8 2014/03/30 12:31:17 imil Exp $ -SHA1 (salt-0.16.3.tar.gz) = 503b36467900ef457fc391b80be09a877d03ba9d -RMD160 (salt-0.16.3.tar.gz) = d1b3d1a0f8ca72a0ca0ad8fa14362d0a4698db78 -Size (salt-0.16.3.tar.gz) = 3543283 bytes -SHA1 (patch-setup.py) = 15907268df5ee1d06e1c932dc84fd7701156519d +SHA1 (salt-2014.1.1.tar.gz) = 02d1d7ea2cee51b6a84be645895b6c655cc5d5f9 +RMD160 (salt-2014.1.1.tar.gz) = 9b750ede94b9185eeea6012c2e7546a77f717569 +Size (salt-2014.1.1.tar.gz) = 2811441 bytes +SHA1 (patch-setup.py) = 1f31af196ff806104bbfdf688cd9d9cc48cee307 diff --git a/sysutils/salt/patches/patch-setup.py b/sysutils/salt/patches/patch-setup.py index e16e2f89955..7fd83a1ed81 100644 --- a/sysutils/salt/patches/patch-setup.py +++ b/sysutils/salt/patches/patch-setup.py @@ -1,51 +1,21 @@ -$NetBSD: patch-setup.py,v 1.3 2013/04/28 09:46:25 imil Exp $ +$NetBSD: patch-setup.py,v 1.4 2014/03/30 12:31:17 imil Exp $ -* Remove unused example_path and template_path; -* Set etc_path to the directory where configfiles will be - installed, which is PREFIX/share/examples, not /etc or - PKG_SYSCONFDIR. The files are copied to PKG_SYSCONFDIR - via the CONFIG_FILES setting in the pkgsrc Makefile. -* Install man pages in PKGMANDIR, not PREFIX/share/man. +Install manpages in man/, not share/man/ ---- setup.py.orig 2013-03-29 00:06:49.000000000 +0000 +--- setup.py.orig 2014-03-19 04:30:45.000000000 +0000 +++ setup.py -@@ -151,13 +151,15 @@ DESC = ('Portable, distributed, remote e - 'configuration management system') - mod_path = os.path.join(get_python_lib(), 'salt/modules') - doc_path = os.path.join(PREFIX, 'share/doc', NAME + '-' + VER) --example_path = os.path.join(doc_path, 'examples') --template_path = os.path.join(example_path, 'templates') - --if 'SYSCONFDIR' in os.environ: -- etc_path = os.environ['SYSCONFDIR'] -+# For pkgsrc: -+# * Do not define example_path, template_path, or etc_path; they are not used. -+# * man_path should be set to PKGMANDIR, defaulting to PREFIX/share/man. -+# -+if 'PKGMANDIR' in os.environ: -+ man_path = os.environ['PKGMANDIR'] - else: -- etc_path = os.path.join(os.path.dirname(PREFIX), 'etc') -+ man_path = os.path.join(os.path.dirname(PREFIX), 'share/man') - - with open(salt_reqs) as f: - lines = f.read().split('\n') -@@ -210,7 +212,7 @@ setup_kwargs = {'name': NAME, - 'salt.utils', - ], - 'package_data': {'salt.modules': ['rh_ip/*.jinja']}, +@@ -452,12 +452,12 @@ SETUP_KWARGS = {'name': NAME, + 'virt/*.jinja' + ], + }, - 'data_files': [('share/man/man1', -+ 'data_files': [(os.path.join(man_path, 'man1'), - ['doc/man/salt-master.1', - 'doc/man/salt-key.1', - 'doc/man/salt.1', -@@ -220,7 +222,8 @@ setup_kwargs = {'name': NAME, - 'doc/man/salt-run.1', ++ 'data_files': [('man/man1', + ['doc/man/salt-cp.1', + 'doc/man/salt-call.1', 'doc/man/salt-minion.1', ]), -- ('share/man/man7', ['doc/man/salt.7']), -+ (os.path.join(man_path, 'man7'), -+ ['doc/man/salt.7']), +- ('share/man/man7', ++ ('man/man7', + ['doc/man/salt.7', + ]), ], - # Required for esky builds - 'install_requires': requirements, |