libtirpc:upgrade 1.0.3 -> 1.1.4

-Upgrade from libtirpc_1.0.3.bb to libtirpc_1.1.4.bb.

-Delete libtirpc/libtirpc-1.0.4-rc1.patch beacuse this patch has been
adopted in the high version.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.4-rc1.patch b/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.4-rc1.patch
deleted file mode 100644 (file)
index 6d40d3c..0000000
--- a/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.4-rc1.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Patch from Fedora https://src.fedoraproject.org/rpms/libtirpc/raw/master/f/libtirpc-1.0.4-rc1.patch
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-diff --git a/src/clnt_generic.c b/src/clnt_generic.c
-index e5a314f..3f3dabf 100644
---- a/src/clnt_generic.c
-+++ b/src/clnt_generic.c
-@@ -47,7 +47,6 @@
- 
- extern bool_t __rpc_is_local_host(const char *);
- int __rpc_raise_fd(int);
--extern int __binddynport(int fd);
- 
- #ifndef NETIDLEN
- #define       NETIDLEN 32
-@@ -341,8 +340,7 @@ clnt_tli_create(int fd, const struct netconfig *nconf,
-               servtype = nconf->nc_semantics;
-               if (!__rpc_fd2sockinfo(fd, &si))
-                       goto err;
--              if (__binddynport(fd) == -1)
--                      goto err;
-+              bindresvport(fd, NULL);
-       } else {
-               if (!__rpc_fd2sockinfo(fd, &si))
-                       goto err;
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index af6c482..5a6eeb7 100644
---- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -67,8 +67,6 @@
- 
- extern mutex_t        rpcsoc_lock;
- 
--extern int __binddynport(int fd);
--
- static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t,
-     int *, u_int, u_int, char *, int);
- static SVCXPRT *svc_com_create(int, u_int, u_int, char *);
-@@ -147,8 +145,7 @@ clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp, flags)
-       bindaddr.maxlen = bindaddr.len =  sizeof (struct sockaddr_in);
-       bindaddr.buf = raddr;
- 
--      if (__binddynport(fd) == -1)
--              goto err;
-+      bindresvport(fd, NULL);
-       cl = clnt_tli_create(fd, nconf, &bindaddr, prog, vers,
-                               sendsz, recvsz);
-       if (cl) {
-diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
-index a94fc73..4b44364 100644
---- a/src/rpcb_clnt.c
-+++ b/src/rpcb_clnt.c
-@@ -752,7 +752,7 @@ __try_protocol_version_2(program, version, nconf, host, tp)
- 
-       client = getpmaphandle(nconf, host, &parms.r_addr);
-       if (client == NULL)
--              return (NULL);
-+              goto error;
- 
-       /*
-        * Set retry timeout.
-@@ -771,11 +771,11 @@ __try_protocol_version_2(program, version, nconf, host, tp)
-       if (clnt_st != RPC_SUCCESS) {
-               rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-               clnt_geterr(client, &rpc_createerr.cf_error);
--              return (NULL);
-+              goto error;
-       } else if (port == 0) {
-               pmapaddress = NULL;
-               rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
--              return (NULL);
-+              goto error;
-       }
-       port = htons(port);
-       CLNT_CONTROL(client, CLGET_SVC_ADDR, (char *)&remote);
-@@ -789,14 +789,24 @@ __try_protocol_version_2(program, version, nconf, host, tp)
-                       free(pmapaddress);
-                       pmapaddress = NULL;
-               }
--              return (NULL);
-+              goto error;
-       }
-       memcpy(pmapaddress->buf, remote.buf, remote.len);
-       memcpy(&((char *)pmapaddress->buf)[sizeof (short)],
-                       (char *)(void *)&port, sizeof (short));
-       pmapaddress->len = pmapaddress->maxlen = remote.len;
- 
-+      CLNT_DESTROY(client);
-       return pmapaddress;
-+
-+error:
-+      if (client) {
-+              CLNT_DESTROY(client);
-+              client = NULL;
-+
-+      }
-+      return (NULL);
-+
- }
- #endif
- 

diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
similarity index 83%
rename from meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb
rename to meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
index f978c8c8ab04a3596959fb8769ed51f96f7a4873..9c480b825f25ff1a443467eeb682ea53fe897bf7 100644 (file)
--- a/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
@@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
 PROVIDES = "virtual/librpc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
-           file://libtirpc-1.0.4-rc1.patch \
            file://musl.patch \
            "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
-SRC_URI[md5sum] = "f8403a10695348854e71d525c4db5931"
-SRC_URI[sha256sum] = "86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e"
+SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a"
+SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
 
 inherit autotools pkgconfig