commit: 2d58b63f8b08a94af2d27e0f447914355db3fefb Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Nov 14 15:16:27 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Mon Nov 18 22:16:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d58b63f
sys-libs/libhugetlbfs: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13652 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/libhugetlbfs-2.20-noexec-stack.patch | 135 --------------------- .../files/libhugetlbfs-2.9-build.patch | 31 ----- 2 files changed, 166 deletions(-) diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch deleted file mode 100644 index 04c8baee37b..00000000000 --- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch +++ /dev/null @@ -1,135 +0,0 @@ -https://github.com/libhugetlbfs/libhugetlbfs/pull/9 - -From 1c41d751d57a598919c40ab9c27514a98da93273 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <[email protected]> -Date: Sat, 31 Oct 2009 07:59:57 +0000 -Subject: [PATCH] set noexec markers in the asm file directly - -Using -Wl,-z,noexecstack can hide real exec stack issues coming from other -files, and is a bit unportable. Instead, set proper section markers in the -assembly files directly. It also means people using the static libraries -won't have to use -Wl,-z,noexecstack when they link their code. ---- - Makefile | 2 +- - sys-aarch64elf.S | 4 ++++ - sys-armelf_linux_eabi.S | 4 ++++ - sys-elf32ppclinux.S | 4 ++++ - sys-elf64_s390.S | 4 ++++ - sys-elf64ppc.S | 4 ++++ - sys-elf_i386.S | 4 ++++ - sys-elf_s390.S | 4 ++++ - sys-elf_x86_64.S | 4 ++++ - 9 files changed, 33 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 73ebad7..ca987d9 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ NODEPTARGETS=<version.h> <clean> - - INSTALL = install - --LDFLAGS += -Wl,-z,noexecstack -ldl -+LDFLAGS += -ldl - CFLAGS ?= -O2 -g - CFLAGS += -Wall -fPIC - CPPFLAGS += -D__LIBHUGETLBFS__ -diff --git a/sys-aarch64elf.S b/sys-aarch64elf.S -index 54799d3..210558b 100644 ---- a/sys-aarch64elf.S -+++ b/sys-aarch64elf.S -@@ -32,3 +32,7 @@ direct_syscall: - mov x6, x7 - svc 0x0 - ret -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-armelf_linux_eabi.S b/sys-armelf_linux_eabi.S -index dfa7407..265b75d 100644 ---- a/sys-armelf_linux_eabi.S -+++ b/sys-armelf_linux_eabi.S -@@ -31,3 +31,7 @@ direct_syscall: - swi 0x0 - ldmfd sp!, {r4, r5, r6, r7} - bx lr -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf32ppclinux.S b/sys-elf32ppclinux.S -index 65d8b3f..6ba3f22 100644 ---- a/sys-elf32ppclinux.S -+++ b/sys-elf32ppclinux.S -@@ -32,3 +32,7 @@ direct_syscall: - mr 8,9 - sc - blr -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf64_s390.S b/sys-elf64_s390.S -index 425a387..5c31899 100644 ---- a/sys-elf64_s390.S -+++ b/sys-elf64_s390.S -@@ -20,3 +20,7 @@ direct_syscall: - lgr %r5,%r6 - svc 0 - br %r14 -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf64ppc.S b/sys-elf64ppc.S -index d50f4a6..b57a345 100644 ---- a/sys-elf64ppc.S -+++ b/sys-elf64ppc.S -@@ -46,3 +46,7 @@ direct_syscall: - mr 8,9 - sc - blr -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf_i386.S b/sys-elf_i386.S -index ab30c8d..6182b3d 100644 ---- a/sys-elf_i386.S -+++ b/sys-elf_i386.S -@@ -40,3 +40,7 @@ direct_syscall: - pop %edi - pop %ebp - ret -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf_s390.S b/sys-elf_s390.S -index 40630d1..e6a9a96 100644 ---- a/sys-elf_s390.S -+++ b/sys-elf_s390.S -@@ -20,3 +20,7 @@ direct_syscall: - lr %r5,%r6 - svc 0 - br %r14 -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif -diff --git a/sys-elf_x86_64.S b/sys-elf_x86_64.S -index 6af06ad..561f49b 100644 ---- a/sys-elf_x86_64.S -+++ b/sys-elf_x86_64.S -@@ -32,3 +32,7 @@ direct_syscall: - mov 0x8(%rsp),%r9 - syscall - retq -+ -+#if defined(__linux__) && defined(__ELF__) -+ .section .note.GNU-stack,"",%progbits -+#endif --- -2.6.2 - diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch deleted file mode 100644 index 827e2a58d10..00000000000 --- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2010-08-13 20:14:18.000000000 -0400 -+++ Makefile 2010-08-13 20:14:42.000000000 -0400 -@@ -314,24 +314,24 @@ - $(BIN_OBJ_DIR)/hugectl: $(BIN_OBJ_DIR)/hugectl.o - @$(VECHO) LDHOST $@ - mkdir -p $(BIN_OBJ_DIR) -- $(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^ -+ $(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) - - $(BIN_OBJ_DIR)/hugeedit: $(BIN_OBJ_DIR)/hugeedit.o - @$(VECHO) LDHOST $@ - mkdir -p $(BIN_OBJ_DIR) -- $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ -+ $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS) - - HUGEADM_OBJ=hugeadm.o libhugetlbfs_privutils.a - $(BIN_OBJ_DIR)/hugeadm: $(foreach file,$(HUGEADM_OBJ),$(BIN_OBJ_DIR)/$(file)) - @$(VECHO) LDHOST $@ - mkdir -p $(BIN_OBJ_DIR) -- $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ -+ $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS) - - PAGESIZE_OBJ=pagesize.o libhugetlbfs_privutils.a - $(BIN_OBJ_DIR)/pagesize: $(foreach file,$(PAGESIZE_OBJ),$(BIN_OBJ_DIR)/$(file)) - @$(VECHO) LDHOST $@ - mkdir -p $(BIN_OBJ_DIR) -- $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ -+ $(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS) - - clean: - @$(VECHO) CLEAN
