- update to cyrus-imapd 2.3.13

- only build_depends on mail/drac for the drac FLAVOR as the drac server can be external - rename drac patch - tweak DESCR-perl and MESSAGE-main - fix -perl packaging after perl upgrade to 5.10
2008-10-21 08:36:25 +00:00 · 2008-10-21 08:36:25 +00:00 · 438e63d181
commit 438e63d181
parent 8c6ef5e35a
9 changed files with 80 additions and 97 deletions
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.24 2008/10/02 20:32:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2008/10/21 08:36:25 ajacoutot Exp $

 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server

-V=		2.3.12
+V=		2.3.13
 DISTNAME=	cyrus-imapd-${V}
-PKGNAME-main=	${DISTNAME}p1
-FULLPKGNAME-perl=cyrus-imapd-perl-${V}p1
+PKGNAME-main=	${DISTNAME}
+FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
 CATEGORIES=	mail
+
 HOMEPAGE=	http://cyrusimap.web.cmu.edu

 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
@ -58,7 +59,12 @@ CONFIGURE_ARGS=	--with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
 		--enable-murder \
 		--enable-nntp \
 		--without-zephyr \
-		--without-snmp
+		--without-snmp \
+		--with-afs=no \
+		--with-ldap=no \
+		--with-mysql=no \
+		--with-pgsql=no \
+		--with-sqlite=no

 # this is a needed hack; to update PLIST:
 # make SHARED_ONLY=Yes plist
@ -70,9 +76,8 @@ FLAVOR?=

 .if ${FLAVOR:L:Mdrac}
 BUILD_DEPENDS+=	::mail/drac
-RUN_DEPENDS-main+=::mail/drac
 PATCH_LIST+=	${WRKSRC}/contrib/drac_auth.patch \
-		drac-patch-imap_Makefile.in
+		drac-patch-imap_Makefile_in
 .endif

 WANTLIB-main=	${WANTLIB} asn1 c com_err gssapi krb5 pthread wrap
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@ -1,5 +1,5 @@
-MD5 (cyrus-imapd-2.3.12.tar.gz) = fdiDXsP5EttBjjVBrJZcFg==
-RMD160 (cyrus-imapd-2.3.12.tar.gz) = szpqnnljMZE0owNGINA6uPKU6j4=
-SHA1 (cyrus-imapd-2.3.12.tar.gz) = bxQ3Ti71HcgBgh5t1ywm41/ZEMM=
-SHA256 (cyrus-imapd-2.3.12.tar.gz) = q0qUstOkexRRAEagZANorFUXo0CXAL7ZMUVoYXmpAnY=
-SIZE (cyrus-imapd-2.3.12.tar.gz) = 2291961
+MD5 (cyrus-imapd-2.3.13.tar.gz) = fcSDJMOpniEL93fqdKrmlA==
+RMD160 (cyrus-imapd-2.3.13.tar.gz) = 38yO+vXzSVuPyDg0VByStkgeKN4=
+SHA1 (cyrus-imapd-2.3.13.tar.gz) = lYd9weHaXSaLHCSDV/vQV0n6xy4=
+SHA256 (cyrus-imapd-2.3.13.tar.gz) = 9lHD9REtOu+lq1JQ+cubsBIEagw71y6ruC2p3eEVD7o=
+SIZE (cyrus-imapd-2.3.13.tar.gz) = 2328467
--- a/mail/cyrus-imapd/patches/drac-patch-imap_Makefile_in
+++ b/mail/cyrus-imapd/patches/drac-patch-imap_Makefile_in
--- a/mail/cyrus-imapd/patches/patch-configure
+++ b/mail/cyrus-imapd/patches/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	Mon Apr 21 13:17:40 2008
-+++ configure	Mon Apr 21 16:16:41 2008
-@@ -5206,9 +5206,7 @@ CFLAGS=$save_CFLAGS
+--- configure.orig	Fri Oct 17 14:56:20 2008
+++ configure	Tue Oct 21 09:26:08 2008
+@@ -7005,9 +7005,7 @@ CFLAGS=$save_CFLAGS
 fi
 
 if test "$ac_cv_fpic" = "yes"; then
