upgrade version to 235
This commit is contained in:
parent
ee0d61cdf6
commit
efdf03dc88
@ -1,46 +0,0 @@
|
|||||||
From ab9f2797127b374665c37c06b02121f5dcf7d61c Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
||||||
Date: Thu, 12 Nov 2020 16:55:56 +0100
|
|
||||||
Subject: [PATCH 2/2] reader: make PY_SSIZE_T_CLEAN
|
|
||||||
|
|
||||||
---
|
|
||||||
systemd/_reader.c | 15 +++++++++++++--
|
|
||||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/systemd/_reader.c b/systemd/_reader.c
|
|
||||||
index 8de7f6a963..3b6a4d0bbc 100644
|
|
||||||
--- a/systemd/_reader.c
|
|
||||||
+++ b/systemd/_reader.c
|
|
||||||
@@ -18,7 +18,12 @@
|
|
||||||
along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
***/
|
|
||||||
|
|
||||||
+#define PY_SSIZE_T_CLEAN
|
|
||||||
+#pragma GCC diagnostic push
|
|
||||||
+#pragma GCC diagnostic ignored "-Wredundant-decls"
|
|
||||||
#include <Python.h>
|
|
||||||
+#pragma GCC diagnostic pop
|
|
||||||
+
|
|
||||||
#include <structmember.h>
|
|
||||||
#include <datetime.h>
|
|
||||||
#include <time.h>
|
|
||||||
@@ -710,11 +715,17 @@ PyDoc_STRVAR(Reader_add_match__doc__,
|
|
||||||
"Match is a string of the form \"FIELD=value\".");
|
|
||||||
static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) {
|
|
||||||
char *match;
|
|
||||||
- int match_len, r;
|
|
||||||
+ Py_ssize_t match_len;
|
|
||||||
+ int r;
|
|
||||||
if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
- r = sd_journal_add_match(self->j, match, match_len);
|
|
||||||
+ if (match_len > INT_MAX) {
|
|
||||||
+ set_error(-ENOBUFS, NULL, NULL);
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ r = sd_journal_add_match(self->j, match, (int) match_len);
|
|
||||||
if (set_error(r, NULL, "Invalid match") < 0)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
python-systemd-235.tar.gz
Normal file
BIN
python-systemd-235.tar.gz
Normal file
Binary file not shown.
@ -1,13 +1,11 @@
|
|||||||
Name: python-systemd
|
Name: python-systemd
|
||||||
Version: 234
|
Version: 235
|
||||||
Release: 15
|
Release: 1
|
||||||
Summary: Python module for native access to the systemd facilities.
|
Summary: Python module for native access to the systemd facilities.
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/systemd/%{name}
|
URL: https://github.com/systemd/%{name}
|
||||||
Source0: https://github.com/systemd/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/systemd/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch6000: backport-reader-make-PY_SSIZE_T_CLEAN.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc systemd-devel
|
BuildRequires: gcc systemd-devel
|
||||||
|
|
||||||
BuildRequires: python3-devel python3-sphinx python3-pytest
|
BuildRequires: python3-devel python3-sphinx python3-pytest
|
||||||
@ -64,6 +62,9 @@ make check PYTHON=%{__python3}
|
|||||||
%exclude %{_pkgdocdir}/html
|
%exclude %{_pkgdocdir}/html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 24 2022 dongyuzhen <dongyuzhen@h-partners.com> - 235-1
|
||||||
|
- upgrade version to 235
|
||||||
|
|
||||||
* Mon Jun 20 2022 renhongxun <renhongxun@h-partners.com> - 234-15
|
* Mon Jun 20 2022 renhongxun <renhongxun@h-partners.com> - 234-15
|
||||||
- add compile option _FORTIFY_SOURCE
|
- add compile option _FORTIFY_SOURCE
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user