Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Eray Aslan (eras)" <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/cyrus-sasl/files: cyrus-sasl-2.1.25-autotools_fixes.patch cyrus-sasl-2.1.25-sasldb_al.patch cyrus-sasl-2.1.25-fix_heimdal.patch cyrus-sasl-2.1.25-gssapi.patch cyrus-sasl-2.1.25-lib_before_plugin.patch cyrus-sasl-2.1.25-as_needed.patch cyrus-sasl-2.1.25-avoid_pic_overwrite.patch cyrus-sasl-2.1.25-missing_header.patch cyrus-sasl-2.1.25-saslauthd_libtool.patch
Date: Wed, 30 Nov 2011 15:49:42
Message-Id: 20111130154928.302F72004B@flycatcher.gentoo.org
1 eras 11/11/30 15:49:28
2
3 Added: cyrus-sasl-2.1.25-autotools_fixes.patch
4 cyrus-sasl-2.1.25-sasldb_al.patch
5 cyrus-sasl-2.1.25-fix_heimdal.patch
6 cyrus-sasl-2.1.25-gssapi.patch
7 cyrus-sasl-2.1.25-lib_before_plugin.patch
8 cyrus-sasl-2.1.25-as_needed.patch
9 cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
10 cyrus-sasl-2.1.25-missing_header.patch
11 cyrus-sasl-2.1.25-saslauthd_libtool.patch
12 Log:
13 Version bump. Add ldapdb USE flag - bug #320893
14
15 (Portage version: 2.1.10.39/cvs/Linux x86_64)
16
17 Revision Changes Path
18 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
19
20 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch?rev=1.1&view=markup
21 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch?rev=1.1&content-type=text/plain
22
23 Index: cyrus-sasl-2.1.25-autotools_fixes.patch
24 ===================================================================
25 --- a/configure.in
26 +++ b/configure.in
27 @@ -44,6 +44,8 @@ dnl
28 AC_INIT(lib/saslint.h)
29 AC_PREREQ([2.54])
30
31 +AC_CONFIG_MACRO_DIR([cmulocal] [config])
32 +
33 dnl use ./config.cache as the default cache file.
34 dnl we require a cache file to successfully configure our build.
35 if test $cache_file = "/dev/null"; then
36 --- a/Makefile.am
37 +++ b/Makefile.am
38 @@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7
39 #
40 ################################################################
41
42 +ACLOCAL_AMFLAGS = -I cmulocal -I config
43 +
44 if SASLAUTHD
45 SAD = saslauthd
46 else
47 --- a/saslauthd/configure.in
48 +++ b/saslauthd/configure.in
49 @@ -1,7 +1,8 @@
50 AC_INIT(mechanisms.h)
51 AC_PREREQ([2.54])
52
53 -AC_CONFIG_AUX_DIR(config)
54 +AC_CONFIG_MACRO_DIR([../cmulocal] [../config])
55 +AC_CONFIG_AUX_DIR([config])
56 AC_CANONICAL_HOST
57
58 dnl Should we enable SASLAUTHd at all?
59 @@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS)
60
61 dnl Checks for which function macros exist
62 AC_MSG_CHECKING(whether $CC implements __func__)
63 -AC_CACHE_VAL(have_func,
64 +AC_CACHE_VAL(_cv_have_func,
65 [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);],
66 -have_func=yes,
67 -have_func=no)])
68 -AC_MSG_RESULT($have_func)
69 -if test "$have_func" = yes; then
70 +_cv_have_func=yes,
71 +_cv_have_func=no)])
72 +AC_MSG_RESULT($_cv_have_func)
73 +if test "$_cv_have_func" = yes; then
74 AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__])
75 else
76 AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
77 - AC_CACHE_VAL(have_pretty_function,
78 + AC_CACHE_VAL(_cv_have_pretty_function,
79 [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);],
80 - have_pretty_function=yes,
81 - have_pretty_function=no)])
82 - AC_MSG_RESULT($have_pretty_function)
83 - if test "$have_pretty_function" = yes; then
84 + _cv_have_pretty_function=yes,
85 + _cv_have_pretty_function=no)])
86 + AC_MSG_RESULT($_cv_have_pretty_function)
87 + if test "$_cv_have_pretty_function" = yes; then
88 AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__])
89 else
90 AC_MSG_CHECKING(whether $CC implements __FUNCTION__)
91 - AC_CACHE_VAL(have_function,
92 + AC_CACHE_VAL(_cv_have_function,
93 [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);],
94 - have_function=yes,
95 - have_function=no)])
96 - AC_MSG_RESULT($have_function)
97 - if test "$have_function" = yes; then
98 + _cv_have_function=yes,
99 + _cv_have_function=no)])
100 + AC_MSG_RESULT($_cv_have_function)
101 + if test "$_cv_have_function" = yes; then
102 AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__])
103 fi
104 fi
105 --- a/saslauthd/Makefile.am
106 +++ b/saslauthd/Makefile.am
107 @@ -1,4 +1,6 @@
108 AUTOMAKE_OPTIONS = 1.7
109 +ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
110 +
111 sbin_PROGRAMS = saslauthd testsaslauthd
112 EXTRA_PROGRAMS = saslcache
113
114 --- a/config/kerberos_v4.m4
115 +++ b/config/kerberos_v4.m4
116 @@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
117 dnl if we were ambitious, we would look more aggressively for the
118 dnl krb4 install
119 if test -d ${krb4}; then
120 - AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
121 + AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
122 for krbhloc in include/kerberosIV include/kerberos include
123 do
124 if test -f ${krb4}/${krbhloc}/krb.h ; then
125 - cyrus_krbinclude=${krb4}/${krbhloc}
126 + cyrus_cv_krbinclude=${krb4}/${krbhloc}
127 break
128 fi
129 done
130 ])
131
132 - if test -n "${cyrus_krbinclude}"; then
133 - CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
134 + if test -n "${cyrus_cv_krbinclude}"; then
135 + CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
136 fi
137 LDFLAGS="$LDFLAGS -L$krb4/lib"
138 fi
139
140
141
142 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
143
144 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch?rev=1.1&view=markup
145 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch?rev=1.1&content-type=text/plain
146
147 Index: cyrus-sasl-2.1.25-sasldb_al.patch
148 ===================================================================
149 Author: Fabian Fagerholm <fabbe@××××××.org>
150 Description: Fix linking with libsasldb.a when saslauthd is built with sasldb
151 support.
152 --- a/saslauthd/configure.in
153 +++ b/saslauthd/configure.in
154 @@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
155 AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
156 SASL_DB_PATH_CHECK()
157 SASL_DB_CHECK()
158 - SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
159 + SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
160 fi
161
162 AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
163
164
165
166 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
167
168 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch?rev=1.1&view=markup
169 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch?rev=1.1&content-type=text/plain
170
171 Index: cyrus-sasl-2.1.25-fix_heimdal.patch
172 ===================================================================
173 Fix compiling against heimdal
174
175 --- sample/server.c 2010-12-01 14:52:55.000000000 +0000
176 +++ sample/server.c 2011-11-30 14:54:42.000000000 +0000
177 @@ -85,8 +85,10 @@
178
179 #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
180 #include <gssapi/gssapi.h>
181 +#ifndef KRB5_HEIMDAL
182 #include <gssapi/gssapi_ext.h>
183 #endif
184 +#endif
185
186 #include "common.h"
187
188 --- plugins/gssapi.c 2011-05-11 19:25:55.000000000 +0000
189 +++ plugins/gssapi.c 2011-11-30 14:54:33.000000000 +0000
190 @@ -50,6 +50,9 @@
191 #else
192 #include <gssapi/gssapi.h>
193 #endif
194 +#ifdef KRB5_HEIMDAL
195 +#include <gssapi/gssapi_krb5.h>
196 +#endif
197
198 #ifdef WIN32
199 # include <winsock2.h>
200
201
202
203 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
204
205 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch?rev=1.1&view=markup
206 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch?rev=1.1&content-type=text/plain
207
208 Index: cyrus-sasl-2.1.25-gssapi.patch
209 ===================================================================
210 Fix segfault in gssapi.
211
212 --- a/plugins/gssapi.c
213 +++ b/plugins/gssapi.c
214 @@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
215 }
216
217 if (output_token->value && output) {
218 - unsigned char * p = (unsigned char *) text->encode_buf;
219 + int len;
220
221 ret = _plug_buf_alloc(text->utils,
222 &(text->encode_buf),
223 @@ -384,11 +384,8 @@ sasl_gss_encode(void *context, const str
224 return ret;
225 }
226
227 - p[0] = (output_token->length>>24) & 0xFF;
228 - p[1] = (output_token->length>>16) & 0xFF;
229 - p[2] = (output_token->length>>8) & 0xFF;
230 - p[3] = output_token->length & 0xFF;
231 -
232 + len = htonl(output_token->length);
233 + memcpy(text->encode_buf, &len, 4);
234 memcpy(text->encode_buf + 4, output_token->value, output_token->length);
235 }
236
237
238
239
240 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
241
242 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch?rev=1.1&view=markup
243 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch?rev=1.1&content-type=text/plain
244
245 Index: cyrus-sasl-2.1.25-lib_before_plugin.patch
246 ===================================================================
247 Fixes parallel make
248 http://git.cyrusimap.org/cyrus-sasl/commit/?id=5611d43e27098f659f84155271cf42f46aab1caf
249
250 From 5611d43e27098f659f84155271cf42f46aab1caf Mon Sep 17 00:00:00 2001
251 From: Alexey Melnikov <alexey.melnikov@×××××.com>
252 Date: Thu, 22 Sep 2011 14:41:12 +0000
253 Subject: lib should be built before plugins (Patch from marcandre.lureau@××××××.com)
254
255 ---
256 diff --git a/Makefile.am b/Makefile.am
257 index d6005fb..b35164e 100644
258 --- a/Makefile.am
259 +++ b/Makefile.am
260 @@ -69,7 +69,7 @@ else
261 INSTALLOSX =
262 endif
263
264 -SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
265 +SUBDIRS=include sasldb lib plugins utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
266 EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT
267
268 dist-hook:
269 --
270 cgit v0.9.0.2
271
272
273
274 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
275
276 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch?rev=1.1&view=markup
277 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch?rev=1.1&content-type=text/plain
278
279 Index: cyrus-sasl-2.1.25-as_needed.patch
280 ===================================================================
281 Author: Matthias Klose <doko@××××××.com>
282 Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
283 it.
284 --- a/saslauthd/Makefile.am
285 +++ b/saslauthd/Makefile.am
286 @@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
287 saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
288 saslauthd_LDADD = @SASL_KRB_LIB@ \
289 @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
290 - @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
291 + @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
292
293 testsaslauthd_SOURCES = testsaslauthd.c utils.c
294 testsaslauthd_LDADD = @LIB_SOCKET@
295 --- a/sasldb/Makefile.am
296 +++ b/sasldb/Makefile.am
297 @@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
298
299 libsasldb_la_SOURCES = allockey.c sasldb.h
300 EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
301 -libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
302 -libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
303 +libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
304 +libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
305
306 # Prevent make dist stupidity
307 libsasldb_a_SOURCES =
308
309
310
311 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
312
313 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch?rev=1.1&view=markup
314 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch?rev=1.1&content-type=text/plain
315
316 Index: cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
317 ===================================================================
318 Author: Fabian Fagerholm <fabbe@××××××.org>
319 Description: This patch makes sure the non-PIC version of libsasldb.a, which
320 is created out of non-PIC objects, is not going to overwrite the PIC version,
321 which is created out of PIC objects. The PIC version is placed in .libs, and
322 the non-PIC version in the current directory. This ensures that both non-PIC
323 and PIC versions are available in the correct locations.
324 --- a/lib/Makefile.am
325 +++ b/lib/Makefile.am
326 @@ -78,7 +78,7 @@ endif
327
328 libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
329 @echo adding static plugins and dependencies
330 - $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
331 + $(AR) cru $@ $(SASL_STATIC_OBJS)
332 @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
333 if test ! -f $$i; then continue; fi; . $$i; \
334 for j in $$dependency_libs foo; do \
335 --- a/sasldb/Makefile.am
336 +++ b/sasldb/Makefile.am
337 @@ -63,6 +63,6 @@ libsasldb_a_SOURCES =
338 EXTRA_libsasldb_a_SOURCES =
339
340 libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
341 - $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
342 + $(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
343
344
345
346
347
348 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
349
350 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch?rev=1.1&view=markup
351 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch?rev=1.1&content-type=text/plain
352
353 Index: cyrus-sasl-2.1.25-missing_header.patch
354 ===================================================================
355 --- pwcheck/pwcheck_getspnam.c 1999-08-26 19:22:44.000000000 +0300
356 +++ pwcheck/pwcheck_getspnam.c 2011-11-30 13:22:24.601023316 +0200
357 @@ -24,6 +24,7 @@
358 ******************************************************************/
359
360 #include <shadow.h>
361 +#include <string.h>
362
363 extern char *crypt();
364
365
366
367
368 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
369
370 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch?rev=1.1&view=markup
371 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch?rev=1.1&content-type=text/plain
372
373 Index: cyrus-sasl-2.1.25-saslauthd_libtool.patch
374 ===================================================================
375 Author: Fabian Fagerholm <fabbe@××××××.org>
376 Description: Enable libtool use.
377 --- a/saslauthd/configure.in
378 +++ b/saslauthd/configure.in
379 @@ -25,6 +25,7 @@ AC_PROG_AWK
380 AC_PROG_MAKE_SET
381 AC_PROG_LN_S
382 AC_PROG_INSTALL
383 +AC_PROG_LIBTOOL
384
385 dnl Checks for build foo
386 CMU_C___ATTRIBUTE__
Report Message
Find on MARC Find on Google Groups