head 1.7; access; symbols pkgsrc-2020Q1:1.6.0.92 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.114 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.110 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.108 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.106 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.104 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.102 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.100 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.98 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.96 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.94 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.90 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.88 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.86 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.84 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.82 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.80 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.78 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.76 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.74 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.72 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.70 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.68 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.66 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.64 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.62 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.60 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.58 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.56 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.54 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.52 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.50 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.48 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.46 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.44 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.42 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.40 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.38 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.36 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.34 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.32 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.30 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.28 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.26 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.24 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.22 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.20 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.18 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.16 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.14 pkgsrc-2008Q1:1.6.0.12 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.10 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.8 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.6 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.4 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.2 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.5.0.14 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.12 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.10 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.8 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.6 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.4 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.12 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.10 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.8 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.6 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 buildlink2-base:1.3 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.7 date 2020.05.14.16.58.41; author nia; state dead; branches; next 1.6; commitid yeOjACxRtGmSje8C; 1.6 date 2006.10.09.12.46.01; author obache; state Exp; branches; next 1.5; 1.5 date 2005.03.02.21.42.48; author wiz; state dead; branches; next 1.4; 1.4 date 2002.10.21.06.12.54; author jlam; state Exp; branches; next 1.3; 1.3 date 2001.10.15.21.30.38; author jlam; state dead; branches; next 1.2; 1.2 date 2001.09.18.21.56.30; author skrll; state Exp; branches; next 1.1; 1.1 date 2000.12.10.19.33.03; author jlam; state Exp; branches; next ; desc @@ 1.7 log @Remove old cyrus-imapds that no longer build with pkgsrc OpenSSL @ text @$NetBSD: patch-ae,v 1.6 2006/10/09 12:46:01 obache Exp $ --- imap/backend.c.orig 2006-02-08 05:57:27.000000000 +0900 +++ imap/backend.c @@@@ -264,25 +264,28 @@@@ static void timed_out(int sig) } } -struct backend *backend_connect(struct backend *ret, const char *server, +struct backend *backend_connect(struct backend *ret_backend, const char *server, struct protocol_t *prot, const char *userid, const char **auth_status) { /* need to (re)establish connection to server or create one */ int sock = -1; int r; - int err = 0; + int err = -1; struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res; struct sockaddr_un sunsock; char buf[2048], *mechlist = NULL; struct sigaction action; + struct backend *ret; - if (!ret) { + if (!ret_backend) { ret = xmalloc(sizeof(struct backend)); memset(ret, 0, sizeof(struct backend)); strlcpy(ret->hostname, server, sizeof(ret->hostname)); ret->timeout = NULL; } + else + ret = ret_backend; if (server[0] == '/') { /* unix socket */ res0 = &hints; @@@@ -312,7 +315,7 @@@@ struct backend *backend_connect(struct b if (err) { syslog(LOG_ERR, "getaddrinfo(%s) failed: %s", server, gai_strerror(err)); - free(ret); + if (!ret_backend) free(ret); return NULL; } /* Get addrinfo struct for local interface. */ @@@@ -363,7 +366,7 @@@@ struct backend *backend_connect(struct b if (res0 != &hints) freeaddrinfo(res0); syslog(LOG_ERR, "connect(%s) failed: %m", server); - free(ret); + if (!ret_backend) free(ret); return NULL; } memcpy(&ret->addr, res->ai_addr, res->ai_addrlen); @@@@ -381,7 +384,7 @@@@ struct backend *backend_connect(struct b syslog(LOG_ERR, "backend_connect(): couldn't read initial greeting: %s", ret->in->error ? ret->in->error : "(null)"); - free(ret); + if (!ret_backend) free(ret); close(sock); return NULL; } @@@@ -396,13 +399,15 @@@@ struct backend *backend_connect(struct b if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) { syslog(LOG_ERR, "couldn't authenticate to backend server: %s", sasl_errstring(r, NULL, NULL)); - free(ret); + if (!ret_backend) free(ret); close(sock); ret = NULL; } } if (mechlist) free(mechlist); + + if (!ret_backend) ret_backend = ret; return ret; } @ 1.6 log @Add patch to imap/backend.c(r1.38), diff came from cyrus cvs repository. r1.39: initialize err to revent segfault r1.40: only free() the backend struct if we allocated it (don't free cached connections) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update to 2.2.12, i.e. copy the contents of mail/cyrus-imapd22 here. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2002/10/21 06:12:54 jlam Exp $ d3 5 a7 3 --- cmulocal/sasl.m4.orig Fri Jul 7 13:46:12 2000 +++ cmulocal/sasl.m4 @@@@ -54,6 +54,9 @@@@ AC_ARG_WITH(sasl, d9 65 a73 5 SASLFLAGS="" LIB_SASL="" + AC_PATH_PROG(SASL_CONFIG, sasl-config, no) + + if test "$SASL_CONFIG" = no; then d75 1 a75 14 cmu_saved_CPPFLAGS=$CPPFLAGS cmu_saved_LDFLAGS=$LDFLAGS @@@@ -82,6 +85,15 @@@@ AC_ARG_WITH(sasl, LIB_SASL="" SASLFLAGS="" fi + + else # SASL_CONFIG + + ac_cv_found_sasl=yes + SASLFLAGS=`$SASL_CONFIG --cflags` + LIB_SASL=`$SASL_CONFIG --libs` + + fi d77 4 a80 3 AC_SUBST(LIB_SASL) AC_SUBST(SASLFLAGS) ]) @ 1.4 log @Ensure that everything that is linked against libsasl is also linked against its dependent libraries by using the output of "sasl-config --libs" if sasl-config is present. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Rename the manpages {deliver,imapd,master,pop3d}.8 to cyrus-*.8 as well as changing all cross-references to them. This prevents name collisions with other packages' manpages. This addresses pkg/14245 by Kimmo Suominen (cyrus: master(8) conflicts). @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2001/09/18 21:56:30 skrll Exp $ d3 28 a30 11 --- man/Makefile.in.orig Sun Jul 15 19:08:15 2001 +++ man/Makefile.in @@@@ -65,7 +65,7 @@@@ MAN3 = $(srcdir)/imclient.3 MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5 MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ + $(srcdir)/fud.8 $(srcdir)/cyrus-imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \ $(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \ @ 1.2 log @Update to version 2.0.16 Changes to numerous to mention see the changes.html file. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @imapd.8 -> cyrus-imapd.8 so as not to conflict with identically named manpage from the UW IMAP package (imap-uw). @ text @d3 1 a3 1 --- man/Makefile.in.orig Mon Sep 27 13:24:48 1999 d5 1 a5 1 @@@@ -52,7 +52,7 @@@@ d7 1 a7 1 MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5 d12 2 a13 2 $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 @