@ -9,9 +9,9 @@
 -    FPIC_CFLAGS=""
 +    CFLAGS="${CFLAGS} -fPIC"
 fi
- echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
- echo "${ECHO_T}$ac_cv_fpic" >&6
-@@ -8908,7 +8906,7 @@ echo "$as_me: error: Berkeley DB 3.x or later was not 
+ { echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+ echo "${ECHO_T}$ac_cv_fpic" >&6; }
+@@ -10480,7 +10478,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"
-@@ -12270,7 +12268,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -14080,7 +14078,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
-@@ -14831,7 +14829,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -16516,7 +16514,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
-@@ -14921,7 +14919,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
+@@ -16603,7 +16601,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
-@@ -15391,8 +15389,8 @@ fi
+@@ -17055,8 +17053,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"
-@@ -15576,7 +15574,7 @@ if test "${ac_cv_lib_resolv_res_search+set}" = set; th
+@@ -17240,7 +17238,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,9 +67,9 @@
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -17414,6 +17412,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.  */
+@@ -18993,6 +18991,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ extern "C"
+ #endif
 char request_init ();
 +int allow_severity = 1;
 +int deny_severity = 1;
--- a/mail/cyrus-imapd/patches/patch-lib_libconfig_c
+++ b/mail/cyrus-imapd/patches/patch-lib_libconfig_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_libconfig_c,v 1.1 2008/04/23 13:33:22 ajacoutot Exp $
--- lib/libconfig.c.orig	Wed Apr 23 12:03:13 2008
-+++ lib/libconfig.c	Wed Apr 23 12:05:47 2008
-@@ -344,7 +344,7 @@ void config_read_file(const char *filename)
- 		/* end of line */
- 		buf[--len] = '\0';
- 
-		if (buf[len-1] == '\\') {
-+		if (len && buf[len-1] == '\\') {
- 		    /* line continuation */
- 		    len--;
- 		    lineno++;
--- a/mail/cyrus-imapd/pkg/DESCR-perl
+++ b/mail/cyrus-imapd/pkg/DESCR-perl
@ -1,14 +1,2 @@
-The Cyrus IMAP server differs from other IMAP server implementations in
-that it is generally intended to be run on sealed servers, where normal
-users are not permitted to log in. The mailbox database is stored in
-parts of the filesystem that are private to the Cyrus IMAP system. All
-user access to mail is through the IMAP, POP3, or KPOP protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability. Multiple concurrent
-read/write connections to the same mailbox are permitted. The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
 This package contains the perl utilities for managing the Cyrus Imap
 server.
--- a/mail/cyrus-imapd/pkg/MESSAGE-main
+++ b/mail/cyrus-imapd/pkg/MESSAGE-main
@ -1,2 +1,3 @@
 Don't forget to edit /etc/services to include missing network services
 if needed.
+  e.g. sieve	2000/tcp
--- a/mail/cyrus-imapd/pkg/PLIST-main
+++ b/mail/cyrus-imapd/pkg/PLIST-main
@ -1,16 +1,16 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2008/03/15 10:07:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2008/10/21 08:36:25 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},-main,kerberos
@newgroup _cyrus:543
@newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/var/empty:/sbin/nologin
-bin/imtest
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sivtest
-bin/smtptest
-bin/synctest
+@bin bin/imtest
+@bin bin/lmtptest
+@bin bin/mupdatetest
+@bin bin/nntptest
+@bin bin/pop3test
+@bin bin/sivtest
+@bin bin/smtptest
+@bin bin/synctest
 include/cyrus/
 include/cyrus/acl.h
 include/cyrus/assert.h
@ -50,44 +50,43 @@ include/cyrus/xstrlcat.h
 include/cyrus/xstrlcpy.h
 lib/libcyrus.a
 lib/libcyrus_min.a
-@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
-@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
 libexec/cyrus-imapd/
-libexec/cyrus-imapd/arbitron
-libexec/cyrus-imapd/chk_cyrus
-libexec/cyrus-imapd/ctl_cyrusdb
-libexec/cyrus-imapd/ctl_deliver
-libexec/cyrus-imapd/ctl_mboxlist
-libexec/cyrus-imapd/cvt_cyrusdb
-libexec/cyrus-imapd/cyr_dbtool
-libexec/cyrus-imapd/cyr_expire
-libexec/cyrus-imapd/cyr_synclog
-libexec/cyrus-imapd/cyrdump
-libexec/cyrus-imapd/deliver
-libexec/cyrus-imapd/fetchnews
-libexec/cyrus-imapd/fud
-libexec/cyrus-imapd/idled
-libexec/cyrus-imapd/imapd
-libexec/cyrus-imapd/ipurge
-libexec/cyrus-imapd/lmtpd
-libexec/cyrus-imapd/lmtpproxyd
-libexec/cyrus-imapd/master
-libexec/cyrus-imapd/mbexamine
-libexec/cyrus-imapd/mbpath
-libexec/cyrus-imapd/mupdate
-libexec/cyrus-imapd/nntpd
-libexec/cyrus-imapd/notifyd
-libexec/cyrus-imapd/pop3d
-libexec/cyrus-imapd/pop3proxyd
-libexec/cyrus-imapd/proxyd
-libexec/cyrus-imapd/quota
-libexec/cyrus-imapd/reconstruct
-libexec/cyrus-imapd/sievec
-libexec/cyrus-imapd/smmapd
-libexec/cyrus-imapd/squatter
-libexec/cyrus-imapd/timsieved
-libexec/cyrus-imapd/tls_prune
-libexec/cyrus-imapd/unexpunge
+@bin libexec/cyrus-imapd/arbitron
+@bin libexec/cyrus-imapd/chk_cyrus
+@bin libexec/cyrus-imapd/ctl_cyrusdb
+@bin libexec/cyrus-imapd/ctl_deliver
+@bin libexec/cyrus-imapd/ctl_mboxlist
+@bin libexec/cyrus-imapd/cvt_cyrusdb
+@bin libexec/cyrus-imapd/cyr_dbtool
+@bin libexec/cyrus-imapd/cyr_expire
+@bin libexec/cyrus-imapd/cyr_synclog
+@bin libexec/cyrus-imapd/cyrdump
+@bin libexec/cyrus-imapd/deliver
+@bin libexec/cyrus-imapd/fetchnews
+@bin libexec/cyrus-imapd/fud
+@bin libexec/cyrus-imapd/idled
+@bin libexec/cyrus-imapd/imapd
+@bin libexec/cyrus-imapd/ipurge
+@bin libexec/cyrus-imapd/lmtpd
+@bin libexec/cyrus-imapd/lmtpproxyd
+@bin libexec/cyrus-imapd/master
+@bin libexec/cyrus-imapd/mbexamine
+@bin libexec/cyrus-imapd/mbpath
+@bin libexec/cyrus-imapd/mupdate
+@bin libexec/cyrus-imapd/nntpd
+@bin libexec/cyrus-imapd/notifyd
+@bin libexec/cyrus-imapd/pop3d
+@bin libexec/cyrus-imapd/pop3proxyd
+@bin libexec/cyrus-imapd/proxyd
+@bin libexec/cyrus-imapd/quota
+@bin libexec/cyrus-imapd/reconstruct
+@bin libexec/cyrus-imapd/sievec
+@bin libexec/cyrus-imapd/sieved
+@bin libexec/cyrus-imapd/smmapd
+@bin libexec/cyrus-imapd/squatter
+@bin libexec/cyrus-imapd/timsieved
+@bin libexec/cyrus-imapd/tls_prune
+@bin libexec/cyrus-imapd/unexpunge
@man man/man1/imtest.1
@man man/man1/lmtptest.1
@man man/man1/mupdatetest.1
--- a/mail/cyrus-imapd/pkg/PLIST-perl
+++ b/mail/cyrus-imapd/pkg/PLIST-perl
@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST-perl,v 1.2 2006/04/08 20:46:20 sturm Exp $
+@comment $OpenBSD: PLIST-perl,v 1.3 2008/10/21 08:36:25 ajacoutot Exp $
 bin/cyradm
 bin/installsieve
 bin/sieveshell
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/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/