.gitignore

@@ -1 +1 @@
-SOURCES/python-systemd-235.tar.gz
+SOURCES/python-systemd-234.tar.gz

.python-systemd.metadata

@@ -1 +1 @@
-d22d9465e5bbfa9c73720e09b5925707d31e2907 SOURCES/python-systemd-235.tar.gz
+0aea149f95c43c44905cb898a9c51f61a4012787 SOURCES/python-systemd-234.tar.gz

SOURCES/0001-journal-avoid-warning-about-deprecated-constant.patch

@@ -0,0 +1,22 @@
+From 63473b65d0c10268a9e2c9485313c4584027e67e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 11 Nov 2020 22:36:04 +0100
+Subject: [PATCH 1/2] journal: avoid warning about deprecated constant
+
+---
+ systemd/_reader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/_reader.c b/systemd/_reader.c
+index c9aa11d43c..8de7f6a963 100644
+--- a/systemd/_reader.c
++++ b/systemd/_reader.c
+@@ -1339,7 +1339,7 @@ init_reader(void)
+             PyModule_AddIntConstant(m, "LOCAL_ONLY", SD_JOURNAL_LOCAL_ONLY) ||
+             PyModule_AddIntConstant(m, "RUNTIME_ONLY", SD_JOURNAL_RUNTIME_ONLY) ||
+             PyModule_AddIntConstant(m, "SYSTEM", SD_JOURNAL_SYSTEM) ||
+-            PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM_ONLY) ||
++            PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM) ||
+             PyModule_AddIntConstant(m, "CURRENT_USER", SD_JOURNAL_CURRENT_USER) ||
+             PyModule_AddIntConstant(m, "OS_ROOT", SD_JOURNAL_OS_ROOT) ||
+             PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) {

SOURCES/0002-reader-make-PY_SSIZE_T_CLEAN.patch

@@ -0,0 +1,46 @@
+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;
+ 

SOURCES/0003-test-make-sure-NOTIFY_SOCKET-is-unset-in-test.patch

@@ -0,0 +1,25 @@
+From 21e0cee30e5550cd6c9afa8c4cdedbcfdfca8480 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 17:08:02 +0100
+Subject: [PATCH] test: make sure $NOTIFY_SOCKET is unset in test
+
+When running the tests in Fedora's mock, the test would
+fail because NOTIFY_SOCKET is set to /run/systemd/nspawn/notify, and
+we get a permission error.
+---
+ systemd/test/test_daemon.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
+index 1ddb55e94d..ff9e086e72 100644
+--- a/systemd/test/test_daemon.py
++++ b/systemd/test/test_daemon.py
+@@ -257,6 +257,8 @@ def test_listen_fds_default_unset():
+     assert listen_fds() == []
+ 
+ def test_notify_no_socket():
++    os.environ.pop('NOTIFY_SOCKET', None)
++
+     assert notify('READY=1') is False
+     with skip_enosys():
+         assert notify('FDSTORE=1', fds=[]) is False

SPECS/python-systemd.spec

@@ -1,36 +1,30 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.1)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 10;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 Name:           python-systemd
-Version:        235
-Release:        %autorelease
-Summary:        Python module wrapping libsystemd functionality
+Version:        234
+Release:        18%{?dist}
+Summary:        Python module wrapping systemd functionality
 
-License:        LGPL-2.1-or-later
+License:        LGPLv2+
 URL:            https://github.com/systemd/python-systemd
 Source0:        https://github.com/systemd/python-systemd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+Patch0001:      0001-journal-avoid-warning-about-deprecated-constant.patch
+Patch0002:      0002-reader-make-PY_SSIZE_T_CLEAN.patch
+Patch0003:      0003-test-make-sure-NOTIFY_SOCKET-is-unset-in-test.patch
+
 BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  systemd-devel
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
 BuildRequires:  web-assets-devel
 BuildRequires:  python3-pytest
 
 %global _description %{expand:
-Python module for native access to the libsystemd facilities. Functionality
-includes sending of structured messages to the journal and reading journal
-files, querying machine and boot identifiers and a lists of message identifiers
-provided by systemd. Other functionality provided the library is also wrapped.}
+Python module for native access to the systemd facilities.
+Functionality includes sending of structured messages to the journal
+and reading journal files, querying machine and boot identifiers and a
+lists of message identifiers provided by systemd. Other functionality
+provided by libsystemd is also wrapped.}
 
 %description %_description
 
@@ -41,6 +35,7 @@ Summary:        %{summary}
 Provides:       systemd-python3 = %{version}-%{release}
 Provides:       systemd-python3%{?_isa} = %{version}-%{release}
 Obsoletes:      systemd-python3 < 230
+Recommends:	%{name}-doc
 
 %description -n python3-systemd %_description
 
@@ -84,54 +79,12 @@ make PYTHON=%{__python3} check
 %doc %{_pkgdocdir}/html
 
 %changelog
-## START: Generated by rpmautospec
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 235-10
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 235-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 235-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Aug 22 2023 Jens Petersen <petersen@redhat.com> - 235-7
-- Don't recommend python-systemd-doc which pulls in 3 packages
-
-* Mon Aug 07 2023 Lukáš Zaoral <lzaoral@redhat.com> - 235-6
-- migrate to SPDX license format
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 235-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 235-4
-- Rebuilt for Python 3.12
-
-* Tue Feb 28 2023 Miro Hrončok <miro@hroncok.cz> - 235-3
-- BuildRequire python3-setuptools explicitly
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 234-18
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 235-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Aug 16 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 235-1
-- Version 235 (rhbz#2113777)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 234-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 234-21
-- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 234-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Sep 16 2021 Paul Wouters <paul.wouters@aiven.io> - 234-19
-- Pull in namespace support of upstream PR#87
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 234-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 234-17
-- Rebuilt for Python 3.10
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 234-17
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 234-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -212,5 +165,3 @@ make PYTHON=%{__python3} check
 
 * Mon Jul  6 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@laptop> - 230-1
 - Initial packaging
-
-## END: Generated by rpmautospec