From nobody@FreeBSD.org  Mon Jun  3 17:05:59 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 0C2E24EB
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Jun 2013 17:05:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id F32551AD2
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Jun 2013 17:05:58 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r53H5wsC090812
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 3 Jun 2013 17:05:58 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r53H5wTq090807;
	Mon, 3 Jun 2013 17:05:58 GMT
	(envelope-from nobody)
Message-Id: <201306031705.r53H5wTq090807@oldred.freebsd.org>
Date: Mon, 3 Jun 2013 17:05:58 GMT
From: Christer Edwards <christer.edwards@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: maintainer update : sysutils/py-salt
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         179265
>Category:       ports
>Synopsis:       maintainer update : sysutils/py-salt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    culot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 03 17:10:00 UTC 2013
>Closed-Date:    Wed Jun 05 09:05:58 UTC 2013
>Last-Modified:  Wed Jun  5 09:10:00 UTC 2013
>Originator:     Christer Edwards
>Release:        9.1-RELEASE-p2
>Organization:
Salt Stack Inc
>Environment:
FreeBSD starbuck 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #7 r249029: Sat Apr 13 11:22:22 MDT 2013     root@starbuck:/usr/obj/usr/src/sys/STARBUCK  amd64
>Description:
Mantainer update : sysutils/py-salt
>How-To-Repeat:
Mantainer update : sysutils/py-salt
>Fix:
Mantainer update : sysutils/py-salt

Patch attached with submission follows:

diff -ruN py-salt-0.15.3/Makefile /usr/local/poudriere/ports/default/sysutils/py-salt/Makefile
--- py-salt-0.15.3/Makefile	2013-05-14 10:34:28.000000000 -0600
+++ /usr/local/poudriere/ports/default/sysutils/py-salt/Makefile	2013-06-03 10:57:53.257791004 -0600
@@ -2,7 +2,7 @@
 # $FreeBSD: sysutils/py-salt/Makefile 318175 2013-05-14 16:34:28Z miwi $
 
 PORTNAME=	salt
