Version bump (#201816).

(Portage version: 2.1.3.19)

5 files changed, 188 insertions, 11 deletions

diff --git a/net-proxy/sshproxy/ChangeLog b/net-proxy/sshproxy/ChangeLog
index 12c31e63f1f6..1d15e449795c 100644
--- a/net-proxy/sshproxy/ChangeLog
+++ b/net-proxy/sshproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/sshproxy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.6 2007/11/04 08:25:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.7 2007/12/11 20:12:23 mrness Exp $
+
+*sshproxy-0.6.0_beta0 (11 Dec 2007)
+
+  11 Dec 2007; Alin Năstac <mrness@gentoo.org> files/sshproxy.ini,
+  files/sshproxyd.initd, +sshproxy-0.6.0_beta0.ebuild:
+  Version bump (#201816).
 
   04 Nov 2007; Alin Năstac <mrness@gentoo.org> sshproxy-0.5.0.ebuild:
   Remove useless pkg_setup call from pkg_preinst.
diff --git a/net-proxy/sshproxy/files/digest-sshproxy-0.6.0_beta0 b/net-proxy/sshproxy/files/digest-sshproxy-0.6.0_beta0
new file mode 100644
index 000000000000..3c038d14b287
--- /dev/null
+++ b/net-proxy/sshproxy/files/digest-sshproxy-0.6.0_beta0
@@ -0,0 +1,3 @@
+MD5 28b12a3a3e12cba94080821f989f3b30 sshproxy-0.6.0_beta0.tar.gz 126549
+RMD160 381c83ab9db5a0c306dd0df52a3e29c64f7ed04a sshproxy-0.6.0_beta0.tar.gz 126549
+SHA256 1915989a98a3fcb6a4769feacb31eeb40003660370c1068bdaa5e847339a3da4 sshproxy-0.6.0_beta0.tar.gz 126549
diff --git a/net-proxy/sshproxy/files/sshproxy.ini b/net-proxy/sshproxy/files/sshproxy.ini
index 983669d6146a..c37cb374b3d2 100644
--- a/net-proxy/sshproxy/files/sshproxy.ini
+++ b/net-proxy/sshproxy/files/sshproxy.ini
@@ -1,26 +1,26 @@
 [sshproxy]
 max_connections = 0
-client_db = file_db
+client_db = ini_db
 pkey_id = sshproxy@%HOSTNAME%
 plugin_dir = /usr/lib/sshproxy
-plugin_list = file_db
+plugin_list = ini_db
 port = 2242
 logger_conf = /usr/share/sshproxy/logger.conf
 cipher_type = blowfish
 log_dir = /var/log/sshproxy
-acl_db = file_db
-site_db = file_db
+acl_db = ini_db
+site_db = ini_db
 listen_on = 
 auto_add_key = no
 
 [blowfish]
 secret = %BLOWFISH_SECRET%
 
-[client_db.file]
+[client_db.ini]
 file = /var/lib/sshproxy/client.db
 
-[acl_db.file]
+[acl_db.ini]
 file = /var/lib/sshproxy/acl.db
 
-[site_db.file]
+[site_db.ini]
 db_path = /var/lib/sshproxy/site.db
diff --git a/net-proxy/sshproxy/files/sshproxyd.initd b/net-proxy/sshproxy/files/sshproxyd.initd
index 02e3bdcc35f0..52dd72a771ee 100644
--- a/net-proxy/sshproxy/files/sshproxyd.initd
+++ b/net-proxy/sshproxy/files/sshproxyd.initd
@@ -7,10 +7,11 @@ depend() {
 
 start() {
 	ebegin "Starting SSH Proxy daemon"
-	start-stop-daemon --start --exec /usr/bin/sshproxyd -- \
+	start-stop-daemon --start --background \
+		--pidfile /var/run/sshproxyd.pid --exec /usr/bin/sshproxyd -- \
 		--daemon --user ${SSHPROXYD_USER:-sshproxy} \
-        --config-dir ${SSHPROXYD_CONFDIR:-/etc/sshproxy} \
-        --pid /var/run/sshproxyd.pid
+		--config-dir ${SSHPROXYD_CONFDIR:-/etc/sshproxy} \
+		--pid /var/run/sshproxyd.pid
 	eend $?
 }
 
diff --git a/net-proxy/sshproxy/sshproxy-0.6.0_beta0.ebuild b/net-proxy/sshproxy/sshproxy-0.6.0_beta0.ebuild
new file mode 100644
index 000000000000..9d5f25898239
--- /dev/null
+++ b/net-proxy/sshproxy/sshproxy-0.6.0_beta0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.6.0_beta0.ebuild,v 1.1 2007/12/11 20:12:23 mrness Exp $
+
+inherit distutils
+
+DESCRIPTION="sshproxy is an ssh gateway to apply ACLs on ssh connections"
+HOMEPAGE="http://sshproxy-project.org/"
+SRC_URI="http://sshproxy-project.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="client-only mysql minimal"
+# mysql: install the mysql_db backend driver
+# minimal: do not install extra plugins
+# client-only: install only the client wrappers
+
+DEPEND="!client-only? (
+			>=dev-python/paramiko-1.6.2
+			mysql? ( >=dev-python/mysql-python-1.2.0 )
+		)"
+RDEPEND="${DEPEND}
+		net-misc/openssh"
+
+pkg_setup() {
+	enewgroup sshproxy
+	enewuser sshproxy -1 -1 /var/lib/sshproxy sshproxy
+}
+
+src_install () {
+	dobin bin/pssh
+	dobin bin/pscp
+	if ! use client-only; then
+		distutils_src_install
+
+		diropts -o sshproxy -g sshproxy -m0750
+		keepdir /var/lib/sshproxy
+		keepdir /var/log/sshproxy
+
+		# Create a default sshproxy.ini
+		dodir /etc/sshproxy
+		insopts -o sshproxy -g sshproxy -m0600
+		insinto /etc/sshproxy
+		doins "${FILESDIR}/sshproxy.ini"
+		local BLOWFISH_SECRET=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
+		sed -i -e "s/%BLOWFISH_SECRET%/${BLOWFISH_SECRET}/" \
+			-e "s/%HOSTNAME%/${HOSTNAME}/" \
+			"${D}/etc/sshproxy/sshproxy.ini"
+
+		rm -rf "${D}/usr/lib/sshproxy/spexpect"
+		if use minimal; then
+			local p
+			for p in acl_funcs console_extra logusers; do
+				rm -rf "${D}/usr/lib/sshproxy/${p}"
+			done
+		else
+			keepdir /var/log/sshproxy/logusers
+			{   # initialize a reasonable value for the logusers plugin
+				echo
+				echo "[logusers]"
+				echo "logdir = /var/log/sshproxy/logusers"
+				echo
+			} >> "${D}/etc/sshproxy/sshproxy.ini"
+		fi
+
+		# init/conf files for sshproxy daemon
+		newinitd "${FILESDIR}/sshproxyd.initd" sshproxyd
+		newconfd "${FILESDIR}/sshproxyd.confd" sshproxyd
+
+		if use mysql; then
+			insinto /usr/share/sshproxy/mysql_db
+			doins misc/mysql_db.sql
+			doins misc/sshproxy-mysql-user.sql
+		else
+			rm -rf "${D}/usr/lib/sshproxy/mysql_db"
+			sed -i -e 's/[ \t]\+mysql//' \
+				"${D}/etc/init.d/sshproxyd"
+		fi
+	fi
+}
+
+pkg_postinst () {
+	if use client-only; then
+		echo
+		einfo "Don't forget to set the following environment variables"
+		einfo "   SSHPROXY_HOST (default to localhost)"
+		einfo "   SSHPROXY_PORT (default to 2242)"
+		einfo "   SSHPROXY_USER (default to \$USER)"
+		einfo "for each sshproxy user."
+	else
+		distutils_pkg_postinst
+
+		echo
+		einfo "If this is your first installation, run"
+		einfo "   emerge --config =${CATEGORY}/${PF}"
+		einfo "to initialize the backend and configure sshproxy."
+		echo
+		einfo "There is no need to install sshproxy on a client machine."
+		einfo "You can connect to a SSH server using this proxy by running"
+		einfo "   ssh -tp PROXY_PORT PROXY_USER@PROXY_HOST -- REMOTE_USER@REMOTE_HOST"
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${ROOT}/usr/lib/sshproxy/mysql_db" ]]; then
+		local PASSWD=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
+		local SHARE="${ROOT}/usr/share/sshproxy/mysql_db"
+		local DB_HOST DB_PORT
+		read -p "Enter the MySQL host (default localhost): " DB_HOST
+		[[ -n "${DB_HOST}" ]] || DB_HOST=localhost
+		read -p "Enter the MySQL port (default 3306): " DB_PORT
+		[[ -n "${DB_PORT}" ]] || DB_PORT=3306
+
+		ewarn "When prompted for a password, enter your MySQL root password"
+		ewarn
+
+		if mysql -h ${DB_HOST} -P ${DB_PORT} -u root -p <<EOF ; then
+CREATE DATABASE sshproxy;
+USE sshproxy;
+$(sed -e "s/sshproxypw/${PASSWD}/g" "${SHARE}/sshproxy-mysql-user.sql")
+$(<"${SHARE}/mysql_db.sql")
+EOF
+
+			{
+				echo
+				echo "[client_db.mysql]"
+				echo "host = ${DB_HOST}"
+				echo "password = ${PASSWD}"
+				echo "db = sshproxy"
+				echo "user = sshproxy"
+				echo "port = ${DB_PORT}"
+				echo
+				echo "[acl_db.mysql]"
+				echo "host = ${DB_HOST}"
+				echo "password = ${PASSWD}"
+				echo "db = sshproxy"
+				echo "user = sshproxy"
+				echo "port = ${DB_PORT}"
+				echo
+				echo "[site_db.mysql]"
+				echo "host = ${DB_HOST}"
+				echo "password = ${PASSWD}"
+				echo "db = sshproxy"
+				echo "user = sshproxy"
+				echo "port = ${DB_PORT}"
+			} >> "${ROOT}/etc/sshproxy/sshproxy.ini"
+
+			sed -i -e 's/^\(\(acl\|client\|site\)_db = \)ini_db/\1mysql_db/g' \
+				"${ROOT}/etc/sshproxy/sshproxy.ini"
+			grep -q "^plugin_list .* mysql_db" \
+				"${ROOT}/etc/sshproxy/sshproxy.ini" || \
+					sed -i -e 's/^\(plugin_list = .*\)$/\1 mysql_db/g' \
+						"${ROOT}/etc/sshproxy/sshproxy.ini"
+		else
+			ewarn "Failed to create MySQL database!"
+			ewarn "If the database already existed and you want to replace it,"
+			ewarn "hit Ctrl-C now and drop the old database by running the command:"
+			ewarn "    /usr/bin/mysqladmin -h ${DB_HOST} -P ${DB_PORT} -u root -p drop sshproxy"
+			read -p "Hit Ctrl-C to stop the procedure or Enter to continue " key
+		fi
+	fi
+
+	INITD_STARTUP="/etc/init.d/sshproxyd start" chroot "${ROOT}" \
+		sshproxy-setup -u sshproxy -c /etc/sshproxy
+}