26ae40b6bc
The FreeBSD Python team welcomes Python 2.7.8 to the Ports tree! Announcement: https://www.python.org/download/releases/2.7.8/ Changelog: http://hg.python.org/cpython/raw-file/v2.7.8/Misc/NEWS - Update to 2.7.8, update pkg-plist - OPTIONS: Reorder and sort alphabetically - OPTIONS: Make POSIX SEM(aphores) a DEFAULT (Hi binary package users!) - OPTIONS: Add better descriptions for UCS2 and UCS4 - OPTIONS: Use options helpers - Remove patch-CVE-2014-1912: upstream, was backported - Remove patch-issue20374: upstream, was backported - Rename patch-Doc__library__fcntl.rst: underscore convention - Rename patch-Modules__fcntlmodule.c: underscore convention - Patch: setup.py: Remove ncurses overrides and return to upstream code - Patch: setup.py: Add partial backport for ossaudio OS checks - pkg-message: Remove warning for POSIX Semaphores. They are now in GENERIC for FreeBSD 8.x 9.x, 10.x and tested well upstream - pkg-message: No longer needs substitutions, remove .in suffix and SUB_FILES - Rework and simplify the platformX mechanism, update pkg-plist accordingly - Add regression-test target - Deprecate NOPORTDATA, remove pkg-plist entries with %%PORTDATA%% - Replace bsd.{pre,post}.mk with bsd.port.options.mk Based on original patch submitted by wen@ and worked on by lwhsu@, thank you! PR: 191405 PR: 178301 PR: 171246 Phabric: D364 Reviewed by: antoine, bapt, mat, mva, wg
54 lines
2.1 KiB
C
54 lines
2.1 KiB
C
--- ./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000
|
|
+++ ./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000
|
|
@@ -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;
|
|
char *str;
|
|
@@ -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,
|
|
&str, &len, &mutate_arg)) {
|
|
char *arg;
|
|
@@ -170,7 +165,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,
|
|
@@ -192,7 +187,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;
|