- update to 2.3.9
beware that plaintext authentication is now disabled by default
This commit is contained in:
ajacoutot
parent
db80820803
commit
07d1ee4fdd
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2007/08/28 13:24:51 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2007/08/29 20:08:17 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= Cyrus IMAP server
|
||||
COMMENT-perl= perl utils for the Cyrus IMAP server
|
||||
|
||||
V= 2.3.8
|
||||
V= 2.3.9
|
||||
DISTNAME= cyrus-imapd-${V}
|
||||
PKGNAME-main= ${DISTNAME}p0
|
||||
FULLPKGNAME-perl=cyrus-imapd-perl-${V}p0
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
|
||||
FULLPKGPATH-perl=mail/cyrus-imapd,-perl
|
||||
CATEGORIES= mail
|
||||
HOMEPAGE= http://cyrusimap.web.cmu.edu
|
||||
@ -88,11 +88,13 @@ SIEVEREF= lib/imapoptions man/imapd.conf.5 \
|
||||
tools/masssievec tools/rehash tools/translatesieve \
|
||||
tools/upgradesieve doc/text/install-upgrade
|
||||
|
||||
pre-build:
|
||||
pre-configure:
|
||||
.for i in ${MAN8}
|
||||
perl -pi -e "s,${i}\(8\),cyrus-${i}\(8\),g" ${WRKSRC}/man/*.[0-9]
|
||||
@perl -pi -e "s,${i}\(8\),cyrus-${i}\(8\),g" ${WRKSRC}/man/*.[0-9]
|
||||
.endfor
|
||||
.for i in ${SIEVEREF}
|
||||
@perl -pi -e "s,/usr/sieve,/var/sieve,g" ${WRKSRC}/${i}
|
||||
.endfor
|
||||
cd ${WRKSRC} && perl -pi -e "s,/usr/sieve,/var/sieve,g" ${SIEVEREF}
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrus-imapd
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (cyrus-imapd-2.3.8.tar.gz) = rAOwLBrgjVL4B7WMSIsgTw==
|
||||
RMD160 (cyrus-imapd-2.3.8.tar.gz) = 6JBU918QbCb0l7w399UUsL+Av+A=
|
||||
SHA1 (cyrus-imapd-2.3.8.tar.gz) = xnH2MXU6E4ufqbW+1++katyLTj4=
|
||||
SHA256 (cyrus-imapd-2.3.8.tar.gz) = D1wEp94tpzflygtPjfhkcXUYiyKXIAAZK7x82H/9p/4=
|
||||
SIZE (cyrus-imapd-2.3.8.tar.gz) = 2207366
|
||||
MD5 (cyrus-imapd-2.3.9.tar.gz) = ETQzwf3Hd+OwRmtc5kO4vA==
|
||||
RMD160 (cyrus-imapd-2.3.9.tar.gz) = yarjR2EIwPrOBt/jBKE2AVNwsWY=
|
||||
SHA1 (cyrus-imapd-2.3.9.tar.gz) = uV4d6H/yx6QtS+yHyDn+Q5RSp5w=
|
||||
SHA256 (cyrus-imapd-2.3.9.tar.gz) = J+ZHZ4l4i3xy8JcRED98S9ATbb0zzq3Qri3HdqF6tDc=
|
||||
SIZE (cyrus-imapd-2.3.9.tar.gz) = 2272004
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: imapd.conf,v 1.1.1.1 2005/03/27 18:01:50 alek Exp $
|
||||
# $OpenBSD: imapd.conf,v 1.2 2007/08/29 20:08:17 ajacoutot Exp $
|
||||
# imapd.conf(5)
|
||||
|
||||
configdirectory: /var/imap
|
||||
@ -7,4 +7,7 @@ sievedir: /var/sieve
|
||||
sendmail: /usr/sbin/sendmail
|
||||
#admins:
|
||||
#sasl_pwcheck_method:
|
||||
#sasl_mech_list:
|
||||
#sasl_mech_list:
|
||||
|
||||
# uncomment to allow plaintext authentication
|
||||
#allowplaintext: 1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- configure.orig Wed Feb 7 19:47:27 2007
|
||||
+++ configure Fri Mar 23 15:08:09 2007
|
||||
--- configure.orig Wed Aug 15 19:23:15 2007
|
||||
+++ configure Tue Aug 28 15:37:04 2007
|
||||
@@ -5206,9 +5206,7 @@ CFLAGS=$save_CFLAGS
|
||||
fi
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
|
||||
echo "${ECHO_T}$ac_cv_fpic" >&6
|
||||
@@ -8905,7 +8903,7 @@ echo "$as_me: error: Berkeley DB 3.x or later was not
|
||||
@@ -8907,7 +8905,7 @@ echo "$as_me: error: Berkeley DB 3.x or later was not
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
|
||||
|
||||
CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
|
||||
@@ -12246,7 +12244,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
@@ -12248,7 +12246,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -29,7 +29,7 @@
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -14800,7 +14798,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
@@ -14802,7 +14800,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -38,7 +38,7 @@
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -14890,7 +14888,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
|
||||
@@ -14892,7 +14890,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -47,7 +47,7 @@
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -15360,8 +15358,8 @@ fi
|
||||
@@ -15362,8 +15360,8 @@ fi
|
||||
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
|
||||
elif test "$gss_impl" = "heimdal"; then
|
||||
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
|
||||
@ -58,7 +58,7 @@
|
||||
elif test "$gss_impl" = "cybersafe03"; then
|
||||
# Version of CyberSafe with two libraries
|
||||
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
|
||||
@@ -15545,7 +15543,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
@@ -15547,7 +15545,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -67,7 +67,7 @@
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -17383,6 +17381,8 @@ extern "C"
|
||||
@@ -17385,6 +17383,8 @@ extern "C"
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char request_init ();
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-imap_reconstruct_c,v 1.1 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
--- imap/reconstruct.c.orig Mon Feb 5 19:41:48 2007
|
||||
+++ imap/reconstruct.c Fri Mar 23 15:08:09 2007
|
||||
@@ -577,8 +577,7 @@ reconstruct_expunge (char * path, struct mailbox * mai
|
||||
free(expuid);
|
||||
return IMAP_IOERROR;
|
||||
}
|
||||
- unsigned msgno;
|
||||
- const char *p = index_base + start_offset;
|
||||
+ p = index_base + start_offset;
|
||||
|
||||
/*
|
||||
* verify the message files exist -
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-lib_cyrusdb_berkeley_c,v 1.1 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
--- lib/cyrusdb_berkeley.c.orig Fri Mar 23 15:08:41 2007
|
||||
+++ lib/cyrusdb_berkeley.c Fri Mar 23 15:09:29 2007
|
||||
@@ -176,7 +176,15 @@ static int init(const char *dbdir, int myflags)
|
||||
syslog(LOG_WARNING,
|
||||
"DBERROR: invalid berkeley_locks_max value, using internal default");
|
||||
} else {
|
||||
+#if DB_VERSION_MAJOR >= 4
|
||||
+ r = dbenv->set_lk_max_locks(dbenv, opt);
|
||||
+ if (!r)
|
||||
+ r = dbenv->set_lk_max_lockers(dbenv, opt);
|
||||
+ if (!r)
|
||||
+ r = dbenv->set_lk_max_objects(dbenv, opt);
|
||||
+#else
|
||||
r = dbenv->set_lk_max(dbenv, opt);
|
||||
+#endif
|
||||
if (r) {
|
||||
dbenv->err(dbenv, r, "set_lk_max");
|
||||
syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-man_Makefile_in,v 1.1 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
--- man/Makefile.in.orig Thu Nov 30 18:11:23 2006
|
||||
+++ man/Makefile.in Fri Mar 23 15:08:09 2007
|
||||
@@ -68,7 +68,7 @@ MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(s
|
||||
$(srcdir)/notifyd.8 $(srcdir)/chk_cyrus.8 $(srcdir)/mbexamine.8 \
|
||||
$(srcdir)/nntpd.8 $(srcdir)/fetchnews.8 $(srcdir)/smmapd.8 \
|
||||
$(srcdir)/sync_client.8 $(srcdir)/sync_server.8 $(srcdir)/sync_reset.8 \
|
||||
- $(srcdir)/unexpunge.8 $(srcdir)/make_md5.8
|
||||
+ $(srcdir)/unexpunge.8 $(srcdir)/make_md5.8 $(srcdir)/cyr_dbtool.8
|
||||
|
||||
all: $(MAN1) $(MAN3) $(MAN5) $(MAN8)
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
$OpenBSD: patch-man_cyr_dbtool_8,v 1.1 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
--- man/cyr_dbtool.8.orig Fri Feb 9 14:14:14 2007
|
||||
+++ man/cyr_dbtool.8 Fri Feb 9 14:14:14 2007
|
||||
@@ -0,0 +1,91 @@
|
||||
+.\" -*- nroff -*-
|
||||
+.TH CYR_DBTOOL 8 "Project Cyrus" CMU
|
||||
+.\"
|
||||
+.\" Copyright (c) 1998-2007 Carnegie Mellon University. All rights reserved.
|
||||
+.\"
|
||||
+.\" Redistribution and use in source and binary forms, with or without
|
||||
+.\" modification, are permitted provided that the following conditions
|
||||
+.\" are met:
|
||||
+.\"
|
||||
+.\" 1. Redistributions of source code must retain the above copyright
|
||||
+.\" notice, this list of conditions and the following disclaimer.
|
||||
+.\"
|
||||
+.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
+.\" notice, this list of conditions and the following disclaimer in
|
||||
+.\" the documentation and/or other materials provided with the
|
||||
+.\" distribution.
|
||||
+.\"
|
||||
+.\" 3. The name "Carnegie Mellon University" must not be used to
|
||||
+.\" endorse or promote products derived from this software without
|
||||
+.\" prior written permission. For permission or any other legal
|
||||
+.\" details, please contact
|
||||
+.\" Office of Technology Transfer
|
||||
+.\" Carnegie Mellon University
|
||||
+.\" 5000 Forbes Avenue
|
||||
+.\" Pittsburgh, PA 15213-3890
|
||||
+.\" (412) 268-4387, fax: (412) 268-7395
|
||||
+.\" tech-transfer@andrew.cmu.edu
|
||||
+.\"
|
||||
+.\" 4. Redistributions of any form whatsoever must retain the following
|
||||
+.\" acknowledgment:
|
||||
+.\" "This product includes software developed by Computing Services
|
||||
+.\" at Carnegie Mellon University (http://www.cmu.edu/computing/)."
|
||||
+.\"
|
||||
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
||||
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
|
||||
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
|
||||
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
+.\"
|
||||
+.\" $Id: patch-man_cyr_dbtool_8,v 1.1 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
+.SH NAME
|
||||
+cyr_dbtool \- manage Cyrus databases
|
||||
+.SH SYNOPSIS
|
||||
+.B cyr_dbtool
|
||||
+[
|
||||
+.B \-C
|
||||
+.I config-file
|
||||
+]
|
||||
+<old db> <old db backend> <action>
|
||||
+[
|
||||
+<key>
|
||||
+]
|
||||
+[
|
||||
+<value>
|
||||
+]
|
||||
+.SH DESCRIPTION
|
||||
+.I cyr_dbtool
|
||||
+is used to manage a cyrusdb file. The usable actions are:
|
||||
+.PP
|
||||
+.BI show " [<prefix>]"
|
||||
+.PP
|
||||
+.BI get " <key>"
|
||||
+.PP
|
||||
+.BI set " <key> <value>"
|
||||
+.PP
|
||||
+.BI delete " <key>"
|
||||
+.PP
|
||||
+You may omit key or key/value and specify one per line on stdin. Keys are
|
||||
+terminated by tab or newline, values are terminated by newline.
|
||||
+.PP
|
||||
+Running without any options will list the available database backends and
|
||||
+usable actions.
|
||||
+.PP
|
||||
+.I cyr_dbtool
|
||||
+reads any applicable configuration options out of the
|
||||
+.IR imapd.conf (5)
|
||||
+file unless specified otherwise by \fB-C\fR.
|
||||
+note that the file locations are NOT read out of the configuration file,
|
||||
+and must be supplied on the command line.
|
||||
+.SH OPTIONS
|
||||
+.TP
|
||||
+.BI \-C " config-file"
|
||||
+Read configuration options from \fIconfig-file\fR.
|
||||
+.SH FILES
|
||||
+.TP
|
||||
+.B /etc/imapd.conf
|
||||
+.SH SEE ALSO
|
||||
+.PP
|
||||
+\fBimapd.conf(5)\fR
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2007/03/31 09:33:21 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2007/08/29 20:08:17 ajacoutot Exp $
|
||||
@pkgpath ${BASE_PKGPATH}
|
||||
@newgroup _cyrus:543
|
||||
@newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/var/empty:/sbin/nologin
|
||||
@ -42,7 +42,6 @@ include/cyrus/prot.h
|
||||
include/cyrus/retry.h
|
||||
include/cyrus/rfc822date.h
|
||||
include/cyrus/strhash.h
|
||||
include/cyrus/strhash.o
|
||||
include/cyrus/stristr.h
|
||||
include/cyrus/sysexits.h
|
||||
include/cyrus/util.h
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user