From 2e7903d8613ccf885b432fd1a9452c1f51094228 Mon Sep 17 00:00:00 2001
From: "Cook, Samuel" <samuel.cook@cornelisnetworks.com>
Date: Tue, 21 Feb 2023 14:51:28 +0000
Subject: python-systemd: update from v234 to v235

Includes bugfix from v234 which won't run on python3.10
See: https://github.com/systemd/python-systemd/issues/107

Removes patches now no longer required as they are implemented in v235

drop setting md5 checksum for src_uri as it is no longer needed

rename patch directory to match recipe name as python2 version of recipe
is gone

V235 released to PyPI on 11 Feb 23
https://pypi.org/project/systemd-python/235/

Signed-off-by: Samuel Cook <samuel.cook@cornelisnetworks.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ovide-implementation-of-strndupa-for-musl.patch | 42 ----------------------
 ...up.py-switch-from-distutils-to-setuptools.patch | 30 ----------------
 .../python/python-systemd/endian.patch             | 14 --------
 3 files changed, 86 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
 delete mode 100644 meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch
 delete mode 100644 meta-python/recipes-devtools/python/python-systemd/endian.patch

(limited to 'meta-python/recipes-devtools/python/python-systemd')

diff --git a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
deleted file mode 100644
index d7085a8565..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8b639f9faf6199e47b9eae0698d01a22917b6abe Mon Sep 17 00:00:00 2001
-From: Tim Orling <timothy.t.orling@linux.intel.com>
-Date: Fri, 29 Dec 2017 09:17:17 -0800
-Subject: [PATCH] Provide implementation of strndupa for musl
-
-Reuse the approach from oe-core:
-/meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch
-
-Original patch author: Emil Renner Berthing <systemd@esmil.dk>
-
-Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com
----
-Upstream-Status: Pending
-
- systemd/util.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/systemd/util.c b/systemd/util.c
-index e02c825..277e611 100644
---- a/systemd/util.c
-+++ b/systemd/util.c
-@@ -34,6 +34,17 @@
- 
- #include "util.h"
- 
-+#if !HAVE_DECL_STRNDUPA
-+#define strndupa(s, n) \
-+  ({ \
-+    const char *__old = (s); \
-+    size_t __len = strnlen(__old, (n)); \
-+    char *__new = (char *)alloca(__len + 1); \
-+    __new[__len] = '\0'; \
-+    (char *)memcpy(__new, __old, __len); \
-+  })
-+#endif
-+
- int safe_atou(const char *s, unsigned *ret_u) {
-         char *x = NULL;
-         unsigned long l;
--- 
-2.13.6
-
diff --git a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch
deleted file mode 100644
index b3180f29f2..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a681a79472df85cdc8c052bc61fb8b9e7b9a6495 Mon Sep 17 00:00:00 2001
-From: Tim Orling <tim.orling@konsulko.com>
-Date: Sun, 27 Feb 2022 11:50:36 -0800
-Subject: [PATCH] setup.py: switch from distutils to setuptools
-
-In Python 3.10, distutils is deprecated and slated for removal in Python
-3.12. It also prevents 'setup.py bdist_wheel' from building a wheel.
-
-Upstream-Status: Submitted
-[https://github.com/systemd/python-systemd/pull/103]
-
-Signed-off-by: Tim Orling <tim.orling@konsulko.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 099819b..fe9c03a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,5 +1,5 @@
- import sys, os
--from distutils.core import setup, Extension
-+from setuptools import setup, Extension
- from subprocess import Popen, PIPE, check_output
- 
- def call(*cmd):
--- 
-2.30.2
-
diff --git a/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-python/recipes-devtools/python/python-systemd/endian.patch
deleted file mode 100644
index e09aea7336..0000000000
--- a/meta-python/recipes-devtools/python/python-systemd/endian.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Include endian.h for missing definitions of htobe16
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/systemd/util.c
-+++ b/systemd/util.c
-@@ -28,6 +28,7 @@
- #include <stdbool.h>
- #include <assert.h>
- #include <errno.h>
-+#include <endian.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <net/if.h>
-- 
cgit v1.2.3-54-g00ecf