summaryrefslogtreecommitdiffstats
path: root/source/ap/hplip/hplip.python3.10.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-10-19 01:10:06 +0000
committer Eric Hameleers <alien@slackware.com>2021-10-19 08:59:56 +0200
commit499145d97dda62f534754e4aeacf7ed4a4a9c26e (patch)
treedacc20bb4fcf392cea01973477eecda20bf1c544 /source/ap/hplip/hplip.python3.10.diff
parent48bc5b3a925a6398c4fab04dede1e4a5e0ea42af (diff)
downloadcurrent-499145d97dda62f534754e4aeacf7ed4a4a9c26e.tar.gz
current-499145d97dda62f534754e4aeacf7ed4a4a9c26e.tar.xz
Tue Oct 19 01:10:06 UTC 202120211019011006
a/file-5.41-x86_64-1.txz: Upgraded. ap/vim-8.2.3536-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.23.0-x86_64-4.txz: Rebuilt. Fixed appling the previous patch. Thanks to LuckyCyborg. xap/vim-gvim-8.2.3536-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/hplip/hplip.python3.10.diff')
-rw-r--r--source/ap/hplip/hplip.python3.10.diff77
1 files changed, 77 insertions, 0 deletions
diff --git a/source/ap/hplip/hplip.python3.10.diff b/source/ap/hplip/hplip.python3.10.diff
new file mode 100644
index 000000000..5963f567a
--- /dev/null
+++ b/source/ap/hplip/hplip.python3.10.diff
@@ -0,0 +1,77 @@
+diff --git a/io/mudext/hpmudext.c b/io/mudext/hpmudext.c
+index dca3e9d..dfcd22a 100644
+--- a/io/mudext/hpmudext.c
++++ b/io/mudext/hpmudext.c
+@@ -24,6 +24,8 @@ Authors: Don Welch, David Suffield, Naga Samrat Chowdary Narla
+
+ \*****************************************************************************/
+
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <stdarg.h>
+ #include "hpmud.h"
+@@ -187,14 +189,22 @@ static PyObject *write_channel(PyObject *self, PyObject *args)
+ HPMUD_CHANNEL cd;
+ int timeout = 30;
+ char * buf;
+- int buf_size = 0;
++ Py_ssize_t buf_size = 0;
++ int buf_size_asInt = 0;
+ int bytes_written = 0;
+
+ if (!PyArg_ParseTuple(args, "iis#|i", &dd, &cd, &buf, &buf_size, &timeout))
+ return NULL;
+
++ if (buf_size < INT_MIN)
++ buf_size_asInt = INT_MIN;
++ else if (buf_size > INT_MAX)
++ buf_size_asInt = INT_MAX;
++ else
++ buf_size_asInt = (int)buf_size;
++
+ Py_BEGIN_ALLOW_THREADS
+- result = hpmud_write_channel(dd, cd, buf, buf_size, timeout, &bytes_written);
++ result = hpmud_write_channel(dd, cd, buf, buf_size_asInt, timeout, &bytes_written);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue("(ii)", result, bytes_written);
+@@ -231,14 +241,22 @@ static PyObject *set_pml(PyObject *self, PyObject *args)
+ char * oid;
+ int type;
+ char * data;
+- int data_size;
++ Py_ssize_t data_size = 0;
++ int data_size_asInt = 0;
+ int pml_result;
+
+ if (!PyArg_ParseTuple(args, "iisis#", &dd, &cd, &oid, &type, &data, &data_size))
+ return NULL;
+
++ if (data_size < INT_MIN)
++ data_size_asInt = INT_MIN;
++ else if (data_size > INT_MAX)
++ data_size_asInt = INT_MAX;
++ else
++ data_size_asInt = (int)data_size;
++
+ Py_BEGIN_ALLOW_THREADS
+- result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size, &pml_result);
++ result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size_asInt, &pml_result);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue("(ii)", result, pml_result);
+diff --git a/scan/scanext/scanext.c b/scan/scanext/scanext.c
+index 1e6b514..597abd8 100755
+--- a/scan/scanext/scanext.c
++++ b/scan/scanext/scanext.c
+@@ -45,6 +45,8 @@ PERFORMANCE OF THIS SOFTWARE.
+ *******************************************************************/
+
+
++#define PY_SSIZE_T_CLEAN
++
+ /* _ScanDevice objects */
+
+ #include "Python.h"
+