Add !net-misc/putty dependency atom (#248193).

Package-Manager: portage-2.1.4.5

5 files changed, 18 insertions, 189 deletions

diff --git a/net-proxy/sshproxy/ChangeLog b/net-proxy/sshproxy/ChangeLog
index eb74ad449bc8..110061d63840 100644
--- a/net-proxy/sshproxy/ChangeLog
+++ b/net-proxy/sshproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/sshproxy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.10 2008/08/23 02:56:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.11 2008/12/14 14:36:51 mrness Exp $
+
+  14 Dec 2008; Alin Năstac <mrness@gentoo.org> sshproxy-0.5.0.ebuild,
+  -sshproxy-0.6.0_beta1.ebuild, sshproxy-0.6.0_beta2.ebuild:
+  Add !net-misc/putty dependency atom (#248193).
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-proxy/sshproxy/Manifest b/net-proxy/sshproxy/Manifest
index cd4e90e49f31..0346fe43fef6 100644
--- a/net-proxy/sshproxy/Manifest
+++ b/net-proxy/sshproxy/Manifest
@@ -5,17 +5,15 @@ AUX sshproxy.ini 493 RMD160 a3374b25ca48b9e06def302ca6ccf490893487ce SHA1 270465
 AUX sshproxyd.confd 195 RMD160 fb23a5667dfde2477c7f4213d597b39bcd811315 SHA1 d7f89bdea160a05a58e6905677a279b872db3bc7 SHA256 a7fdc26b308d71a4ff1c2070af0bff241f766f0492570384e00edf4b3234ed73
 AUX sshproxyd.initd 482 RMD160 aecb78a75b9587274eba286bea9d615d75741c79 SHA1 ab19155320d0bb25ca4b63bde20155b4f2756a6c SHA256 4e4975ce221053ef50af497625d9fc9c3a5b37a2b22b295ace1c202a18ccd324
 DIST sshproxy-0.5.0.tar.gz 108834 RMD160 786a8b2708329ec5e91657cc20479928f73e2b22 SHA1 9a401bde8a26aa5cfcb1be1d5f745a9fb8699e5a SHA256 a5f091fc389696cfe618466b61e76559a36ee503b6ce7855089050900021caa8
-DIST sshproxy-0.6.0_beta1.tar.gz 126571 RMD160 69a97500c958b318ceaa71234d86fb8cc12da1cb SHA1 73b01a73374186f0514e0083e2d8301db000d05c SHA256 0f05766603ea02afa2eec393e14ecd0b15e6c4a08f14c730af9b543f3a94190b
 DIST sshproxy-0.6.0_beta2.tar.gz 131958 RMD160 41d26950bfed9a938254d49cef960d5c7149775f SHA1 cf20fc7a1df59518ab87d61b8e1e79d3f5140e68 SHA256 c36fbd22d1315f290a9bfefa176bc29c82e0bf450a75a1bd0a09cfa54b08363c
-EBUILD sshproxy-0.5.0.ebuild 5062 RMD160 e64ec2f45630011933af21f9e971b4e6a139e672 SHA1 6d62457ebd0f43e3a6e7c977387b297bc62798ba SHA256 fc8c64d405cd7735eb74d4944ac839880c2b76ad64c5c0425416974fb6e5f6a7
-EBUILD sshproxy-0.6.0_beta1.ebuild 5251 RMD160 762e2401edba414c9e842812edba760cfeb19182 SHA1 5ac17b79e3a1f4b91b4a95626401cf501d013e40 SHA256 89fcf041ec0dc96b29290ce165bb952ba780c6277d63a0c84c91463b41206f90
-EBUILD sshproxy-0.6.0_beta2.ebuild 5288 RMD160 7464072df0adc1d90e21520d2836456b932627d1 SHA1 24f25b7e33a6eab552bb63ada991934ae4236c99 SHA256 5d70a0ec9d444ed745661ab5271bd305b227401887b8978070e4e826953b7e06
-MISC ChangeLog 1824 RMD160 9744c5c6063f06467f1324c48fc866d318415ecd SHA1 6b3351337afacc058d23f093d27e084a0396c8ab SHA256 441cca99e41e420051a08ef55095935e04a263f31eb760f9de8f73890e42a089
+EBUILD sshproxy-0.5.0.ebuild 5079 RMD160 11d6d7707747dd805382c49b1b5e7ee0ffb20879 SHA1 3bdc955d0b46bb15ad307737bed9a1e61ad2698b SHA256 ce80161e5b5af76c9825151d10f1b5eaf181c63f45275d2eed0f8c06cf229fb9
+EBUILD sshproxy-0.6.0_beta2.ebuild 5305 RMD160 a6d208bdebf0400bae23d19c6e2f06044369c133 SHA1 e81200e617ae85435f2ac376060afa55fbbeb813 SHA256 e5fe553f3d3b917b51724282f3287aff4968573e93f6b5e15a212c42bf53c043
+MISC ChangeLog 2006 RMD160 b22e70f47b05bb0b11f2e6ce8b9f87a591481192 SHA1 cfbc80a16fa57d17a4f3dc40365dbe51b55c6077 SHA256 55e6028aa68029a8e8b1dc2537f316c083aeb1a673669d6aa0017fc028732640
 MISC metadata.xml 1312 RMD160 e7a0347ffb24c7a778bfffe3b38c1ce975e1f6f4 SHA1 be0b8a2cd9c1fd285c3b9887a480b6084c05ec37 SHA256 ea82f5e499eaeddd423b2bfa77a06193ff7257477e49164a97314751724baef7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivfGIACgkQoeSe8B0zEfwbOQCeNBudpylxkQR2O+x81G2xT16u
-dTYAmwchLm0HsT1nrZ2i26PETLNGi+uZ
-=rpUJ
+iEYEARECAAYFAklFGg8ACgkQPrHvTlXvhts/qQCfZnQe5XXoxYiaLVjCTEC9Vpit
+RU4AoKn5SViiQkrZbBZnGhsG0qZ9PBRX
+=t8dO
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/sshproxy/sshproxy-0.5.0.ebuild b/net-proxy/sshproxy/sshproxy-0.5.0.ebuild
index 490fca3b2d95..56d3e5d8a736 100644
--- a/net-proxy/sshproxy/sshproxy-0.5.0.ebuild
+++ b/net-proxy/sshproxy/sshproxy-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.5.0.ebuild,v 1.3 2007/11/04 08:25:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.5.0.ebuild,v 1.4 2008/12/14 14:36:51 mrness Exp $
 
 inherit distutils
 
@@ -17,7 +17,8 @@ IUSE="client-only mysql minimal"
 # minimal: do not install extra plugins
 # client-only: install only the client wrappers
 
-DEPEND="!client-only? (
+DEPEND="!net-misc/putty
+	!client-only? (
 			>=dev-python/paramiko-1.6.2
 			mysql? ( >=dev-python/mysql-python-1.2.0 )
 		)"
diff --git a/net-proxy/sshproxy/sshproxy-0.6.0_beta1.ebuild b/net-proxy/sshproxy/sshproxy-0.6.0_beta1.ebuild
deleted file mode 100644
index 41d1a5868bf9..000000000000
--- a/net-proxy/sshproxy/sshproxy-0.6.0_beta1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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_beta1.ebuild,v 1.1 2007/12/27 08:48:00 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
-
-		# install manpages
-		doman doc/pscp.1
-		doman doc/pssh.1
-		if ! use client-only; then
-			doman doc/sshproxy.ini.5
-			doman doc/sshproxy-setup.8
-			doman doc/sshproxyd.8
-		fi
-
-		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 () {
-	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."
-	if ! use client-only; then
-		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
-}
diff --git a/net-proxy/sshproxy/sshproxy-0.6.0_beta2.ebuild b/net-proxy/sshproxy/sshproxy-0.6.0_beta2.ebuild
index de61df628f0c..749adaa7e865 100644
--- a/net-proxy/sshproxy/sshproxy-0.6.0_beta2.ebuild
+++ b/net-proxy/sshproxy/sshproxy-0.6.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_beta2.ebuild,v 1.1 2008/01/29 10:37:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.6.0_beta2.ebuild,v 1.2 2008/12/14 14:36:51 mrness Exp $
 
 inherit distutils
 
@@ -17,7 +17,8 @@ IUSE="client-only mysql minimal"
 # minimal: do not install extra plugins
 # client-only: install only the client wrappers
 
-DEPEND="!client-only? (
+DEPEND="!net-misc/putty
+	!client-only? (
 			>=dev-python/paramiko-1.6.2
 			mysql? ( >=dev-python/mysql-python-1.2.0 )
 		)"