- added heimdal patch to prefer heimdal kerberos5 impl

Changed files:
    postgresql-heimdal.patch -> 1.1
    postgresql.spec -> 1.458

diff --git a/postgresql-heimdal.patch b/postgresql-heimdal.patch
new file mode 100644 (file)
index 0000000..f54ffe8
--- /dev/null
+++ b/postgresql-heimdal.patch
@@ -0,0 +1,20 @@
+--- postgresql-9.0.0/configure.in.orig 2010-10-03 11:14:32.231741882 +0200
++++ postgresql-9.0.0/configure.in      2010-10-03 11:46:29.767741043 +0200
+@@ -906,7 +906,7 @@
+ 
+ if test "$with_gssapi" = yes ; then
+   if test "$PORTNAME" != "win32"; then
+-    AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
++    AC_SEARCH_LIBS(gss_init_sec_context, [gssapi 'gssapi -lkrb5 -lcrypto' gssapi_krb5 gss], [],
+                                 [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+   else
+     LIBS="$LIBS -lgssapi32"
+@@ -915,7 +915,7 @@
+ 
+ if test "$with_krb5" = yes ; then
+   if test "$PORTNAME" != "win32"; then
+-     AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [],
++     AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+                     [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+      AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+                     [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])

diff --git a/postgresql.spec b/postgresql.spec
index 87f367225a40d8c1620a68004757a751df7a8203..cff947c4d7a5e2b33efc3c0f1f746f500765c9c0 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -47,6 +47,7 @@ Patch2:               %{name}-ecpg-includedir.patch
 Patch3:                %{name}-ac_version.patch
 Patch4:                %{name}-disable_horology_test.patch
 Patch5:                %{name}-pg_ctl-fix.patch
+Patch6:                %{name}-heimdal.patch
 URL:           http://www.postgresql.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -773,6 +774,7 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 tar xzf %{SOURCE4} -C contrib