Added a patch that makes downloading in passive mode possible.

6 files changed, 43 insertions, 8 deletions

diff --git a/net-p2p/dctc/ChangeLog b/net-p2p/dctc/ChangeLog
index dc7555225ac5..0c7913758797 100644
--- a/net-p2p/dctc/ChangeLog
+++ b/net-p2p/dctc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/dctc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.22 2004/01/31 23:14:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.23 2004/02/02 00:10:43 spock Exp $
+
+*dctc-0.85.4 (02 Feb 2004)
+
+  02 Feb 2004; Michal Januszewski <spock@gentoo.org> dctc-0.85.4.ebuild,
+  dctc-0.85.6.ebuild, dctc-0.85.8.ebuild, dctc-0.85.9.ebuild,
+  files/dctc-0.85.6-passive.patch:
+  Added a patch that makes downloading in passive mode possible. Fixed headers
+  in the ebuilds.
 
 *dctc-0.85.9 (01 Feb 2004)
 
diff --git a/net-p2p/dctc/dctc-0.85.4.ebuild b/net-p2p/dctc/dctc-0.85.4.ebuild
index fe26422676cb..2ed216aa0074 100644
--- a/net-p2p/dctc/dctc-0.85.4.ebuild
+++ b/net-p2p/dctc/dctc-0.85.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.4.ebuild,v 1.3 2003/11/03 23:35:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.4.ebuild,v 1.4 2004/02/02 00:10:43 spock Exp $
 
 DESCRIPTION="Direct Connect Text Client, almost famous file share program"
 HOMEPAGE="http://ac2i.tzo.com/dctc/"
diff --git a/net-p2p/dctc/dctc-0.85.6.ebuild b/net-p2p/dctc/dctc-0.85.6.ebuild
index c9d1d0e4754d..3cc6426e325a 100644
--- a/net-p2p/dctc/dctc-0.85.6.ebuild
+++ b/net-p2p/dctc/dctc-0.85.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.6.ebuild,v 1.1 2003/11/03 23:35:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.6.ebuild,v 1.2 2004/02/02 00:10:43 spock Exp $
 
 DESCRIPTION="Direct Connect Text Client, almost famous file share program"
 HOMEPAGE="http://ac2i.tzo.com/dctc/"
diff --git a/net-p2p/dctc/dctc-0.85.8.ebuild b/net-p2p/dctc/dctc-0.85.8.ebuild
index 3f92b2d5593e..2406384e321b 100644
--- a/net-p2p/dctc/dctc-0.85.8.ebuild
+++ b/net-p2p/dctc/dctc-0.85.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.8.ebuild,v 1.2 2004/01/22 01:39:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.8.ebuild,v 1.3 2004/02/02 00:10:43 spock Exp $
 
 DESCRIPTION="Direct Connect Text Client, almost famous file share program"
 HOMEPAGE="http://ac2i.homelinux.com/dctc/"
diff --git a/net-p2p/dctc/dctc-0.85.9.ebuild b/net-p2p/dctc/dctc-0.85.9.ebuild
index b518d12a5aa1..263abe11e417 100644
--- a/net-p2p/dctc/dctc-0.85.9.ebuild
+++ b/net-p2p/dctc/dctc-0.85.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.1 2004/01/31 23:14:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.2 2004/02/02 00:10:43 spock Exp $
 
 DESCRIPTION="Direct Connect Text Client, almost famous file share program"
 HOMEPAGE="http://ac2i.homelinux.com/dctc/"
@@ -21,6 +21,8 @@ src_unpack() {
 	if [ "${dbfunc}" != "db_env_create" ] ; then
 		sed -i "s:db_env_create:${dbfunc}:g" configure
 	fi
+
+	epatch ${FILESDIR}/dctc-0.85.6-passive.patch
 }
 
 src_install() {
diff --git a/net-p2p/dctc/files/dctc-0.85.6-passive.patch b/net-p2p/dctc/files/dctc-0.85.6-passive.patch
new file mode 100644
index 000000000000..65775e2acf38
--- /dev/null
+++ b/net-p2p/dctc/files/dctc-0.85.6-passive.patch
@@ -0,0 +1,25 @@
+diff -Naur dctc-0.86.6-orig/src/keyboard_master.c dctc-0.85.6/src/keyboard_master.c
+--- dctc-0.86.6-orig/src/keyboard_master.c	2003-10-01 19:16:35.000000000 +0200
++++ dctc-0.85.6/src/keyboard_master.c	2003-11-02 15:36:43.000000000 +0100
+@@ -238,12 +238,15 @@
+ 			{	/* we are behind a firewall */
+ 				/* so, the remote side wont be able to contact us */
+ 				/* let's ask a reverse connection */
+-				if(!user_in_list(hub_user_list,fields[2]))		/* if the user is not here and we are behind a firewall, we cannot do anything */
+-					goto abrt;
+-
+-				LOCK_READ(user_info);
+-				send_dc_line(sck,"$RevConnectToMe",nickname,fields[2],NULL);
+-				UNLOCK_READ(user_info);
++				if(user_in_list(hub_user_list,fields[2])) {
++					LOCK_READ(user_info);
++					send_dc_line(sck,"$RevConnectToMe",nickname,fields[2],NULL);
++					UNLOCK_READ(user_info);
++				} else {
++					/* try a conditionnal download on other client */
++					send_dc_line_to_dctc_link(fields[2],sck,"$RevConnectToMe",nickname,fields[2],NULL);
++				}
++				
+ 				disp_msg(DEBUG_MSG,"","/XDL in $RevConnectToMe",NULL);
+ 			}
+ 			else