gentoo resync : 13.10.2019

9 files changed, 8 insertions, 90 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 82063ad78d26..4b5c65b62e07 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index f9db3c11fecc..5fec100c7ec9 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -26,8 +26,8 @@ DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a23
 DIST openldap-2.4.47.tgz 5699678 BLAKE2B e172b3f0bb3c1dfdaa734fd76581758a5d51bb9abb9c038f9ae5dfa6de45ae0eaaecab443aa113b08f8c26b44b1b1ed684a85882732bffa42548029f80f4c1be SHA512 d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
 DIST openldap-2.4.48.tgz 5704883 BLAKE2B ef856ff0b22c9187e68e9c09583a176fe4c2ee1f5bfe6b169f03bc0058294170ec4d1aa1b164e28eecd2ef6bafab539c1b942b0bd74e93852205beeaff39aeef SHA512 cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.45-r1.ebuild 27965 BLAKE2B c33bc19e6bcd3cbaa39cc59b44bff96606495a34f15c67b2a0742c54dfed1a68a735fdff749ebb53b37f062aacad4ec57203fae53bbb6fb4ef451cadba619943 SHA512 dc1704b4c2c01e85c7cdce5242b0b7c81738b8220bbe0f6564542912a90cd290b938451dabac6651012ee6ec6cf3a093f09bfb028d98a18e6a5f4493001fb966
-EBUILD openldap-2.4.45.ebuild 27948 BLAKE2B 9adf4df42b2ae571fffa70ad15cbc685614657adb53dd2b8e0c3750597166968269df7fe7727c8a514333eb250749aef9e592fdd2c8ef6272240760ea7f6671f SHA512 32433e8cb7b67b1f4defa18718f32100234af7d144aaf978dddd3eec0b3f24ffd4ccc4334d9f9bb5a35c88571ac146bcc5933b04c4c4cfc2f0dd4d83294c33c5
-EBUILD openldap-2.4.47-r1.ebuild 28964 BLAKE2B 2618e731d2d3af0b59db13f32eb8653fc44eaec7b94dbbe5c190fc74db2730c932d970db4e48fa09b684eca801be107d7f2e31f49b0fcc93a1a9f7a3ec911647 SHA512 756d2cbf0bf6bfd4be99f0836f6f8c6d83b0a453617b8d43731d0a2415f0d1bd6be33f8f8d9e7ba79c74dc62612b37cbb4d2b1e840d5474bbdb40eb8a94eff03
-EBUILD openldap-2.4.48.ebuild 28993 BLAKE2B 5b28558a7e614a8f01cc8fae1fc27af8aba77b3f64e0d0130511036c2c179cbc7dbba91b76eb9706f09c9e4714bdbd019888ad1e4f8fbf1c5f25db0c2335533c SHA512 20fd95b45964f60c2c56bc422834139de1b5a2ac88283643f85ded59aeb5bbc832f4483d1dd5782bb47288a216f5c24d3ce5b0023a2aa50ed0d6837c4a3489a2
+EBUILD openldap-2.4.45-r1.ebuild 27943 BLAKE2B a0da4de5bd0e09b475ec4659327fafff725172ba1451bd763f046efe1f890b9100deb7024b561a971f1791ad76da7ef904c2487131e4439432e67cd64274adc6 SHA512 60d37af3ced25c80d82556cbd2464320bc3f59df4b0679204ef6038039179799caac0f56ed14a52a56eec3cc3a770e6276a3770a0624ec77aaebafcba1eeb65a
+EBUILD openldap-2.4.45.ebuild 27926 BLAKE2B 639d13201517635fbefd53cf1b34b61bd906dca7245ba9337f4e5498c458171065425ab9db4ac7914fd8767ffe84e3dc1c94be2a5a44c4c60037ad7cc13357ba SHA512 b568fbb665aae0f324fabb3b3385d5d08bbf5e38d1b3481b808016f2e8acff4cd02b5607658659f81f210528c89d44128cf59c8a1a86d52f94976753f3992c01
+EBUILD openldap-2.4.47-r1.ebuild 28942 BLAKE2B a8ca7165c0028f2365e3a854ca52d3bc7e1879f06f543f5bf0e0a6812de16419f85b92586a67d5555301ba9c688e6f6b37cb52abe24f2710e1871ab5332f5b17 SHA512 6e47ab403cf2ac56c722b4d44727a7690ac4906d97571c80cecaa87f982532ad615451a5577a91fb0599b6229c07697525c6a1e8811194720d6751445c5cfef4
+EBUILD openldap-2.4.48.ebuild 28963 BLAKE2B 26e01c1c3509ba31ff00f6384cf9a1258b39c97f26c61f613f9120d38a68c57d47c553a186efc94114bf43affd6e421a71852942e6196584c2849057bb73181d SHA512 113d502877bcee87c5d36abf944e4d56a2e9b05719312493347862bea596c1a2f99ebf7b4a35fe3fc159acd439409c0cf02999ceda80b8849f968bea0cbc2b9b
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.45-r1.ebuild b/net-nds/openldap/openldap-2.4.45-r1.ebuild
index 027f4e6a258c..8cb3e58f1d40 100644
--- a/net-nds/openldap/openldap-2.4.45-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.45-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index afafb6f7063a..344d168105b3 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.47-r1.ebuild b/net-nds/openldap/openldap-2.4.47-r1.ebuild
index 2193b6d1a1e7..8023c2ebaf90 100644
--- a/net-nds/openldap/openldap-2.4.47-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.47-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild
index 34edb0aee645..c8fa5b950ca5 100644
--- a/net-nds/openldap/openldap-2.4.48.ebuild
+++ b/net-nds/openldap/openldap-2.4.48.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 91ef39df93a7..22a7780c4382 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,9 +1,6 @@
-AUX rpcbind-0.2.4-CVE-2017-8779.patch 646 BLAKE2B 648010974bfc732f39ad0eaea6a6f51568ce75207e37ceed5088ed445a7563e450ac9de1f6ffa50bb04364dcbc0e4e98b513f1067f636692c8fd23c047d41dfd SHA512 a4be0f33b6e680ab0255191f959c911deb7e8a12bd2bb3c82b61943e100d9de64a1a8f0b2e3cd2009e2b83e3d091a6461de28cb564d90a838fe39a7098b638e2
 AUX rpcbind.confd 68 BLAKE2B 2309602d38fd5119fc5e6c123ca9da7a6f86526a0dddad12e1be24a7af9724b5d1b389cf44299722fb4af7932b26fc2a62996bb815cebd258e56a3248e63b393 SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044
 AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e19421459eee23ad3ea77118a053c72cda96d8d2ba8a2ab63faf8bf74d9b238ec4f37b059f62108 SHA512 43f26570fbff0970c5aa0a1ee5f4f561645d31c90e3bb997bd63e05678814f199263a5aaa5051bfe88622a156f8260825ffd905301d158cb410f25631d75cc55
-DIST rpcbind-0.2.4.tar.bz2 122781 BLAKE2B ac1c374a1081559bf09bc209256daa1bb530d71f0c7fe45cec4c9b87cf110c15251a05dce2cf2b78ffa4d902f817efed30350ad08a23e12a7f219f10fe626aa8 SHA512 f3966a7284e94bdf120a9b3f0dd66efa1fe8761df2313545a031f77b7c06e27d7955d2780469943deb537d34f95c4cf3f30de523ec9fab9f571322d7224b210c
 DIST rpcbind-1.2.5.tar.bz2 123502 BLAKE2B de0d10406aeffd75195c1fa1d0179b2c7c0ba54c3f3ac58ce9d7e9448d1dbe91a296ad69c45dee115e0a739aa9cfec53b750d3a5ca405e16605a92bbb2006859 SHA512 e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4
-EBUILD rpcbind-0.2.4-r3.ebuild 1384 BLAKE2B 43fa1418a4a836cb1c76bf14c57ebfb801a6c5919d82e3d1bb07265438410869ee5b65d9eb384b93cd6d3b393dc79412df143496db70a669bb507c4ba03bde12 SHA512 389d0073ed7613e57655a38da3b6efc75f1e114eb50b203811fe78075fa4eca04b03064c3355dd7cd407fcaefc5139242dd68a3d1add874681b9057066f08de2
 EBUILD rpcbind-1.2.5.ebuild 1394 BLAKE2B 71ccd1d81624247ffc2ca788f2a6bb939fcb4fc345cf514e002cca16087d327a6795aa15244f5edaa8af3fe02146afe54fc62e27243a066ce281d758faf7debb SHA512 9c13aa67c1761759cbc6a4fc8ccfe483a050c04855181314dad3567d4a69905e29be2eca7d2be369aec5ade79f798f3e7abae6b40bde8dea5b33de8cd2e8d220
 EBUILD rpcbind-9999.ebuild 1401 BLAKE2B 12e7b0b777f3e77b94ad59073031c61d69ca485ab83221d54e992bdcd1a8da162cc7d19a340271bb9dcb04e08d869d902fa1f2e14710691a669fcb1f48553646 SHA512 155442d872e210f34ee2de90413c8f60d9ce8adae234df72e7df5193162678bd5316549e28cf275ab98cfe143d3b0ba503b7afa7543ecee11913b144aa2fff19
 MISC metadata.xml 459 BLAKE2B d3625a12679bb29b5402e397618cb007079ca84ada8ef79ced347338a6dacb4473a58fcdf7350e16f8623442f601563acaa247f5f605df1d289876cb3fc4dde1 SHA512 1aa9e72521a4c4c22c78e5a5e9f32c89d66b50079b9e42dc4cb4a043561d6a48e9e76ab52c2803609479161bfd7b21c18689d5088594762c4e09fa1fa58dd3b1
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.4-CVE-2017-8779.patch b/net-nds/rpcbind/files/rpcbind-0.2.4-CVE-2017-8779.patch
deleted file mode 100644
index cef088badc91..000000000000
--- a/net-nds/rpcbind/files/rpcbind-0.2.4-CVE-2017-8779.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
-index 5862c26..e11f61b 100644
---- a/src/rpcb_svc_com.c
-+++ b/src/rpcb_svc_com.c
-@@ -48,6 +48,7 @@
- #include <rpc/rpc.h>
- #include <rpc/rpcb_prot.h>
- #include <rpc/svc_dg.h>
-+#include <rpc/rpc_com.h>
- #include <netconfig.h>
- #include <errno.h>
- #include <syslog.h>
-@@ -432,7 +433,7 @@ rpcbproc_taddr2uaddr_com(void *arg, struct svc_req *rqstp /*__unused*/,
- static bool_t
- xdr_encap_parms(XDR *xdrs, struct encap_parms *epp)
- {
--	return (xdr_bytes(xdrs, &(epp->args), (u_int *) &(epp->arglen), ~0));
-+	return (xdr_bytes(xdrs, &(epp->args), (u_int *) &(epp->arglen), RPC_MAXDATASIZE));
- }
- 
- /*
diff --git a/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild b/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
deleted file mode 100644
index 8431b518c940..000000000000
--- a/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
-REQUIRED_USE="systemd? ( warmstarts )"
-
-CDEPEND=">=net-libs/libtirpc-1.0:=
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2017-8779.patch"
-)
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-rpcuser=root \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable warmstarts)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}