Fix fcntl.ioctl argument parsing to accept termios.TIOCGWINSZ.

Submitted by:	jkim
Obtained from:	Python CVS

4 files changed, 72 insertions, 2 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 3ed91aa7f7ad..b386300ad03c 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python/files/patch-Modules::fcntlmodule.c b/lang/python/files/patch-Modules::fcntlmodule.c
new file mode 100644
index 000000000000..c9ae38a1759b
--- /dev/null
+++ b/lang/python/files/patch-Modules::fcntlmodule.c
@@ -0,0 +1,35 @@
+Index: Modules/fcntlmodule.c
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
+retrieving revision 2.43
+retrieving revision 2.44
+diff -u -r2.43 -r2.44
+--- Modules/fcntlmodule.c	30 Nov 2004 14:31:54 -0000	2.43
++++ Modules/fcntlmodule.c	27 Jul 2005 20:24:30 -0000	2.44
+@@ -102,7 +102,7 @@
+ 	int mutate_arg = 1;
+ 	char buf[1024];
+ 
+-	if (PyArg_ParseTuple(args, "O&iw#|i:ioctl",
++	if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
+                              conv_descriptor, &fd, &code, 
+ 			     &str, &len, &mutate_arg)) {
+ 		char *arg;
+@@ -151,7 +151,7 @@
+ 	}
+ 
+ 	PyErr_Clear();
+-	if (PyArg_ParseTuple(args, "O&is#:ioctl",
++	if (PyArg_ParseTuple(args, "O&Is#:ioctl",
+                              conv_descriptor, &fd, &code, &str, &len)) {
+ 		if (len > sizeof buf) {
+ 			PyErr_SetString(PyExc_ValueError,
+@@ -172,7 +172,7 @@
+ 	PyErr_Clear();
+ 	arg = 0;
+ 	if (!PyArg_ParseTuple(args,
+-	     "O&i|i;ioctl requires a file or file descriptor,"
++	     "O&I|i;ioctl requires a file or file descriptor,"
+ 	     " an integer and optionally a integer or buffer argument",
+ 			      conv_descriptor, &fd, &code, &arg)) {
+ 	  return NULL;
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 3ed91aa7f7ad..b386300ad03c 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python24/files/patch-Modules::fcntlmodule.c b/lang/python24/files/patch-Modules::fcntlmodule.c
new file mode 100644
index 000000000000..c9ae38a1759b
--- /dev/null
+++ b/lang/python24/files/patch-Modules::fcntlmodule.c
@@ -0,0 +1,35 @@
+Index: Modules/fcntlmodule.c
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
+retrieving revision 2.43
+retrieving revision 2.44
+diff -u -r2.43 -r2.44
+--- Modules/fcntlmodule.c	30 Nov 2004 14:31:54 -0000	2.43
++++ Modules/fcntlmodule.c	27 Jul 2005 20:24:30 -0000	2.44
+@@ -102,7 +102,7 @@
+ 	int mutate_arg = 1;
+ 	char buf[1024];
+ 
+-	if (PyArg_ParseTuple(args, "O&iw#|i:ioctl",
++	if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
+                              conv_descriptor, &fd, &code, 
+ 			     &str, &len, &mutate_arg)) {
+ 		char *arg;
+@@ -151,7 +151,7 @@
+ 	}
+ 
+ 	PyErr_Clear();
+-	if (PyArg_ParseTuple(args, "O&is#:ioctl",
++	if (PyArg_ParseTuple(args, "O&Is#:ioctl",
+                              conv_descriptor, &fd, &code, &str, &len)) {
+ 		if (len > sizeof buf) {
+ 			PyErr_SetString(PyExc_ValueError,
+@@ -172,7 +172,7 @@
+ 	PyErr_Clear();
+ 	arg = 0;
+ 	if (!PyArg_ParseTuple(args,
+-	     "O&i|i;ioctl requires a file or file descriptor,"
++	     "O&I|i;ioctl requires a file or file descriptor,"
+ 	     " an integer and optionally a integer or buffer argument",
+ 			      conv_descriptor, &fd, &code, &arg)) {
+ 	  return NULL;