gentoo resync : 15.12.2019

5 files changed, 7 insertions, 173 deletions

diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index b5bb23971b29..6c5261ac0c05 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,8 +1,6 @@
-AUX libhugetlbfs-2.20-noexec-stack.patch 3513 BLAKE2B b33aa3f5891e1c55c00c61e7d7232504466dc78c6b4d232f64ec5047c45c6044058bdebea02ddb1f67deb20f298e970d96d2fe8a76a017984d46863c179c0924 SHA512 b8146512167da9530f107d3db4695d8e1174568c2f10bab41c3c3f8dff27b1357cef409e95cea75fbce177366a84904d80a7f1cfb7653dc6e8e10c0abfd8ef0b
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
-AUX libhugetlbfs-2.9-build.patch 1163 BLAKE2B 782c802c12ba86c637fa693dda3d8fb618068f156ccaae5a60623d077997d4dcc7a27e3b2fa4e3b7ec0a34ae8db2e9571bad077de103ca6b65de533b6fc896c9 SHA512 d6443875d2dd2e44abfd470ec793b70d0cf5a69931e2c2889a7b204d1c27bc2abc3b0c7149a495845e080cb797b759844c330ad5c467aed7dae0669b7f5b7ff2
 DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0
 DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8
-EBUILD libhugetlbfs-2.21.ebuild 4068 BLAKE2B 903b0db5f72e4926e8185d15bc4ad970fc77926381bdb6ad0205aa9bcbb7fe6a8936f38a4b783d2a418ad0523ca045cca45db7ed1650e892edd58db1f04de233 SHA512 9df56b646c5df82903a03562e7de61b019d3182a9b8d9b24506ad3bd0edf2ba68b4cd00ba5c47410c8f60876d0fe79b360b50d6c40f6a08d9db6c688cfbfc36d
-EBUILD libhugetlbfs-2.22.ebuild 4153 BLAKE2B 3079451b1dd71059eb955d6ff8a3c08986176fdaeadfce9358b56deedd011a23a301cf80eff014960103a08802a77ef8327f0394e38c9c94a89550a45bb876a1 SHA512 a77ab0a980a286945b1082cbcfa02a7c984d16be555bcfc50b9b2f2bc4a4c1cae45bb93e304ad9b3970e59624d52624be9806c20d576ab41d791d916ae7a2e56
+EBUILD libhugetlbfs-2.21.ebuild 4061 BLAKE2B 93e5777e62c7002285854bda8e2f6b7560ef4a2a00347407bee21d0bbba46ed4e9b0d21f5b054c65a05564271c5a39efd1989131735eac257dec270c8a8bf4a0 SHA512 19b644e0e4c67417ca4e3e3c8da804f00efecb13a68f241eaafc869183c1512e96099fbc6b528cf87484119d6e31cdd692ccd9b90d16e87dd551574a5a5ef753
+EBUILD libhugetlbfs-2.22.ebuild 4149 BLAKE2B 6dd795205b11af7732ff851aa87c382d2ebdc58d26fda6edff6357f8c21dd2d06cdff5d08676b53bb5eab7ec7f9f8b8f96e39ce59d735e7d6971d442bd0b6897 SHA512 e2d515965d2f09c337d682126cd4aa0439f91e282a72dc259d754998f3933b6b692967ef5efa57f55670b8cf6a3d85f56422fbb9f07d229550840d5744bd9880
 MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
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 04c8baee37b8..000000000000
--- 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" <robbat2@gentoo.org>
-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 827e2a58d101..000000000000
--- 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
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
index e7aae65f6050..8afaeb6120b1 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
@@ -72,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	hugeadm='obj/hugeadm'
 	allocated=''
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
index 34b969c3fe3d..b62aa943041e 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
@@ -72,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	local hugeadm='obj/hugeadm'
 	local allocated=''