diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/bfd-api-change.patch b/bfd-api-change.patch new file mode 100644 index 0000000..7503183 --- /dev/null +++ b/bfd-api-change.patch @@ -0,0 +1,22 @@ +diff --git a/backtrace-symbols.c b/backtrace-symbols.c +index 0176e3f..5384e2e 100644 +--- a/backtrace-symbols.c ++++ b/backtrace-symbols.c +@@ -124,14 +124,14 @@ static void find_address_in_section( + if (arg->found) + return; + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + return; + +- bfd_vma const vma = bfd_get_section_vma(abfd, section); ++ bfd_vma const vma = bfd_section_vma(section); + if (arg->pc < vma) + return; + +- bfd_size_type const size = bfd_section_size(abfd, section); ++ bfd_size_type const size = bfd_section_size(section); + if (arg->pc >= vma + size) + return; + diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} 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 4a0ca2b..9f47afa 100644 --- a/memstomp.spec +++ b/memstomp.spec @@ -1,12 +1,14 @@ %global githash 38573e7d + Name: memstomp Version: 0.1.4 -Release: 26%{?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: @@ -15,6 +17,7 @@ URL: git://fedorapeople.org/home/fedora/wcohen/public_git/memstomp # git archive --prefix memstomp-0.1.4-38573e7d/ master | gzip > memstomp-0.1.4-3867e37d.tar.gz Source0: %{name}-%{version}-%{githash}.tar.gz Requires: util-linux +BuildRequires: make BuildRequires: gcc BuildRequires: binutils-devel autoconf automake dejagnu @@ -26,6 +29,9 @@ Patch4: memstomp-quietmode.patch 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 @@ -37,14 +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 +%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 @@ -69,6 +78,61 @@ 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 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.1.4-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.1.4-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon May 18 2020 Jeff Law - 0.1.4-29 +- Various fixes for API changes in bfd + +* Wed Jan 29 2020 Fedora Release Engineering - 0.1.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.1.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.1.4-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/Sanity/memstomp-testsuite/Makefile b/tests/Sanity/memstomp-testsuite/Makefile new file mode 100644 index 0000000..189fbe8 --- /dev/null +++ b/tests/Sanity/memstomp-testsuite/Makefile @@ -0,0 +1,64 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/memstomp/Sanity/memstomp-testsuite +# Description: Runs memstomp testsuite on installed packages +# Author: Miroslav Franc +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2013 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/tools/memstomp/Sanity/memstomp-testsuite +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Miroslav Franc " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Runs memstomp testsuite on installed packages" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 15m" >> $(METADATA) + @echo "RunFor: memstomp" >> $(METADATA) + @echo "Requires: autoconf automake binutils-devel dejagnu gcc gcc-c++ glibc-devel memstomp rpm-build" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL8 -RHEL9" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Sanity/memstomp-testsuite/PURPOSE b/tests/Sanity/memstomp-testsuite/PURPOSE new file mode 100644 index 0000000..8be9f56 --- /dev/null +++ b/tests/Sanity/memstomp-testsuite/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/memstomp/Sanity/memstomp-testsuite +Description: Runs memstomp testsuite on installed packages +Author: Miroslav Franc diff --git a/tests/Sanity/memstomp-testsuite/main.fmf b/tests/Sanity/memstomp-testsuite/main.fmf new file mode 100644 index 0000000..6388c8a --- /dev/null +++ b/tests/Sanity/memstomp-testsuite/main.fmf @@ -0,0 +1,20 @@ +summary: Runs memstomp testsuite on installed packages +description: '' +contact: Miroslav Franc +component: +- memstomp +test: ./runtest.sh +framework: beakerlib +recommend: +- autoconf +- automake +- binutils-devel +- dejagnu +- gcc +- gcc-c++ +- glibc-devel +- memstomp +- rpm-build +duration: 15m +extra-summary: /tools/memstomp/Sanity/memstomp-testsuite +extra-task: /tools/memstomp/Sanity/memstomp-testsuite diff --git a/tests/Sanity/memstomp-testsuite/runtest.sh b/tests/Sanity/memstomp-testsuite/runtest.sh new file mode 100755 index 0000000..ad1a6d6 --- /dev/null +++ b/tests/Sanity/memstomp-testsuite/runtest.sh @@ -0,0 +1,87 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/memstomp/Sanity/memstomp-testsuite +# Description: Runs memstomp testsuite on installed packages +# Author: Miroslav Franc +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2013 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGES=(binutils-devel autoconf automake dejagnu) + +if [[ $(arch) == i686 ]] +then + ourlibdir=lib +else + ourlibdir=lib64 +fi + +PACKAGE=memstomp + +if scl_enabled +then + for p in ${X_SCLS} + do + [[ $p == devtoolset* ]] && PACKAGE=${p}-${PACKAGE} + done; unset p +fi + +rlJournalStart + rlPhaseStartSetup "testing $PACKAGE" + for p in "${PACKAGES[@]}"; do + rpm -q "$p" || yum -y install "$p" + rlAssertRpm "$p" + done; unset p + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlRun "echo '%_topdir /root/memstomp-rebuild' > ~/.rpmmacros" + rlRun "mkdir -p /root/memstomp-rebuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}" + rlFetchSrcForInstalled $PACKAGE + rlRun "rpm -Uvh *.src.rpm" + export CC=/usr/bin/gcc + rlRun "rpmbuild -bi /root/memstomp-rebuild/SPECS/memstomp.spec &> build_log" + rlFileSubmit build_log + rlRun "pushd /root/memstomp-rebuild/BUILD/memstomp-*/testsuite" + rlLog "We should run this on installed packages..." + rlRun "find /root/memstomp-rebuild/ -name libmemstomp.so -delete" + rlRun "find /root/memstomp-rebuild/ -name libmemstomp-backtrace-symbols.so -delete" + rlPhaseEnd + + rlPhaseStartTest + rlRun "runtest -v --tool memstomp --srcdir `pwd` > $TmpDir/log 2>&1" + rlAssertNotGrep 'unexpected failures' $TmpDir/log + rlLog "No testcases should disappear..." + rlRun "[[ $(grep '# of expected passes' $TmpDir/log | awk '{print $5}') -ge 88 ]]" + rlLog "$(sed -n '/=== memstomp Summary ===/,$p' $TmpDir/log)" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd"; rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun "rm -r /root/memstomp-rebuild" + rlRun "rm -r ~/.rpmmacros" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd