From e50410dd2e07acddf63131a39398f382758a60b7 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 17:21:52 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/annobin.git#a707c7d43e875c51159fa2d72de13d2a6cf0cedf --- annobin.spec | 10 +++++++--- gating.yaml | 7 ------- tests/test_annobin | 40 ---------------------------------------- tests/test_annocheck | 40 ---------------------------------------- tests/tests.yml | 15 --------------- 5 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 gating.yaml delete mode 100644 tests/test_annobin delete mode 100644 tests/test_annocheck delete mode 100644 tests/tests.yml diff --git a/annobin.spec b/annobin.spec index 928e16f..4bdf605 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 9.36 -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv3+ # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -312,8 +312,12 @@ fi #--------------------------------------------------------------------------------- %changelog -* Fri Oct 23 2020 Nick Clifton - 9.36-3 -- Record the use of LTO and produce a soft warning if not enabled. (#1889821) +* Wed Oct 21 2020 Nick Clifton - 9.36-1 +- Record the -flto setting and produce a soft warning if it is absent. +- Suppress warnings about _D_GLIBCXX_ASSERTIONS if the source code is known to be something other than C++. + +* Wed Oct 21 2020 Nick Clifton - 9.35-3 +- NVR bump to allow building on ELN sidetag. * Mon Oct 05 2020 Nick Clifton - 9.35-2 - Correct the directory chosen for 32-bit LLVM and Clang plugins. (#1884951) diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 4f520a7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other.functional} diff --git a/tests/test_annobin b/tests/test_annobin deleted file mode 100644 index 7953dda..0000000 --- a/tests/test_annobin +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# Checks that annobin works - -. /usr/share/beakerlib/beakerlib.sh - -# Set the full test name -TEST="/AppStream/annobin/Sanity/annobin" - -# Package being tested -PACKAGE="annobin" - -rlJournalStart - # Setup phase: Prepare test directory - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun 'TmpDir=$(mktemp -d)' 0 'Creating tmp directory' # no-reboot - rlRun "pushd $TmpDir" - rlPhaseEnd - - # Test phase: Test the annobin plugin - rlPhaseStartTest - rlRun 'echo "int main (void) { return 0; }" >main.c' 0 "Create a C test source file" - rlAssertExists "main.c" - rlRun "gcc -fplugin=annobin main.c -o a.exe" 0 "Compile the test file" - rlAssertExists "a.exe" - rlRun "readelf --wide --notes a.exe >readelf.out" 0 "Examine the executable with readelf" - rlAssertExists "readelf.out" - # FIXME: Parse the output and make sure that there are is valid annobin data there - rlPhaseEnd - - # Cleanup phase: Remove test directory - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalEnd - -# Print the test report -rlJournalPrintText diff --git a/tests/test_annocheck b/tests/test_annocheck deleted file mode 100644 index 0296254..0000000 --- a/tests/test_annocheck +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# Checks that annocheck works - -. /usr/share/beakerlib/beakerlib.sh - -# Set the full test name -TEST="/AppStream/annobin/Sanity/annocheck" - -# Package being tested -PACKAGE="annobin" - -rlJournalStart - # Setup phase: Prepare test directory - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun 'TmpDir=$(mktemp -d)' 0 'Creating tmp directory' # no-reboot - rlRun "pushd $TmpDir" - rlPhaseEnd - - # Test phase: Test the annobin plugin - rlPhaseStartTest - rlRun 'echo "int main (void) { return 0; }" >main.c' 0 "Create a C test source file" - rlAssertExists "main.c" - rlRun "gcc -O2 -fstack-protector-strong -fPIE -fplugin=annobin -pie -Wl,-z,now main.c -o a.exe" 0 "Compile the test file" - rlAssertExists "a.exe" - rlRun "annocheck a.exe --skip-cf-protection --skip-stack-clash --skip-glibcxx-assertions --skip-fortify --skip-warnings >annocheck.out" 0 "Examine the executable with annocheck" - rlAssertExists "annocheck.out" - # FIXME: Parse the output and make sure that the checks pass - rlPhaseEnd - - # Cleanup phase: Remove test directory - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalEnd - -# Print the test report -rlJournalPrintText diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 057e77a..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - atomic - - classic - - container - tests: - - test_annobin - - test_annocheck - required_packages: - - findutils # beakerlib needs find command - - annobin # So that we can test it... - - annobin-annocheck # We need the annocheck command - - gcc # To build some test cases