diff options
Diffstat (limited to 'dev-libs/libkdumpfile')
7 files changed, 60 insertions, 254 deletions
diff --git a/dev-libs/libkdumpfile/Manifest b/dev-libs/libkdumpfile/Manifest index 5e7b29427f3a..e8015de3bf04 100644 --- a/dev-libs/libkdumpfile/Manifest +++ b/dev-libs/libkdumpfile/Manifest @@ -1,9 +1,5 @@ -AUX libkdumpfile-0.5.4-32-bit-tests.patch 2197 BLAKE2B 3368b373a0e8e7127bc560fdfa5b370e4a42920c04d18d05a5c60bd29ad6b33703e52e0dcaa886bc91444f5e90a11e3a97e3d64692d26430d48df5c2b43e3c3b SHA512 6cc17ef0214f8fab33e6c36df457a11c2dd1feaa18804e93fde94c7e68fe96ba3ba6869231de3215a38944025741028d696ef679d44dbcbb24d2cd363ea537db -AUX libkdumpfile-0.5.4-c99.patch 1500 BLAKE2B f7879cf9d08660ce89ae3e771c36cbe07a51767288c6dbd36be2e97a795698ca381370f16d7a3ff134b147eb2c5c01efba0bf792c5da7637df6597a355f283a9 SHA512 5b67254f2f113ea6e86a4024917bf02683ae8c9a6757edbc01f26d107ff86ae30dc111285e66513f81e36fe32188b45d52927235198217de40c256ee2effadaa -AUX libkdumpfile-0.5.4-disabled-compression-tests.patch 2006 BLAKE2B b4c8555ca7ea47dc5f842c71dee21967d1044d874538b8f02d30f11e6dc10306ceab52de0b0e0d3e20182234ce0a2c6a2885a528831ca7fda0d4c753620f5848 SHA512 27bcd11b409bc547eaa125736015ca319a9fbaa720b078dc7eec0274ab95302dff231048404957dea5c4cfed2854909faf23df4126efcadb767e44c5926983c4 AUX libkdumpfile-0.5.5-bfd-include.patch 17521 BLAKE2B 2f900b524e6288cb2bca74f756ff35747704095ed4a9f28931105c24906a1e373c3d771cb9bb43957794348aa16dd3b37fbf9daf9f8187d836d97f598db9a7cf SHA512 9e9837c41815cdb5a7f1ddd9de06904aaf724c62cc1795c0d0a9586a3663f4d204e2971446fbed6ca6571f5fd5894330327081c4a2ac221fda44505faa54bde3 -DIST libkdumpfile-0.5.4.tar.bz2 623108 BLAKE2B 17a425c2a0545f60574255d5ec139f60a59dd2c9c047a89f9d021afe31cae959c691b550d9ad4e10c88a11f5f1bab1a4d94dab025060dcd2598837442281b3b9 SHA512 6cdd77e3460b324f4e0641fc8f4cf1dcd8b7de4ec82a37ca11e4edfa7730f90305c2724825f8b1cf8ac2e8ad104fee1b6a36775287b084db802ae2f44a55cd85 +AUX libkdumpfile-0.5.5-parallel-tests.patch 1749 BLAKE2B 471c88e980cfa210149351e9ed55ef0cb04fd2ac21108b16537b55d5e607356405f33066b790347c4714593d552524a12861f63cf35416515b9f3e00d2de005d SHA512 5f1c4daad659fbd626608ea9d89661dcd1d2f1b7e9eaa620c44d004cf5da1a81c0bcdb7b9e64aaf49d9663375ea03b47c0fc40bbbd9336d8438b2e1cbfac68e1 DIST libkdumpfile-0.5.5.tar.bz2 672321 BLAKE2B 41c2044ac7f11ab94b2c80771d28ded5dbd75693d3adffc84a96e9595b1a7b52229cac9ba6622e6715261a877fb7a90de570c791039287e6c44b8fa8e3c9e688 SHA512 35935bab7e7e9d5914b6f20efd545f89d89d7edf74c07e26057fdd07823aa73a87cde7765632289709b071d80501648c9373a202432f64ff469f95dd9a50adf3 -EBUILD libkdumpfile-0.5.4-r1.ebuild 1192 BLAKE2B 52aa2fb439d4924da30e7987c069254604371e972d832cebb919a24ed51b8dfb174bcebd58ae6b2d7cada02d0b00c3864262d0a7e3c039e9a132deade418cc28 SHA512 365a38362b7795d9166d00262f3d544b5f00f87376493682431ebac8662bd1d7b3183088aadea09be662e7087c36413d39675aa10ec7d02bcc30da07e165173b -EBUILD libkdumpfile-0.5.5-r2.ebuild 1047 BLAKE2B 25dc0972851b47a220e019ca35f60540ce169e9c45379abdc0d7e33f97434c518c3451e36669dda071a9181f073e731d1b5f5510d34822c6601edc2dd3746910 SHA512 747156864e23174bce4e05888c387416f6824d2dfb4dc89bae8dfb7395f76fb7056b5456fccc195aa5acd3166e123206dbb28103e5bcf8840bdc409ea16356b0 +EBUILD libkdumpfile-0.5.5-r2.ebuild 1086 BLAKE2B 0075a03c5692bcb2fd4a3ce9527309ad3b644d0a5a490e29513d3ef2291276bc094221af94356f86cbaf7b4bea956094c861f8b37d60836e13ee119a1645ed68 SHA512 b8f696911738931fe86cab5927d9407d87ab4f4a6640fdc6c2ad4a58e1c80896a5e4cec8f8c8be5acd23e823f44383e8bc35333e1470d31662be1b8599becf07 MISC metadata.xml 326 BLAKE2B 13b23cbf5c4089460907bebe9e73dad724bfea465300417f82d20748779d865459c6791d0a6d27237db88819690b4124235721c555895b3ca0a3aa5fa63ad2cf SHA512 aae2510a5c9a7662d7beaccef7c19b42be69e34bc0a2e6fb7f31d332ec7a5389f38aef97123b2f213bd4bb3376630b6989a6d71785f0198f563f9ce5d05cfdca diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch deleted file mode 100644 index 4b5c0cb4c8fc..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/16c73b83a78c1bfb55f3e9823b09fce549c8ec11 - -From 16c73b83a78c1bfb55f3e9823b09fce549c8ec11 Mon Sep 17 00:00:00 2001 -From: Petr Tesarik <petr@tesarici.cz> -Date: Thu, 23 May 2024 13:01:17 +0200 -Subject: [PATCH] Fix file cache test for 32-bit architectures - -If 64-bit file offsets are selected with _FILE_OFFSET_BITS on a 32-bit -architecture, the default mmap() call takes a 64-bit off_t, but dlsym() -returns a pointer to a function that takes a 32-bit off_t. - -To fix it: - -- always call original mmap64() if it is available, -- use XSTRINGIFY(mmap) instead of "mmap". - -The latter is needed, because some systems define mmap as a macro which -expands to another identifier. - -Fixes: #80 -Signed-off-by: Petr Tesarik <petr@tesarici.cz> ---- - configure.ac | 2 ++ - src/kdumpfile/test-fcache.c | 13 ++++++++++++- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 04d1c6fa..93ebb39d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,6 +61,8 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(off_t) - AC_SUBST(SIZEOF_OFF_T, $ac_cv_sizeof_off_t) - -+AC_CHECK_FUNCS(mmap64) -+ - dnl This makes sure pkg.m4 is available. - m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) - -diff --git a/src/kdumpfile/test-fcache.c b/src/kdumpfile/test-fcache.c -index 1ed57447..604ed540 100644 ---- a/src/kdumpfile/test-fcache.c -+++ b/src/kdumpfile/test-fcache.c -@@ -64,9 +64,20 @@ static char *mmapbuf; - - static int failmmap; - -+#ifdef HAVE_MMAP64 -+ -+#define STR_MMAP XSTRINGIFY(mmap64) -+static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags, -+ int fd, off64_t offset); -+ -+#else -+ -+#define STR_MMAP XSTRINGIFY(mmap) - static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags, - int fd, off_t offset); - -+#endif -+ - void * - mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) - { -@@ -445,7 +456,7 @@ main(int argc, char **argv) - return TEST_ERR; - } - -- orig_mmap = dlsym(RTLD_NEXT, "mmap"); -+ orig_mmap = dlsym(RTLD_NEXT, STR_MMAP); - if (!orig_mmap) { - fprintf(stderr, "Cannot get original mmap() address: %s\n", - dlerror()); diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch deleted file mode 100644 index 959af60454ef..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/3682f5cad70146ab35d05af251d4461ef650b4b5 - -From 3682f5cad70146ab35d05af251d4461ef650b4b5 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 4 Jan 2024 12:36:53 +0100 -Subject: [PATCH] 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. ---- 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*/ - diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch deleted file mode 100644 index 5748a27e1e81..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/d529a573ab2cdbda501309e377007812e6de3351 - -From d529a573ab2cdbda501309e377007812e6de3351 Mon Sep 17 00:00:00 2001 -From: Stephen Brennan <stephen.s.brennan@oracle.com> -Date: Fri, 19 Jan 2024 11:52:24 -0800 -Subject: [PATCH] tests: skip tests which apply to disabled compression - -If configured --without-libzstd, for example, the diskdump-basic-zstd -test will return an ERROR code, causing "make check" to fail. Even using -XFAIL_TESTS will not resolve the error, because the return code is -ERROR, not FAIL. - -Instead, conditionally include the tests based on whether we are -compiling with each compression format. This way, we don't test -unsupported features. - -Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com> ---- - m4/compression.m4 | 1 + - tests/Makefile.am | 17 +++++++++++++---- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/m4/compression.m4 b/m4/compression.m4 -index 6755ef13..8cb7ce2d 100644 ---- a/m4/compression.m4 -+++ b/m4/compression.m4 -@@ -32,4 +32,5 @@ AC_SUBST([$2][_REQUIRES]) - AC_SUBST([$2][_CFLAGS]) - AC_SUBST([$2][_LIBS]) - AC_SUBST([$2][_PC_LIBS]) -+AM_CONDITIONAL(HAVE_$2, test "x$have_$1" = xyes) - ]) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 0c03b20b..8ac90b39 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -196,10 +196,6 @@ test_scripts = \ - diskdump-empty-s390x \ - diskdump-empty-x86_64 \ - diskdump-basic-raw \ -- diskdump-basic-zlib \ -- diskdump-basic-lzo \ -- diskdump-basic-snappy \ -- diskdump-basic-zstd \ - diskdump-flat-raw \ - diskdump-multiread \ - diskdump-excluded \ -@@ -331,6 +327,19 @@ test_scripts = \ - xlat-xen-x86_64-4.6-bigmem \ - zero-size - -+if HAVE_ZSTD -+test_scripts += diskdump-basic-zstd -+endif -+if HAVE_ZLIB -+test_scripts += diskdump-basic-zlib -+endif -+if HAVE_LZO -+test_scripts += diskdump-basic-lzo -+endif -+if HAVE_SNAPPY -+test_scripts += diskdump-basic-snappy -+endif -+ - dist_check_DATA = \ - addrmap-single-begin.expect \ - addrmap-single-middle.expect \ - diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch new file mode 100644 index 000000000000..20282a7a2df2 --- /dev/null +++ b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch @@ -0,0 +1,55 @@ +https://github.com/ptesarik/libkdumpfile/commit/cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5 + +From cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5 Mon Sep 17 00:00:00 2001 +From: Petr Tesarik <petr@tesarici.cz> +Date: Fri, 27 Dec 2024 12:17:35 +0100 +Subject: [PATCH] tests: Fix xlat-linux-x86_64-6.11-pti-user-ver with parallel + runs + +The xlat-linux-x86_64-6.11-pti-user and xlat-linux-x86_64-6.11-pti-user-ver +test cases use the same input files, but the logic is flawed, because they +also use the same output file names. That fails if both run in parallel. + +Fixes: #85 +Signed-off-by: Petr Tesarik <petr@tesarici.cz> +--- + tests/xlat-linux-x86_64-6.11-pti-user-ver | 2 +- + tests/xlat-os-common | 11 ++++++----- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/tests/xlat-linux-x86_64-6.11-pti-user-ver b/tests/xlat-linux-x86_64-6.11-pti-user-ver +index 43d500d1..427985bc 100755 +--- a/tests/xlat-linux-x86_64-6.11-pti-user-ver ++++ b/tests/xlat-linux-x86_64-6.11-pti-user-ver +@@ -14,5 +14,5 @@ opts=( + osver=0x060b00 + ) + +-name=xlat-linux-x86_64-6.11-pti-user ++srcname=xlat-linux-x86_64-6.11-pti-user + . "$srcdir"/xlat-os-common +diff --git a/tests/xlat-os-common b/tests/xlat-os-common +index a308a743..7dcdee91 100644 +--- a/tests/xlat-os-common ++++ b/tests/xlat-os-common +@@ -4,13 +4,14 @@ + + mkdir -p out || exit 99 + +-if [ -z "$name" ]; then +- name=$( basename "$0" ) ++name=$( basename "$0" ) ++if [ -z "$srcname" ]; then ++ srcname="$name" + fi + resultfile="out/${name}.result" +-expectfile="$srcdir/$name.expect" +-symfile="$srcdir/$name.sym" +-datafile="$srcdir/$name.data" ++expectfile="$srcdir/$srcname.expect" ++symfile="$srcdir/$srcname.sym" ++datafile="$srcdir/$srcname.data" + cfgfile="out/${name}.cfg" + + optspec= + diff --git a/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild b/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild deleted file mode 100644 index a0f045ef6f41..000000000000 --- a/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Kernel coredump file access" -HOMEPAGE="https://github.com/ptesarik/libkdumpfile" -SRC_URI="https://github.com/ptesarik/libkdumpfile/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -SLOT="0" -KEYWORDS="~amd64" -IUSE="lzo snappy zlib zstd" - -DEPEND=" - lzo? ( dev-libs/lzo ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-c99.patch - "${FILESDIR}"/${P}-disabled-compression-tests.patch - "${FILESDIR}"/${P}-32-bit-tests.patch -) - -src_prepare() { - default - - # Can drop on next release >0.5.4 - eautoreconf -} - -src_configure() { - local myeconfargs=( - # The Python bindings within libkdumpfile are deprecated - # and don't work w/ PEP517. There's a new CFFI bindings - # project we can use if anyone asks for them. - --without-python - $(use_with lzo lzo2) - $(use_with snappy) - $(use_with zlib) - $(use_with zstd libzstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild b/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild index 2c9c9ab35874..f60bded6e070 100644 --- a/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild +++ b/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,8 @@ RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-0.5.5-bfd-include.patch + "${FILESDIR}"/${P}-bfd-include.patch + "${FILESDIR}"/${P}-parallel-tests.patch ) src_configure() { |