From nobody@FreeBSD.org  Fri Dec 14 17:33:45 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CEF48A66
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Dec 2012 17:33:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id B47DE8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Dec 2012 17:33:45 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEHXjg3077761
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 Dec 2012 17:33:45 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qBEHXj7N077760;
	Fri, 14 Dec 2012 17:33:45 GMT
	(envelope-from nobody)
Message-Id: <201212141733.qBEHXj7N077760@red.freebsd.org>
Date: Fri, 14 Dec 2012 17:33:45 GMT
From: Christer Edwards <christer.edwards@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: sysutils/salt - maintainer update (0.10.5 -> 0.11.0)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         174439
>Category:       ports
>Synopsis:       sysutils/salt - maintainer update (0.10.5 -> 0.11.0)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 14 17:40:00 UTC 2012
>Closed-Date:    Sun Dec 16 20:22:53 UTC 2012
>Last-Modified:  Sun Dec 16 20:22:53 UTC 2012
>Originator:     Christer Edwards
>Release:        9.0-RELEASE
>Organization:
Salt Stack
>Environment:
FreeBSD starbuck 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #2: Thu Aug 16 10:47:06 MDT 2012     root@starbuck:/usr/obj/usr/src/sys/STARBUCK  amd64
>Description:
sysutils/salt - maintainer update
>How-To-Repeat:
sysutils/salt - maintainer update
>Fix:
sysutils/salt - maintainer update

Patch attached with submission follows:

diff -ruN salt-0.10.5/Makefile salt-0.11.0/Makefile
--- salt-0.10.5/Makefile	2012-11-25 23:06:50.000000000 -0700
+++ salt-0.11.0/Makefile	2012-12-14 09:35:46.000000000 -0700
@@ -2,9 +2,9 @@
 # $FreeBSD: ports/sysutils/salt/Makefile,v 1.16 2012/11/26 06:06:50 svnexp Exp $
 
 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 @@
 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-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 -ruN salt-0.10.5/distinfo salt-0.11.0/distinfo
--- salt-0.10.5/distinfo	2012-11-25 23:06:50.000000000 -0700
+++ salt-0.11.0/distinfo	2012-12-14 09:35:12.000000000 -0700
@@ -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 -ruN salt-0.10.5/files/pkg-message.in salt-0.11.0/files/pkg-message.in
--- salt-0.10.5/files/pkg-message.in	2011-12-26 13:52:53.000000000 -0700
+++ salt-0.11.0/files/pkg-message.in	2012-12-14 09:59:06.000000000 -0700
@@ -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 -ruN salt-0.10.5/pkg-plist salt-0.11.0/pkg-plist
--- salt-0.10.5/pkg-plist	2012-11-25 23:06:50.000000000 -0700
+++ salt-0.11.0/pkg-plist	2012-12-14 10:20:34.000000000 -0700
@@ -86,6 +86,9 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Sun Dec 16 00:07:30 UTC 2012 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174439 

From: Beech Rintoul <beech@freebsdnorth.com>
To: Christer Edwards <christer.edwards@gmail.com>
Cc: Bug Followup <bug-followup@freebsd.org>,
 Beech Rintoul <beech@freebsdnorth.com>
Subject: Re: ports/174439: sysutils/salt - maintainer update (0.10.5 -> 0.11.0)
Date: Sat, 15 Dec 2012 16:56:11 -0900

 Problems with pkg-plist, please fix.
 
 http://tom1.akherb.com/tb/errors/9-FreeBSD/salt-0.11.0.log
 
 Thanks,
 
 Beech
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Sun Dec 16 20:22:38 UTC 2012 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174439 
>Unformatted:
