Update to latest RC release: libtirpc-0-2-6-rc3
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
2977588de0
commit
7846561ddd
@ -1,83 +0,0 @@
|
|||||||
commit a4fa582908b9c63957240cb0cb68b59d56244ef5
|
|
||||||
Author: Bodo Stroesser <bstroesser@ts.fujitsu.com>
|
|
||||||
Date: Thu Nov 6 13:26:00 2014 -0500
|
|
||||||
|
|
||||||
write_vc: fix write retry loop for nonblocking mode
|
|
||||||
|
|
||||||
This is a simple fix for the write retry loop that is used on
|
|
||||||
non-blocking connections if write() failed with -EAGAIN.
|
|
||||||
|
|
||||||
Additionally it removes a redundant if () {}
|
|
||||||
|
|
||||||
Erroneously at each cycle of the loop the length of the data
|
|
||||||
to send is incremented and the buffer pointer is decremented.
|
|
||||||
Thus, it might happen that:
|
|
||||||
* the application crashes
|
|
||||||
* data from the memory before the buffer is sent
|
|
||||||
|
|
||||||
Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/src/svc_vc.c b/src/svc_vc.c
|
|
||||||
index 4c70de8..4d3ea51 100644
|
|
||||||
--- a/src/svc_vc.c
|
|
||||||
+++ b/src/svc_vc.c
|
|
||||||
@@ -559,20 +559,19 @@ write_vc(xprtp, buf, len)
|
|
||||||
cd->strm_stat = XPRT_DIED;
|
|
||||||
return (-1);
|
|
||||||
}
|
|
||||||
- if (cd->nonblock && i != cnt) {
|
|
||||||
- /*
|
|
||||||
- * For non-blocking connections, do not
|
|
||||||
- * take more than 2 seconds writing the
|
|
||||||
- * data out.
|
|
||||||
- *
|
|
||||||
- * XXX 2 is an arbitrary amount.
|
|
||||||
- */
|
|
||||||
- gettimeofday(&tv1, NULL);
|
|
||||||
- if (tv1.tv_sec - tv0.tv_sec >= 2) {
|
|
||||||
- cd->strm_stat = XPRT_DIED;
|
|
||||||
- return (-1);
|
|
||||||
- }
|
|
||||||
+ /*
|
|
||||||
+ * For non-blocking connections, do not
|
|
||||||
+ * take more than 2 seconds writing the
|
|
||||||
+ * data out.
|
|
||||||
+ *
|
|
||||||
+ * XXX 2 is an arbitrary amount.
|
|
||||||
+ */
|
|
||||||
+ gettimeofday(&tv1, NULL);
|
|
||||||
+ if (tv1.tv_sec - tv0.tv_sec >= 2) {
|
|
||||||
+ cd->strm_stat = XPRT_DIED;
|
|
||||||
+ return (-1);
|
|
||||||
}
|
|
||||||
+ i = 0; /* Don't change buf and cnt */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
commit e34b252aaf9b7932c17f5d6b271e296220d31dc4
|
|
||||||
Author: Mike Frysinger <vapier@gentoo.org>
|
|
||||||
Date: Tue Aug 12 10:50:34 2014 -0400
|
|
||||||
|
|
||||||
libtirpc: include stdarg.h when used
|
|
||||||
|
|
||||||
The debug.h header uses va_list but doesn't include stdarg.h which
|
|
||||||
can lead to random build failures.
|
|
||||||
|
|
||||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
||||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/src/debug.h b/src/debug.h
|
|
||||||
index afc8d57..c971ac3 100644
|
|
||||||
--- a/src/debug.h
|
|
||||||
+++ b/src/debug.h
|
|
||||||
@@ -21,6 +21,8 @@
|
|
||||||
|
|
||||||
#ifndef _DEBUG_H
|
|
||||||
#define _DEBUG_H
|
|
||||||
+
|
|
||||||
+#include <stdarg.h>
|
|
||||||
#include <syslog.h>
|
|
||||||
|
|
||||||
extern int libtirpc_debug_level;
|
|
2721
libtirpc-0.2.6-rc3.patch
Normal file
2721
libtirpc-0.2.6-rc3.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: libtirpc
|
Name: libtirpc
|
||||||
Version: 0.2.5
|
Version: 0.2.5
|
||||||
Release: 2.1%{?dist}
|
Release: 3.0%{?dist}
|
||||||
Summary: Transport Independent RPC Library
|
Summary: Transport Independent RPC Library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: SISSL and BSD
|
License: SISSL and BSD
|
||||||
@ -10,7 +10,7 @@ URL: http://nfsv4.bullopensource.org/
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch001: libtirpc-0.2.6-rc2.patch
|
Patch001: libtirpc-0.2.6-rc3.patch
|
||||||
|
|
||||||
BuildRequires: automake, autoconf, libtool, pkgconfig
|
BuildRequires: automake, autoconf, libtool, pkgconfig
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
@ -41,6 +41,7 @@ developing programs which use the tirpc library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
rm -f INSTALL
|
||||||
%patch001 -p1
|
%patch001 -p1
|
||||||
|
|
||||||
# Remove .orig files
|
# Remove .orig files
|
||||||
@ -132,10 +133,13 @@ rm -rf %{buildroot}
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 23 2015 Steve Dickson <steved@redhat.com> 0.2.5-3.0
|
||||||
|
- Update to latest RC release: libtirpc-0-2-6-rc3
|
||||||
|
|
||||||
* Tue Dec 16 2014 Tom Callaway <spot@fedoraproject.org> 0.2.5-2.1
|
* Tue Dec 16 2014 Tom Callaway <spot@fedoraproject.org> 0.2.5-2.1
|
||||||
- minor spec cleanups, add license texts
|
- minor spec cleanups, add license texts
|
||||||
|
|
||||||
- Tue Dec 16 2014 Steve Dickson <steved@redhat.com> 0.2.5-1.0
|
* Tue Dec 16 2014 Steve Dickson <steved@redhat.com> 0.2.5-1.0
|
||||||
- Update to latest RC release: libtirpc-0-2-6-rc2
|
- Update to latest RC release: libtirpc-0-2-6-rc2
|
||||||
|
|
||||||
* Tue Nov 11 2014 Steve Dickson <steved@redhat.com> 0.2.5-1.0
|
* Tue Nov 11 2014 Steve Dickson <steved@redhat.com> 0.2.5-1.0
|
||||||
|
Loading…
Reference in New Issue
Block a user