diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..d87f5613ec4234f82f8eaeebc563711f587fdf88 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..4e5375010e83eab9ad8a77bc1ba4f811674259ba --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/libdwarf diff --git a/libdwarf-2.1.0.tar.xz b/libdwarf-2.1.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c6d96a0c8f615c9c60de01fd2df0a898cfacad56 --- /dev/null +++ b/libdwarf-2.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461bd29cbb9a41c26a25b0e527c3736c772bb7a89f6260d1edb39ab105226e06 +size 2946744 diff --git a/libdwarf-20201020.tar.gz b/libdwarf-20201020.tar.gz deleted file mode 100644 index a3cdf3aec8455db4075569a2290c76d39d00c206..0000000000000000000000000000000000000000 Binary files a/libdwarf-20201020.tar.gz and /dev/null differ diff --git a/libdwarf-both.patch b/libdwarf-both.patch new file mode 100644 index 0000000000000000000000000000000000000000..fd5550219732f7d27f893d1d84d8832ef57728cf --- /dev/null +++ b/libdwarf-both.patch @@ -0,0 +1,55 @@ +From 51ea3e8455f1da6e3b6d5c34fb0d3ffdb0c155a2 Mon Sep 17 00:00:00 2001 +From: Tom Hughes +Date: Tue, 25 Jun 2024 08:55:46 +0100 +Subject: [PATCH] Make default-library=both work on linux + +--- + src/lib/libdwarf/meson.build | 8 ++++---- + src/lib/libdwarfp/meson.build | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/lib/libdwarf/meson.build b/src/lib/libdwarf/meson.build +index a7570214..6a970024 100644 +--- a/src/lib/libdwarf/meson.build ++++ b/src/lib/libdwarf/meson.build +@@ -121,12 +121,12 @@ else + libzstd_deps = dependency('',required: false) + endif + +-if (lib_type == 'shared') +- compiler_flags = ['-DLIBDWARF_BUILD'] +- compiler_flags_public = [] +-else ++if (lib_type == 'static') + compiler_flags = ['-DLIBDWARF_STATIC'] + compiler_flags_public = ['-DLIBDWARF_STATIC'] ++else ++ compiler_flags = ['-DLIBDWARF_BUILD'] ++ compiler_flags_public = [] + endif + + libdwarf_lib = library('dwarf', libdwarf_src, +diff --git a/src/lib/libdwarfp/meson.build b/src/lib/libdwarfp/meson.build +index a46c89eb..c6a1cf72 100644 +--- a/src/lib/libdwarfp/meson.build ++++ b/src/lib/libdwarfp/meson.build +@@ -31,12 +31,12 @@ libdwarfp_src = [ + ] + + libdwarf_dir = include_directories('../libdwarf') +-if (lib_type == 'shared') +- compiler_flags = ['-DLIBDWARF_BUILD'] +- compiler_flags_public = [] +-else ++if (lib_type == 'static') + compiler_flags = ['-DLIBDWARF_STATIC'] + compiler_flags_public = ['-DLIBDWARF_STATIC'] ++else ++ compiler_flags = ['-DLIBDWARF_BUILD'] ++ compiler_flags_public = [] + endif + + +-- +2.49.0 + diff --git a/libdwarf.spec b/libdwarf.spec index 22b5418635c62751f37f3ea7c6a3cd468a942c65..2e2bdbfcf0e17a1b37dc522bf0d7db81be3dacf7 100644 --- a/libdwarf.spec +++ b/libdwarf.spec @@ -1,11 +1,17 @@ Name: libdwarf -Version: 20201020 +Epoch: 1 +Version: 2.1.0 Release: 1 Summary: Library to access DWARF debugging information -License: LGPLv2 -URL: http://www.prevanders.net/dwarf.html -Source0: http://www.prevanders.net/%{name}-%{version}.tar.gz -BuildRequires: gcc binutils-devel elfutils-libelf-devel dos2unix +License: LGPL-2.1-only and BSD-2-Clause +URL: https://www.prevanders.net/dwarf.html +Source0: https://www.prevanders.net/%{name}-%{version}.tar.xz +# Make default-library=both work on linux +Patch1: libdwarf-both.patch +BuildRequires: gcc +BuildRequires: meson >= 0.54 +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(zlib) %description Libdwarf is a library of functions to provide read/write DWARF @@ -13,7 +19,7 @@ debugging records. %package devel Summary: Library and header files of libdwarf -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Provides: libdwarf-static = %{version}-%{release} Obsoletes: libdwarf-static < %{version}-%{release} @@ -22,7 +28,7 @@ Libdwarf-devel provides libraries and header files for libdwarf. %package tools Summary: Tools to access the DWARF debugging file format -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description tools Libdwarf-tools contains dwarfdump, a tool to access DWARF debug information. @@ -33,49 +39,67 @@ Libdwarf-tools contains dwarfdump, a tool to access DWARF debug information. %autosetup -n %{name}-%{version} -p1 %build -%configure --enable-shared -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build +%meson -Ddwarfgen=true --default-library=both +%meson_build %install -%make_install -install -d %{buildroot}%{_includedir}/libdwarf -mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/libdwarf - -%delete_la +%meson_install %check -LD_LIBRARY_PATH=$PWD/libdwarf/.libs %__make check +%meson_test %files -%defattr(-,root,root) -%license libdwarf/{COPYING,LIBDWARFCOPYRIGHT,LGPL.txt} -%{_libdir}/libdwarf.so.* -%exclude %{_datadir}/libdwarf +%license src/lib/libdwarf/{COPYING,LIBDWARFCOPYRIGHT,LGPL.txt} +%{_libdir}/libdwarf.so.2 +%{_libdir}/libdwarf.so.2.* +%{_libdir}/libdwarfp.so.2 +%{_libdir}/libdwarfp.so.2.* %files devel -%defattr(-,root,root) -%{_includedir}/libdwarf -%{_libdir}/{libdwarf.so,libdwarf.a} +%{_includedir}/libdwarf-2 +%{_libdir}/pkgconfig/libdwarf.pc +%{_libdir}/libdwarf.so +%{_libdir}/libdwarfp.so +%{_libdir}/libdwarf.a +%{_libdir}/libdwarfp.a %files tools -%defattr(-,root,root) -%doc dwarfdump/{README,ChangeLog} -%license dwarfdump/{COPYING,DWARFDUMPCOPYRIGHT,GPL.txt} +%license src/bin/dwarfdump/{COPYING,DWARFDUMPCOPYRIGHT,GPL.txt} %{_bindir}/dwarfdump +%{_bindir}/dwarfgen %{_datadir}/dwarfdump/dwarfdump.conf %files help -%defattr(-,root,root) -%doc libdwarf/{ChangeLog,README,*.pdf} -%{_mandir}/man1/dwarfdump.1.gz +%doc src/lib/libdwarf/{ChangeLog,README} doc/*.pdf +%{_mandir}/man1/dwarfdump.1* +%{_mandir}/man1/dwarfgen.1* %changelog +* Tue Jul 22 2025 Funda Wang - 1:2.1.0-1 +- update to 2.1.0 + +* Wed May 21 2025 Funda Wang - 1:2.0.0-1 +- update to 2.0.0 + +* Sun Apr 27 2025 Funda Wang - 1:0.12.0-1 +- update to 0.12.0 + +* Mon Dec 09 2024 Funda Wang - 1:0.11.1-1 +- update to 0.11.1 + +* Mon Mar 25 2024 wangkai <13474090681@163.com> - 1:0.9.1-1 +- Update to 0.9.1 and fix CVE-2024-2002 + +* Thu Jun 15 2023 liyanan - 1:0.7.0-1 +- Update to 0.7.0 + +* Tue Jul 26 2022 panys - 20210528-1 +- upgrade to version 20210528 + * Tue Nov 24 2020 SimpleUpdate Robot - 20201020-1 - Upgrade to version 20201020 -* Fri Jun 21 2020 hanhui - 20200114 +* Sun Jun 21 2020 hanhui - 20200114 - Mainline branch update to 20200114 * Tue Apr 21 2020 songnannan - 20200114 diff --git a/libdwarf.yaml b/libdwarf.yaml index 43e8f5102418fdee97752e1e03ff3bc0dbaace44..618056959e7db5b8837ae047007685bbd68946fd 100644 --- a/libdwarf.yaml +++ b/libdwarf.yaml @@ -1,5 +1,4 @@ -git_url: git://git.code.sf.net/p/libdwarf/code -version_control: git -src_repo: git://git.code.sf.net/p/libdwarf/code -tag_prefix: -seperator: "." +version_control: github +src_repo: davea42/libdwarf-code +tag_prefix: "^v" +separator: "."