Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 82 insertions, 0 deletions

diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 22a7780c4382..91ef39df93a7 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,6 +1,9 @@
+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
new file mode 100644
index 000000000000..cef088badc91
--- /dev/null
+++ b/net-nds/rpcbind/files/rpcbind-0.2.4-CVE-2017-8779.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..8431b518c940
--- /dev/null
+++ b/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
@@ -0,0 +1,58 @@
+# 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}
+}