6 files changed, 0 insertions, 392 deletions
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 227f8bcb8c23..024d8b49569b 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,11 +1,5 @@
-AUX libtirpc-1.3.2-dos.patch 4821 BLAKE2B 033ac017c663610389d50730994fde908b5a44cc41399006735bcd0b6a9e37ef58887e8b64487534a878faa599d968bd6d5588fa18761816a8dad69c6839b61f SHA512 01e9fc4adb55f2baf2a2646237a72203647cc7bb310d9706f2517ef262d31772a835c0f5860498c3e6f98c74254e125d3c7068b7455f0665d13ac2af045f1385
-AUX libtirpc-1.3.2-memory-leak.patch 1691 BLAKE2B 166245e7f2179094a9e7937083998548fe55b4fb1f948c523fa0be81974c1cb30c3fb36c13337bc694aa5ecf40d4681b0792cd377c6c7684b76e9ec6da1c9400 SHA512 bc639ed3f4be7d0d76402ab445d6ed93c8db00dc417ad458658c77af67de2d1e3a024c67fa327e38f1191b6515d365cc606d38d0eae8ec65a27b02f4c48acf9f
-AUX libtirpc-1.3.2-use-after-free.patch 995 BLAKE2B b654c6e9f94d236b7d3aae2b730429bdb5803f5a685a2f041f22b500eac0127139a007ccb7e3c8f5cec8a7488db73c5f1287333d91925262ed2b95d557a10961 SHA512 0a259a3d68a41e418c7b5b0bf9cca7a6255e6cfc0ba0e0cfe559e683c654ce4b1af2d249c17f81be2a3cea7a20f48a2065d5ec5ecb83786cc0bd61a93414eb7b
 AUX libtirpc-1.3.3-release-version.patch 3090 BLAKE2B 3578e2f9ac0dc6479d790c9bf20850d2be18bdfa7819e9f36861b679ce718f84c74dbb79a403fef4f1c7215e5b8e5c14cdc56b9f8b79d4ac3536630fb2d91d12 SHA512 74ff64a9d9c6cb4eb899d43899c7bb306709ecf6748989a056a78296101b6258d287f7f348fde05ce053eacdefe36a62752756cec3e361a9bb5fb671d7598a4f
-DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255
 DIST libtirpc-1.3.3.tar.bz2 562812 BLAKE2B e229869b05103d912b677f78648dce1f7fa7649bdf44b782a5fb97635eecf07f768bbc0ef25c0f065c8253fbe37c12b80934d9102b7345adfc4102897458b487 SHA512 df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.3.2-r1.ebuild 1675 BLAKE2B f9e1dc1d82e8a3a1eec4b21ca9065d6e74894872474fb5b30a9e2ec261821aa75fa3c55b210fd4f7970eef44bdc44dc2f4313322d9f2b7179f56dc2adacb72aa SHA512 5a92d6a4a2c0720b9e348d81da333207b70160c29403152a5793f00f15919ffba524a198fa8db6e01ae77f6a0ad3216a883a048c5140a5375bdaee69f016a57d
-EBUILD libtirpc-1.3.2.ebuild 1505 BLAKE2B 4401d8de52c71bf6be066b36a3d27c308bb0fd1b7ee8d027fc5a1e8c26183b86412f001275274377ff60ec207a16ca2815daf19f0fb4a186d9be343bd5157d61 SHA512 c1d0c9d720ce1eddecc1e6b32be3f2b95d6b70338c377440bca6cf578a8eb49bb8bd4eb8dd1051e518166900a05fe6a90cc459a056ab96ed1e2a6f8f5d07a282
 EBUILD libtirpc-1.3.3.ebuild 1612 BLAKE2B 3eddf1e21cd230f387d93772a161453f620e8b7e1c0af7fb7089189fc33615a1c27f4f63ed637ce1ec299573fe615f22c2e765f0ec8cebc567820beccb5a6b15 SHA512 ad8cdeabe50d6f151645adcec02f637953133d3393c41a32c230c6978dc3579444f6d00c2cc54755f1224ae3333acda1989c42492e08f494d19dd81dcc6b9ce5
 MISC metadata.xml 405 BLAKE2B 3006391cb2dac9927f450164f2705d31c35172560ddb436edb76f6c56efc2915a63d57e5be8835801b3b4bbe77526cdaf681b49c4fa43285549b7f0707af4814 SHA512 63489cba710ba40c334508406bf10c28ddc2133cd3eab86afde1670e3d4bb126d0e77abb45c99fd7b6abd438a9e7cc5a10b6742563be51601c7945c87419c928
