- make krb.h c++ safe (from upstream)

Changed files:
    heimdal-cpp-safe.patch -> 1.1
    heimdal.spec -> 1.181

diff --git a/heimdal-cpp-safe.patch b/heimdal-cpp-safe.patch
new file mode 100644 (file)
index 0000000..5c810fb
--- /dev/null
+++ b/heimdal-cpp-safe.patch
@@ -0,0 +1,32 @@
+commit 826c14833f98d1c52830361f4b5a76e3344f388c
+Author: Love Hornquist Astrand <lha@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;

diff --git a/heimdal.spec b/heimdal.spec
index 51f20ae7602af2d6943000b1e0db36e33fc39ac8..d4d0c50399039a98be497dc4962c5102a3a46dc7 100644 (file)
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -6,7 +6,7 @@ Summary:        Heimdal implementation of Kerberos V5 system
 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
@@ -36,6 +36,7 @@ Patch10:      %{name}-shared-libcom_err.patch
 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
@@ -348,6 +349,7 @@ Demony korzystające z systemu Kerberos do autoryzacji dostępu.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 rm -f acinclude.m4 cf/{libtool,lt*}.m4