Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Apr 2018 16:06:33 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467246 - in head/sysutils/py-salt: . files
Message-ID:  <201804131606.w3DG6X0s019487@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Fri Apr 13 16:06:33 2018
New Revision: 467246
URL: https://svnweb.freebsd.org/changeset/ports/467246

Log:
  Fix saltstack bootstrap renaming desired to be installed package from
  swig -> swig30 since former package doesn't exist
  
  PR:		226830
  Submitted by:	garga
  Approved by:	maintainer timeout (> 2 weeks)
  Obtained from:	https://github.com/saltstack/salt-bootstrap/issues/1192
  MFH:		2018Q2
  Sponsored by:	Rubicon communications, LLC (Netgate)

Added:
  head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh   (contents, props changed)
Modified:
  head/sysutils/py-salt/Makefile

Modified: head/sysutils/py-salt/Makefile
==============================================================================
--- head/sysutils/py-salt/Makefile	Fri Apr 13 15:44:23 2018	(r467245)
+++ head/sysutils/py-salt/Makefile	Fri Apr 13 16:06:33 2018	(r467246)
@@ -3,7 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2017.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh	Fri Apr 13 16:06:33 2018	(r467246)
@@ -0,0 +1,14 @@
+--- salt/cloud/deploy/bootstrap-salt.sh.orig	2018-03-21 17:37:20 UTC
++++ salt/cloud/deploy/bootstrap-salt.sh
+@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() {
+         __configure_freebsd_pkg_details || return 1
+     fi
+ 
+-    # Now install swig
++    # Now install swig30
+     # shellcheck disable=SC2086
+-    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1
++    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1
+ 
+     # YAML module is used for generating custom master/minion configs
+     # shellcheck disable=SC2086



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804131606.w3DG6X0s019487>