gentoo resync : 25.11.2020

4 files changed, 6 insertions, 133 deletions

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 41c64efdcc93..cfa529d40e18 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -3,13 +3,11 @@ AUX ldap-scripts/edquota_editor 1243 BLAKE2B fbaf521aeda741ce3d2aabaa60609d914b6
 AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059da8da9da0f8065e0bdd2dfa8c624787f860843d07e38caf301ccfc9b9d2dac2e978a68304abc037f375b4c647c SHA512 9e08e51834458885a046395002bb19a463533bc0e1fc23f1fda98c41ee48c0f122e284f4a520d6f6ef44d66142395c10f91e18076e0a54e57dd198f7da268748
 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad
 AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b
-AUX quota-4.04-Listen-on-a-TCP-socket.patch 2432 BLAKE2B cfc2d9d3e8200e0974ee98cf35600185e7331d659117fc4bc0c4f141523475af9c7625dd6b9754199357af212043591089727e7bb9234808aad75c61c345cff6 SHA512 3f6a567a271333d01b4aa81e90fa0fd68a32c7888813c8bd86f5847ad7d8b8f8575370ede313b9e5c922bcb81e1cca3211c18b4ac97a2dcbfca00e282f9fab11
-AUX quota-4.04-glibc226.patch 983 BLAKE2B 7d4dd586fb6731d62e8c442d849b33b537e3e93719261ac42889d8de04199286a1ac2a0a0ba32acc174573883288821797d291e33b2b4b57c7fb66e6cab07c90 SHA512 90bcfb9fbb881602cb01000cea691016e6c7c99a5d2fc22b114615fec9ef4752c07253eaeaf80023e6f0768ab95429aac10772f6d12547c43eba4300877f89b9
 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
-DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
-EBUILD quota-4.04-r3.ebuild 1658 BLAKE2B ebac2f79e9f2497f7bf900e2a66b4d4baf9fcad47841ed781fd82817df33c9cfaa1da46be94937847abbb2b4b770140281fef31116f4e3d8294e925b9a962dde SHA512 d01f8fbc83d7f766fbdbc01cac988f5b07408d1019c9156f83ef62794b87a868a75510afc6972917519761b702cac406004e8c02fa31178478669c181f98f399
+DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
 EBUILD quota-4.05-r1.ebuild 1560 BLAKE2B e618e2d76a444f254a9edf3185e32616d8eaab8669c0d616316c57d60b88ff6fdb41f50f60747232451377927cf5f5f556929de5ef9c173eb3ad855ec094ec46 SHA512 19a9557d7f9fe22e7ed9eea549546f7dad50d69642753aa974f80a63d43b6962e375fd9b5ffb83b81eebe87ca51937be321ffc7b0a0676da4bd77d4b698881f6
+EBUILD quota-4.06.ebuild 1577 BLAKE2B 7a3ddaf149f29f4bd1f9228f27a9084dc72a96f03b8a4b7842e3bd4e0ed7a3b5c1c14d8f9469b67b715850b446b6394bed20480d65b2dd7b8f4beefa0a89c726 SHA512 8498b17c4852f96a4a508e26c4e9e71e297bbd93a21792d995671246c44abc3cb6d8f65e71b40a1673e166dc379cb8934125ab12ea1a3f8fe258d36f7789b9a2
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
deleted file mode 100644
index cf1bd4aad32f..000000000000
--- a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 22 May 2018 12:41:59 +0200
-Subject: [PATCH] Listen on a TCP socket
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
-connections because the polled TCP socket is not listening:
-
-poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
-  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
-accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-
-The polled descriptors are:
-
-rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
-rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
-rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
-rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
-
-That results into a high CPU usage just after staring rpc.rquotad
-process.
-
-This patch adds a listen() call to svc_create_sock()
-routine which is needed with libtirpc version of svc_tli_create()
-as well as a needed IPv6 setsockopt().
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- svc_socket.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/svc_socket.c b/svc_socket.c
-index 8a44604..d2e3abf 100644
---- a/svc_socket.c
-+++ b/svc_socket.c
-@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		return -1;
- 	}
- 
-+	if (ai->ai_family == AF_INET6) {
-+		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+				&optval, sizeof(optval)) < 0) {
-+			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
- 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
- 		close(fd);
-@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		close(fd);
- 		return -1;
- 	}
-+
-+	if (ai->ai_protocol == IPPROTO_TCP) {
-+		if (listen(fd, SOMAXCONN) < 0) {
-+			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	return fd;
- }
- 
--- 
-2.14.3
-
diff --git a/sys-fs/quota/files/quota-4.04-glibc226.patch b/sys-fs/quota/files/quota-4.04-glibc226.patch
deleted file mode 100644
index 5f63cde7d426..000000000000
--- a/sys-fs/quota/files/quota-4.04-glibc226.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bbb8819fc0f6ed379a05d635a61bcf9c8986079f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 16 Sep 2017 13:09:43 +0200
-Subject: [PATCH] Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support,
- needed for libc 2.26
-
----
- Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8d80bee..278290a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -51,6 +51,8 @@ EXTRA_DIST = \
- noinst_LIBRARIES = libquota.a
- 
- if WITH_RPC
-+CFLAGS += $(TIRPC_CFLAGS)
-+
- rpcsvcdir = $(includedir)/rpcsvc
- rpcsvc_DATA = \
- 	rquota.h \
-@@ -100,8 +102,6 @@ libquota_a_SOURCES = \
- 	mntopt.h \
- 	pot.c \
- 	pot.h
--libquota_a_CFLAGS = \
--	$(TIRPC_CFLAGS)
- libquota_a_LIBADD = \
- 	$(RPCLIBS)
- 
-@@ -235,7 +235,6 @@ rpc_rquotad_SOURCES = \
- 	rquota_server.c \
- 	rquota_svc.c \
- 	svc_socket.c
--rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS)
- rpc_rquotad_LDADD = \
- 	libquota.a \
- 	$(WRAP_LIBS) \
--- 
-2.14.1
-
diff --git a/sys-fs/quota/quota-4.04-r3.ebuild b/sys-fs/quota/quota-4.06.ebuild
index 9a208fb2b9a6..18e04a761974 100644
--- a/sys-fs/quota/quota-4.04-r3.ebuild
+++ b/sys-fs/quota/quota-4.06.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
@@ -28,19 +28,14 @@ RDEPEND="
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 PDEPEND="
 	rpc? ( net-nds/rpcbind )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-glibc226.patch"
-	"${FILESDIR}/${P}-Listen-on-a-TCP-socket.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf