3 files changed, 81 insertions, 0 deletions

diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 3f647bc78182..6096791061aa 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python25
 PORTVERSION=	2.5.5
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python25/files/patch-Lib-test-test_ioctl.py b/lang/python25/files/patch-Lib-test-test_ioctl.py
new file mode 100644
index 000000000000..b354e097c21a
--- /dev/null
+++ b/lang/python25/files/patch-Lib-test-test_ioctl.py
@@ -0,0 +1,27 @@
+--- Lib/test/test_ioctl.py.orig	2008-08-03 20:45:34.000000000 -0400
++++ Lib/test/test_ioctl.py	2010-06-24 13:26:52.000000000 -0400
+@@ -44,21 +44,12 @@ class IoctlTests(unittest.TestCase):
+             raise TestSkipped('pty module required')
+         mfd, sfd = pty.openpty()
+         try:
+-            if termios.TIOCSWINSZ < 0:
+-                set_winsz_opcode_maybe_neg = termios.TIOCSWINSZ
+-                set_winsz_opcode_pos = termios.TIOCSWINSZ & 0xffffffffL
+-            else:
+-                set_winsz_opcode_pos = termios.TIOCSWINSZ
+-                set_winsz_opcode_maybe_neg, = struct.unpack("i",
+-                        struct.pack("I", termios.TIOCSWINSZ))
+-
++            set_winsz_opcode = termios.TIOCSWINSZ
+             # We're just testing that these calls do not raise exceptions.
+             saved_winsz = fcntl.ioctl(mfd, termios.TIOCGWINSZ, "\0"*8)
+             our_winsz = struct.pack("HHHH",80,25,0,0)
+-            # test both with a positive and potentially negative ioctl code
+-            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz)
+-            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz)
+-            fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, saved_winsz)
++            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz)
++            fcntl.ioctl(mfd, set_winsz_opcode, saved_winsz)
+         finally:
+             os.close(mfd)
+             os.close(sfd)
diff --git a/lang/python25/files/patch-Modules-fcntlmodule.c b/lang/python25/files/patch-Modules-fcntlmodule.c
new file mode 100644
index 000000000000..6a3d1dfe5240
--- /dev/null
+++ b/lang/python25/files/patch-Modules-fcntlmodule.c
@@ -0,0 +1,53 @@
+--- Modules/fcntlmodule.c.orig	2008-08-03 20:45:34.000000000 -0400
++++ Modules/fcntlmodule.c	2010-06-24 22:22:33.000000000 -0400
+@@ -97,20 +97,15 @@
+ {
+ #define IOCTL_BUFSZ 1024
+ 	int fd;
+-	/* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
++	/* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
+ 	   format for the 'code' parameter because Python turns 0x8000000
+ 	   into either a large positive number (PyLong or PyInt on 64-bit
+ 	   platforms) or a negative number on others (32-bit PyInt)
+ 	   whereas the system expects it to be a 32bit bit field value
+ 	   regardless of it being passed as an int or unsigned long on
+-	   various platforms.  See the termios.TIOCSWINSZ constant across
+-	   platforms for an example of thise.
+-
+-	   If any of the 64bit platforms ever decide to use more than 32bits
+-	   in their unsigned long ioctl codes this will break and need
+-	   special casing based on the platform being built on.
++	   various platforms.
+ 	 */
+-	unsigned int code;
++	unsigned long code;
+ 	int arg;
+ 	int ret;
+ 	char *str;
+@@ -118,7 +113,7 @@
+ 	int mutate_arg = 1;
+  	char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
+ 
+-	if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
++	if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",
+                              conv_descriptor, &fd, &code, 
+ 			     &str, &len, &mutate_arg)) {
+ 		char *arg;
+@@ -169,7 +164,7 @@
+ 	}
+ 
+ 	PyErr_Clear();
+-	if (PyArg_ParseTuple(args, "O&Is#:ioctl",
++	if (PyArg_ParseTuple(args, "O&ks#:ioctl",
+                              conv_descriptor, &fd, &code, &str, &len)) {
+ 		if (len > IOCTL_BUFSZ) {
+ 			PyErr_SetString(PyExc_ValueError,
+@@ -191,7 +186,7 @@
+ 	PyErr_Clear();
+ 	arg = 0;
+ 	if (!PyArg_ParseTuple(args,
+-	     "O&I|i;ioctl requires a file or file descriptor,"
++	     "O&k|i;ioctl requires a file or file descriptor,"
+ 	     " an integer and optionally an integer or buffer argument",
+ 			      conv_descriptor, &fd, &code, &arg)) {
+ 	  return NULL;