head 1.4; access; symbols pkgsrc-2020Q1:1.3.0.90 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.112 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.108 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.106 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.104 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.102 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.100 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.98 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.96 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.94 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.92 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.88 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.86 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.84 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.82 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.80 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.78 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.76 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.74 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.72 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.70 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.68 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.66 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.64 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.62 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.60 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.58 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.56 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.54 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.50 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.48 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.46 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.44 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.42 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.40 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.38 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.36 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.34 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.32 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.30 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.28 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.26 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.24 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.22 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.20 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.18 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.16 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.14 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.12 pkgsrc-2008Q1:1.3.0.10 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.8 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.6 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.4 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.12 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.10 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.8 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.6 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.4 date 2020.05.14.16.58.41; author nia; state dead; branches; next 1.3; commitid yeOjACxRtGmSje8C; 1.3 date 2007.03.09.14.46.08; author obache; state Exp; branches; next 1.2; 1.2 date 2005.03.02.21.42.48; author wiz; state Exp; branches 1.2.16.1; next 1.1; 1.1 date 2002.11.01.00.26.30; author jlam; state Exp; branches; next ; 1.2.16.1 date 2007.03.09.15.26.59; author salo; state Exp; branches; next ; desc @@ 1.4 log @Remove old cyrus-imapds that no longer build with pkgsrc OpenSSL @ text @$NetBSD: patch-al,v 1.3 2007/03/09 14:46:08 obache Exp $ --- imtest/imtest.c.orig 2006-01-21 05:31:23.000000000 +0900 +++ imtest/imtest.c @@@@ -47,7 +47,9 @@@@ #include #include #include +#if !defined(__APPLE__) #include +#endif #include #include @@@@ -72,6 +74,10 @@@@ #include #include +#ifdef HAVE_SYS_PARAM_H +#include +#endif + #include #include @@@@ -886,6 +892,12 @@@@ imt_stat getauthline(struct sasl_cmd_t * } if (*str != '\r') { + /* trim CRLF */ + char *p = str + strlen(str) - 1; + if (p >= str && *p == '\n') *p-- = '\0'; + if (p >= str && *p == '\r') *p-- = '\0'; + + /* alloc space for decoded response */ len = strlen(str) + 1; *line = malloc(len); if ((*line) == NULL) { @ 1.3 log @compatibility fix for SASL 2.1.22. Taken from: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imtest/imtest.c.diff?r1=1.107&r2=1.108 Bump PKGREVISION. Reported by Jukka Salmi in PR 35959. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.2 2005/03/02 21:42:48 wiz Exp $ @ 1.2 log @Update to 2.2.12, i.e. copy the contents of mail/cyrus-imapd22 here. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.2 2004/11/28 14:34:07 recht Exp $ d3 2 a4 2 --- imtest/imtest.c.orig Wed Aug 4 15:03:18 2004 +++ imtest/imtest.c Sun Nov 28 15:12:44 2004 d15 1 a15 2 @@@@ -71,6 +73,10 @@@@ #include d18 1 a18 1 + d22 1 a22 1 d25 14 @ 1.2.16.1 log @Pullup ticket 2046 - requested by obache compatibility fix for cyrus-imapd Revisions pulled up: - pkgsrc/mail/cyrus-imapd/Makefile 1.70 - pkgsrc/mail/cyrus-imapd/distinfo 1.27 - pkgsrc/mail/cyrus-imapd/patches/patch-al 1.3 Module Name: pkgsrc Committed By: obache Date: Fri Mar 9 14:46:08 UTC 2007 Modified Files: pkgsrc/mail/cyrus-imapd: Makefile distinfo pkgsrc/mail/cyrus-imapd/patches: patch-al Log Message: compatibility fix for SASL 2.1.22. Taken from: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imtest/imtest.c.diff?r1=1.107&r2=1.108 Bump PKGREVISION. Reported by Jukka Salmi in PR 35959. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.3 2007/03/09 14:46:08 obache Exp $ d3 2 a4 2 --- imtest/imtest.c.orig 2006-01-21 05:31:23.000000000 +0900 +++ imtest/imtest.c d15 2 a16 1 @@@@ -72,6 +74,10 @@@@ d19 1 a19 1 d23 1 a23 1 + a25 14 @@@@ -886,6 +892,12 @@@@ imt_stat getauthline(struct sasl_cmd_t * } if (*str != '\r') { + /* trim CRLF */ + char *p = str + strlen(str) - 1; + if (p >= str && *p == '\n') *p-- = '\0'; + if (p >= str && *p == '\r') *p-- = '\0'; + + /* alloc space for decoded response */ len = strlen(str) + 1; *line = malloc(len); if ((*line) == NULL) { @ 1.1 log @If we are building with perl, then create libcyrus.a, libacap.a, and libsieve.a from relocatable objects so that when the Perl modules are linked against these libraries, they are composed wholly from relocatable objects. We query perl for how to compile a source file into a relocatable object file. This should fix pkg/16089. @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 5 --- acap/Makefile.in.orig Thu Oct 31 19:16:25 2002 +++ acap/Makefile.in @@@@ -53,7 +53,7 @@@@ DEFS = @@DEFS@@ CPPFLAGS = @@CPPFLAGS@@ @@SASLFLAGS@@ -I. -I.. LIBS = @@LIBS@@ d15 8 a22 3 -CFLAGS = @@CFLAGS@@ +CFLAGS = @@CFLAGS@@ @@PERL_CCCDLFLAGS@@ LDFLAGS = @@LDFLAGS@@ d24 2 a25 1 SHELL = /bin/sh @