diff --git a/memstomp-PTR.patch b/memstomp-PTR.patch new file mode 100644 index 0000000..0afb7d8 --- /dev/null +++ b/memstomp-PTR.patch @@ -0,0 +1,17 @@ +diff --git a/backtrace-symbols.c b/backtrace-symbols.c +index 5384e2e..9fc464a 100644 +--- a/backtrace-symbols.c ++++ b/backtrace-symbols.c +@@ -90,10 +90,10 @@ static asymbol **slurp_symtab(bfd *const abfd) + return syms; + + unsigned int size; +- long symcount = bfd_read_minisymbols(abfd, false, (PTR) & syms, &size); ++ long symcount = bfd_read_minisymbols(abfd, false, (void *) & syms, &size); + if (symcount == 0) + symcount = bfd_read_minisymbols(abfd, true /* dynamic */ , +- (PTR) & syms, &size); ++ (void *) & syms, &size); + + if (symcount < 0) + bfd_fatal(bfd_get_filename(abfd)); diff --git a/memstomp-sframe.patch b/memstomp-sframe.patch new file mode 100644 index 0000000..b0091eb --- /dev/null +++ b/memstomp-sframe.patch @@ -0,0 +1,12 @@ +diff -up memstomp-0.1.4-38573e7d/configure.ac.orig memstomp-0.1.4-38573e7d/configure.ac +--- memstomp-0.1.4-38573e7d/configure.ac.orig 2023-03-06 14:07:57.086183046 -0500 ++++ memstomp-0.1.4-38573e7d/configure.ac 2023-03-06 14:16:31.513215306 -0500 +@@ -76,6 +76,8 @@ AC_SEARCH_LIBS([htab_find_slot], [iberty + AC_CHECK_HEADERS([libiberty.h], [], [AC_MSG_ERROR([*** libiberty.h header not found])]) + AC_SEARCH_LIBS([bfd_init], [bfd], [], [AC_MSG_ERROR([*** libbfd not found])]) + AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([*** bfd.h header not found])]) ++# Newer binutils-2.40 also need to link with sframe library ++AC_SEARCH_LIBS(sframe_decode, sframe) + + #### Typdefs, structures, etc. #### + diff --git a/memstomp.spec b/memstomp.spec index bdf1e61..9f47afa 100644 --- a/memstomp.spec +++ b/memstomp.spec @@ -2,12 +2,13 @@ Name: memstomp Version: 0.1.4 -Release: 32%{?dist} +Release: 44%{?dist} Summary: Warns of memory argument overlaps to various functions # The entire source code is LGPLV3+ with the exception of backtrace-symbols.c which # is GPLv2+ by way of being a hacked up old version of binutils's addr2line. # backtrace-symbols.c is built into an independent .so to avoid license contamination -License: LGPLv3+ and GPLv2+ +# Automatically converted from old format: LGPLv3+ and GPLv2+ - review is highly recommended. +License: LGPL-3.0-or-later AND GPL-2.0-or-later URL: git://fedorapeople.org/home/fedora/wcohen/public_git/memstomp # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: @@ -29,6 +30,8 @@ Patch5: memstomp-rh1093173.patch Patch6: memstomp-rh1133815.patch Patch7: memstomp-implicit-int.patch Patch8: bfd-api-change.patch +Patch9: memstomp-PTR.patch +Patch10: memstomp-sframe.patch %description @@ -40,15 +43,17 @@ overlapping memory arguments to certain library calls. %prep %setup -q -n %{name}-%{version}-%{githash} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 +%patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 %build @@ -73,6 +78,43 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/memstomp.1.gz %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.4-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.4-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Aug 07 2024 Miroslav Suchý - 0.1.4-42 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.4-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.1.4-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.1.4-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.4-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Mar 6 2023 William Cohen - 0.1.4-37 +- Link in binutils sframe library when available to fix FTBFS. (rhbz#2171607) + +* Mon Feb 20 2023 Jeff Law - 0.1.4-36 +- Fix for libibery no longer providing PTR + (#2171607) + +* Thu Jan 19 2023 Fedora Release Engineering - 0.1.4-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.1.4-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.1.4-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.1.4-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild