Update to cyrus-imapd-2.4.7.

This commit is contained in:
ajacoutot 2011-03-30 16:10:28 +00:00
parent ed80a78265
commit a0fb790fcd
6 changed files with 28 additions and 29 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.54 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.55 2011/03/30 16:10:28 ajacoutot Exp $
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
V= 2.4.6
V= 2.4.7
DISTNAME= cyrus-imapd-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
FULLPKGPATH-perl=mail/cyrus-imapd,-perl
REVISION-main= 1
CATEGORIES= mail
HOMEPAGE= http://www.cyrusimap.org/
@ -23,7 +21,8 @@ PERMIT_PACKAGE_FTP= yes
PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
MASTER_SITES= http://cyrusimap.org/releases/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
WANTLIB += crypto ssl z sasl2 lib/db4/db>=4

View File

@ -1,5 +1,5 @@
MD5 (cyrus-imapd-2.4.6.tar.gz) = w3sGziQZc02O3z1nAE5bDA==
RMD160 (cyrus-imapd-2.4.6.tar.gz) = R/DrB1DzZLD9a7+XCHO8EBLtKr8=
SHA1 (cyrus-imapd-2.4.6.tar.gz) = LihUPDzKrXniSQt6aYYw2St1aXM=
SHA256 (cyrus-imapd-2.4.6.tar.gz) = /AB2Sa0KQ1j1eUqU3C1Qqa7h1pqfE+UP0G1mRWvNGqk=
SIZE (cyrus-imapd-2.4.6.tar.gz) = 2377895
MD5 (cyrus-imapd-2.4.7.tar.gz) = fvOgLD6SpEoq3yX4HbTKPA==
RMD160 (cyrus-imapd-2.4.7.tar.gz) = q7fX44JHXWkWNJDvs7oNQ9OUfAM=
SHA1 (cyrus-imapd-2.4.7.tar.gz) = ioM5XMrkOBNHI00xEsgVlLNhXWk=
SHA256 (cyrus-imapd-2.4.7.tar.gz) = CQ0KJ2FffOZJDjsN3IdyJdVMTjK/vFFMRi4A7Ciyfn4=
SIZE (cyrus-imapd-2.4.7.tar.gz) = 2444382

View File

@ -1,5 +1,5 @@
--- configure.orig Mon Dec 20 14:20:42 2010
+++ configure Mon Dec 20 14:55:45 2010
--- configure.orig Wed Mar 30 15:53:09 2011
+++ configure Wed Mar 30 17:05:07 2011
@@ -5051,9 +5051,7 @@ CFLAGS=$save_CFLAGS
fi
@ -11,7 +11,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
$as_echo "$ac_cv_fpic" >&6; }
@@ -6420,7 +6418,7 @@ fi
@@ -6444,7 +6442,7 @@ fi
@ -20,7 +20,7 @@
CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
@@ -9574,7 +9572,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
@@ -9598,7 +9596,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -9876,8 +9874,8 @@ fi
@@ -9900,8 +9898,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"
@ -40,7 +40,7 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -10445,7 +10443,7 @@ elif test "${with_perl}" != "no"; then
@@ -10469,7 +10467,7 @@ elif test "${with_perl}" != "no"; then
PERL_SUBDIRS="imap"
PERL="${with_perl}"
case "${target_os}" in
@ -49,7 +49,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
eval `${PERL} -V:cccdlflags`
@@ -10508,6 +10506,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10532,6 +10530,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
extern "C"
#endif
char request_init ();

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_imapoptions,v 1.2 2010/12/02 11:30:43 ajacoutot Exp $
--- lib/imapoptions.orig Mon Nov 29 14:28:06 2010
+++ lib/imapoptions Thu Dec 2 12:25:23 2010
$OpenBSD: patch-lib_imapoptions,v 1.3 2011/03/30 16:10:28 ajacoutot Exp $
--- lib/imapoptions.orig Wed Mar 30 15:47:59 2011
+++ lib/imapoptions Wed Mar 30 17:05:07 2011
@@ -253,7 +253,7 @@ Blank lines and lines beginning with ``#'' are ignored
/* Debug command to be used by processes started with -D option. The string
is a C format string that gets 3 options: the first is the name of the
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_imapoptions,v 1.2 2010/12/02 11:30:43 ajacoutot Exp $
{ "defaultacl", "anyone lrs", STRING }
/* The Access Control List (ACL) placed on a newly-created (non-user)
@@ -1018,7 +1018,7 @@ And the notification message will be available on \fIs
@@ -1013,7 +1013,7 @@ And the notification message will be available on \fIs
{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
/* The cyrusdb backend to use for the seen state. */

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_imapd_conf_5,v 1.1 2010/12/02 11:30:43 ajacoutot Exp $
--- man/imapd.conf.5.orig Thu Dec 2 12:25:41 2010
+++ man/imapd.conf.5 Thu Dec 2 12:26:22 2010
$OpenBSD: patch-man_imapd_conf_5,v 1.2 2011/03/30 16:10:28 ajacoutot Exp $
--- man/imapd.conf.5.orig Wed Mar 30 15:53:09 2011
+++ man/imapd.conf.5 Wed Mar 30 17:05:07 2011
@@ -231,7 +231,7 @@ required.
Debug command to be used by processes started with -D option. The string
is a C format string that gets 3 options: the first is the name of the
@ -10,7 +10,7 @@ $OpenBSD: patch-man_imapd_conf_5,v 1.1 2010/12/02 11:30:43 ajacoutot Exp $
.IP "\fBdefaultacl:\fR anyone lrs" 5
The Access Control List (ACL) placed on a newly-created (non-user)
mailbox that does not have a parent mailbox.
@@ -865,7 +865,7 @@ Possible values include "auxprop", "saslauthd", and "p
@@ -861,7 +861,7 @@ Possible values include "auxprop", "saslauthd", and "p
The cyrusdb backend to use for the seen state.
Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR

View File

@ -1,10 +1,7 @@
@comment $OpenBSD: PLIST-perl,v 1.5 2010/10/29 09:26:58 ajacoutot Exp $
@comment $OpenBSD: PLIST-perl,v 1.6 2011/03/30 16:10:28 ajacoutot Exp $
bin/cyradm
bin/installsieve
bin/sieveshell
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/perllocal.pod
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/
@ -23,6 +20,9 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/managesieve.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/managesieve.so
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/perllocal.pod
@man man/man1/cyradm.1
@man man/man1/installsieve.1
@man man/man1/sieveshell.1