From owner-freebsd-python@FreeBSD.ORG Thu Mar 6 09:10:02 2014
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: freebsd-python@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 05EDEE98
for <freebsd-python@smarthost.ysv.freebsd.org>;
Thu, 6 Mar 2014 09:10:02 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2001:1900:2254:206c::16:87])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id DB07E5EA
for <freebsd-python@smarthost.ysv.freebsd.org>;
Thu, 6 Mar 2014 09:10:01 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s269A1KQ001647
for <freebsd-python@freefall.freebsd.org>; Thu, 6 Mar 2014 09:10:01 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s269A1o3001646;
Thu, 6 Mar 2014 09:10:01 GMT (envelope-from gnats)
Date: Thu, 6 Mar 2014 09:10:01 GMT
Message-Id: <201403060910.s269A1o3001646@freefall.freebsd.org>
To: freebsd-python@FreeBSD.org
Cc:
From: Johannes Meixner <xmj@chaot.net>
Subject: ports/186950: maintainer update : sysutils/py-salt
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: Johannes Meixner <xmj@chaot.net>
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-python>,
<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python/>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 09:10:02 -0000
The following reply was made to PR ports/186950; it has been noted by GNATS.
From: Johannes Meixner <xmj@chaot.net>
To: bug-followup@freebsd.org
Cc:
Subject: ports/186950: maintainer update : sysutils/py-salt
Date: Thu, 6 Mar 2014 11:04:12 +0200
--7gGkHNMELEOhSGF6
Content-Type: multipart/mixed; boundary="DBIVS5p969aUjpLe"
Content-Disposition: inline
--DBIVS5p969aUjpLe
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi,
as salt 2014.1.0 comes in with a lot of cool stuff, we should make sure this
gets in as soon as possible.
Attached is a patch that actually applies, and replaces pkg-plist with
PYDISTUTILS_AUTOPLIST.
Best regards,
--=20
xmj@chaot.net
http://xmj.me
--DBIVS5p969aUjpLe
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="py-salt-2014.1.0.diff"
Content-Transfer-Encoding: quoted-printable
=3D=3D=3D> Updating from SVN
Updating '.':
At revision 347173.
=3D=3D=3D> Generating patch
=3D=3D=3D> Viewing diff with less -iRM
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile (revision 347173)
+++ Makefile (working copy)
@@ -2,7 +2,8 @@
# $FreeBSD$
=20
PORTNAME=3D salt
-PORTVERSION=3D 0.17.5
+PORTVERSION=3D 2014.1.0
+PORTEPOCH=3D 1
CATEGORIES=3D sysutils python
MASTER_SITES=3D CHEESESHOP
PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -17,6 +18,8 @@
${PYTHON_PKGNAMEPREFIX}pycrypto>=3D0:${PORTSDIR}/security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}Jinja2>=3D0:${PORTSDIR}/devel/py-Jinja2 \
${PYTHON_PKGNAMEPREFIX}msgpack>=3D0.1.9:${PORTSDIR}/devel/py-msgpack \
+ ${PYTHON_PKGNAMEPREFIX}libcloud>=3D0.11.4:${PORTSDIR}/net/py-libcloud \
+ ${PYTHON_PKGNAMEPREFIX}botocore>=3D0:${PORTSDIR}/devel/py-botocore \
${PYTHON_PKGNAMEPREFIX}m2crypto>=3D0:${PORTSDIR}/security/py-m2crypto \
sshpass>=3D0:${PORTSDIR}/security/sshpass
RUN_DEPENDS:=3D ${BUILD_DEPENDS}
@@ -23,6 +26,7 @@
=20
USE_PYTHON=3D 2
USE_PYDISTUTILS=3Dyes
+PYDISTUTilS_AUTOPLIST=3D yes
=20
PYDISTUTILS_INSTALLARGS+=3D\
--prefix=3D${PREFIX} \
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- distinfo (revision 347173)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (salt-0.17.5.tar.gz) =3D 36ae196ef87af0ae33e880d1ad593783e2cb102221=
edda2782071738d595ea3f
-SIZE (salt-0.17.5.tar.gz) =3D 1873131
+SHA256 (salt-2014.1.0.tar.gz) =3D 168dd154a9243b1c853700e61f56e7d6ab5cbc98=
62fb215ab991e05f46b2a406
+SIZE (salt-2014.1.0.tar.gz) =3D 2787665
Index: files/patch-salt__grains__core.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-salt__grains__core.py (revision 347173)
+++ files/patch-salt__grains__core.py (working copy)
@@ -1,9 +1,9 @@
---- ./salt/grains/core.py.orig 2013-10-17 08:48:57.000000000 +0400
-+++ ./salt/grains/core.py 2013-10-25 10:46:21.000000000 +0400
-@@ -1059,7 +1059,7 @@
- '''
+--- ./salt/grains/core.py.orig 2014-02-19 22:21:14.000000000 +0200
++++ ./salt/grains/core.py 2014-03-06 10:50:07.000000000 +0200
+@@ -1133,7 +1133,7 @@
# Provides:
# path
+=20
- return {'path': os.environ['PATH'].strip()}
+ return {'path': os.environ['PATH'].strip() + ':/usr/local/bin:/usr/lo=
cal/sbin'}
=20
Index: files/patch-salt__modules__reebsdpkg.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-salt__modules__reebsdpkg.py (revision 347173)
+++ files/patch-salt__modules__reebsdpkg.py (working copy)
@@ -1,11 +0,0 @@
---- salt/modules/freebsdpkg.py.orig 2013-10-30 16:16:31.850225522 +0000
-+++ salt/modules/freebsdpkg.py 2013-10-30 16:16:47.868224728 +0000
-@@ -27,7 +27,7 @@
- '''
- Looks to see if pkgng is being used by checking if database exists
- '''
-- return os.path.isfile('/var/db/pkg/local.sqlite')
-+ return os.path.isfile('/usr/local/etc/pkg.conf')
-=20
-=20
- @decorators.memoize
Index: files/patch-salt__utils____init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-salt__utils____init__.py (revision 347173)
+++ files/patch-salt__utils____init__.py (working copy)
@@ -1,6 +1,6 @@
---- ./salt/utils/__init__.py.orig 2013-10-17 21:27:29.000000000 +0400
-+++ ./salt/utils/__init__.py 2013-10-25 10:52:19.000000000 +0400
-@@ -266,6 +266,15 @@
+--- ./salt/utils/__init__.py.orig 2014-02-19 22:21:15.000000000 +0200
++++ ./salt/utils/__init__.py 2014-03-06 10:50:07.000000000 +0200
+@@ -316,6 +316,15 @@
if os.access(exe, os.X_OK):
return exe
=20
Index: files/patch-setup.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-setup.py (revision 347173)
+++ files/patch-setup.py (working copy)
@@ -1,20 +1,17 @@
---- ./setup.py.orig 2013-10-17 21:27:29.000000000 +0400
-+++ ./setup.py 2013-10-25 10:43:51.000000000 +0400
-@@ -313,7 +313,7 @@
- 'salt.log.handlers',
- ],
- 'package_data': {'salt.modules': ['rh_ip/*.jinja']},
+--- ./setup.py.orig 2014-03-06 10:50:27.000000000 +0200
++++ ./setup.py 2014-03-06 10:52:20.000000000 +0200
+@@ -451,12 +451,12 @@
+ 'virt/*.jinja'
+ ],
+ },
- 'data_files': [('share/man/man1',
+ 'data_files': [('man/man1',
- ['doc/man/salt-master.1',
- 'doc/man/salt-key.1',
- 'doc/man/salt.1',
-@@ -324,7 +324,7 @@
- 'doc/man/salt-ssh.1',
+ ['doc/man/salt-cp.1',
+ 'doc/man/salt-call.1',
'doc/man/salt-minion.1',
]),
-- ('share/man/man7', ['doc/man/salt.7']),
-+ ('man/man7', ['doc/man/salt.7']),
+- ('share/man/man7',
++ ('man/man7',
+ ['doc/man/salt.7',
+ ]),
],
- # Required for esky builds
- 'install_requires': REQUIREMENTS,
=3D=3D=3D> Done
--DBIVS5p969aUjpLe--
--7gGkHNMELEOhSGF6
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)
iQIcBAEBAgAGBQJTGDoMAAoJEAy1bITjfmSMsGgP/08xvYx59zkNCyuk8AILWKAU
QCUExS0/j7fpuZuwXe+SE5ilkwa+IDqTgs7AS4hlJvwJfDUdUuut0nlRxofR6xWm
FfnMhPFhtENnAPIwGEBvWYzimX0eeKjlzjiloAcYlvJ56TEBFDrtqFsJkhA5KwUK
muOeL1VwhvVAL+WBQMykXKcXCenSa6aQE2iCzK6C6xG57JL6jF1wWePvdQ87jFxS
D+4ogOhufKQtYtVRzE3ZdrYkMBXnTBCFJno16Kaq9ixLQW9phOi4mnWu3g0ohtik
uZ+XrZM2fDCnVFKRS7GuBn+U5b0EO4mhY4k2y4utDEJordyrfo2nLcuHzMbZz7hp
wL6WZ30018WB64EdxrEeEMfU00cZ4uDKSpiftWO+9JOTD8vj2nMaOkr9o2ydr38C
52WRlBqXDHh+fOyDkDue7mmKEV/5qxtPPRmrZFphyO5Fecerw0llzwj/huzEzQz0
gaYBZuQ598bWWipsksJGdKkED2JZ8XpdZ4AlSRfkb5zqSPou5Y2NGmWAiFrqS45v
47VP9Q30Z3tuTUz5Bh8cjVvKkYb7g8HJJGvnujOZEFKzHqMqMTmQnIxj1egM1lnx
/eWLyb18PcABpsByjBBcLdMpfqXU1yXBwllNpohzPXGRayGUjNpR60OPselJVxxk
z/x0yKOh4iAhyIsbnJQ9
=O2M5
-----END PGP SIGNATURE-----
--7gGkHNMELEOhSGF6--