Update to latest RC release: libtirpc-0-2-6-rc1 (bz 1162711)
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
97f980447f
commit
31adcd67f9
83
libtirpc-0.2.6-rc1.patch
Normal file
83
libtirpc-0.2.6-rc1.patch
Normal file
@ -0,0 +1,83 @@
|
||||
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;
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: libtirpc
|
||||
Version: 0.2.5
|
||||
Release: 0.1%{?dist}
|
||||
Release: 1.0%{?dist}
|
||||
Summary: Transport Independent RPC Library
|
||||
Group: System Environment/Libraries
|
||||
License: SISSL and BSD
|
||||
@ -11,6 +11,8 @@ URL: http://nfsv4.bullopensource.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
||||
|
||||
Patch001: libtirpc-0.2.6-rc1.patch
|
||||
|
||||
BuildRequires: automake, autoconf, libtool, pkgconfig
|
||||
BuildRequires: krb5-devel
|
||||
|
||||
@ -40,6 +42,8 @@ developing programs which use the tirpc library.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch001 -p1
|
||||
|
||||
# Remove .orig files
|
||||
find . -name "*.orig" | xargs rm -f
|
||||
|
||||
@ -127,6 +131,9 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 11 2014 Steve Dickson <steved@redhat.com> 0.2.5-1.0
|
||||
- Update to latest RC release: libtirpc-0-2-6-rc1 (bz 1162711)
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.5-0.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user