packages: heimdal/heimdal.spec, heimdal/heimdal-cpp-safe.patch (NEW) - make...

[baggins]

Author: baggins                      Date: Tue Dec  8 00:28:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make krb.h c++ safe (from upstream)

---- Files affected:
packages/heimdal:
   heimdal.spec (1.180 -> 1.181) , heimdal-cpp-safe.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.180 packages/heimdal/heimdal.spec:1.181
--- packages/heimdal/heimdal.spec:1.180	Mon Dec  7 23:45:22 2009
+++ packages/heimdal/heimdal.spec	Tue Dec  8 01:28:10 2009
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.3.1
-Release:	0.1
+Release:	0.2
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@
 Patch11:	%{name}-strsvisx.patch
 Patch12:	%{name}-sbindir.patch
 Patch13:	%{name}-hdb-ldap-module.patch
+Patch14:	%{name}-cpp-safe.patch
 URL:		http://www.h5l.org/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
@@ -349,6 +350,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 rm -f acinclude.m4 cf/{libtool,lt*}.m4
@@ -773,6 +775,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181  2009/12/08 00:28:10  baggins
+- make krb.h c++ safe (from upstream)
+
 Revision 1.180  2009/12/07 22:45:22  baggins
 - renumber patches
 

================================================================
Index: packages/heimdal/heimdal-cpp-safe.patch
diff -u /dev/null packages/heimdal/heimdal-cpp-safe.patch:1.1
--- /dev/null	Tue Dec  8 01:28:15 2009
+++ packages/heimdal/heimdal-cpp-safe.patch	Tue Dec  8 01:28:10 2009
@@ -0,0 +1,32 @@
+commit 826c14833f98d1c52830361f4b5a76e3344f388c
+Author: Love Hornquist Astrand <lha at h5l.org>
+Date:   Mon Nov 23 07:19:00 2009 -0800
+
+    make cpp safe, from Allan McRae
+
+diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
+index 505ecd0..42e1877 100644
+--- a/lib/krb5/cache.c
++++ b/lib/krb5/cache.c
+@@ -1376,7 +1376,7 @@ out:
+  *
+  */
+ 
+-struct krb5_cccol_cursor {
++struct krb5_cccol_cursor_data {
+     int idx;
+     krb5_cc_cache_cursor cursor;
+ };
+diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
+index 9d2ecb3..8fda340 100644
+--- a/lib/krb5/krb5.h
++++ b/lib/krb5/krb5.h
+@@ -313,7 +313,7 @@ struct krb5_cc_ops;
+ 				 NULL)
+ 
+ typedef void *krb5_cc_cursor;
+-typedef struct krb5_cccol_cursor *krb5_cccol_cursor;
++typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor;
+ 
+ typedef struct krb5_ccache_data {
+     const struct krb5_cc_ops *ops;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.180&r2=1.181&f=u