[pkgsrc/trunk]: pkgsrc/security/fsh Extend "fshcompat.py" to work with python...

[fredb <fredb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ce1ea43e399
branches:  trunk
changeset: 490795:9ce1ea43e399
user:      fredb <fredb%pkgsrc.org@localhost>
date:      Sun Mar 20 12:51:54 2005 +0000

description:
Extend "fshcompat.py" to work with python24, using patch submitted by
lukem in PR pkg/29704. Reviewed by recht.

diffstat:

 security/fsh/Makefile         |   3 ++-
 security/fsh/distinfo         |   3 ++-
 security/fsh/patches/patch-aa |  40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diffs (68 lines):

diff -r 27df12535e42 -r 9ce1ea43e399 security/fsh/Makefile
--- a/security/fsh/Makefile     Sun Mar 20 12:51:34 2005 +0000
+++ b/security/fsh/Makefile     Sun Mar 20 12:51:54 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/08/09 11:21:54 seb Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/20 12:51:54 fredb Exp $
 #
 
 DISTNAME=      fsh-1.2
+PKGREVISION=   1
 CATEGORIES=    security net
 MASTER_SITES=  ftp://ftp.lysator.liu.se/pub/unix/fsh/ \
                http://www.lysator.liu.se/fsh/
diff -r 27df12535e42 -r 9ce1ea43e399 security/fsh/distinfo
--- a/security/fsh/distinfo     Sun Mar 20 12:51:34 2005 +0000
+++ b/security/fsh/distinfo     Sun Mar 20 12:51:54 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/03/20 12:51:54 fredb Exp $
 
 SHA1 (fsh-1.2.tar.gz) = c2f1e923076d368fbb5504dcd1d33c74024b0d1b
 RMD160 (fsh-1.2.tar.gz) = 41f20e5a4001851d2cadc6909b72a17a270acfd2
 Size (fsh-1.2.tar.gz) = 152374 bytes
+SHA1 (patch-aa) = 369d409cf63c77780f15234e22103762a036cc0f
diff -r 27df12535e42 -r 9ce1ea43e399 security/fsh/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/fsh/patches/patch-aa     Sun Mar 20 12:51:54 2005 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2005/03/20 12:51:54 fredb Exp $
+
+--- fshcompat.py.orig  2001-12-23 05:08:26.000000000 -0600
++++ 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:
+