head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.34 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.32 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.30 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.28 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.26 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.24 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.22 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.20 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.18 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.16 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.14 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.12 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.10 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.8 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.6 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.4 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.4.0.14 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.12 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.10 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.8 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4; locks; strict; comment @# @; 1.5 date 2006.04.13.21.35.24; author wiz; state dead; branches; next 1.4; 1.4 date 2004.08.06.06.36.18; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.08.04.19.41.07; author jlam; state dead; branches; next 1.2; 1.2 date 2004.07.08.21.11.26; author recht; state Exp; branches; next 1.1; 1.1 date 2004.07.05.16.49.18; author recht; state Exp; branches; next ; desc @@ 1.5 log @Finish move of cyrus-sasl2 to cyrus-sasl. @ text @$NetBSD: patch-ap,v 1.4 2004/08/06 06:36:18 jlam Exp $ --- sasldb/Makefile.am.orig Fri Jul 2 15:39:41 2004 +++ sasldb/Makefile.am @@@@ -51,20 +51,8 @@@@ extra_common_sources = db_none.c db_ndbm EXTRA_DIST = NTMakefile noinst_LTLIBRARIES = libsasldb.la -noinst_LIBRARIES = libsasldb.a libsasldb_la_SOURCES = allockey.c sasldb.h EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) libsasldb_la_LIBADD = $(SASL_DB_BACKEND) - -LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g") - -# Prevent make dist stupidity -libsasldb_a_SOURCES = -EXTRA_libsasldb_a_SOURCES = - -libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC) - $(AR) cru .libs/$@@ $(LOCAL_SASL_DB_BACKEND_STATIC) - - @ 1.4 log @There is no way for libtool to generate a convenience library that can be used to create shared libraries _and_ be linked into a statically linked program. Instead of trying to hack libtool to do this, just accept the fact and do what you want another way! Remove the ugly hack in sasldb/Makefile.am that regenerated the static archive from the non-PIC object files. While this was fine for linking into programs, it breaks things when you link this into the sasldb plugin. Leaving it the other way, where the static archive from the PIC object files, is also unacceptable because there are potential problems on some platforms when linking an archive of of PIC objects into an executable. The solution: let the static archive contain PIC objects and be used to link into the sasldb plugin, but for the programs in the utils directory, explicitly add the non-PIC object files listed in $(SASL_DB_BACKEND_STATIC) to the files used to generate the programs. This is easy because SASL_DB_BACKEND_STATIC is already generated properly by config/sasldb.m4, so make use if it. This should fix problems with using Cyrus SASL on non-i386 platforms noted in PR pkg/26492 by Matt Dainty. Bump the PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Updated security/cyrus-sasl2 to 2.1.19. Changes from version 2.1.18 include: * Support for forwarding of GSSAPI credentials * A nontrivial number of small bugfixes. @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.2 2004/07/08 21:11:26 recht Exp $ d3 4 a6 29 --- plugins/gssapi.c.orig Fri Feb 6 18:23:51 2004 +++ plugins/gssapi.c Wed Jul 7 12:09:07 2004 @@@@ -990,8 +990,14 @@@@ GSS_C_QOP_DEFAULT, (OM_uint32) oparams->maxoutbuf, &max_input); - - oparams->maxoutbuf -= (max_input - oparams->maxoutbuf); + + if(max_input > oparams->maxoutbuf) { + /* Heimdal appears to get this wrong */ + oparams->maxoutbuf -= (max_input - oparams->maxoutbuf); + } else { + /* This code is actually correct */ + oparams->maxoutbuf = max_input; + } } gss_release_buffer(&min_stat, output_token); @@@@ -1134,6 +1140,7 @@@@ gss_buffer_t input_token, output_token; gss_buffer_desc real_input_token, real_output_token; OM_uint32 maj_stat = 0, min_stat = 0; + OM_uint32 max_input; gss_buffer_desc name_token; int ret; OM_uint32 req_flags, out_req_flags; @@@@ -1418,8 +1425,20 @@@@ (((unsigned char *) output_token->value)[3] << 0); d8 18 a25 20 if(oparams->mech_ssf) { - /* xxx probably too large */ - oparams->maxoutbuf -= 50; + maj_stat = gss_wrap_size_limit( &min_stat, + text->gss_ctx, + 1, + GSS_C_QOP_DEFAULT, + (OM_uint32) oparams->maxoutbuf, + &max_input); + + if(max_input > oparams->maxoutbuf) { + /* Heimdal appears to get this wrong */ + oparams->maxoutbuf -= (max_input - oparams->maxoutbuf); + } else { + /* This code is actually correct */ + oparams->maxoutbuf = max_input; + } } gss_release_buffer(&min_stat, output_token); @ 1.2 log @Use a better fix from ASG CVS the GSSAPI problems. patch-ap now includes the updates between rev 1.84 and rev 1.90 modulo the support for passing of GSSAPI credentials. Patch provided by Jukka Salmi in PR 26184 Bump PKGREVISION to 3 for the new fix. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Pull in a fix from ASG CVS: increase maxoutbuf buffer size This allows uploading of SIEVE scripts larger than 4kb if GSSAPI authentification is used for cyrus-imapd. link to the patch provided by Jukka Salmi in PR 26165 bump PKGREVISION to 1 @ text @d3 29 a31 3 --- plugins/gssapi.c.orig 2004-02-06 18:23:51.000000000 +0100 +++ plugins/gssapi.c 2004-07-05 18:41:39.000000000 +0200 @@@@ -1419,7 +1419,7 @@@@ d34 1 a34 1 /* xxx probably too large */ d36 14 a49 1 + oparams->maxoutbuf -= 256; @