[gentoo-commits] gentoo-x86 commit in app-crypt/heimdal/files: heimdal-r23235-kb5-libwind_la.patch heimdal-kdc-sans_pkinit.patch heimdal-system_sqlite.patch heimdal-r23238-kb5_locl_h-wind_h.patch

[Michael Hammer (mueli)]

mueli       08/06/11 07:27:47

  Added:                heimdal-r23235-kb5-libwind_la.patch
                        heimdal-kdc-sans_pkinit.patch
                        heimdal-system_sqlite.patch
                        heimdal-r23238-kb5_locl_h-wind_h.patch
  Log:
  Added new heimdal version - see bug #185899. Sry for the partial QA payment but it makes no sense IMHO to refactor the outdated heimdal release.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch?rev=1.1&content-type=text/plain

Index: heimdal-r23235-kb5-libwind_la.patch
===================================================================
--- trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:24 UTC (rev 23237)
+++ trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:43 UTC (rev 23238)
@@ -131,6 +131,8 @@
 #include <parse_time.h>
 #include <base64.h>
 
+#include <wind.h>
+
 #include "crypto-headers.h"





1.1                  app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch?rev=1.1&content-type=text/plain

Index: heimdal-kdc-sans_pkinit.patch
===================================================================
diff -Naur tmp-old/kdc/Makefile.am tmp-new/kdc/Makefile.am
--- kdc/Makefile.am	2008-06-02 14:38:03.000000000 +0000
+++ kdc/Makefile.am	2008-06-03 04:06:19.000000000 +0000
@@ -84,12 +84,10 @@
 	$(LIB_roken) \
 	$(DBLIB) 
 
-if PKINIT
-LIB_pkinit = $(top_builddir)/lib/hx509/libhx509.la
-endif
+LIB_hx509 = $(top_builddir)/lib/hx509/libhx509.la
 
 libkdc_la_LIBADD = \
-	$(LIB_pkinit) \
+	$(LIB_hx509) \
 	$(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \



1.1                  app-crypt/heimdal/files/heimdal-system_sqlite.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-system_sqlite.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-system_sqlite.patch?rev=1.1&content-type=text/plain

Index: heimdal-system_sqlite.patch
===================================================================
diff -Naur tmp-old/configure.in tmp-new/configure.in
--- configure.in	2008-06-08 08:06:38.000000000 +0000
+++ configure.in	2008-06-08 08:15:29.000000000 +0000
@@ -104,6 +104,8 @@
 
 KRB_PTHREADS
 
+PKG_CHECK_MODULES([sqlite], [sqlite3])
+
 AC_ARG_ENABLE(dce, 
 	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
 if test "$enable_dce" = yes; then
diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
--- lib/Makefile.am	2008-06-07 16:53:11.000000000 +0000
+++ lib/Makefile.am	2008-06-07 16:55:58.000000000 +0000
@@ -18,6 +18,6 @@
 dir_hcrypto = hcrypto
 endif
 
-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
+SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
 	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
 	auth $(dir_45) $(dir_otp) $(dir_dce)
diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
--- lib/krb5/Makefile.am	2008-06-07 16:54:02.000000000 +0000
+++ lib/krb5/Makefile.am	2008-06-08 08:17:00.000000000 +0000
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
 
 bin_PROGRAMS = verify_krb5_conf
 
@@ -53,7 +53,7 @@
 
 libkrb5_la_LIBADD = \
 	$(LIB_pkinit) \
-	../sqlite/libsqlite.la \
+	$(sqlite_LIBS) \
 	$(LIB_com_err) \
 	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
--- lib/krb5/scache.c	2008-06-07 16:54:30.000000000 +0000
+++ lib/krb5/scache.c	2008-06-07 17:01:43.000000000 +0000
@@ -32,7 +32,7 @@
  */
 
 #include "krb5_locl.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 
 RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
 



1.1                  app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch?rev=1.1&content-type=text/plain

Index: heimdal-r23238-kb5_locl_h-wind_h.patch
===================================================================
--- trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:41 UTC (rev 23234)
+++ trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:53 UTC (rev 23235)
@@ -57,6 +57,7 @@
 	$(LIB_com_err) \
 	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
+	../wind/libwind.la \
 	$(LIBADD_roken) \
 	$(LIB_door_create) \
 	$(LIB_dlopen)



-- 
gentoo-commits@l.g.o mailing list