.execstack.metadata

@@ -1 +1 @@
-2d9c4f3c410e4820587cf22d22091fb38f6bc43f SOURCES/prelink-4c79120.tar.gz
+2d9c4f3c410e4820587cf22d22091fb38f6bc43f prelink-4c79120.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/prelink-4c79120.tar.gz
+/prelink-4c79120.tar.gz

SOURCES/coverity.patch

@@ -1,12 +0,0 @@
-diff --git a/src/fptr.c b/src/fptr.c
-index cfe3aed..5d68c11 100644
---- a/src/fptr.c
-+++ b/src/fptr.c
-@@ -458,6 +458,7 @@ opd_size (struct prelink_info *info, GElf_Word entsize)
- 	e->val = f->val;
- 	e->gp = f->gp;
- 	e->opd = ret | OPD_ENT_NEW;
-+	f->ent = e;
- 	ret += entsize;
-       }
- 

coverity.patch

@@ -0,0 +1,27 @@
+diff --git a/src/arch-ia64.c b/src/arch-ia64.c
+index 2573d69..6ca1129 100644
+--- a/src/arch-ia64.c
++++ b/src/arch-ia64.c
+@@ -119,8 +119,8 @@ ia64_adjust_rela (DSO *dso, GElf_Rela *rela, GElf_Addr start,
+ 	}
+       else
+ 	{
+-	  write_le64 (dso, rela->r_offset, val);
+-	  write_le64 (dso, rela->r_offset + 8, gp);
++	  write_be64 (dso, rela->r_offset, val);
++	  write_be64 (dso, rela->r_offset + 8, gp);
+ 	}
+     }
+   return 0;
+diff --git a/src/fptr.c b/src/fptr.c
+index cfe3aed..5d68c11 100644
+--- a/src/fptr.c
++++ b/src/fptr.c
+@@ -458,6 +458,7 @@ opd_size (struct prelink_info *info, GElf_Word entsize)
+ 	e->val = f->val;
+ 	e->gp = f->gp;
+ 	e->opd = ret | OPD_ENT_NEW;
++	f->ent = e;
+ 	ret += entsize;
+       }
+ 

execstack.spec

@@ -1,6 +1,6 @@
 Name:           execstack
 Version:        0.5.0
-Release:        15%{?dist}
+Release:        23%{?dist}
 Summary:        Utility to set/clear/query executable stack bit
 
 %global commit 4c79120bcdbde0616f592458ccde7035e92ca3d8
@@ -13,9 +13,12 @@ Source0: https://github.com/keszybz/prelink/archive/%{commit}.tar.gz#/prelink-%{
 Patch0:  Add-PL_ARCH-for-AArch64.patch
 Patch1:  coverity.patch
 
+BuildRequires: gcc
+BuildRequires: gcc-c++
 BuildRequires: elfutils-libelf-devel
 BuildRequires: libselinux-devel, libselinux-utils
 BuildRequires: git
+BuildRequires: make
 Requires: glibc >= 2.2.4-18, coreutils, findutils
 Requires: util-linux, gawk, grep
 
@@ -56,8 +59,34 @@ install -Dm0644 doc/execstack.8 %{buildroot}%{_mandir}/man8/execstack.8
 %{_mandir}/man8/execstack.8.*
 
 %changelog
-* Thu Oct 18 2018 Nikola Forró <nforro@redhat.com> - 0.5.0-15
-- Fix important Covscan defects (#1602488)
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.0-23
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jul 30 2021 Nikola Forró <nforro@redhat.com> - 0.5.0-22
+- Fix important Covscan defects
+  resolves: #1938712
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.0-21
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -0,0 +1 @@
+be72ec6026b1be67ad46351c428d004e  prelink-4c79120.tar.gz

tests/test_execstack

@@ -0,0 +1,35 @@
+#!/bin/bash
+ 
+. /usr/share/beakerlib/beakerlib.sh
+ 
+TEST="/CRB/execstack/Sanity/execstack"
+ 
+PACKAGES=${PACKAGES:-execstack}
+REQUIRES=${REQUIRES:-gcc}
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm --all
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+ 
+    rlPhaseStartTest
+        rlRun "echo 'int main() {}' | gcc -x c -z noexecstack - -o A" 0 "Compiling binary without executable stack"
+        rlRun "echo 'int main() {}' | gcc -x c -z execstack - -o B" 0 "Compiling binary with executable stack"
+        rlRun "execstack --query A > out" 0 "Querying binary A"
+        rlAssertGrep "^-" "out"
+        rlRun "execstack --query B > out" 0 "Querying binary B"
+        rlAssertGrep "^X" "out"
+        rlRun "execstack --clear-execstack B" 0 "Clearing executable stack marking from binary B"
+        rlRun "execstack --query B > out" 0 "Querying binary B"
+        rlAssertGrep "^-" "out"
+    rlPhaseEnd
+ 
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalEnd
+ 
+rlJournalPrintText

tests/tests.yml

@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - atomic
+    - classic
+    - container
+    tests:
+    - test_execstack
+    required_packages:
+    - execstack
+    - gcc