Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
42f5867437 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/libkdumpfile-0.5.2.tar.gz
|
libkdumpfile-0.5.4.tar.gz
|
||||||
|
@ -1 +0,0 @@
|
|||||||
1770835d08f36a8ed2afa7f891742dc42a395637 SOURCES/libkdumpfile-0.5.2.tar.gz
|
|
45
libkdumpfile-c99.patch
Normal file
45
libkdumpfile-c99.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
Python 3 does not have a tp_print member in PyTypeObject
|
||||||
|
|
||||||
|
This avoids an int-conversion compiler error with current compilers:
|
||||||
|
|
||||||
|
./kdumpfile.c:1449:9: error: initialization of 'long int' from 'int (*)(PyObject *, FILE *, int)' {aka 'int (*)(struct _object *, FILE *, int)'} makes integer from pointer without a cast
|
||||||
|
1449 | attr_dir_print, /* tp_print*/
|
||||||
|
| ^~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
In Python 3.11, the field at this position is called
|
||||||
|
tp_vectorcall_offset and has type Py_ssize_t, hence the error.
|
||||||
|
|
||||||
|
Submitted upstream: <https://github.com/ptesarik/libkdumpfile/pull/78>
|
||||||
|
|
||||||
|
diff --git a/python/kdumpfile.c b/python/kdumpfile.c
|
||||||
|
index 7c5917522ef05539..332318e76f317dff 100644
|
||||||
|
--- a/python/kdumpfile.c
|
||||||
|
+++ b/python/kdumpfile.c
|
||||||
|
@@ -1143,7 +1143,6 @@ attr_dir_repr(PyObject *_self)
|
||||||
|
Py_XDECREF(colon);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
static int
|
||||||
|
attr_dir_print(PyObject *_self, FILE *fp, int flags)
|
||||||
|
@@ -1214,6 +1213,7 @@ attr_dir_print(PyObject *_self, FILE *fp, int flags)
|
||||||
|
kdump_attr_iter_end(ctx, &iter);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
attr_iterkey_new(PyObject *_self)
|
||||||
|
@@ -1446,7 +1446,11 @@ static PyTypeObject attr_dir_object_type =
|
||||||
|
sizeof(char), /* tp_itemsize*/
|
||||||
|
/* methods */
|
||||||
|
attr_dir_dealloc, /* tp_dealloc*/
|
||||||
|
+#if PY_MAJOR_VERSION < 3
|
||||||
|
attr_dir_print, /* tp_print*/
|
||||||
|
+#else
|
||||||
|
+ 0,
|
||||||
|
+#endif
|
||||||
|
0, /* tp_getattr*/
|
||||||
|
0, /* tp_setattr*/
|
||||||
|
0, /* tp_compare*/
|
@ -1,14 +1,25 @@
|
|||||||
|
## START: Set by rpmautospec
|
||||||
|
## (rpmautospec version 0.6.1)
|
||||||
|
## RPMAUTOSPEC: autorelease, autochangelog
|
||||||
|
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||||
|
release_number = 5;
|
||||||
|
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
|
||||||
|
|
||||||
%global mainlibsover 10
|
%global mainlibsover 10
|
||||||
%global addrlibsover 3
|
%global addrlibsover 3
|
||||||
|
|
||||||
Name: libkdumpfile
|
Name: libkdumpfile
|
||||||
Version: 0.5.2
|
Version: 0.5.4
|
||||||
Release: 2%{?dist}
|
Release: %autorelease
|
||||||
Summary: Kernel coredump file access
|
Summary: Kernel coredump file access
|
||||||
|
|
||||||
License: LGPL-3.0-or-later OR GPL-2.0-or-later
|
License: LGPL-3.0-or-later OR GPL-2.0-or-later
|
||||||
URL: https://github.com/ptesarik/libkdumpfile
|
URL: https://github.com/ptesarik/libkdumpfile
|
||||||
Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: libkdumpfile-c99.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -123,6 +134,25 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
|||||||
%{_bindir}/showxlat
|
%{_bindir}/showxlat
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
## START: Generated by rpmautospec
|
||||||
|
* Thu May 02 2024 Philipp Rudo <prudo@redhat.com> - 0.5.4-5
|
||||||
|
- Add gating.yaml to RHEL10 libkdumpfile
|
||||||
|
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 04 2024 Florian Weimer <fweimer@redhat.com> - 0.5.4-2
|
||||||
|
- More complete Python 3 port for improved C compatibility
|
||||||
|
|
||||||
|
* Tue Nov 28 2023 Michel Lind <salimma@fedoraproject.org> - 0.5.4-1
|
||||||
|
- Update to 0.5.4
|
||||||
|
|
||||||
|
* Fri Nov 10 2023 Michel Lind <salimma@fedoraproject.org> - 0.5.3-1
|
||||||
|
- Update to 0.5.3
|
||||||
|
|
||||||
* Wed Jul 26 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.5.2-1
|
* Wed Jul 26 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.5.2-1
|
||||||
- Update to 0.5.2
|
- Update to 0.5.2
|
||||||
- Use SPDX license identifiers
|
- Use SPDX license identifiers
|
||||||
@ -187,3 +217,16 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
|||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-5
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.4.0-3
|
||||||
|
- Rebuilt for Python 3.10
|
||||||
|
|
||||||
|
* Fri Apr 2 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 0.4.0-2
|
||||||
|
- Fix license
|
||||||
|
|
||||||
|
* Fri Feb 26 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 0.4.0-1
|
||||||
|
- Initial package
|
||||||
|
|
||||||
|
## END: Generated by rpmautospec
|
Loading…
Reference in New Issue
Block a user