Fixed FCNTL problem with Python 2.4 bug# 95533

Package-Manager: portage-2.0.51.22-r1

6 files changed, 90 insertions, 7 deletions

diff --git a/net-misc/fsh/ChangeLog b/net-misc/fsh/ChangeLog
index 312407046b4b..0d3bee98391a 100644
--- a/net-misc/fsh/ChangeLog
+++ b/net-misc/fsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/fsh
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/ChangeLog,v 1.7 2004/09/16 15:27:44 blubb Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/ChangeLog,v 1.8 2005/06/09 16:22:50 pythonhead Exp $
+
+*fsh-1.2-r2 (09 Jun 2005)
+
+  09 Jun 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/fsh-1.2-gentoo-fcntl.patch, fsh-1.2-r1.ebuild, +fsh-1.2-r2.ebuild:
+  Fixed FCNTL problem with Python 2.4 bug# 95533
 
   16 Sep 2004; <blubb@gentoo.org> fsh-1.2-r1.ebuild:
   added ~amd64
diff --git a/net-misc/fsh/Manifest b/net-misc/fsh/Manifest
index 0ae9bb263ed0..41caeba402b3 100644
--- a/net-misc/fsh/Manifest
+++ b/net-misc/fsh/Manifest
@@ -1,4 +1,7 @@
-MD5 44e4780665a2310cb48c0c9972ff4b64 ChangeLog 759
-MD5 3f0e22b6d98cc197f7628fc127149d60 fsh-1.2-r1.ebuild 831
+MD5 a7c36b9bf564165c3b8f03195e1a2db9 ChangeLog 970
+MD5 9e68c6c5f6569227db760ed87c70ef4b fsh-1.2-r1.ebuild 841
+MD5 3e381af6a53567fde6bd0564ced968e8 fsh-1.2-r2.ebuild 910
+MD5 300b043054e7206e2a05f8e11653b65a files/fsh-1.2-gentoo-fcntl.patch 1198
 MD5 b784b126706d26f48759c60d6b2a5c45 files/digest-fsh-1.2-r1 59
 MD5 2822dfff6a02066868da8c3ab1ccc775 files/fsh-1.2-fcpwrap.patch 460
+MD5 b784b126706d26f48759c60d6b2a5c45 files/digest-fsh-1.2-r2 59
diff --git a/net-misc/fsh/files/digest-fsh-1.2-r2 b/net-misc/fsh/files/digest-fsh-1.2-r2
new file mode 100644
index 000000000000..1b2164e12be6
--- /dev/null
+++ b/net-misc/fsh/files/digest-fsh-1.2-r2
@@ -0,0 +1 @@
+MD5 74d7fc65044d1c9c27c6e9edbbde9c68 fsh-1.2.tar.gz 152374
diff --git a/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch b/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch
new file mode 100644
index 000000000000..4c76c9fe43c6
--- /dev/null
+++ b/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch
@@ -0,0 +1,37 @@
+--- fsh-1.2/fshcompat.py.orig	2001-12-23 22:08:26.000000000 +1100
++++ fsh-1.2/fshcompat.py
+@@ -52,20 +52,23 @@ except:
+ # in Python 2.2 as a bug.  See <URL:http://sourceforge.net/tracker/
+ # ?func=detail&aid=496171&group_id=5470&atid=105470>.
+ try:
+-    # Stop Python 2.2 from warning that we import a deprecated module.
+-    # But Python 1.5.2 doesn't have the warnings module, so be prepared
+-    # for the import statement to fail.
+     try:
+-        import warnings
+-        warnings.filterwarnings(
+-            "ignore",
+-            "the FCNTL module is deprecated; please use fcntl",
+-            DeprecationWarning)
+-    except ImportError:
+-        pass
++	FD_CLOEXEC = fcntl.FD_CLOEXEC
++    except:
++	# Stop Python 2.2 from warning that we import a deprecated module.
++	# But Python 1.5.2 doesn't have the warnings module, so be prepared
++	# for the import statement to fail.
++	try:
++	    import warnings
++	    warnings.filterwarnings(
++		"ignore",
++		"the FCNTL module is deprecated; please use fcntl",
++		DeprecationWarning)
++	except ImportError:
++	    pass
+ 
+-    import FCNTL
+-    FD_CLOEXEC = FCNTL.FD_CLOEXEC
++	import FCNTL
++	FD_CLOEXEC = FCNTL.FD_CLOEXEC
+ 
+ except AttributeError:
diff --git a/net-misc/fsh/fsh-1.2-r1.ebuild b/net-misc/fsh/fsh-1.2-r1.ebuild
index 5c056bed61a1..20523133cd05 100644
--- a/net-misc/fsh/fsh-1.2-r1.ebuild
+++ b/net-misc/fsh/fsh-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r1.ebuild,v 1.4 2004/09/16 15:27:44 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r1.ebuild,v 1.5 2005/06/09 16:22:50 pythonhead Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND="net-misc/openssh
-	dev-lang/python"
+	<dev-lang/python-2.4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/fsh/fsh-1.2-r2.ebuild b/net-misc/fsh/fsh-1.2-r2.ebuild
new file mode 100644
index 000000000000..cc369714569c
--- /dev/null
+++ b/net-misc/fsh/fsh-1.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r2.ebuild,v 1.1 2005/06/09 16:22:50 pythonhead Exp $
+
+inherit eutils
+
+DESCRIPTION="System to allow fast-reuse of a ssh secure tunnel to avoid connection lag"
+HOMEPAGE="http://www.lysator.liu.se/fsh/"
+SRC_URI="http://www.lysator.liu.se/fsh/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="net-misc/openssh
+	dev-lang/python"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix scp invocation parsing when user@host is used
+	epatch ${FILESDIR}/${P}-fcpwrap.patch
+	# Python 2.4 FCNTL problem:
+	epatch ${FILESDIR}/${P}-gentoo-fcntl.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr --infodir=/usr/share/info
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO
+}