Index: lang/python24/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/python24/Makefile,v retrieving revision 1.170 diff -u -r1.170 Makefile --- lang/python24/Makefile 26 Nov 2009 14:04:19 -0000 1.170 +++ lang/python24/Makefile 25 Jun 2010 02:33:38 -0000 @@ -7,7 +7,7 @@ PORTNAME= python24 PORTVERSION= 2.4.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Index: lang/python24/files/patch-Modules-fcntlmodule.c =================================================================== RCS file: lang/python24/files/patch-Modules-fcntlmodule.c diff -N lang/python24/files/patch-Modules-fcntlmodule.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python24/files/patch-Modules-fcntlmodule.c 25 Jun 2010 02:33:38 -0000 @@ -0,0 +1,38 @@ +--- Modules/fcntlmodule.c.orig 2006-09-27 15:17:32.000000000 -0400 ++++ Modules/fcntlmodule.c 2010-06-24 21:15:48.000000000 -0400 +@@ -95,7 +95,7 @@ + { + #define IOCTL_BUFSZ 1024 + int fd; +- int code; ++ unsigned long code; + int arg; + int ret; + char *str; +@@ -103,7 +103,7 @@ + int mutate_arg = 0; + 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; +@@ -164,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, +@@ -186,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 a integer or buffer argument", + conv_descriptor, &fd, &code, &arg)) { + return NULL; Index: lang/python25/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/python25/Makefile,v retrieving revision 1.159 diff -u -r1.159 Makefile --- lang/python25/Makefile 2 Feb 2010 22:00:24 -0000 1.159 +++ lang/python25/Makefile 25 Jun 2010 02:33:39 -0000 @@ -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} Index: lang/python25/files/patch-Lib-test-test_ioctl.py =================================================================== RCS file: lang/python25/files/patch-Lib-test-test_ioctl.py diff -N lang/python25/files/patch-Lib-test-test_ioctl.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python25/files/patch-Lib-test-test_ioctl.py 25 Jun 2010 02:33:39 -0000 @@ -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) Index: lang/python25/files/patch-Modules-fcntlmodule.c =================================================================== RCS file: lang/python25/files/patch-Modules-fcntlmodule.c diff -N lang/python25/files/patch-Modules-fcntlmodule.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python25/files/patch-Modules-fcntlmodule.c 25 Jun 2010 02:33:39 -0000 @@ -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; Index: lang/python26/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/python26/Makefile,v retrieving revision 1.166 diff -u -r1.166 Makefile --- lang/python26/Makefile 12 May 2010 12:13:06 -0000 1.166 +++ lang/python26/Makefile 25 Jun 2010 02:33:39 -0000 @@ -6,6 +6,7 @@ PORTNAME= python26 PORTVERSION= 2.6.5 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Index: lang/python26/files/patch-Doc-library-fcntl.rst =================================================================== RCS file: lang/python26/files/patch-Doc-library-fcntl.rst diff -N lang/python26/files/patch-Doc-library-fcntl.rst --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python26/files/patch-Doc-library-fcntl.rst 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,11 @@ +--- Doc/library/fcntl.rst.orig 2009-10-27 10:29:22.000000000 -0400 ++++ Doc/library/fcntl.rst 2010-06-24 22:28:28.000000000 -0400 +@@ -50,8 +50,6 @@ + operations are typically defined in the library module :mod:`termios` and the + argument handling is even more complicated. + +- The op parameter is limited to values that can fit in 32-bits. +- + The parameter *arg* can be one of an integer, absent (treated identically to the + integer ``0``), an object supporting the read-only buffer interface (most likely + a plain Python string) or an object supporting the read-write buffer interface. Index: lang/python26/files/patch-Lib-test-test_ioctl.py =================================================================== RCS file: lang/python26/files/patch-Lib-test-test_ioctl.py diff -N lang/python26/files/patch-Lib-test-test_ioctl.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python26/files/patch-Lib-test-test_ioctl.py 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,23 @@ +--- Lib/test/test_ioctl.py.orig 2008-05-24 05:36:45.000000000 -0400 ++++ Lib/test/test_ioctl.py 2010-06-24 13:29:31.000000000 -0400 +@@ -44,18 +44,9 @@ 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 + 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) ++ new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz) + finally: + os.close(mfd) + os.close(sfd) Index: lang/python26/files/patch-Modules-fcntlmodule.c =================================================================== RCS file: lang/python26/files/patch-Modules-fcntlmodule.c diff -N lang/python26/files/patch-Modules-fcntlmodule.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python26/files/patch-Modules-fcntlmodule.c 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,53 @@ +--- Modules/fcntlmodule.c.orig 2009-05-24 11:41:43.000000000 -0400 ++++ Modules/fcntlmodule.c 2010-06-24 22:27:04.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; Index: lang/python31/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/python31/Makefile,v retrieving revision 1.166 diff -u -r1.166 Makefile --- lang/python31/Makefile 12 May 2010 12:13:06 -0000 1.166 +++ lang/python31/Makefile 25 Jun 2010 02:33:39 -0000 @@ -6,6 +6,7 @@ PORTNAME= python31 PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Index: lang/python31/files/patch-Doc-library-fcntl.rst =================================================================== RCS file: lang/python31/files/patch-Doc-library-fcntl.rst diff -N lang/python31/files/patch-Doc-library-fcntl.rst --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python31/files/patch-Doc-library-fcntl.rst 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,11 @@ +--- Doc/library/fcntl.rst.orig 2009-06-08 09:41:29.000000000 -0400 ++++ Doc/library/fcntl.rst 2010-06-24 22:31:02.000000000 -0400 +@@ -48,8 +48,6 @@ + This function is identical to the :func:`fcntl` function, except that the + argument handling is even more complicated. + +- The op parameter is limited to values that can fit in 32-bits. +- + The parameter *arg* can be one of an integer, absent (treated identically to the + integer ``0``), an object supporting the read-only buffer interface (most likely + a plain Python string) or an object supporting the read-write buffer interface. Index: lang/python31/files/patch-Lib-test-test_fcntl.py =================================================================== RCS file: lang/python31/files/patch-Lib-test-test_fcntl.py diff -N lang/python31/files/patch-Lib-test-test_fcntl.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python31/files/patch-Lib-test-test_fcntl.py 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,11 @@ +--- Lib/test/test_fcntl.py.orig 2009-05-24 11:46:13.000000000 -0400 ++++ Lib/test/test_fcntl.py 2010-06-24 13:56:52.000000000 -0400 +@@ -29,7 +29,7 @@ + if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', + 'Darwin1.2', 'darwin', + 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', +- 'freebsd6', 'freebsd7', 'freebsd8', ++ 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', + 'bsdos2', 'bsdos3', 'bsdos4', + 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'): + if struct.calcsize('l') == 8: Index: lang/python31/files/patch-Lib-test-test_ioctl.py =================================================================== RCS file: lang/python31/files/patch-Lib-test-test_ioctl.py diff -N lang/python31/files/patch-Lib-test-test_ioctl.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python31/files/patch-Lib-test-test_ioctl.py 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,23 @@ +--- Lib/test/test_ioctl.py.orig 2009-08-13 04:51:18.000000000 -0400 ++++ Lib/test/test_ioctl.py 2010-06-24 13:35:29.000000000 -0400 +@@ -41,18 +41,9 @@ class IoctlTests(unittest.TestCase): + raise unittest.SkipTest('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 & 0xffffffff +- 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 + 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) ++ new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz) + finally: + os.close(mfd) + os.close(sfd) Index: lang/python31/files/patch-Lib-test-test_socket.py =================================================================== RCS file: lang/python31/files/patch-Lib-test-test_socket.py diff -N lang/python31/files/patch-Lib-test-test_socket.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python31/files/patch-Lib-test-test_socket.py 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,11 @@ +--- Lib/test/test_socket.py.orig 2009-10-04 10:54:52.000000000 -0400 ++++ Lib/test/test_socket.py 2010-06-24 13:57:37.000000000 -0400 +@@ -337,7 +337,7 @@ + # I've ordered this by protocols that have both a tcp and udp + # protocol, at least for modern Linuxes. + if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7', 'freebsd8', 'darwin'): ++ 'freebsd7', 'freebsd8', 'freebsd9', 'darwin'): + # avoid the 'echo' service on this platform, as there is an + # assumption breaking non-standard port/protocol entry + services = ('daytime', 'qotd', 'domain') Index: lang/python31/files/patch-Modules-fcntlmodule.c =================================================================== RCS file: lang/python31/files/patch-Modules-fcntlmodule.c diff -N lang/python31/files/patch-Modules-fcntlmodule.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/python31/files/patch-Modules-fcntlmodule.c 25 Jun 2010 02:33:39 -0000 @@ -0,0 +1,53 @@ +--- Modules/fcntlmodule.c.orig 2009-05-24 11:46:13.000000000 -0400 ++++ Modules/fcntlmodule.c 2010-06-24 22:30:32.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; + Py_buffer pstr; +@@ -119,7 +114,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, + &pstr, &mutate_arg)) { + char *arg; +@@ -174,7 +169,7 @@ + } + + PyErr_Clear(); +- if (PyArg_ParseTuple(args, "O&Is*:ioctl", ++ if (PyArg_ParseTuple(args, "O&ks*:ioctl", + conv_descriptor, &fd, &code, &pstr)) { + str = pstr.buf; + len = pstr.len; +@@ -201,7 +196,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;