diff --git a/net-libs/libtirpc/files/libtirpc-1.3.2-dos.patch b/net-libs/libtirpc/files/libtirpc-1.3.2-dos.patch
deleted file mode 100644
index 88b6f5719f41..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.3.2-dos.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 86529758570cef4c73fb9b9c4104fdc510f701ed Mon Sep 17 00:00:00 2001
-From: Dai Ngo <dai.ngo@oracle.com>
-Date: Sat, 21 Aug 2021 13:16:23 -0400
-Subject: [PATCH] Fix DoS vulnerability in libtirpc
-
-Currently svc_run does not handle poll timeout and rendezvous_request
-does not handle EMFILE error returned from accept(2 as it used to.
-These two missing functionality were removed by commit b2c9430f46c4.
-
-The effect of not handling poll timeout allows idle TCP conections
-to remain ESTABLISHED indefinitely. When the number of connections
-reaches the limit of the open file descriptors (ulimit -n) then
-accept(2) fails with EMFILE. Since there is no handling of EMFILE
-error this causes svc_run() to get in a tight loop calling accept(2).
-This resulting in the RPC service of svc_run is being down, it's
-no longer able to service any requests.
-
-RPC service rpcbind, statd and mountd are effected by this
-problem.
-
-Fix by enhancing rendezvous_request to keep the number of
-SVCXPRT conections to 4/5 of the size of the file descriptor
-table. When this thresold is reached, it destroys the idle
-TCP connections or destroys the least active connection if
-no idle connnction was found.
-
-Fixes: 44bf15b8 rpcbind: don't use obsolete svc_fdset interface of libtirpc
-Signed-off-by: dai.ngo@oracle.com
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- INSTALL      | 371 +----------------------------------------------------------
- src/svc.c    |  17 ++-
- src/svc_vc.c |  62 +++++++++-
- 3 files changed, 78 insertions(+), 372 deletions(-)
- mode change 100644 => 120000 INSTALL
-
-diff --git a/src/svc.c b/src/svc.c
-index 6db164b..3a8709f 100644
---- a/src/svc.c
-+++ b/src/svc.c
-@@ -57,7 +57,7 @@
- 
- #define max(a, b) (a > b ? a : b)
- 
--static SVCXPRT **__svc_xports;
-+SVCXPRT **__svc_xports;
- int __svc_maxrec;
- 
- /*
-@@ -194,6 +194,21 @@ __xprt_do_unregister (xprt, dolock)
-     rwlock_unlock (&svc_fd_lock);
- }
- 
-+int
-+svc_open_fds()
-+{
-+	int ix;
-+	int nfds = 0;
-+
-+	rwlock_rdlock (&svc_fd_lock);
-+	for (ix = 0; ix < svc_max_pollfd; ++ix) {
-+		if (svc_pollfd[ix].fd != -1)
-+			nfds++;
-+	}
-+	rwlock_unlock (&svc_fd_lock);
-+	return (nfds);
-+}
-+
- /*
-  * Add a service program to the callout list.
-  * The dispatch routine will be called when a rpc request for this
-diff --git a/src/svc_vc.c b/src/svc_vc.c
-index f1d9f00..3dc8a75 100644
---- a/src/svc_vc.c
-+++ b/src/svc_vc.c
-@@ -64,6 +64,8 @@
- 
- 
- extern rwlock_t svc_fd_lock;
-+extern SVCXPRT **__svc_xports;
-+extern int svc_open_fds();
- 
- static SVCXPRT *makefd_xprt(int, u_int, u_int);
- static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
-@@ -82,6 +84,7 @@ static void svc_vc_ops(SVCXPRT *);
- static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
- static bool_t svc_vc_rendezvous_control (SVCXPRT *xprt, const u_int rq,
- 				   	     void *in);
-+static int __svc_destroy_idle(int timeout);
- 
- struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
- 	u_int sendsize;
-@@ -313,13 +316,14 @@ done:
- 	return (xprt);
- }
- 
-+
- /*ARGSUSED*/
- static bool_t
- rendezvous_request(xprt, msg)
- 	SVCXPRT *xprt;
- 	struct rpc_msg *msg;
- {
--	int sock, flags;
-+	int sock, flags, nfds, cnt;
- 	struct cf_rendezvous *r;
- 	struct cf_conn *cd;
- 	struct sockaddr_storage addr;
-@@ -379,6 +383,16 @@ again:
- 
- 	gettimeofday(&cd->last_recv_time, NULL);
- 
-+	nfds = svc_open_fds();
-+	if (nfds >= (_rpc_dtablesize() / 5) * 4) {
-+		/* destroy idle connections */
-+		cnt = __svc_destroy_idle(15);
-+		if (cnt == 0) {
-+			/* destroy least active */
-+			__svc_destroy_idle(0);
-+		}
-+	}
-+
- 	return (FALSE); /* there is never an rpc msg to be processed */
- }
- 
-@@ -820,3 +834,49 @@ __svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
- {
- 	return FALSE;
- }
-+
-+static int
-+__svc_destroy_idle(int timeout)
-+{
-+	int i, ncleaned = 0;
-+	SVCXPRT *xprt, *least_active;
-+	struct timeval tv, tdiff, tmax;
-+	struct cf_conn *cd;
-+
-+	gettimeofday(&tv, NULL);
-+	tmax.tv_sec = tmax.tv_usec = 0;
-+	least_active = NULL;
-+	rwlock_wrlock(&svc_fd_lock);
-+
-+	for (i = 0; i <= svc_max_pollfd; i++) {
-+		if (svc_pollfd[i].fd == -1)
-+			continue;
-+		xprt = __svc_xports[i];
-+		if (xprt == NULL || xprt->xp_ops == NULL ||
-+			xprt->xp_ops->xp_recv != svc_vc_recv)
-+			continue;
-+		cd = (struct cf_conn *)xprt->xp_p1;
-+		if (!cd->nonblock)
-+			continue;
-+		if (timeout == 0) {
-+			timersub(&tv, &cd->last_recv_time, &tdiff);
-+			if (timercmp(&tdiff, &tmax, >)) {
-+				tmax = tdiff;
-+				least_active = xprt;
-+			}
-+			continue;
-+		}
-+		if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
-+			__xprt_unregister_unlocked(xprt);
-+			__svc_vc_dodestroy(xprt);
-+			ncleaned++;
-+		}
-+	}
-+	if (timeout == 0 && least_active != NULL) {
-+		__xprt_unregister_unlocked(least_active);
-+		__svc_vc_dodestroy(least_active);
-+		ncleaned++;
-+	}
-+	rwlock_unlock(&svc_fd_lock);
-+	return (ncleaned);
-+}
--- 
-1.8.3.1
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.3.2-memory-leak.patch b/net-libs/libtirpc/files/libtirpc-1.3.2-memory-leak.patch
deleted file mode 100644
index 8ce864a2950c..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.3.2-memory-leak.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 63f3b9e883231ca08cf9c3cd8f5d582584412d94 Mon Sep 17 00:00:00 2001
-From: Ali Abdallah <ali.abdallah@suse.com>
-Date: Thu, 14 Jul 2022 13:47:32 -0400
-Subject: [PATCH] Fix potential memory leak of parms.r_addr
-
-During some valgrind test, the following is observed
-
-==11391== 64 bytes in 4 blocks are definitely lost in loss record 11 of 16
-==11391==    at 0x4C2A2AF: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
-==11391==    by 0x50ECED9: strdup (in /lib64/libc-2.22.so)
-==11391==    by 0x4E4AFBF: getclnthandle (in /lib64/libtirpc.so.3.0.0)
-==11391==    by 0x4E4BD8A: __rpcb_findaddr_timed (in /lib64/libtirpc.so.3.0.0)
-==11391==    by 0x4E443AF: clnt_tp_create_timed (in /lib64/libtirpc.so.3.0.0)
-==11391==    by 0x4E44580: clnt_create_timed (in /lib64/libtirpc.so.3.0.0)
-==11391==    by 0x400755: main (in /local/02/xdtadti/tirpc-test/client)
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- INSTALL         | 369 +-------------------------------------------------------
- src/rpcb_clnt.c |   8 ++
- 2 files changed, 9 insertions(+), 368 deletions(-)
- mode change 100644 => 120000 INSTALL
-
-diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
-index 0c34cb7..1a23cb1 100644
---- a/src/rpcb_clnt.c
-+++ b/src/rpcb_clnt.c
-@@ -798,6 +798,10 @@ __try_protocol_version_2(program, version, nconf, host, tp)
- 	pmapaddress->len = pmapaddress->maxlen = remote.len;
- 
- 	CLNT_DESTROY(client);
-+
-+	if (parms.r_addr != NULL && parms.r_addr != nullstring)
-+		free(parms.r_addr);
-+
- 	return pmapaddress;
- 
- error:
-@@ -806,6 +810,10 @@ error:
- 		client = NULL;
- 
- 	}
-+
-+	if (parms.r_addr != NULL && parms.r_addr != nullstring)
-+		free(parms.r_addr);
-+
- 	return (NULL);
- 
- }
--- 
-1.8.3.1
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.3.2-use-after-free.patch b/net-libs/libtirpc/files/libtirpc-1.3.2-use-after-free.patch
deleted file mode 100644
index 8e85a564f29a..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.3.2-use-after-free.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d0dc59e27263c6b53435d770010dcc6f397d58ee Mon Sep 17 00:00:00 2001
-From: Frank Sorenson <sorenson@redhat.com>
-Date: Mon, 17 Jan 2022 13:33:13 -0500
-Subject: [PATCH] libtirpc: Fix use-after-free accessing the error number
-
-Free the cbuf after obtaining the error number.
-
-Signed-off-by: Frank Sorenson <sorenson@redhat.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/clnt_dg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/clnt_dg.c b/src/clnt_dg.c
-index e1255de..b3d82e7 100644
---- a/src/clnt_dg.c
-+++ b/src/clnt_dg.c
-@@ -456,9 +456,9 @@ get_reply:
- 		 cmsg = CMSG_NXTHDR (&msg, cmsg))
- 	      if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR)
- 		{
--		  mem_free(cbuf, (outlen + 256));
- 		  e = (struct sock_extended_err *) CMSG_DATA(cmsg);
- 		  cu->cu_error.re_errno = e->ee_errno;
-+		  mem_free(cbuf, (outlen + 256));
- 		  release_fd_lock(cu->cu_fd_lock, mask);
- 		  return (cu->cu_error.re_status = RPC_CANTRECV);
- 		}
--- 
-1.8.3.1
-
diff --git a/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild
deleted file mode 100644
index fe750fb291d8..000000000000
--- a/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/libtirpc-1.3.2-dos.patch
-		"${FILESDIR}"/libtirpc-1.3.2-use-after-free.patch
-		"${FILESDIR}"/libtirpc-1.3.2-memory-leak.patch
-	)
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	default
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable ipv6)
-		$(use_enable kerberos gssapi)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# libtirpc replaces rpc support in glibc, so we need it in /
-	gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc
-	doins doc/netconfig
-
-	insinto /usr/include/tirpc
-	doins -r "${WORKDIR}"/tirpc/*
-
-	# makes sure that the linking order for nfs-utils is proper, as
-	# libtool would inject a libgssglue dependency in the list.
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
deleted file mode 100644
index 8b1e3780df4b..000000000000
--- a/net-libs/libtirpc/libtirpc-1.3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	default
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable ipv6)
-		$(use_enable kerberos gssapi)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# libtirpc replaces rpc support in glibc, so we need it in /
-	gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc
-	doins doc/netconfig
-
-	insinto /usr/include/tirpc
-	doins -r "${WORKDIR}"/tirpc/*
-
-	# makes sure that the linking order for nfs-utils is proper, as
-	# libtool would inject a libgssglue dependency in the list.
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}