-PORTVERSION=	0.15.1
+PORTVERSION=	0.15.3
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff -ruN py-salt-0.15.3/distinfo /usr/local/poudriere/ports/default/sysutils/py-salt/distinfo
--- py-salt-0.15.3/distinfo	2013-05-14 10:34:28.000000000 -0600
+++ /usr/local/poudriere/ports/default/sysutils/py-salt/distinfo	2013-06-03 10:58:00.346796708 -0600
@@ -1,2 +1,2 @@
-SHA256 (salt-0.15.1.tar.gz) = 2bd3bdb38bb7aefebdfaddfef70ebce29e7fa2dc9806e87115a9c6f0915b4f95
-SIZE (salt-0.15.1.tar.gz) = 5752766
+SHA256 (salt-0.15.3.tar.gz) = 19e2ca70b60cad9a2752d1c16d007a243f3dbf4a00bba24d8ecfba1b59e135b2
+SIZE (salt-0.15.3.tar.gz) = 3427038
diff -ruN py-salt-0.15.3/files/patch-salt__grains__core.py /usr/local/poudriere/ports/default/sysutils/py-salt/files/patch-salt__grains__core.py
--- py-salt-0.15.3/files/patch-salt__grains__core.py	2013-03-23 00:04:41.000000000 -0600
+++ /usr/local/poudriere/ports/default/sysutils/py-salt/files/patch-salt__grains__core.py	2013-05-31 10:26:33.555801476 -0600
@@ -1,6 +1,6 @@
---- ./salt/grains/core.py.orig	2013-03-19 09:30:55.000000000 +0400
-+++ ./salt/grains/core.py	2013-03-20 20:15:36.000000000 +0400
-@@ -730,7 +730,7 @@
+--- ./salt/grains/core.py.orig	2013-05-29 00:22:30.000000000 -0600
++++ ./salt/grains/core.py	2013-05-31 10:09:03.273791365 -0600
+@@ -791,7 +791,7 @@
      '''
      # Provides:
      #   path
diff -ruN py-salt-0.15.3/files/patch-salt__utils____init__.py /usr/local/poudriere/ports/default/sysutils/py-salt/files/patch-salt__utils____init__.py
--- py-salt-0.15.3/files/patch-salt__utils____init__.py	2013-03-23 00:04:41.000000000 -0600
+++ /usr/local/poudriere/ports/default/sysutils/py-salt/files/patch-salt__utils____init__.py	2013-05-31 11:03:58.126789566 -0600
@@ -1,8 +1,8 @@
---- ./salt/utils/__init__.py.orig	2013-03-19 09:30:55.000000000 +0400
-+++ ./salt/utils/__init__.py	2013-03-20 20:22:28.000000000 +0400
-@@ -228,6 +228,15 @@
-         # default path based on busybox's default
-         default_path = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
+--- salt/utils/__init__.py.orig	2013-05-29 00:20:55.000000000 -0600
++++ salt/utils/__init__.py	    2013-05-31 10:13:41.486795573 -0600
+@@ -242,6 +242,15 @@
+         default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
+         search_path = os.environ.get('PATH', default_path)
  
 +        p = os.environ.get('PATH')
 +        if p is not None:
@@ -13,6 +13,6 @@
 +                pp.append('/usr/local/sbin')
 +            os.environ['PATH'] = os.pathsep.join(pp)
 +
-         for path in os.environ.get('PATH', default_path).split(os.pathsep):
+         for path in search_path.split(os.pathsep):
              full_path = os.path.join(path, exe)
              if os.access(full_path, os.X_OK):


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 3 17:10:09 UTC 2013 
Responsible-Changed-Why:  
freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179265 
Responsible-Changed-From-To: freebsd-python->culot 
Responsible-Changed-By: culot 
Responsible-Changed-When: Wed Jun 5 08:33:15 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179265 
State-Changed-From-To: open->closed 
State-Changed-By: culot 
State-Changed-When: Wed Jun 5 09:05:57 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179265: commit references a PR
Date: Wed,  5 Jun 2013 09:05:58 +0000 (UTC)

 Author: culot
 Date: Wed Jun  5 09:05:45 2013
 New Revision: 319966
 URL: http://svnweb.freebsd.org/changeset/ports/319966
 
 Log:
   - Update to 0.15.3
   
   PR:		ports/179265
   Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)
 
 Modified:
   head/sysutils/py-salt/Makefile
   head/sysutils/py-salt/distinfo
   head/sysutils/py-salt/files/patch-salt__grains__core.py
   head/sysutils/py-salt/files/patch-salt__utils____init__.py
   head/sysutils/py-salt/pkg-plist
 
 Modified: head/sysutils/py-salt/Makefile
 ==============================================================================
 --- head/sysutils/py-salt/Makefile	Wed Jun  5 09:02:46 2013	(r319965)
 +++ head/sysutils/py-salt/Makefile	Wed Jun  5 09:05:45 2013	(r319966)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	salt
 -PORTVERSION=	0.15.1
 +PORTVERSION=	0.15.3
  CATEGORIES=	sysutils python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 Modified: head/sysutils/py-salt/distinfo
 ==============================================================================
 --- head/sysutils/py-salt/distinfo	Wed Jun  5 09:02:46 2013	(r319965)
 +++ head/sysutils/py-salt/distinfo	Wed Jun  5 09:05:45 2013	(r319966)
 @@ -1,2 +1,2 @@
 -SHA256 (salt-0.15.1.tar.gz) = 2bd3bdb38bb7aefebdfaddfef70ebce29e7fa2dc9806e87115a9c6f0915b4f95
 -SIZE (salt-0.15.1.tar.gz) = 5752766
 +SHA256 (salt-0.15.3.tar.gz) = 19e2ca70b60cad9a2752d1c16d007a243f3dbf4a00bba24d8ecfba1b59e135b2
 +SIZE (salt-0.15.3.tar.gz) = 3427038
 
 Modified: head/sysutils/py-salt/files/patch-salt__grains__core.py
 ==============================================================================
 --- head/sysutils/py-salt/files/patch-salt__grains__core.py	Wed Jun  5 09:02:46 2013	(r319965)
 +++ head/sysutils/py-salt/files/patch-salt__grains__core.py	Wed Jun  5 09:05:45 2013	(r319966)
 @@ -1,6 +1,6 @@
 ---- ./salt/grains/core.py.orig	2013-03-19 09:30:55.000000000 +0400
 -+++ ./salt/grains/core.py	2013-03-20 20:15:36.000000000 +0400
 -@@ -730,7 +730,7 @@
 +--- ./salt/grains/core.py.orig	2013-05-29 00:22:30.000000000 -0600
 ++++ ./salt/grains/core.py	2013-05-31 10:09:03.273791365 -0600
 +@@ -791,7 +791,7 @@
       '''
       # Provides:
       #   path
 
 Modified: head/sysutils/py-salt/files/patch-salt__utils____init__.py
 ==============================================================================
 --- head/sysutils/py-salt/files/patch-salt__utils____init__.py	Wed Jun  5 09:02:46 2013	(r319965)
 +++ head/sysutils/py-salt/files/patch-salt__utils____init__.py	Wed Jun  5 09:05:45 2013	(r319966)
 @@ -1,8 +1,8 @@
 ---- ./salt/utils/__init__.py.orig	2013-03-19 09:30:55.000000000 +0400
 -+++ ./salt/utils/__init__.py	2013-03-20 20:22:28.000000000 +0400
 -@@ -228,6 +228,15 @@
 -         # default path based on busybox's default
 -         default_path = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
 +--- salt/utils/__init__.py.orig	2013-05-29 00:20:55.000000000 -0600
 ++++ salt/utils/__init__.py	    2013-05-31 10:13:41.486795573 -0600
 +@@ -242,6 +242,15 @@
 +         default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
 +         search_path = os.environ.get('PATH', default_path)
   
  +        p = os.environ.get('PATH')
  +        if p is not None:
 @@ -13,6 +13,6 @@
  +                pp.append('/usr/local/sbin')
  +            os.environ['PATH'] = os.pathsep.join(pp)
  +
 -         for path in os.environ.get('PATH', default_path).split(os.pathsep):
 +         for path in search_path.split(os.pathsep):
               full_path = os.path.join(path, exe)
               if os.access(full_path, os.X_OK):
 
 Modified: head/sysutils/py-salt/pkg-plist
 ==============================================================================
 --- head/sysutils/py-salt/pkg-plist	Wed Jun  5 09:02:46 2013	(r319965)
 +++ head/sysutils/py-salt/pkg-plist	Wed Jun  5 09:05:45 2013	(r319966)
 @@ -275,9 +275,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/localemod.py
 +%%PYTHON_SITELIBDIR%%/salt/modules/localemod.pyc
 +%%PYTHON_SITELIBDIR%%/salt/modules/localemod.pyo
  %%PYTHON_SITELIBDIR%%/salt/modules/locate.py
  %%PYTHON_SITELIBDIR%%/salt/modules/locate.pyc
  %%PYTHON_SITELIBDIR%%/salt/modules/locate.pyo
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
