From owner-svn-ports-head@freebsd.org Sat Aug 8 23:44:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D2BB73A83E8; Sat, 8 Aug 2020 23:44:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BPJjY5BnFz4S6G; Sat, 8 Aug 2020 23:44:33 +0000 (UTC) (envelope-from asomers@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95B581056A; Sat, 8 Aug 2020 23:44:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 078NiXKf010323; Sat, 8 Aug 2020 23:44:33 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 078NiXbt010322; Sat, 8 Aug 2020 23:44:33 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202008082344.078NiXbt010322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 8 Aug 2020 23:44:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544532 - head/sysutils/py-salt X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/sysutils/py-salt X-SVN-Commit-Revision: 544532 X-SVN-Commit-Repository: ports 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.33 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: Sat, 08 Aug 2020 23:44:33 -0000 Author: asomers (src committer) Date: Sat Aug 8 23:44:32 2020 New Revision: 544532 URL: https://svnweb.freebsd.org/changeset/ports/544532 Log: sysutils/py-salt: revert upstream PR 55719 Salt PR 55719 changed the signature of Linux's sysctl.persist function, without changing it for any other OS. Widespread breakage is the result. Revert that PR until upstream fixes it. PR: 247627 Reported by: ari@ish.com.au Approved by: 0mp (ports) Approved by: christer.edwards@gmail.com (maintainer timeout) MFH: 2020Q3 Sponsored by: Axcient Modified: head/sysutils/py-salt/Makefile head/sysutils/py-salt/distinfo Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Sat Aug 8 23:14:11 2020 (r544531) +++ head/sysutils/py-salt/Makefile Sat Aug 8 23:44:32 2020 (r544532) @@ -3,10 +3,16 @@ PORTNAME= salt PORTVERSION= 3001 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +# Unbreak the sysctl state. +# https://github.com/saltstack/salt/issues/57826 +# https://github.com/saltstack/salt/pull/57839 +PATCH_SITES= https://github.com/saltstack/salt/commit/ +PATCHFILES+= 0dda2fdbdc577b092c5fc894951e8a750b275c56.patch:-p1 MAINTAINER= christer.edwards@gmail.com COMMENT= Distributed remote execution and configuration management system Modified: head/sysutils/py-salt/distinfo ============================================================================== --- head/sysutils/py-salt/distinfo Sat Aug 8 23:14:11 2020 (r544531) +++ head/sysutils/py-salt/distinfo Sat Aug 8 23:44:32 2020 (r544532) @@ -1,3 +1,5 @@ -TIMESTAMP = 1592464695 +TIMESTAMP = 1596928973 SHA256 (salt-3001.tar.gz) = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154 SIZE (salt-3001.tar.gz) = 14448043 +SHA256 (0dda2fdbdc577b092c5fc894951e8a750b275c56.patch) = 1d29b67d1f251ea54a91a54006cc9e51eae9b96bfb1fbb3c6ba23d9b876313a7 +SIZE (0dda2fdbdc577b092c5fc894951e8a750b275c56.patch) = 9297