From 2274414b492a789cbb3b83f7c997ce78a4889f37 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Mon, 29 Jul 2024 09:09:45 +0800
Subject: [PATCH] libtirpc: upgrade 1.3.4 -> 1.3.5

ipv6.patch
removed since it's included in 1.3.5

(From OE-Core rev: 1c02b1764c4e51a4b78719f45419b3de122ac692)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../libtirpc/libtirpc/ipv6.patch              | 52 -------------------
 .../{libtirpc_1.3.4.bb => libtirpc_1.3.5.bb}  |  6 +--
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
 rename meta/recipes-extended/libtirpc/{libtirpc_1.3.4.bb => libtirpc_1.3.5.bb} (86%)

diff --git a/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch b/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
deleted file mode 100644
index f746f986f4..0000000000
--- a/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
-Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
-From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
-Date: Thu, 12 Oct 2023 16:22:59 +0200
-Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the configuration for IPv6 is disabled, the netconfig should not contain
-settings for tcp6 and udp6.
-
-The test for the configure option didn't work, because it check the wrong
-variable.
-
-Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
-Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net]
-Upstream-Status: Submitted [linux-nfs@vger.kernel.org]
----
- configure.ac    | 2 +-
- doc/Makefile.am | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe6c517..b687f8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ fi
- AC_ARG_ENABLE(ipv6,
- 	[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
- 	[],[enable_ipv6=yes])
--AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
-+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
- if test "x$enable_ipv6" != xno; then
- 	AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
- fi
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index d42ab90..b9678f6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -2,3 +2,8 @@ dist_sysconf_DATA	= netconfig bindresvport.blacklist
- 
- CLEANFILES	       = cscope.* *~
- DISTCLEANFILES	       = Makefile.in
-+
-+if ! INET6
-+install-exec-hook:
-+	$(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
-+endif
--- 
-2.34.1
-
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.5.bb
similarity index 86%
rename from meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb
rename to meta/recipes-extended/libtirpc/libtirpc_1.3.5.bb
index aa526e9e1c..d4cd24ec0c 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.5.bb
@@ -9,12 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
 
 PROVIDES = "virtual/librpc"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
-	file://ipv6.patch \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
-SRC_URI[sha256sum] = "1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860"
+SRC_URI[sha256sum] = "9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f"
 
 CVE_STATUS[CVE-2021-46828] = "fixed-version: fixed in 1.3.3rc1 so not present in 1.3.3"