summaryrefslogtreecommitdiff
path: root/lang/python32/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python32/files')
-rw-r--r--lang/python32/files/patch-Doc-library-fcntl.rst11
-rw-r--r--lang/python32/files/patch-Lib-test-test_fcntl.py11
-rw-r--r--lang/python32/files/patch-Lib-test-test_ioctl.py23
-rw-r--r--lang/python32/files/patch-Lib-test-test_socket.py11
-rw-r--r--lang/python32/files/patch-Lib-test_regrtest.py10
-rw-r--r--lang/python32/files/patch-Modules-_ctypes-libffi-configure11
-rw-r--r--lang/python32/files/patch-Modules-fcntlmodule.c53
-rw-r--r--lang/python32/files/patch-setup.py91
8 files changed, 0 insertions, 221 deletions
diff --git a/lang/python32/files/patch-Doc-library-fcntl.rst b/lang/python32/files/patch-Doc-library-fcntl.rst
deleted file mode 100644
index 46c072e1c062..000000000000
--- a/lang/python32/files/patch-Doc-library-fcntl.rst
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
diff --git a/lang/python32/files/patch-Lib-test-test_fcntl.py b/lang/python32/files/patch-Lib-test-test_fcntl.py
deleted file mode 100644
index 62104a2da20e..000000000000
--- a/lang/python32/files/patch-Lib-test-test_fcntl.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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:
diff --git a/lang/python32/files/patch-Lib-test-test_ioctl.py b/lang/python32/files/patch-Lib-test-test_ioctl.py
deleted file mode 100644
index 2488bc755583..000000000000
--- a/lang/python32/files/patch-Lib-test-test_ioctl.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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)
diff --git a/lang/python32/files/patch-Lib-test-test_socket.py b/lang/python32/files/patch-Lib-test-test_socket.py
deleted file mode 100644
index 4895d7bc5fc8..000000000000
--- a/lang/python32/files/patch-Lib-test-test_socket.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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')
diff --git a/lang/python32/files/patch-Lib-test_regrtest.py b/lang/python32/files/patch-Lib-test_regrtest.py
deleted file mode 100644
index d10cb99056e6..000000000000
--- a/lang/python32/files/patch-Lib-test_regrtest.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- Lib/test/regrtest.py.orgi 2009-11-26 13:29:08.000000000 +0100
-+++ Lib/test/regrtest.py 2009-11-26 13:29:37.000000000 +0100
-@@ -1146,6 +1146,7 @@
- _expectations['freebsd6'] = _expectations['freebsd4']
- _expectations['freebsd7'] = _expectations['freebsd4']
- _expectations['freebsd8'] = _expectations['freebsd4']
-+_expectations['freebsd9'] = _expectations['freebsd4']
-
- class _ExpectedSkips:
- def __init__(self):
diff --git a/lang/python32/files/patch-Modules-_ctypes-libffi-configure b/lang/python32/files/patch-Modules-_ctypes-libffi-configure
deleted file mode 100644
index c788e1813719..000000000000
--- a/lang/python32/files/patch-Modules-_ctypes-libffi-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900
-+++ Modules/_ctypes/libffi/configure 2008-10-09 20:24:02.000000000 +0900
-@@ -4725,7 +4725,7 @@
- rm -rf conftest*
- ;;
-
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
diff --git a/lang/python32/files/patch-Modules-fcntlmodule.c b/lang/python32/files/patch-Modules-fcntlmodule.c
deleted file mode 100644
index 3803ad427fbe..000000000000
--- a/lang/python32/files/patch-Modules-fcntlmodule.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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;
diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
deleted file mode 100644
index 5f78c13849a4..000000000000
--- a/lang/python32/files/patch-setup.py
+++ /dev/null
@@ -1,91 +0,0 @@
---- setup.py.orig 2009-08-12 20:39:44.000000000 +0200
-+++ setup.py 2009-11-26 12:58:45.000000000 +0100
-@@ -16,7 +16,7 @@
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_sqlite3", "_tkinter", "_gdbm"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -514,7 +514,7 @@
-
- readline_libs = ['readline']
- if self.compiler.find_library_file(lib_dirs,
-- 'ncursesw'):
-+ 'XXXncursesw'):
- readline_libs.append('ncursesw')
- elif self.compiler.find_library_file(lib_dirs,
- 'ncurses'):
-@@ -526,7 +526,7 @@
- 'termcap'):
- readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/lib', '/usr/lib/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs) )
- else:
-@@ -619,6 +619,8 @@
- # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
- exts.append( Extension('_sha256', ['sha256module.c']) )
- exts.append( Extension('_sha512', ['sha512module.c']) )
-+ else:
-+ open('.without_own_sha', 'w')
-
- if openssl_ver < 0x00907000:
- # no openssl at all, use our own md5 and sha1
-@@ -994,7 +996,7 @@
- # Curses support, requiring the System V version of curses, often
- # provided by the ncurses library.
- panel_library = 'panel'
-- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
-+ if (self.compiler.find_library_file(lib_dirs, 'XXXncursesw')):
- curses_libs = ['ncursesw']
- # Bug 1464056: If _curses.so links with ncursesw,
- # _curses_panel.so must link with panelw.
-@@ -1004,6 +1006,7 @@
- elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
- curses_libs = ['ncurses']
- exts.append( Extension('_curses', ['_cursesmodule.c'],
-+ library_dirs = ['/usr/lib'],
- libraries = curses_libs) )
- elif (self.compiler.find_library_file(lib_dirs, 'curses')
- and platform != 'darwin'):
-@@ -1025,6 +1028,7 @@
- if (module_enabled(exts, '_curses') and
- self.compiler.find_library_file(lib_dirs, panel_library)):
- exts.append( Extension('_curses_panel', ['_curses_panel.c'],
-+ library_dirs = ['/usr/lib'],
- libraries = [panel_library] + curses_libs) )
- else:
- missing.append('_curses_panel')
-@@ -1161,7 +1165,7 @@
- macros = dict()
- libraries = []
-
-- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
- # FreeBSD's P1003.1b semaphore support is very experimental
- # and has many known problems. (as of June 2008)
- macros = dict()
-@@ -1204,7 +1208,7 @@
-
- # Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-- 'freebsd7', 'freebsd8'):
-+ 'freebsd7', 'freebsd8', 'freebsd9'):
- exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
- else:
- missing.append('ossaudiodev')
-@@ -1665,8 +1669,7 @@
- # called unless there's at least one extension module defined.
- ext_modules=[Extension('_struct', ['_struct.c'])],
-
-- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
-- "Tools/scripts/2to3"]
-+ scripts = []
- )
-
- # --install-platlib
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 20:15:08 +0000