Accepting request 1191071 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/1191071
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/execstack?expand=0&rev=5
This commit is contained in:
2024-08-02 15:27:10 +00:00
committed by Git OBS Bridge
3 changed files with 26 additions and 2 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 1 18:57:10 UTC 2024 - Marcus Meissner <meissner@suse.com>
- prelink-gcc14.patch: fix build with gcc14
- added auto tools for fixing build
-------------------------------------------------------------------
Thu Feb 22 11:39:44 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@@ -1,7 +1,7 @@
#
# spec file for package execstack
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# 2014 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
@@ -38,10 +38,14 @@ Patch1: prelink_update_fsf_address.patch
# bypass where gcc linker do not add the GNU_STACK default header in elf file
Patch2: prelink_add_no_execstack_for_ppc64.patch
Patch3: riscv64-support-for-execstack.patch
Patch4: prelink-gcc14.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: git
BuildRequires: libelf-devel
BuildRequires: libselinux-devel
BuildRequires: libtool
BuildRequires: selinux-tools
Requires: coreutils
Requires: findutils
@@ -65,10 +69,12 @@ with or without executable stack.
%patch -P 2 -p1
%endif
%patch -P 3 -p1
%patch -P 4 -p1
%build
sed -i -e '/^prelink_LDADD/s/$/ -lpthread/' src/Makefile.{am,in}
%configure
autoreconf -i -f
%configure || cat config.log
make %{?_smp_mflags} -C gelf
make %{?_smp_mflags} -C gelfx
make %{?_smp_mflags} -C gelfx32

12
prelink-gcc14.patch Normal file
View File

@@ -0,0 +1,12 @@
Index: prelink-4c79120bcdbde0616f592458ccde7035e92ca3d8/m4/libelf.m4
===================================================================
--- prelink-4c79120bcdbde0616f592458ccde7035e92ca3d8.orig/m4/libelf.m4
+++ prelink-4c79120bcdbde0616f592458ccde7035e92ca3d8/m4/libelf.m4
@@ -14,6 +14,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,