Add app-admin/salt to portage

(Portage version: 2.1.10.57/cvs/Linux x86_64)

7 files changed, 79 insertions, 0 deletions

diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/master-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/master-initd-1 b/app-admin/salt/files/master-initd-1
new file mode 100644
index 000000000000..b39afff05c92
--- /dev/null
+++ b/app-admin/salt/files/master-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+
+command="/usr/bin/salt-master"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+
+depend() {
+	use net
+}
diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/minion-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/minion-initd-1 b/app-admin/salt/files/minion-initd-1
new file mode 100644
index 000000000000..a7f1e37ceb5c
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+
+command="/usr/bin/salt-minion"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-minion.pid"
+name="SALT minion daemon"
+
+depend() {
+	need net
+}
diff --git a/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch b/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch
new file mode 100644
index 000000000000..b449ae38cea8
--- /dev/null
+++ b/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch
@@ -0,0 +1,25 @@
+From 6c25bb24a250eaa41df02a0fe0ea696f227e8d18 Mon Sep 17 00:00:00 2001
+From: Thomas S Hatch <thatch45@gmail.com>
+Date: Sat, 24 Mar 2012 11:51:24 -0600
+Subject: [PATCH] fix issue with syndic resolution of master 1p
+
+---
+ salt/__init__.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/salt/__init__.py b/salt/__init__.py
+index 61b98e3..bce0065 100644
+--- a/salt/__init__.py
++++ b/salt/__init__.py
+@@ -223,7 +223,7 @@ class Syndic(object):
+             # Some of the opts need to be changed to match the needed opts
+             # in the minion class.
+             opts['master'] = opts['syndic_master']
+-            opts['master_ip'] = salt.config.dns_check(opts['master'])
++            opts['master_ip'] = salt.utils.dns_check(opts['master'])
+ 
+             opts['master_uri'] = ('tcp://' + opts['master_ip'] +
+                                   ':' + str(opts['master_port']))
+-- 
+1.7.8.5
+
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/syndic-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-1 b/app-admin/salt/files/syndic-initd-1
new file mode 100644
index 000000000000..d8fdd7757492
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+
+command="/usr/bin/salt-syndic"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-syndic.pid"
+name="SALT syndic daemon"
+
+depend() {
+	use net
+}