Compare commits
10 Commits
0301c789ff
...
c2dd04dcb6
Author | SHA1 | Date | |
---|---|---|---|
|
c2dd04dcb6 | ||
|
e57d0709f3 | ||
|
e08496abde | ||
|
04a726dfa4 | ||
|
bc6c487357 | ||
|
c1cb7a7d24 | ||
|
3acf29cb9e | ||
|
1aa6a95b0f | ||
|
cd0e40f54c | ||
|
7731cb97de |
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +1,4 @@
|
|||||||
Makefile
|
Makefile
|
||||||
x86_64/
|
x86_64/
|
||||||
/libtirpc-1.3.3.tar.bz2
|
/libtirpc-1.3.4.tar.bz2
|
||||||
libtirpc-1.3.3
|
libtirpc-1.3.4
|
||||||
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
File diff suppressed because it is too large
Load Diff
159
libtirpc-1.3.4-rc2.patch
Normal file
159
libtirpc-1.3.4-rc2.patch
Normal file
@ -0,0 +1,159 @@
|
|||||||
|
diff --git a/src/bindresvport.c b/src/bindresvport.c
|
||||||
|
index 5c0ddcf..efeb1cc 100644
|
||||||
|
--- a/src/bindresvport.c
|
||||||
|
+++ b/src/bindresvport.c
|
||||||
|
@@ -130,6 +130,7 @@ load_blacklist (void)
|
||||||
|
if (list == NULL)
|
||||||
|
{
|
||||||
|
free (buf);
|
||||||
|
+ fclose (fp);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/src/clnt_raw.c b/src/clnt_raw.c
|
||||||
|
index 31f9d0c..03f839d 100644
|
||||||
|
--- a/src/clnt_raw.c
|
||||||
|
+++ b/src/clnt_raw.c
|
||||||
|
@@ -142,7 +142,7 @@ clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
|
||||||
|
struct timeval timeout;
|
||||||
|
{
|
||||||
|
struct clntraw_private *clp = clntraw_private;
|
||||||
|
- XDR *xdrs = &clp->xdr_stream;
|
||||||
|
+ XDR *xdrs;
|
||||||
|
struct rpc_msg msg;
|
||||||
|
enum clnt_stat status;
|
||||||
|
struct rpc_err error;
|
||||||
|
@@ -154,6 +154,7 @@ clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
|
||||||
|
mutex_unlock(&clntraw_lock);
|
||||||
|
return (RPC_FAILED);
|
||||||
|
}
|
||||||
|
+ xdrs = &clp->xdr_stream;
|
||||||
|
mutex_unlock(&clntraw_lock);
|
||||||
|
|
||||||
|
call_again:
|
||||||
|
@@ -245,7 +246,7 @@ clnt_raw_freeres(cl, xdr_res, res_ptr)
|
||||||
|
void *res_ptr;
|
||||||
|
{
|
||||||
|
struct clntraw_private *clp = clntraw_private;
|
||||||
|
- XDR *xdrs = &clp->xdr_stream;
|
||||||
|
+ XDR *xdrs;
|
||||||
|
bool_t rval;
|
||||||
|
|
||||||
|
mutex_lock(&clntraw_lock);
|
||||||
|
@@ -254,6 +255,7 @@ clnt_raw_freeres(cl, xdr_res, res_ptr)
|
||||||
|
mutex_unlock(&clntraw_lock);
|
||||||
|
return (rval);
|
||||||
|
}
|
||||||
|
+ xdrs = &clp->xdr_stream;
|
||||||
|
mutex_unlock(&clntraw_lock);
|
||||||
|
xdrs->x_op = XDR_FREE;
|
||||||
|
return ((*xdr_res)(xdrs, res_ptr));
|
||||||
|
diff --git a/src/getnetconfig.c b/src/getnetconfig.c
|
||||||
|
index cfd33c2..d547dce 100644
|
||||||
|
--- a/src/getnetconfig.c
|
||||||
|
+++ b/src/getnetconfig.c
|
||||||
|
@@ -436,11 +436,6 @@ getnetconfigent(netid)
|
||||||
|
fprintf(stderr, "in /etc/netconfig.\n");
|
||||||
|
fprintf(stderr, "Please change this to \"local\" manually ");
|
||||||
|
fprintf(stderr, "or run mergemaster(8).\n");
|
||||||
|
- fprintf(stderr, "See UPDATING entry 20021216 for details.\n");
|
||||||
|
- fprintf(stderr, "Continuing in 10 seconds\n\n");
|
||||||
|
- fprintf(stderr, "This warning will be removed 20030301\n");
|
||||||
|
- sleep(10);
|
||||||
|
-
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
|
||||||
|
index 9a9de69..68fe69a 100644
|
||||||
|
--- a/src/rpcb_clnt.c
|
||||||
|
+++ b/src/rpcb_clnt.c
|
||||||
|
@@ -104,17 +104,27 @@ destroy_addr(addr)
|
||||||
|
{
|
||||||
|
if (addr == NULL)
|
||||||
|
return;
|
||||||
|
- if(addr->ac_host != NULL)
|
||||||
|
+ if (addr->ac_host != NULL) {
|
||||||
|
free(addr->ac_host);
|
||||||
|
- if(addr->ac_netid != NULL)
|
||||||
|
+ addr->ac_host = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (addr->ac_netid != NULL) {
|
||||||
|
free(addr->ac_netid);
|
||||||
|
- if(addr->ac_uaddr != NULL)
|
||||||
|
+ addr->ac_netid = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (addr->ac_uaddr != NULL) {
|
||||||
|
free(addr->ac_uaddr);
|
||||||
|
- if(addr->ac_taddr != NULL) {
|
||||||
|
- if(addr->ac_taddr->buf != NULL)
|
||||||
|
+ addr->ac_uaddr = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (addr->ac_taddr != NULL) {
|
||||||
|
+ if(addr->ac_taddr->buf != NULL) {
|
||||||
|
free(addr->ac_taddr->buf);
|
||||||
|
+ addr->ac_taddr->buf = NULL;
|
||||||
|
+ }
|
||||||
|
+ addr->ac_taddr = NULL;
|
||||||
|
}
|
||||||
|
free(addr);
|
||||||
|
+ addr = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -252,12 +262,15 @@ delete_cache(addr)
|
||||||
|
for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
|
||||||
|
if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
|
||||||
|
/* Unlink from cache. We'll destroy it after releasing the mutex. */
|
||||||
|
- if (cptr->ac_uaddr)
|
||||||
|
+ if (cptr->ac_uaddr) {
|
||||||
|
free(cptr->ac_uaddr);
|
||||||
|
- if (prevptr)
|
||||||
|
+ cptr->ac_uaddr = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (prevptr) {
|
||||||
|
prevptr->ac_next = cptr->ac_next;
|
||||||
|
- else
|
||||||
|
+ } else {
|
||||||
|
front = cptr->ac_next;
|
||||||
|
+ }
|
||||||
|
cachesize--;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
@@ -496,11 +509,7 @@ getpmaphandle(nconf, hostname, tgtaddr)
|
||||||
|
CLIENT *client = NULL;
|
||||||
|
rpcvers_t pmapvers = 2;
|
||||||
|
|
||||||
|
- /*
|
||||||
|
- * Try UDP only - there are some portmappers out
|
||||||
|
- * there that use UDP only.
|
||||||
|
- */
|
||||||
|
- if (nconf == NULL || strcmp(nconf->nc_proto, NC_TCP) == 0) {
|
||||||
|
+ if (nconf == NULL) {
|
||||||
|
struct netconfig *newnconf;
|
||||||
|
|
||||||
|
if ((newnconf = getnetconfigent("udp")) == NULL) {
|
||||||
|
@@ -509,7 +518,8 @@ getpmaphandle(nconf, hostname, tgtaddr)
|
||||||
|
}
|
||||||
|
client = getclnthandle(hostname, newnconf, tgtaddr);
|
||||||
|
freenetconfigent(newnconf);
|
||||||
|
- } else if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
|
||||||
|
+ } else if (strcmp(nconf->nc_proto, NC_UDP) == 0 ||
|
||||||
|
+ strcmp(nconf->nc_proto, NC_TCP) == 0) {
|
||||||
|
if (strcmp(nconf->nc_protofmly, NC_INET) != 0)
|
||||||
|
return NULL;
|
||||||
|
client = getclnthandle(hostname, nconf, tgtaddr);
|
||||||
|
diff --git a/src/svc_auth.c b/src/svc_auth.c
|
||||||
|
index ce8bbd8..789d6af 100644
|
||||||
|
--- a/src/svc_auth.c
|
||||||
|
+++ b/src/svc_auth.c
|
||||||
|
@@ -66,6 +66,9 @@ static struct authsvc *Auths = NULL;
|
||||||
|
|
||||||
|
extern SVCAUTH svc_auth_none;
|
||||||
|
|
||||||
|
+#ifdef AUTHDES_SUPPORT
|
||||||
|
+extern enum auth_stat _svcauth_des(struct svc_req *rqst, struct rpc_msg *msg);
|
||||||
|
+#endif
|
||||||
|
/*
|
||||||
|
* The call rpc message, msg has been obtained from the wire. The msg contains
|
||||||
|
* the raw form of credentials and verifiers. authenticate returns AUTH_OK
|
118
libtirpc.1.3.5-rc2.patch
Normal file
118
libtirpc.1.3.5-rc2.patch
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index f1f4f23..d763afc 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
|
||||||
|
diff --git a/src/auth_gss.c b/src/auth_gss.c
|
||||||
|
index 3127b92..9d18f96 100644
|
||||||
|
--- a/src/auth_gss.c
|
||||||
|
+++ b/src/auth_gss.c
|
||||||
|
@@ -184,7 +184,6 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
|
||||||
|
AUTH *auth, *save_auth;
|
||||||
|
struct rpc_gss_data *gd;
|
||||||
|
OM_uint32 min_stat = 0;
|
||||||
|
- rpc_gss_options_ret_t ret;
|
||||||
|
|
||||||
|
gss_log_debug("in authgss_create()");
|
||||||
|
|
||||||
|
@@ -230,12 +229,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
|
||||||
|
save_auth = clnt->cl_auth;
|
||||||
|
clnt->cl_auth = auth;
|
||||||
|
|
||||||
|
- memset(&ret, 0, sizeof(rpc_gss_options_ret_t));
|
||||||
|
- if (!authgss_refresh(auth, &ret)) {
|
||||||
|
+ if (!authgss_refresh(auth, NULL))
|
||||||
|
auth = NULL;
|
||||||
|
- sec->major_status = ret.major_status;
|
||||||
|
- sec->minor_status = ret.minor_status;
|
||||||
|
- }
|
||||||
|
else
|
||||||
|
authgss_auth_get(auth); /* Reference for caller */
|
||||||
|
|
||||||
|
@@ -624,9 +619,12 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool_t
|
||||||
|
-authgss_refresh(AUTH *auth, void *ret)
|
||||||
|
+authgss_refresh(AUTH *auth, void *dummy)
|
||||||
|
{
|
||||||
|
- return _rpc_gss_refresh(auth, (rpc_gss_options_ret_t *)ret);
|
||||||
|
+ rpc_gss_options_ret_t ret;
|
||||||
|
+
|
||||||
|
+ memset(&ret, 0, sizeof(ret));
|
||||||
|
+ return _rpc_gss_refresh(auth, &ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool_t
|
||||||
|
@@ -844,9 +842,9 @@ rpc_gss_seccreate(CLIENT *clnt, char *principal, char *mechanism,
|
||||||
|
gd->sec = sec;
|
||||||
|
|
||||||
|
if (req) {
|
||||||
|
- sec.req_flags = req->req_flags;
|
||||||
|
+ gd->sec.req_flags = req->req_flags;
|
||||||
|
gd->time_req = req->time_req;
|
||||||
|
- sec.cred = req->my_cred;
|
||||||
|
+ gd->sec.cred = req->my_cred;
|
||||||
|
gd->icb = req->input_channel_bindings;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/rpc_dtablesize.c b/src/rpc_dtablesize.c
|
||||||
|
index bce97e8..e88698f 100644
|
||||||
|
--- a/src/rpc_dtablesize.c
|
||||||
|
+++ b/src/rpc_dtablesize.c
|
||||||
|
@@ -42,6 +42,8 @@ _rpc_dtablesize(void)
|
||||||
|
|
||||||
|
if (size == 0) {
|
||||||
|
size = sysconf(_SC_OPEN_MAX);
|
||||||
|
+ if (size > FD_SETSIZE)
|
||||||
|
+ size = FD_SETSIZE;
|
||||||
|
}
|
||||||
|
return (size);
|
||||||
|
}
|
||||||
|
diff --git a/src/svc.c b/src/svc.c
|
||||||
|
index 3a8709f..9b932a5 100644
|
||||||
|
--- a/src/svc.c
|
||||||
|
+++ b/src/svc.c
|
||||||
|
@@ -657,8 +657,6 @@ svc_getreqset (readfds)
|
||||||
|
assert (readfds != NULL);
|
||||||
|
|
||||||
|
setsize = _rpc_dtablesize ();
|
||||||
|
- if (setsize > FD_SETSIZE)
|
||||||
|
- setsize = FD_SETSIZE;
|
||||||
|
maskp = readfds->fds_bits;
|
||||||
|
for (sock = 0; sock < setsize; sock += NFDBITS)
|
||||||
|
{
|
||||||
|
diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
|
||||||
|
index a530d42..f2af6e9 100644
|
||||||
|
--- a/tirpc/rpc/auth_gss.h
|
||||||
|
+++ b/tirpc/rpc/auth_gss.h
|
||||||
|
@@ -64,8 +64,6 @@ struct rpc_gss_sec {
|
||||||
|
rpc_gss_svc_t svc; /* service */
|
||||||
|
gss_cred_id_t cred; /* cred handle */
|
||||||
|
u_int req_flags; /* req flags for init_sec_context */
|
||||||
|
- int major_status;
|
||||||
|
- int minor_status;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Private data required for kernel implementation */
|
@ -1,13 +1,15 @@
|
|||||||
%define _root_libdir /%{_lib}
|
%define _root_libdir /%{_lib}
|
||||||
|
|
||||||
Name: libtirpc
|
Name: libtirpc
|
||||||
Version: 1.3.3
|
Version: 1.3.4
|
||||||
Release: 1%{?dist}
|
Release: 1.rc2%{?dist}.2
|
||||||
Summary: Transport Independent RPC Library
|
Summary: Transport Independent RPC Library
|
||||||
License: SISSL and BSD
|
License: SISSL AND BSD-3-Clause
|
||||||
URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary
|
URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary
|
||||||
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
||||||
|
|
||||||
|
Patch001: libtirpc.1.3.5-rc2.patch
|
||||||
|
|
||||||
BuildRequires: automake, autoconf, libtool, pkgconfig
|
BuildRequires: automake, autoconf, libtool, pkgconfig
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -112,6 +114,33 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-1.rc2.2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-1.rc2.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 5 2024 Steve Dickson <steved@redhat.com> - 1.3.4-1.rc2
|
||||||
|
- Updated to the latest upstream RC release: libtirpc-1-3-5-rc2
|
||||||
|
|
||||||
|
* Wed Jan 3 2024 Steve Dickson <steved@redhat.com> - 1.3.4-1.rc1
|
||||||
|
- Updated to the latest upstream RC release: libtirpc-1-3-5-rc1
|
||||||
|
|
||||||
|
* Mon Oct 16 2023 Pavel Reichl <preichl@redhat.com> - 1.3.4-1
|
||||||
|
- Convert License tag to SPDX format
|
||||||
|
|
||||||
|
* Sat Oct 7 2023 Steve Dickson <steved@redhat.com> - 1.3.4-0
|
||||||
|
- Updated to latest upstream release: libtirpc-1-3-4
|
||||||
|
|
||||||
|
* Mon Aug 7 2023 Steve Dickson <steved@redhat.com> - 1.3.3-1.rc2
|
||||||
|
- Updated to the latest upstream RC release: libtirpc-1-3-4-rc2
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-1.rc1.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Apr 21 2023 Steve Dickson <steved@redhat.com> - 1.3.3-1.rc1
|
||||||
|
- Updated to the latest upstream RC release: libtirpc-1-3-4-rc1 (bz 1725329)
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-1
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-1
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (libtirpc-1.3.3.tar.bz2) = df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe
|
SHA512 (libtirpc-1.3.4.tar.bz2) = 004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00
|
||||||
|
2
tests/scripts/runtest.sh
Normal file
2
tests/scripts/runtest.sh
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
rpm -qi libtirpc
|
11
tests/tests.yml
Normal file
11
tests/tests.yml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
- hosts: localhost
|
||||||
|
roles:
|
||||||
|
- role: standard-test-basic
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
tests:
|
||||||
|
- simple:
|
||||||
|
dir: scripts
|
||||||
|
run: ./runtest.sh
|
||||||
|
required_packages:
|
||||||
|
- libtirpc
|
Loading…
Reference in New Issue
Block a user