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 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; 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.02.14.07.51.36; author jlam; state dead; branches; next 1.2; 1.2 date 2004.02.14.03.16.59; author jlam; state Exp; branches; next 1.1; 1.1 date 2003.08.16.09.06.42; author recht; state Exp; branches; next ; desc @@ 1.5 log @Finish move of cyrus-sasl2 to cyrus-sasl. @ text @$NetBSD: patch-as,v 1.4 2004/08/06 06:36:18 jlam Exp $ --- utils/Makefile.in.orig Fri Jul 2 15:40:14 2004 +++ utils/Makefile.in @@@@ -237,11 +237,11 @@@@ noinst_PROGRAMS = dbconverter-2 @@NO_SASL_DB_MANS_TRUE@@man_MANS = -saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) +saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) saslpasswd2_SOURCES = saslpasswd.c -sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) +sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) sasldblistusers2_SOURCES = sasldblistusers.c -dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) +dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) testsuite_LDADD = $(all_sasl_libs) @@DMALLOC_LIBS@@ @@@@ -287,16 +287,16 @@@@ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PRO dbconverter_2_SOURCES = dbconverter-2.c dbconverter_2_OBJECTS = dbconverter-2.$(OBJEXT) -dbconverter_2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la +dbconverter_2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la dbconverter_2_LDFLAGS = am_sasldblistusers2_OBJECTS = sasldblistusers.$(OBJEXT) sasldblistusers2_OBJECTS = $(am_sasldblistusers2_OBJECTS) -sasldblistusers2_DEPENDENCIES = ../sasldb/libsasldb.la \ +sasldblistusers2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) \ ../lib/libsasl2.la sasldblistusers2_LDFLAGS = am_saslpasswd2_OBJECTS = saslpasswd.$(OBJEXT) saslpasswd2_OBJECTS = $(am_saslpasswd2_OBJECTS) -saslpasswd2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la +saslpasswd2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la saslpasswd2_LDFLAGS = am_smtptest_OBJECTS = smtptest_OBJECTS = $(am_smtptest_OBJECTS) @ 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 @Remove unused patch. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.2 2004/02/14 03:16:59 jlam Exp $ d3 37 a39 196 --- plugins/digestmd5.c.orig Tue Nov 11 08:26:07 2003 +++ plugins/digestmd5.c @@@@ -60,6 +60,7 @@@@ /* DES support */ #ifdef WITH_DES # ifdef WITH_SSL_DES +# include # include # include # if (OPENSSL_VERSION_NUMBER >= 0x0090700f) && \ @@@@ -733,9 +734,15 @@@@ static void get_pair(char **in, char **n #ifdef WITH_DES struct des_context_s { +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_key_schedule keysched; /* key schedule for des initialization */ + DES_cblock ivec; /* initial vector for encoding */ + DES_key_schedule keysched2; /* key schedule for 3des initialization */ +#else des_key_schedule keysched; /* key schedule for des initialization */ des_cblock ivec; /* initial vector for encoding */ des_key_schedule keysched2; /* key schedule for 3des initialization */ +#endif }; typedef struct des_context_s des_context_t; @@@@ -770,6 +777,15 @@@@ static int dec_3des(context_t *text, des_context_t *c = (des_context_t *) text->cipher_dec_context; int padding, p; +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_ede2_cbc_encrypt((void *) input, + (void *) output, + inputlen, + &c->keysched, + &c->keysched2, + &c->ivec, + DES_DECRYPT); +#else des_ede2_cbc_encrypt((void *) input, (void *) output, inputlen, @@@@ -777,7 +793,7 @@@@ static int dec_3des(context_t *text, c->keysched2, &c->ivec, DES_DECRYPT); - +#endif /* now chop off the padding */ padding = output[inputlen - 11]; if (padding < 1 || padding > 8) { @@@@ -818,6 +834,15 @@@@ static int enc_3des(context_t *text, len=inputlen+paddinglen+10; +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_ede2_cbc_encrypt((void *) output, + (void *) output, + len, + &c->keysched, + &c->keysched2, + &c->ivec, + DES_ENCRYPT); +#else des_ede2_cbc_encrypt((void *) output, (void *) output, len, @@@@ -825,7 +850,7 @@@@ static int enc_3des(context_t *text, c->keysched2, &c->ivec, DES_ENCRYPT); - +#endif *outputlen=len; return SASL_OK; @@@@ -844,12 +869,23 @@@@ static int init_3des(context_t *text, /* setup enc context */ slidebits(keybuf, enckey); +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + if (DES_key_sched((DES_cblock *) keybuf, &c->keysched) < 0) + return SASL_FAIL; +#else if (des_key_sched((des_cblock *) keybuf, c->keysched) < 0) return SASL_FAIL; +#endif slidebits(keybuf, enckey + 7); +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + if (DES_key_sched((DES_cblock *) keybuf, &c->keysched2) < 0) + return SASL_FAIL; +#else if (des_key_sched((des_cblock *) keybuf, c->keysched2) < 0) return SASL_FAIL; +#endif + memcpy(c->ivec, ((char *) enckey) + 8, 8); text->cipher_enc_context = (cipher_context_t *) c; @@@@ -857,13 +893,23 @@@@ static int init_3des(context_t *text, /* setup dec context */ c++; slidebits(keybuf, deckey); + +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + if (DES_key_sched((DES_cblock *) keybuf, &c->keysched) < 0) + return SASL_FAIL; +#else if (des_key_sched((des_cblock *) keybuf, c->keysched) < 0) return SASL_FAIL; - +#endif slidebits(keybuf, deckey + 7); + +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + if (DES_key_sched((DES_cblock *) keybuf, &c->keysched2) < 0) + return SASL_FAIL; +#else if (des_key_sched((des_cblock *) keybuf, c->keysched2) < 0) return SASL_FAIL; - +#endif memcpy(c->ivec, ((char *) deckey) + 8, 8); text->cipher_dec_context = (cipher_context_t *) c; @@@@ -888,12 +934,21 @@@@ static int dec_des(context_t *text, des_context_t *c = (des_context_t *) text->cipher_dec_context; int p, padding = 0; +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_cbc_encrypt((void *) input, + (void *) output, + inputlen, + &c->keysched, + &c->ivec, + DES_DECRYPT); +#else des_cbc_encrypt((void *) input, (void *) output, inputlen, c->keysched, &c->ivec, DES_DECRYPT); +#endif /* Update the ivec (des_cbc_encrypt implementations tend to be broken in this way) */ @@@@ -939,12 +994,21 @@@@ static int enc_des(context_t *text, len = inputlen + paddinglen + 10; +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_cbc_encrypt((void *) output, + (void *) output, + len, + &c->keysched, + &c->ivec, + DES_ENCRYPT); +#else des_cbc_encrypt((void *) output, (void *) output, len, c->keysched, &c->ivec, DES_ENCRYPT); +#endif /* Update the ivec (des_cbc_encrypt implementations tend to be broken in this way) */ @@@@ -968,7 +1032,12 @@@@ static int init_des(context_t *text, /* setup enc context */ slidebits(keybuf, enckey); + +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_key_sched((DES_cblock *) keybuf, &c->keysched); +#else des_key_sched((des_cblock *) keybuf, c->keysched); +#endif memcpy(c->ivec, ((char *) enckey) + 8, 8); @@@@ -977,8 +1046,11 @@@@ static int init_des(context_t *text, /* setup dec context */ c++; slidebits(keybuf, deckey); +#if OPENSSL_VERSION_NUMBER >= 0x0090700f + DES_key_sched((DES_cblock *) keybuf, &c->keysched); +#else des_key_sched((des_cblock *) keybuf, c->keysched); - +#endif memcpy(c->ivec, ((char *) deckey) + 8, 8); text->cipher_dec_context = (cipher_context_t *) c; @ 1.2 log @Update security/cyrus-sasl2 to 2.1.17. Changes from version 2.1.15 include: * Now correctly do authorizaton callback in sasl_checkpass() * Writable auxprop support * Significantly improved documentation @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update to 2.1.15. changes: Fix build on NetBSD-current with OpenSSL 0.9.7. New in 2.1.15 ------------- * Fix a number of build issues * Add a doc/components.html that hopefully describes how things interact better. New in 2.1.14 ------------- * OS X 10.2 support * Support for the Sun SEAM GSSAPI implementation * Support for MySQL 4 * A number of build fixes * Other minor bugfixes OK'ed by chris@@ @ text @d3 3 a5 3 --- plugins/digestmd5.c.orig 2003-08-14 13:15:30.000000000 +0200 +++ plugins/digestmd5.c 2003-08-14 13:41:39.000000000 +0200 @@@@ -59,6 +59,7 @@@@ d11 3 a13 3 # else /* system DES library */ # include @@@@ -655,9 +656,15 @@@@ d29 1 a29 1 @@@@ -692,6 +699,15 @@@@ d45 1 a45 1 @@@@ -699,7 +715,7 @@@@ d54 1 a54 1 @@@@ -743,6 +759,15 @@@@ d70 1 a70 1 @@@@ -750,7 +775,7 @@@@ d79 1 a79 1 @@@@ -769,12 +794,23 @@@@ d103 1 a103 1 @@@@ -782,13 +818,23 @@@@ d129 1 a129 1 @@@@ -813,12 +859,21 @@@@ d151 1 a151 1 @@@@ -867,12 +922,21 @@@@ d173 1 a173 1 @@@@ -896,7 +960,12 @@@@ d186 1 a186 1 @@@@ -905,8 +974,11 @@@@ @