From owner-svn-ports-head@freebsd.org Wed Jul 13 01:53:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01C73B939C3; Wed, 13 Jul 2016 01:53:46 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C72171170; Wed, 13 Jul 2016 01:53:46 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6D1rkGw017720; Wed, 13 Jul 2016 01:53:46 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6D1rjY4017717; Wed, 13 Jul 2016 01:53:45 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201607130153.u6D1rjY4017717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 13 Jul 2016 01:53:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418455 - in head/sysutils/py-salt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2016 01:53:47 -0000 Author: junovitch Date: Wed Jul 13 01:53:45 2016 New Revision: 418455 URL: https://svnweb.freebsd.org/changeset/ports/418455 Log: sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - https://github.com/saltstack/salt/issues/34094 - https://github.com/saltstack/salt/pull/34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - https://github.com/saltstack/salt/issues/33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban Approved by: Christer Edwards (maintainer) MFH: 2016Q3 Added: head/sysutils/py-salt/files/patch-salt_grains_core.py - copied unchanged from r417507, head/sysutils/py-salt/files/patch-salt_grains_core.py head/sysutils/py-salt/files/patch-salt_states_cron.py (contents, props changed) Modified: head/sysutils/py-salt/Makefile Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Wed Jul 13 01:26:46 2016 (r418454) +++ head/sysutils/py-salt/Makefile Wed Jul 13 01:53:45 2016 (r418455) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.3.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Copied: head/sysutils/py-salt/files/patch-salt_grains_core.py (from r417507, head/sysutils/py-salt/files/patch-salt_grains_core.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_grains_core.py Wed Jul 13 01:53:45 2016 (r418455, copy of r417507, head/sysutils/py-salt/files/patch-salt_grains_core.py) @@ -0,0 +1,12 @@ +# Issue #33608 +# https://github.com/saltstack/salt/issues/33608 +--- salt/grains/core.py.orig 2016-05-25 22:30:31 UTC ++++ salt/grains/core.py +@@ -1422,6 +1422,7 @@ def os_data(): + else: + grains['os'] = grains['kernel'] + if grains['kernel'] == 'FreeBSD': ++ grains.update(_bsd_cpudata(grains)) + try: + grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0] + except salt.exceptions.CommandExecutionError: Added: head/sysutils/py-salt/files/patch-salt_states_cron.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_states_cron.py Wed Jul 13 01:53:45 2016 (r418455) @@ -0,0 +1,28 @@ +# Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in +# 2016.3.2. +# https://github.com/saltstack/salt/issues/34094 +# https://github.com/saltstack/salt/pull/34095 +--- salt/states/cron.py.orig 2016-06-13 22:17:50 UTC ++++ salt/states/cron.py +@@ -540,6 +540,7 @@ def file(name, + __env__, + context, + defaults, ++ False, # skip_verify + **kwargs + ) + except Exception as exc: +@@ -573,12 +574,12 @@ def file(name, + ret['comment'] = 'Unable to manage file: {0}'.format(exc) + return ret + ++ cron_ret = None + if ret['changes']: + cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path) + ret['changes'] = {'diff': ret['changes']['diff']} + ret['comment'] = 'Crontab for user {0} was updated'.format(user) + elif ret['result']: +- cron_ret = None + ret['comment'] = 'Crontab for user {0} is in the correct ' \ + 'state'.format(user) +