1 |
mueli 08/06/11 07:27:47 |
2 |
|
3 |
Added: heimdal-r23235-kb5-libwind_la.patch |
4 |
heimdal-kdc-sans_pkinit.patch |
5 |
heimdal-system_sqlite.patch |
6 |
heimdal-r23238-kb5_locl_h-wind_h.patch |
7 |
Log: |
8 |
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. |
9 |
(Portage version: 2.1.4.4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch?rev=1.1&view=markup |
15 |
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 |
16 |
|
17 |
Index: heimdal-r23235-kb5-libwind_la.patch |
18 |
=================================================================== |
19 |
--- trunk/heimdal/lib/krb5/krb5_locl.h 2008-06-01 22:26:24 UTC (rev 23237) |
20 |
+++ trunk/heimdal/lib/krb5/krb5_locl.h 2008-06-01 22:26:43 UTC (rev 23238) |
21 |
@@ -131,6 +131,8 @@ |
22 |
#include <parse_time.h> |
23 |
#include <base64.h> |
24 |
|
25 |
+#include <wind.h> |
26 |
+ |
27 |
#include "crypto-headers.h" |
28 |
|
29 |
|
30 |
|
31 |
|
32 |
|
33 |
1.1 app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch |
34 |
|
35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch?rev=1.1&view=markup |
36 |
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 |
37 |
|
38 |
Index: heimdal-kdc-sans_pkinit.patch |
39 |
=================================================================== |
40 |
diff -Naur tmp-old/kdc/Makefile.am tmp-new/kdc/Makefile.am |
41 |
--- kdc/Makefile.am 2008-06-02 14:38:03.000000000 +0000 |
42 |
+++ kdc/Makefile.am 2008-06-03 04:06:19.000000000 +0000 |
43 |
@@ -84,12 +84,10 @@ |
44 |
$(LIB_roken) \ |
45 |
$(DBLIB) |
46 |
|
47 |
-if PKINIT |
48 |
-LIB_pkinit = $(top_builddir)/lib/hx509/libhx509.la |
49 |
-endif |
50 |
+LIB_hx509 = $(top_builddir)/lib/hx509/libhx509.la |
51 |
|
52 |
libkdc_la_LIBADD = \ |
53 |
- $(LIB_pkinit) \ |
54 |
+ $(LIB_hx509) \ |
55 |
$(top_builddir)/lib/hdb/libhdb.la \ |
56 |
$(LIB_openldap) \ |
57 |
$(top_builddir)/lib/krb5/libkrb5.la \ |
58 |
|
59 |
|
60 |
|
61 |
1.1 app-crypt/heimdal/files/heimdal-system_sqlite.patch |
62 |
|
63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-system_sqlite.patch?rev=1.1&view=markup |
64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/heimdal/files/heimdal-system_sqlite.patch?rev=1.1&content-type=text/plain |
65 |
|
66 |
Index: heimdal-system_sqlite.patch |
67 |
=================================================================== |
68 |
diff -Naur tmp-old/configure.in tmp-new/configure.in |
69 |
--- configure.in 2008-06-08 08:06:38.000000000 +0000 |
70 |
+++ configure.in 2008-06-08 08:15:29.000000000 +0000 |
71 |
@@ -104,6 +104,8 @@ |
72 |
|
73 |
KRB_PTHREADS |
74 |
|
75 |
+PKG_CHECK_MODULES([sqlite], [sqlite3]) |
76 |
+ |
77 |
AC_ARG_ENABLE(dce, |
78 |
AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's])) |
79 |
if test "$enable_dce" = yes; then |
80 |
diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am |
81 |
--- lib/Makefile.am 2008-06-07 16:53:11.000000000 +0000 |
82 |
+++ lib/Makefile.am 2008-06-07 16:55:58.000000000 +0000 |
83 |
@@ -18,6 +18,6 @@ |
84 |
dir_hcrypto = hcrypto |
85 |
endif |
86 |
|
87 |
-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \ |
88 |
+SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \ |
89 |
$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \ |
90 |
auth $(dir_45) $(dir_otp) $(dir_dce) |
91 |
diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am |
92 |
--- lib/krb5/Makefile.am 2008-06-07 16:54:02.000000000 +0000 |
93 |
+++ lib/krb5/Makefile.am 2008-06-08 08:17:00.000000000 +0000 |
94 |
@@ -2,7 +2,7 @@ |
95 |
|
96 |
include $(top_srcdir)/Makefile.am.common |
97 |
|
98 |
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite |
99 |
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS) |
100 |
|
101 |
bin_PROGRAMS = verify_krb5_conf |
102 |
|
103 |
@@ -53,7 +53,7 @@ |
104 |
|
105 |
libkrb5_la_LIBADD = \ |
106 |
$(LIB_pkinit) \ |
107 |
- ../sqlite/libsqlite.la \ |
108 |
+ $(sqlite_LIBS) \ |
109 |
$(LIB_com_err) \ |
110 |
$(LIB_hcrypto) \ |
111 |
$(top_builddir)/lib/asn1/libasn1.la \ |
112 |
diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c |
113 |
--- lib/krb5/scache.c 2008-06-07 16:54:30.000000000 +0000 |
114 |
+++ lib/krb5/scache.c 2008-06-07 17:01:43.000000000 +0000 |
115 |
@@ -32,7 +32,7 @@ |
116 |
*/ |
117 |
|
118 |
#include "krb5_locl.h" |
119 |
-#include "sqlite3.h" |
120 |
+#include <sqlite3.h> |
121 |
|
122 |
RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $"); |
123 |
|
124 |
|
125 |
|
126 |
|
127 |
1.1 app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch |
128 |
|
129 |
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 |
130 |
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 |
131 |
|
132 |
Index: heimdal-r23238-kb5_locl_h-wind_h.patch |
133 |
=================================================================== |
134 |
--- trunk/heimdal/lib/krb5/Makefile.am 2008-06-01 22:25:41 UTC (rev 23234) |
135 |
+++ trunk/heimdal/lib/krb5/Makefile.am 2008-06-01 22:25:53 UTC (rev 23235) |
136 |
@@ -57,6 +57,7 @@ |
137 |
$(LIB_com_err) \ |
138 |
$(LIB_hcrypto) \ |
139 |
$(top_builddir)/lib/asn1/libasn1.la \ |
140 |
+ ../wind/libwind.la \ |
141 |
$(LIBADD_roken) \ |
142 |
$(LIB_door_create) \ |
143 |
$(LIB_dlopen) |
144 |
|
145 |
|
146 |
|
147 |
-- |
148 |
gentoo-commits@l.g.o mailing list |