packages: librpcsecgss/librpcsecgss-heimdal.patch, librpcsecgss/librpcsecgs...

[qboosh]

Author: qboosh                       Date: Fri Aug 13 18:13:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.19
- implemented heimdal patch in more flexible way, allowing to choose heimdal even if libgssglue is installed

---- Files affected:
packages/librpcsecgss:
   librpcsecgss-heimdal.patch (1.5 -> 1.6) , librpcsecgss.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/librpcsecgss/librpcsecgss-heimdal.patch
diff -u packages/librpcsecgss/librpcsecgss-heimdal.patch:1.5 packages/librpcsecgss/librpcsecgss-heimdal.patch:1.6
--- packages/librpcsecgss/librpcsecgss-heimdal.patch:1.5	Tue Jun 30 15:06:31 2009
+++ packages/librpcsecgss/librpcsecgss-heimdal.patch	Fri Aug 13 20:13:19 2010
@@ -1,19 +1,26 @@
-diff -NaurwB librpcsecgss-0.18.orig/configure.in librpcsecgss-0.18/configure.in
---- librpcsecgss-0.18.orig/configure.in	2008-04-09 00:05:40.000000000 +0200
-+++ librpcsecgss-0.18/configure.in	2008-06-12 19:05:51.000000000 +0200
-@@ -12,10 +12,15 @@
+--- librpcsecgss-0.19/configure.in.orig	2009-07-29 20:33:44.000000000 +0200
++++ librpcsecgss-0.19/configure.in	2010-08-13 19:53:23.298816591 +0200
+@@ -12,10 +12,22 @@
  AC_PROG_RANLIB
  
  # Checks for libraries.
 -PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [],
-+PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1],
-+  [echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue],
-+  [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
-+    [echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi],
-   [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
+-  [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
++GSSAPI_IMPLEMENTATION='libgssglue >= 0.1'
++AC_ARG_WITH([gssapiimpl],
++	    [AS_HELP_STRING([--with-gssapiimpl], [use given GSSAPI implementation (default is libgssglue)])],
++	    [GSSAPI_IMPLEMENTATION=$withval])
++
++PKG_CHECK_MODULES([GSSGLUE], [$GSSAPI_IMPLEMENTATION],
++  [echo GSSAPI in $GSSAPI_IMPLEMENTATION found],
++  [PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1],
++    [echo GSSAPI in libgssglue found; GSSAPI_IMPLEMENTATION='libgssglue >= 0.1'],
++    [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
++      [echo GSSAPI in heimdal-gssapi found; GSSAPI_IMPLEMENTATION='heimdal-gssapi'],
++  [AC_MSG_ERROR([Unable to locate information required to use GSSAPI implementation.
    If you have pkgconfig installed, you might try setting environment
 -  variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])
-+    variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])])
++    variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])])])
 +
 +AC_SUBST([GSSAPI_IMPLEMENTATION])
  

================================================================
Index: packages/librpcsecgss/librpcsecgss.spec
diff -u packages/librpcsecgss/librpcsecgss.spec:1.27 packages/librpcsecgss/librpcsecgss.spec:1.28
--- packages/librpcsecgss/librpcsecgss.spec:1.27	Thu Jul  2 16:06:41 2009
+++ packages/librpcsecgss/librpcsecgss.spec	Fri Aug 13 20:13:19 2010
@@ -6,12 +6,12 @@
 Summary:	rpcsec_gss implementation library
 Summary(pl.UTF-8):	Biblioteka implementująca rpcsec_gss
 Name:		librpcsecgss
-Version:	0.18
-Release:	3
+Version:	0.19
+Release:	1
 License:	BSD/MIT
 Group:		Libraries
 Source0:	http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{name}-%{version}.tar.gz
-# Source0-md5:	f2c4a69c5a32f62b762a569b8d962156
+# Source0-md5:	b45ed565bdc3099023aa35830ec92997
 Patch0:		%{name}-heimdal.patch
 URL:		http://www.citi.umich.edu/projects/nfsv4/linux/
 BuildRequires:	autoconf >= 2.59
@@ -20,7 +20,6 @@
 BuildRequires:	libgssglue-devel >= 0.1
 %else
 BuildRequires:	heimdal-devel
-BuildConflicts:	libgssglue-devel
 %endif
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -77,7 +76,8 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--with-gssapiimpl=%{?with_krb5:libgssglue}%{!?with_krb5:heimdal-gssapi}
 %{__make}
 
 %install
@@ -115,6 +115,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/08/13 18:13:19  qboosh
+- updated to 0.19
+- implemented heimdal patch in more flexible way, allowing to choose heimdal even if libgssglue is installed
+
 Revision 1.27  2009/07/02 14:06:41  baggins
 - rel 3
 - reverse heimdal bcond to krb5, build with heimdal
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librpcsecgss/librpcsecgss-heimdal.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librpcsecgss/librpcsecgss.spec?r1=1.27&r2=1.28&f=u