[libtirpc/f19] Update to latest RC release: libtirpc-0-2-4-rc1 (bz 948378)

[Steve Dickson]

commit caed7e185ad21ead4b4d07dff71e9ec093c97a4a
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Apr 22 08:33:25 2013 -0400

    Update to latest RC release: libtirpc-0-2-4-rc1 (bz 948378)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 libtirpc-0.2.3-rc3.patch | 1312 -------------------------------------------
 libtirpc-0.2.3-rc4.patch | 1397 ----------------------------------------------
 libtirpc-0.2.4-rc1.patch |   88 +++
 libtirpc.spec            |    9 +-
 4 files changed, 94 insertions(+), 2712 deletions(-)
---
diff --git a/libtirpc-0.2.4-rc1.patch b/libtirpc-0.2.4-rc1.patch
new file mode 100644
index 0000000..89480a5
--- /dev/null
+++ b/libtirpc-0.2.4-rc1.patch
@@ -0,0 +1,88 @@
+diff --git a/configure.ac b/configure.ac
+index 40dce96..4a4adba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,15 +5,30 @@ AC_CONFIG_SRCDIR([src/auth_des.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_ARG_ENABLE(gss,[  --enable-gss            Turn on gss api], [case "${enableval}" in
+-        yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;;
++        yes) gss=true ;;
+         no)  gss=false ;;
+         *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;;
+       esac],[gss=false])
+ AM_CONDITIONAL(GSS, test x$gss = xtrue)
++AC_ARG_WITH(gssglue,
++		[  --with-gssglue        Use libgssglue],
++		 [case "${enableval}" in
++		  yes) gssglue=true ;;
++		  no)  gssglue=false ;;
++		  *) AC_MSG_ERROR(bad value ${enableval} for --with-gssglue) ;;
++		  esac],
++		[gssglue=false])
++AM_CONDITIONAL(USEGSSGLUE, test x$gssglue = xtrue)
+ if test x$gss = xtrue; then
+-	AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
+-	PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
+-	AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
++	if test x$gssglue = xtrue; then
++		PKG_CHECK_MODULES(GSSAPI, libgssglue, [],
++		AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
++	else
++		GSSAPI_CFLAGS=`krb5-config --cflags gssapi`
++		GSSAPI_LIBS=`krb5-config --libs gssapi`
++		AC_SUBST([GSSAPI_CFLAGS])
++		AC_SUBST([GSSAPI_LIBS])
++	fi
+ fi
+ AC_ARG_ENABLE(ipv6,
+ 	[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 66350f5..2dd7768 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -58,8 +58,8 @@ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_ref
+ ## Secure-RPC
+ if GSS
+     libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c
+-    libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS)
+-    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
++    libtirpc_la_LDFLAGS += $(GSSAPI_LIBS)
++    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
+ endif
+ 
+ ## libtirpc_a_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
+diff --git a/src/auth_gss.c b/src/auth_gss.c
+index 81ae8ae..703bc3f 100644
+--- a/src/auth_gss.c
++++ b/src/auth_gss.c
+@@ -269,6 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd)
+ 	 * send an RPCSEC_GSS_DESTROY request which might inappropriately
+ 	 * destroy the context.
+ 	 */
++        gd->ctx = GSS_C_NO_CONTEXT;
+ 	gd->gc.gc_ctx.length = 0;
+ 	gd->gc.gc_ctx.value = NULL;
+ 
+@@ -284,7 +285,8 @@ authgss_free_private_data(struct authgss_private_data *pd)
+ 	if (!pd)
+ 		return (FALSE);
+ 
+-	pd->pd_ctx = NULL;
++	if (pd->pd_ctx != GSS_C_NO_CONTEXT)
++		gss_delete_sec_context(&min_stat, &pd->pd_ctx, NULL);
+ 	gss_release_buffer(&min_stat, &pd->pd_ctx_hndl);
+ 	memset(&pd->pd_ctx_hndl, 0, sizeof(pd->pd_ctx_hndl));
+ 	pd->pd_seq_win = 0;
+diff --git a/src/svc_dg.c b/src/svc_dg.c
+index b1ac462..6e00191 100644
+--- a/src/svc_dg.c
++++ b/src/svc_dg.c
+@@ -284,7 +284,6 @@ svc_dg_getargs(xprt, xdr_args, args_ptr)
+ {
+ 	if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs),
+ 			     xdr_args, args_ptr)) {
+-		(void)svc_freeargs(xprt, xdr_args, args_ptr);
+ 		return FALSE;
+ 	}
+ 	return TRUE;
diff --git a/libtirpc.spec b/libtirpc.spec
index 92a459f..f57f227 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -2,7 +2,7 @@
 
 Name:		   libtirpc
 Version:		0.2.3
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL and BSD
@@ -11,7 +11,7 @@ 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_gssglue.patch
+Patch001: libtirpc-0.2.4-rc1.patch
 
 BuildRequires:		automake, autoconf, libtool, pkgconfig
 BuildRequires:		krb5-devel
@@ -131,10 +131,13 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 22 2013 Steve Dickson <steved at redhat.com> 0.2.3-2
+- Update to latest RC release: libtirpc-0-2-4-rc1 (bz 948378)
+
 * Thu Apr 11 2013 Guenther Deschner <gdeschner at redhat.com> 0.2.3-1
 - Removed libgssglue dependency (patch from master)
 
-* Wed Feb 13 2013 Steve Dickson <steved at redhat.com> 0.2.1-43
+* Wed Feb 13 2013 Steve Dickson <steved at redhat.com> 0.2.3-0
 - Updated to latest upstream release: 0.2.3
 
 * Tue Nov 13 2012 Steve Dickson <steved at redhat.com> 0.2.1-43