mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
ea56f87d19
- Update to 3.3.4
- Update pkg-plist
- Remove patch-CVE-2014-1912 (upstream)
- Remove patch-issue20374 (upstream)
- Repatch and rename patch-Modules__fcntlmodule.c
- Add patch-issue-20695-Lib__test__test_urllibnet.py (tests) [1]
- Add regression-test target for QA
Changes: 3.3.4 - 09/02/2014
http://docs.python.org/3.3/whatsnew/changelog.html#python-3-3-4
Extra:
- Update python-doc-html distinfo for Python 3.3 docs
- Update bsd.python.mk to support the new version
[1] http://bugs.python.org/issue20695
54 lines
2.0 KiB
C
54 lines
2.0 KiB
C
--- ./Modules/fcntlmodule.c.orig 2014-03-04 20:15:17.641117835 +1100
|
|
+++ ./Modules/fcntlmodule.c 2014-03-04 20:19:36.141145958 +1100
|
|
@@ -98,20 +98,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 this.
|
|
-
|
|
- 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;
|
|
@@ -120,7 +115,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;
|
|
@@ -175,7 +170,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;
|
|
@@ -202,7 +197,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;
|