rpms/libtirpc/devel libtirpc-0.1.7-gssglue.patch, NONE, 1.1 libtirpc-0.1.7-svcauthnone.patch, 1.1, 1.2 libtirpc.spec, 1.18, 1.19 libtirpc-0.1.7-gssapi.patch, 1.1, NONE

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038

Modified Files:
	libtirpc-0.1.7-svcauthnone.patch libtirpc.spec 
Added Files:
	libtirpc-0.1.7-gssglue.patch 
Removed Files:
	libtirpc-0.1.7-gssapi.patch 
Log Message:
Switch the libgssapi dependency to libgssglue


libtirpc-0.1.7-gssglue.patch:

--- NEW FILE libtirpc-0.1.7-gssglue.patch ---
diff -up libtirpc-0.1.7/configure.in.orig libtirpc-0.1.7/configure.in
--- libtirpc-0.1.7/configure.in.orig	2007-10-17 12:03:25.000000000 -0400
+++ libtirpc-0.1.7/configure.in	2007-10-17 12:07:18.000000000 -0400
@@ -10,6 +10,10 @@ AC_ARG_ENABLE(gss,[  --enable-gss       
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;;
       esac],[gss=false])
 AM_CONDITIONAL(GSS, test x$gss = xtrue)
+if test x$gss = xtrue; then
+	PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
+	AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
+fi
 
 
 AC_PROG_CC
diff -up libtirpc-0.1.7/src/Makefile.am.orig libtirpc-0.1.7/src/Makefile.am
--- libtirpc-0.1.7/src/Makefile.am.orig	2007-10-17 12:03:25.000000000 -0400
+++ libtirpc-0.1.7/src/Makefile.am	2007-10-17 12:06:19.000000000 -0400
@@ -29,8 +29,8 @@ libtirpc_la_SOURCES += xdr.c xdr_rec.c x
 ## Secure-RPC
 if GSS
     libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c
-    libtirpc_la_LDFLAGS += -lgssapi
-    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS
+    libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS)
+    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS -I/usr/include/gssglue $(GSSGLUE_LIBS)
 endif
 
 ## libtirpc_a_SOURCES += key_call.c key_prot_xdr.c getpublickey.c

libtirpc-0.1.7-svcauthnone.patch:

Index: libtirpc-0.1.7-svcauthnone.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc-0.1.7-svcauthnone.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtirpc-0.1.7-svcauthnone.patch	14 Aug 2006 16:02:26 -0000	1.1
+++ libtirpc-0.1.7-svcauthnone.patch	17 Oct 2007 18:27:04 -0000	1.2
@@ -83,8 +83,8 @@
 -    libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c
 +    libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \
 +		svc_auth_none.c
-     libtirpc_la_LDFLAGS += $(GSSAPI_LIBS)
-     libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
+     libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS)
+     libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
  endif
 @@ -49,7 +50,7 @@ $(libtirpc_la_OBJECTS) :auth_none.c auth
          svc_raw.c svc_run.c svc_simple.c svc_vc.c \


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtirpc.spec	15 Oct 2007 14:35:57 -0000	1.18
+++ libtirpc.spec	17 Oct 2007 18:27:04 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.7
-Release:		11%{?dist}
+Release:		12%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		GPL
@@ -10,7 +10,7 @@
 Source0:		http://nfsv4.bullopensource.org/tarballs/tirpc/%{name}-%{version}.tar.bz2
 
 BuildRequires:		automake, autoconf, libtool, pkgconfig
-BuildRequires:		libgssapi-devel
+BuildRequires:		libgssglue-devel
 
 %description
 This package contains SunLib's implementation of transport-independent
@@ -31,7 +31,7 @@
 Requires:	pkgconfig
 
 Patch1:	 libtirpc-0.1.7-netconfig.patch
-Patch2:	 libtirpc-0.1.7-gssapi.patch
+Patch2:	 libtirpc-0.1.7-gssglue.patch
 Patch3:	 libtirpc-0.1.7-svcauthnone.patch
 Patch4:	 libtirpc-0.1.7-ppc64.patch
 Patch5:	 libtirpc-0.1.7-svcauthdestroy.patch
@@ -145,6 +145,9 @@
 %{_includedir}/tirpc/un-namespace.h
 
 %changelog
+* Wed Oct 17  2007 Steve Dickson  <steved at redhat.com> 0.1.7-12
+- Switch the libgssapi dependency to libgssglue
+
 * Mon Oct 15 2007 Steve Dickson  <steved at redhat.com> 0.1.7-11
 - Made tcp6/udp6 network ids no longer visible in the netconfig
   file since the ipv6 code is not fully baked yet in rpcbind. (bz 249121)


--- libtirpc-0.1.7-gssapi.patch DELETED ---