summaryrefslogtreecommitdiff
path: root/lang/python27/files/patch-Modules__fcntlmodule.c
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2015-07-03 13:27:40 +0000
committerBernard Spil <brnrd@FreeBSD.org>2015-07-03 13:27:40 +0000
commit9390be9165c7248208eb40596ee57ee9a9ae2175 (patch)
treea3bb027b3755b181927204f8d9d39d61af6cd430 /lang/python27/files/patch-Modules__fcntlmodule.c
parent- Add missing change in 1.32.0 update (diff)
lang/python: Update to 2.7.10
The FreeBSD Python team welcomes Python 2.7.10 to the Ports tree! Announcement: https://www.python.org/downloads/release/python-2710/ Changelog: https://hg.python.org/cpython/raw-file/v2.7.10/Misc/NEWS Important changes for this release: - Python 2.7.10 is a bug fix release of the Python 2.7.x series. - Fixes issues with LibreSSL 2.2+ PR: 192511, 201088 Differentialr Revision: D2637 Reviewed by: koobs (mentor), vsevolod (mentor), antoine Approved by: koobs (mentor)
Notes
Notes: svn path=/head/; revision=391238
Diffstat (limited to 'lang/python27/files/patch-Modules__fcntlmodule.c')
-rw-r--r--lang/python27/files/patch-Modules__fcntlmodule.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/python27/files/patch-Modules__fcntlmodule.c b/lang/python27/files/patch-Modules__fcntlmodule.c
index d8a701caeb26..8bda9f62a224 100644
--- a/lang/python27/files/patch-Modules__fcntlmodule.c
+++ b/lang/python27/files/patch-Modules__fcntlmodule.c
@@ -1,6 +1,6 @@
--- ./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 @@
+@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar
{
#define IOCTL_BUFSZ 1024
int fd;
@@ -24,7 +24,7 @@
int arg;
int ret;
char *str;
-@@ -119,7 +114,7 @@
+@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
int mutate_arg = 1;
char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */
@@ -33,7 +33,7 @@
conv_descriptor, &fd, &code,
&str, &len, &mutate_arg)) {
char *arg;
-@@ -170,7 +165,7 @@
+@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
}
PyErr_Clear();
@@ -42,7 +42,7 @@
conv_descriptor, &fd, &code, &str, &len)) {
if (len > IOCTL_BUFSZ) {
PyErr_SetString(PyExc_ValueError,
-@@ -192,7 +187,7 @@
+@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
PyErr_Clear();
arg = 0;
if (!PyArg_ParseTuple(args,