cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cyrus-imapd-2.4.17.

Browse Source 
Merge both subpackages into one -- it made sense when the port was not
SHARED_ONLY but it's been for a while now.
Use /nonexistent for the _cyrus user homedir.
This commit is contained in:
ajacoutot 2012-12-03 11:17:03 +00:00
parent 99f16cc4c0
commit 26d64410a5
10 changed files with 77 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mail/cyrus-imapd/Makefile
View File

@ -1,18 +1,11 @@
# $OpenBSD: Makefile,v 1.74 2012/08/28 08:06:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.75 2012/12/03 11:17:03 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
COMMENT= Cyrus IMAP server
V= 2.4.16
V= 2.4.17
DISTNAME= cyrus-imapd-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
FULLPKGPATH-perl=mail/cyrus-imapd,-perl
REVISION-main= 1
REVISION-perl= 0
CATEGORIES= mail
@ -30,18 +23,12 @@ MASTER_SITES= http://cyrusimap.org/releases/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
MULTI_PACKAGES= -main -perl
WANTLIB += asn1 c com_err crypto gssapi krb5 pcre pcreposix pthread
WANTLIB += sasl2 ssl z lib/db4/db>=4
WANTLIB += crypto ssl z sasl2 lib/db4/db>=4
WANTLIB-main += ${WANTLIB} asn1 c com_err gssapi krb5 pthread
WANTLIB-main += pcre pcreposix
WANTLIB-perl += ${WANTLIB}
LIB_DEPENDS= security/cyrus-sasl2 \
databases/db/v4
LIB_DEPENDS-main=${LIB_DEPENDS} \
devel/pcre
RUN_DEPENDS-main=${RUN_DEPENDS}
LIB_DEPENDS= databases/db/v4 \
devel/pcre \
security/cyrus-sasl2
NO_REGRESS= Yes
@ -76,6 +63,9 @@ CONFIGURE_ARGS= --with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
--with-pgsql=no \
--with-sqlite=no
# XXX our kerberosV is too old; use bundled compile_et and libcom_err
CONFIGURE_ARGS += --with-com_err=yes
FLAVORS= drac
FLAVOR?=
@ -94,10 +84,10 @@ SIEVEREF= lib/imapoptions man/imapd.conf.5 \
pre-configure:
${SUBST_CMD} ${WRKSRC}/{lib/imapoptions,man/imapd.conf.5}
.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}
perl -pi -e "s,/usr/sieve,/var/sieve,g" ${WRKSRC}/${i}
.endfor
post-install:

7
mail/cyrus-imapd/distinfo
View File

@ -1,5 +1,2 @@
MD5 (cyrus-imapd-2.4.16.tar.gz) = 3mGPrwjsPgIipxYw88mJRA==
RMD160 (cyrus-imapd-2.4.16.tar.gz) = eJkKe+RpHJR4GhduNkcEMAy3FV0=
SHA1 (cyrus-imapd-2.4.16.tar.gz) = LTNDeY4XiKPULpwoJfXdlmqYquA=
SHA256 (cyrus-imapd-2.4.16.tar.gz) = vqydYFloC79llI22CjDG6PWXht9KeCHHDcJ7KiJfMsQ=
SIZE (cyrus-imapd-2.4.16.tar.gz) = 2484201
SHA256 (cyrus-imapd-2.4.17.tar.gz) = s+MAUsdk7nFjlH/94nvdWL1N0uVpetFESRlB5GMApYM=
SIZE (cyrus-imapd-2.4.17.tar.gz) = 2486355

16
mail/cyrus-imapd/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.21 2012/08/28 08:06:15 ajacoutot Exp $
--- configure.orig Thu Sep 8 21:03:38 2011
+++ configure Fri Sep 9 08:38:25 2011
@@ -5062,9 +5062,7 @@ CFLAGS=$save_CFLAGS
$OpenBSD: patch-configure,v 1.22 2012/12/03 11:17:04 ajacoutot Exp $
--- configure.orig Sat Dec 1 20:59:51 2012
+++ configure Mon Dec 3 10:59:56 2012
@@ -5061,9 +5061,7 @@ CFLAGS=$save_CFLAGS
fi
if test "$ac_cv_fpic" = "yes"; then
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.21 2012/08/28 08:06:15 ajacoutot Exp $
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
$as_echo "$ac_cv_fpic" >&6; }
@@ -6455,7 +6453,7 @@ fi
@@ -6454,7 +6452,7 @@ fi
@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.21 2012/08/28 08:06:15 ajacoutot Exp $
CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
@@ -9622,7 +9620,7 @@ if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
@@ -9645,7 +9643,7 @@ if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.21 2012/08/28 08:06:15 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -9924,8 +9922,8 @@ fi
@@ -9947,8 +9945,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"
@ -41,7 +41,7 @@ $OpenBSD: patch-configure,v 1.21 2012/08/28 08:06:15 ajacoutot Exp $
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -10493,7 +10491,7 @@ elif test "${with_perl}" != "no"; then
@@ -10516,7 +10514,7 @@ elif test "${with_perl}" != "no"; then
PERL_SUBDIRS="imap"
PERL="${with_perl}"
case "${target_os}" in

8
mail/cyrus-imapd/patches/patch-lib_imapoptions
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_imapoptions,v 1.9 2012/04/20 20:54:17 ajacoutot Exp $
--- lib/imapoptions.orig Thu Apr 19 11:39:51 2012
+++ lib/imapoptions Fri Apr 20 22:37:09 2012
$OpenBSD: patch-lib_imapoptions,v 1.10 2012/12/03 11:17:04 ajacoutot Exp $
--- lib/imapoptions.orig Sat Dec 1 20:57:54 2012
+++ lib/imapoptions Mon Dec 3 10:59:56 2012
@@ -263,7 +263,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.9 2012/04/20 20:54:17 ajacoutot Exp $
{ "defaultacl", "anyone lrs", STRING }
/* The Access Control List (ACL) placed on a newly-created (non-user)
@@ -1089,7 +1089,7 @@ And the notification message will be available on \fIs
@@ -1091,7 +1091,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. */

8
mail/cyrus-imapd/patches/patch-man_imapd_conf_5
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_imapd_conf_5,v 1.8 2012/04/20 20:54:17 ajacoutot Exp $
--- man/imapd.conf.5.orig Thu Apr 19 11:41:06 2012
+++ man/imapd.conf.5 Fri Apr 20 22:37:09 2012
$OpenBSD: patch-man_imapd_conf_5,v 1.9 2012/12/03 11:17:04 ajacoutot Exp $
--- man/imapd.conf.5.orig Sat Dec 1 20:59:51 2012
+++ man/imapd.conf.5 Mon Dec 3 10:59:56 2012
@@ -239,7 +239,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.8 2012/04/20 20:54:17 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.
@@ -926,7 +926,7 @@ Possible values include "auxprop", "saslauthd", and "p
@@ -928,7 +928,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

0
mail/cyrus-imapd/pkg/DESCR-main → mail/cyrus-imapd/pkg/DESCR
View File

2
mail/cyrus-imapd/pkg/DESCR-perl
View File

@ -1,2 +0,0 @@
This package contains the perl utilities for managing the Cyrus IMAP
server.

61
mail/cyrus-imapd/pkg/PLIST-main → mail/cyrus-imapd/pkg/PLIST
View File

@ -1,13 +1,17 @@
@comment $OpenBSD: PLIST-main,v 1.15 2011/12/31 08:04:05 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},-main,kerberos
@comment $OpenBSD: PLIST,v 1.6 2012/12/03 11:17:04 ajacoutot Exp $
@pkgpath mail/cyrus-imapd,-main,kerberos
@pkgpath mail/cyrus-imapd,-main
@pkgpath mail/cyrus-imapd,-perl
@newgroup _cyrus:543
@newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/var/empty:/sbin/nologin
@newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/nonexistent:/sbin/nologin
bin/cyradm
@bin bin/imtest
bin/installsieve
@bin bin/lmtptest
@bin bin/mupdatetest
@bin bin/nntptest
@bin bin/pop3test
bin/sieveshell
@bin bin/sivtest
@bin bin/smtptest
@bin bin/synctest
@ -52,6 +56,27 @@ include/cyrus/xstrlcat.h
include/cyrus/xstrlcpy.h
lib/libcyrus.a
lib/libcyrus_min.a
libdata/perl5/${MACHINE_ARCH}-openbsd/
libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/
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/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Admin.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/IMSP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Shell.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/managesieve.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/IMAP.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/IMAP.so
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
libexec/cyrus-imapd/
@bin libexec/cyrus-imapd/arbitron
@bin libexec/cyrus-imapd/chk_cyrus
@ -92,14 +117,22 @@ libexec/cyrus-imapd/
@bin libexec/cyrus-imapd/timsieved
@bin libexec/cyrus-imapd/tls_prune
@bin libexec/cyrus-imapd/unexpunge
@man man/man1/cyradm.1
@man man/man1/imtest.1
@man man/man1/installsieve.1
@man man/man1/lmtptest.1
@man man/man1/mupdatetest.1
@man man/man1/nntptest.1
@man man/man1/pop3test.1
@man man/man1/sieveshell.1
@man man/man1/sivtest.1
@man man/man1/smtptest.1
@man man/man3/imclient.3
@man man/man3p/Cyrus::IMAP.3p
@man man/man3p/Cyrus::IMAP::Admin.3p
@man man/man3p/Cyrus::IMAP::IMSP.3p
@man man/man3p/Cyrus::IMAP::Shell.3p
@man man/man3p/Cyrus::SIEVE::managesieve.3p
@man man/man5/cyrus.conf.5
@man man/man5/imapd.conf.5
@man man/man5/krb.equiv.5
@ -118,13 +151,9 @@ libexec/cyrus-imapd/
@man man/man8/cyrus-idled.8
@man man/man8/cyrus-imapd.8
@man man/man8/cyrus-master.8
@comment @man man/man8/fetchnews.8
@man man/man8/fud.8
@comment @man man/man8/idled.8
@comment @man man/man8/imapd.8
@man man/man8/ipurge.8
@man man/man8/lmtpd.8
@comment @man man/man8/master.8
@man man/man8/mbexamine.8
@man man/man8/mbpath.8
@man man/man8/nntpd.8
@ -145,8 +174,8 @@ libexec/cyrus-imapd/
share/doc/cyrus-imapd/
share/doc/cyrus-imapd/COPYRIGHT
share/doc/cyrus-imapd/text/
@comment share/doc/cyrus-imapd/text/.cvsignore
@comment share/doc/cyrus-imapd/text/Makefile
share/doc/cyrus-imapd/text/.cvsignore
share/doc/cyrus-imapd/text/Makefile
share/doc/cyrus-imapd/text/ag
share/doc/cyrus-imapd/text/altnamespace
share/doc/cyrus-imapd/text/anoncvs
@ -154,7 +183,7 @@ share/doc/cyrus-imapd/text/bugs
share/doc/cyrus-imapd/text/changes
share/doc/cyrus-imapd/text/faq
share/doc/cyrus-imapd/text/feedback
@comment share/doc/cyrus-imapd/text/htmlstrip.c
share/doc/cyrus-imapd/text/htmlstrip.c
share/doc/cyrus-imapd/text/index
share/doc/cyrus-imapd/text/install
share/doc/cyrus-imapd/text/install-admin-mb
@ -192,17 +221,17 @@ share/examples/cyrus-imapd/normal.conf
share/examples/cyrus-imapd/prefork.conf
share/examples/cyrus-imapd/small.conf
share/examples/cyrus-imapd/tools/
@comment share/examples/cyrus-imapd/tools/arbitronsort.pl
@comment share/examples/cyrus-imapd/tools/config2header
@comment share/examples/cyrus-imapd/tools/config2man
share/examples/cyrus-imapd/tools/arbitronsort.pl
share/examples/cyrus-imapd/tools/config2header
share/examples/cyrus-imapd/tools/config2man
share/examples/cyrus-imapd/tools/convert-sieve.pl
share/examples/cyrus-imapd/tools/dohash
share/examples/cyrus-imapd/tools/masssievec
share/examples/cyrus-imapd/tools/migrate-metadata
share/examples/cyrus-imapd/tools/mkimap
share/examples/cyrus-imapd/tools/mknewsgroups
@comment share/examples/cyrus-imapd/tools/mupdate-loadgen.pl
@comment share/examples/cyrus-imapd/tools/not-mkdep
share/examples/cyrus-imapd/tools/mupdate-loadgen.pl
share/examples/cyrus-imapd/tools/not-mkdep
share/examples/cyrus-imapd/tools/rehash
share/examples/cyrus-imapd/tools/translatesieve
share/examples/cyrus-imapd/tools/undohash

33
mail/cyrus-imapd/pkg/PLIST-perl
View File

@ -1,33 +0,0 @@
@comment $OpenBSD: PLIST-perl,v 1.7 2011/04/13 15:18:24 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/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Admin.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/IMSP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Shell.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/managesieve.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/IMAP.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/IMAP/IMAP.so
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
@man man/man1/cyradm.1
@man man/man1/installsieve.1
@man man/man1/sieveshell.1
@man man/man3p/Cyrus::IMAP.3p
@man man/man3p/Cyrus::IMAP::Admin.3p
@man man/man3p/Cyrus::IMAP::IMSP.3p
@man man/man3p/Cyrus::IMAP::Shell.3p
@man man/man3p/Cyrus::SIEVE::managesieve.3p

2
mail/cyrus-imapd/pkg/README-main → mail/cyrus-imapd/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.3 2011/11/06 17:34:16 ajacoutot Exp $
$OpenBSD: README,v 1.1 2012/12/03 11:17:04 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD