From 536311ca0c1939df5fafc28538dd9c5cdebbfa50 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Mon, 29 Jun 2009 16:57:21 +0000
Subject: [PATCH] - Updated to latest upstream tag: 0-2-1-rc2 rpcb_clnt:    
 RPC_PROGNOTREGISTERED is a permanent error clnt_dg: Fix infinite loop    
 when datagram call times ou Updated .gitignore file Replace the hard    
 coded path name with the top_srcdir macrc Added 'doc' to the SUBDIRS     list
 so make install work correctly.

---
 libtirpc-0.2.0-rc1.patch | 10 ------
 libtirpc-0.2.0-rc2.patch | 67 ++++++++++++++++++++++++++++++++++++++++
 libtirpc.spec            | 12 +++++--
 3 files changed, 77 insertions(+), 12 deletions(-)
 delete mode 100644 libtirpc-0.2.0-rc1.patch
 create mode 100644 libtirpc-0.2.0-rc2.patch

diff --git a/libtirpc-0.2.0-rc1.patch b/libtirpc-0.2.0-rc1.patch
deleted file mode 100644
index b7a8f7a..0000000
--- a/libtirpc-0.2.0-rc1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 3e50d3c..7f5f37b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = src man
-+SUBDIRS = src man doc
- 
- nobase_include_HEADERS = tirpc/netconfig.h \
- 			 tirpc/rpcsvc/crypt.x \
diff --git a/libtirpc-0.2.0-rc2.patch b/libtirpc-0.2.0-rc2.patch
new file mode 100644
index 0000000..b6c6bc3
--- /dev/null
+++ b/libtirpc-0.2.0-rc2.patch
@@ -0,0 +1,67 @@
+diff --git a/.gitignore b/.gitignore
+index d088f05..f4a325a 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -36,3 +36,11 @@ src/libtirpc_la-*.lo
+ *~
+ # cscope database files
+ cscope.*
++# files generated by patches
++*.patch
++*.rej
++*.orig
++# files generated by debugging
++.gdb_history
++.gdbinit
++core
+diff --git a/Makefile.am b/Makefile.am
+index 3e50d3c..7f5f37b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src man
++SUBDIRS = src man doc
+ 
+ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpcsvc/crypt.x \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f832baa..7b002da 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ ## anything like that.
+ 
+ 
+-INCLUDES = -I../tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
++INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
+ 		-D_GNU_SOURCE -Wall -pipe  
+ 
+ lib_LTLIBRARIES = libtirpc.la
+diff --git a/src/clnt_dg.c b/src/clnt_dg.c
+index 2eeaada..2f870b1 100644
+--- a/src/clnt_dg.c
++++ b/src/clnt_dg.c
+@@ -381,6 +381,10 @@ call_again:
+ 	}
+ 
+ send_again:
++	if (total_time <= 0) {
++		cu->cu_error.re_status = RPC_TIMEDOUT;
++		goto out;
++	}
+ 	nextsend_time = cu->cu_wait.tv_sec * 1000 + cu->cu_wait.tv_usec / 1000;
+ 	if (sendto(cu->cu_fd, cu->cu_outbuf, outlen, 0, sa, salen) != outlen) {
+ 		cu->cu_error.re_errno = errno;
+diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
+index 732c556..6494370 100644
+--- a/src/rpcb_clnt.c
++++ b/src/rpcb_clnt.c
+@@ -781,7 +781,7 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
+ 			if ((ua == NULL) || (ua[0] == 0)) {
+ 				/* address unknown */
+ 				rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
+-				continue; /* try other versions */
++				goto error;
+ 			}
+ 			address = uaddr2taddr(nconf, ua);
+ #ifdef ND_DEBUG
diff --git a/libtirpc.spec b/libtirpc.spec
index 1113b9e..18d88f3 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.2.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL and BSD
@@ -30,7 +30,7 @@ Group:	Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires(devel):	pkgconfig man
 
-Patch1: libtirpc-0.2.0-rc1.patch
+Patch1: libtirpc-0.2.0-rc2.patch
 
 %description devel
 This package includes header files and libraries necessary for
@@ -124,6 +124,14 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 29 2009 Steve Dickson  <steved@redhat.com> 0.2.0-2
+- Updated to latest upstream tag: 0-2-1-rc2
+    rpcb_clnt: RPC_PROGNOTREGISTERED is a permanent error
+    clnt_dg: Fix infinite loop when datagram call times ou
+    Updated .gitignore file
+    Replace the hard coded path name with the top_srcdir macrc
+    Added 'doc' to the SUBDIRS list so make install work correctly.
+
 * Fri May 29 2009 Steve Dickson  <steved@redhat.com> 0.2.0-1
 - Updated to latest upstream version: 0.2.0