.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

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

0001-Add-minimal-support-for-RISC-V-64-bit-riscv64.patch

@@ -1,97 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a4c65f2..28ea4a6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,7 +13,7 @@ bin_PROGRAMS = execstack
- arch_SOURCES = arch-i386.c arch-alpha.c arch-ppc.c arch-ppc64.c \
- 	       arch-sparc.c arch-sparc64.c arch-x86_64.c arch-mips.c \
- 	       arch-s390.c arch-s390x.c arch-arm.c arch-sh.c arch-ia64.c \
--	       arch-aarch64.c
-+	       arch-aarch64.c arch-riscv64.c
- common_SOURCES = checksum.c data.c dso.c dwarf2.c dwarf2.h fptr.c fptr.h     \
- 		 hashtab.c hashtab.h mdebug.c prelink.h stabs.c crc32.c
- prelink_SOURCES = cache.c conflict.c cxx.c doit.c exec.c execle_open.c get.c \
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 863dc83..15f7b78 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -108,7 +108,7 @@ bin_PROGRAMS = execstack
- arch_SOURCES = arch-i386.c arch-alpha.c arch-ppc.c arch-ppc64.c \
- 	       arch-sparc.c arch-sparc64.c arch-x86_64.c arch-mips.c \
- 	       arch-s390.c arch-s390x.c arch-arm.c arch-sh.c arch-ia64.c \
--	       arch-aarch64.c
-+	       arch-aarch64.c arch-riscv64.c
- 
- common_SOURCES = checksum.c data.c dso.c dwarf2.c dwarf2.h fptr.c fptr.h     \
- 		 hashtab.c hashtab.h mdebug.c prelink.h stabs.c crc32.c
-@@ -141,7 +141,7 @@ am__objects_2 = arch-i386.$(OBJEXT) arch-alpha.$(OBJEXT) \
- 	arch-sparc64.$(OBJEXT) arch-x86_64.$(OBJEXT) \
- 	arch-mips.$(OBJEXT) arch-s390.$(OBJEXT) arch-s390x.$(OBJEXT) \
- 	arch-arm.$(OBJEXT) arch-sh.$(OBJEXT) arch-ia64.$(OBJEXT) \
--	arch-aarch64.$(OBJEXT)
-+	arch-aarch64.$(OBJEXT) arch-riscv64.$(OBJEXT)
- am_execstack_OBJECTS = execstack.$(OBJEXT) $(am__objects_1) \
- 	$(am__objects_2)
- execstack_OBJECTS = $(am_execstack_OBJECTS)
-@@ -169,7 +169,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/arch-ppc.Po ./$(DEPDIR)/arch-ppc64.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/arch-s390.Po ./$(DEPDIR)/arch-s390x.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/arch-sh.Po ./$(DEPDIR)/arch-sparc.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/arch-sparc64.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/arch-sparc64.Po ./$(DEPDIR)/arch-riscv64.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/arch-x86_64.Po ./$(DEPDIR)/cache.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/canonicalize.Po ./$(DEPDIR)/checksum.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/conflict.Po ./$(DEPDIR)/crc32.Po \
-@@ -290,6 +290,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arch-sh.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arch-sparc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arch-sparc64.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arch-riscv64.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arch-x86_64.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize.Po@am__quote@
-diff --git a/src/arch-riscv64.c b/src/arch-riscv64.c
-new file mode 100644
-index 0000000..927fbb7
---- /dev/null
-+++ b/src/arch-riscv64.c
-@@ -0,0 +1,38 @@
-+/* Copyright (C) 2019 David Abdurachmanov
-+   Written by David Abdurachmanov <david.abdurachmanov@gmail.com>, 2019.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-+
-+#include <config.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <locale.h>
-+#include <error.h>
-+#include <argp.h>
-+#include <stdlib.h>
-+
-+#include "prelink.h"
-+
-+PL_ARCH = {
-+  .name = "RISCV64",
-+  .class = ELFCLASS64,
-+  .machine = EM_RISCV,
-+  .alternate_machine = { EM_NONE },
-+  .max_page_size = 0x1000,
-+  .page_size = 0x1000
-+};
-\ No newline at end of file

changelog

@@ -1,56 +0,0 @@
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 22 2022 Florian Weimer <fweimer@redhat.com> - 0.5.0-24
-- Avoid implicit function declarations in configure (#2144890)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* 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
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Aug 21 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.0-9
-- Add support for aarch64 (#1251165)
-
-* Mon Jul 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.0-8
-- Kill off most of prelink package

coverity.patch

@@ -0,0 +1,12 @@
+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-configure-c99.patch

@@ -1,37 +0,0 @@
-Avoid implicit function declarations, a C feature removed in 1999.
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index a357ef74b30a09a6..2d2af334d5369e8e 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -6727,6 +6727,7 @@ AC_DEFUN(AC_LIBELF_SXWORD,
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- 
- static unsigned char sparc64_elf[] = {
- 0x7f,0x45,0x4c,0x46,0x02,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-diff --git a/configure b/configure
-index 9f2a746fbf3f7471..960e140559761417 100755
---- a/configure
-+++ b/configure
-@@ -4438,8 +4438,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -19411,6 +19411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- 
- static unsigned char sparc64_elf[] = {
- 0x7f,0x45,0x4c,0x46,0x02,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

execstack.spec

@@ -1,26 +1,21 @@
 Name:           execstack
 Version:        0.5.0
-Release:        %autorelease
+Release:        15%{?dist}
 Summary:        Utility to set/clear/query executable stack bit
 
 %global commit 4c79120bcdbde0616f592458ccde7035e92ca3d8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-License: GPL-2.0-or-later
+License: GPLv2+
 # work around for missing upstream tarball with latest checkin
 Source0: https://github.com/keszybz/prelink/archive/%{commit}.tar.gz#/prelink-%{shortcommit}.tar.gz
 
 Patch0:  Add-PL_ARCH-for-AArch64.patch
-Patch1: execstack-configure-c99.patch
+Patch1:  coverity.patch
 
-Patch10:    0001-Add-minimal-support-for-RISC-V-64-bit-riscv64.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
 
@@ -61,4 +56,26 @@ install -Dm0644 doc/execstack.8 %{buildroot}%{_mandir}/man8/execstack.8
 %{_mandir}/man8/execstack.8.*
 
 %changelog
-%autochangelog
+* Thu Oct 18 2018 Nikola Forró <nforro@redhat.com> - 0.5.0-15
+- Fix important Covscan defects (#1602488)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Aug 21 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.0-9
+- Add support for aarch64 (#1251165)
+
+* Mon Jul 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.0-8
+- Kill off most of prelink package

gating.yaml

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

plans/tier1-internal.fmf

@@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/execstack
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora

sources

@@ -1 +1 @@
-be72ec6026b1be67ad46351c428d004e  prelink-4c79120.tar.gz
+SHA512 (prelink-4c79120.tar.gz) = 0735edf2e7c1bd916b4ecad31b71c62319e7c23104f038908a1d8f9135a0c8652d9d62d3fe8c389e1e20062fe6ecca0c1e426ec7029ca6a1ea0ee99a3407404b