Fix build for legacy distributions

The readline module is part of Python itself, but it must be required
explicitly on newer distributions (16.0, Factory). However, Python
packages in older distributions (15.x and earlier) do not have the
corresponding Provides. :-(

Solve it by Build-requiring %pythons. Yes, it does bring a lot of
unneded stuff into the build environment...

Signed-off-by: Petr Tesarik <ptesarik@suse.com>

_service

@@ -2,17 +2,15 @@
     <service name="obs_scm" mode="manual">
         <param name="scm">git</param>
         <param name="url">https://github.com/osandov/drgn.git</param>
-        <param name="revision">refs/tags/v0.0.30</param>
+        <param name="revision">main</param>
-        <!--<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>-->
+        <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.g%h</param>
-        <param name="versionformat">@PARENT_TAG@</param>
+        <param name="versionrewrite-pattern">v([^+]*\+git[1-9].*)|v([^+]*)\+git0.*</param>
-        <param name="versionrewrite-pattern">v(.*)</param>
+        <param name="versionrewrite-replacement">\1\2</param>
-        <param name="versionrewrite-replacement">\1</param>
     </service>
     <service name="set_version" mode="manual"/>
-    <service mode="buildtime" name="tar">
+    <service name="tar" mode="manual"/>
-    </service>
+    <service name="recompress" mode="manual">
-    <service mode="buildtime" name="recompress">
         <param name="file">*.tar</param>
-        <param name="compression">gz</param>
+        <param name="compression">xz</param>
     </service>
 </services>

drgn-0.0.30.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1cbd99a479d3036f446243bfc1630d0393dd334ece9e32b13a61f42b88a3984
-size 4076044

drgn-0.0.30.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:828cb0a3ea424654314548d0f39765cad36c6c285ca0d9f53d0bd29f8f419a52
-size 853847

drgn.obsinfo

@@ -1,4 +1,4 @@
 name: drgn
-version: 0.0.30
+version: 0.0.31
-mtime: 1734560126
+mtime: 1744828823
-commit: 92023c5b5d5a1c7e1556e945b098148f0b46e608
+commit: 8209a147fb61deed38ca376d063bbff0343ca234

libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch

@@ -1,37 +0,0 @@
-From: Petr Tesarik <ptesarik@suse.com>
-Date: Tue, 3 Dec 2024 13:54:40 +0100
-Subject: libdrgn: kdump: prepare for incompatible changes in
- libkdumpfile-0.5.5
-Upstream: merged
-Git-commit: 4e06cfdff158935eee725e726a63a5d9c9e57dab
-
-The kdump_get_typed_attr() function prototype changed in libkdumpfile
-commit e182aeaf4d72 ("Make kdump_get_typed_attr() easier to use").
-
-Signed-off-by: Petr Tesarik <ptesarik@suse.com>
----
- libdrgn/kdump.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libdrgn/kdump.c b/libdrgn/kdump.c
-index 0bb594d1..4e5eea92 100644
---- a/libdrgn/kdump.c
-+++ b/libdrgn/kdump.c
-@@ -318,9 +318,14 @@ struct drgn_error *drgn_program_cache_kdump_threads(struct drgn_program *prog)
- 			       + 1];
- 		snprintf(attr_name, sizeof(attr_name), FORMAT, i);
- #undef FORMAT
-+#if KDUMPFILE_VERSION >= KDUMPFILE_MKVER(0, 5, 5)
-+		ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name,
-+					  KDUMP_BLOB, &prstatus_attr.val);
-+#else
- 		prstatus_attr.type = KDUMP_BLOB;
- 		ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name,
- 					  &prstatus_attr);
-+#endif
- 		if (ks != KDUMP_OK) {
- 			return drgn_error_format(DRGN_ERROR_OTHER,
- 						 "kdump_get_typed_attr(%s): %s",
--- 
-2.47.1
-

libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch

@@ -1,86 +0,0 @@
-From: Petr Tesarik <ptesarik@suse.com>
-Date: Mon, 2 Dec 2024 17:38:24 +0100
-Subject: libdrgn: kdump: simplify getting the PRSTATUS attributes
-Upstream: merged
-Git-commit: 885a3209f3603593fb89327c1072f94e5862ffbb
-
-Since libkdumpfile commit 5b044292abe9 ("Clarify and fix attribute data
-lifetime") changes the lifetime of attribute values retrieved with
-kdump_attr_ref_get(), the extra reference would keep the PRSTATUS blob
-around even after kdump_free().
-
-However, the attribute hierarchy cannot change while iterating over the
-PRSTATUS attributes, so it is not necessary to take an attribute reference
-and we can use kdump_get_typed_attr().
-
-The attribute blob itself should not change either, but it is a good idea
-to keep its data pinned, because a raw pointer to it is stored in the
-drgn_thread_set hash table. If some code tries to modify the PRSTATUS
-attribute data, the attempt will fail with KDUMP_ERR_BUSY rather than leave
-a dangling pointer in the hash table and possibly cause a UAF bug later.
-
-The blob pin does not prevent freeing the blob when the blob reference
-count reaches zero.
-
-Signed-off-by: Petr Tesarik <ptesarik@suse.com>
----
- libdrgn/kdump.c | 28 ++++++++++------------------
- 1 file changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/libdrgn/kdump.c b/libdrgn/kdump.c
-index 09efd965..0bb594d1 100644
---- a/libdrgn/kdump.c
-+++ b/libdrgn/kdump.c
-@@ -299,39 +299,31 @@ struct drgn_error *drgn_program_cache_kdump_threads(struct drgn_program *prog)
- 	}
- 
- 	/*
--	 * Note that in the following loop we never call kdump_attr_unref() on
--	 * prstatus_ref, nor kdump_blob_unpin() on the prstatus blob that we get
--	 * from libkdumpfile. Since drgn is completely read-only as a consumer
--	 * of that library, we "leak" both the attribute reference and blob pin
--	 * until kdump_free() is called which will clean up everything for us.
-+	 * Note that in the following loop we never call kdump_blob_unpin() on
-+	 * the prstatus blob that we get from libkdumpfile. Since drgn never
-+	 * modifies the PRSTATUS attributes (neither directly nor indirectly),
-+	 * we "leak" the blob pin until kdump_free() is called, which will
-+	 * clean up everything for us.
- 	 */
- 	for (i = 0; i < ncpus; i++) {
--		/* Enough for the longest possible PRSTATUS attribute name. */
--		kdump_attr_ref_t prstatus_ref;
- 		kdump_attr_t prstatus_attr;
- 		void *prstatus_data;
- 		size_t prstatus_size;
- 
- #define FORMAT "cpu.%" PRIuFAST64 ".PRSTATUS"
-+		/* Enough for the longest possible PRSTATUS attribute name. */
- 		char attr_name[sizeof(FORMAT)
- 			       - sizeof("%" PRIuFAST64)
- 			       + max_decimal_length(uint_fast64_t)
- 			       + 1];
- 		snprintf(attr_name, sizeof(attr_name), FORMAT, i);
- #undef FORMAT
--		ks = kdump_attr_ref(prog->kdump_ctx, attr_name, &prstatus_ref);
--		if (ks != KDUMP_OK) {
--			return drgn_error_format(DRGN_ERROR_OTHER,
--						 "kdump_attr_ref(%s): %s",
--						 attr_name,
--						 kdump_get_err(prog->kdump_ctx));
--		}
--
--		ks = kdump_attr_ref_get(prog->kdump_ctx, &prstatus_ref,
--					&prstatus_attr);
-+		prstatus_attr.type = KDUMP_BLOB;
-+		ks = kdump_get_typed_attr(prog->kdump_ctx, attr_name,
-+					  &prstatus_attr);
- 		if (ks != KDUMP_OK) {
- 			return drgn_error_format(DRGN_ERROR_OTHER,
--						 "kdump_attr_ref_get(%s): %s",
-+						 "kdump_get_typed_attr(%s): %s",
- 						 attr_name,
- 						 kdump_get_err(prog->kdump_ctx));
- 		}
--- 
-2.47.1
-

python-drgn.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Apr 17 06:47:43 UTC 2025 - Petr Tesařík <ptesarik@suse.com>
+
+- Update to drgn-0.0.31:
+  * New command line options and APIs for controlling how debugging
+    information is found
+  * Improved debuginfod integration
+  * Stack tracing through unknown kernel modules with ORC
+  * New helpers
+  * Bug fixes
+- Drop upstreamed patches:
+  * libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch
+  * libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch
+
 -------------------------------------------------------------------
 Thu Mar  6 13:35:39 UTC 2025 - Michal Koutný <mkoutny@suse.com>
 

python-drgn.spec

@@ -17,17 +17,16 @@
 
 
 Name:           python-drgn
-Version:        0.0.30
+Version:        0.0.31
 Release:        0
 Summary:        Scriptable debugger library
 License:        LGPL-2.1-or-later
 Group:          Development/Tools/Debuggers
 URL:            https://github.com/osandov/drgn
-Source:         drgn-%{version}.tar.gz
+Source:         drgn-%{version}.tar.xz
-Patch1:         libdrgn-kdump-simplify-getting-the-PRSTATUS-attribut.patch
-Patch2:         libdrgn-kdump-prepare-for-incompatible-changes-in-li.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{pythons}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  check-devel
@@ -48,7 +47,6 @@ for easy, expressive scripting in Python.
 
 %prep
 %setup -q -n drgn-%{version}
-%autopatch -p1
 
 %build
 export CFLAGS="%{optflags}"