cyrus-imapd30: a lot of small fixes, the build is now going through, packaging and installation work basically
This commit is contained in:
Matthias Petermann
parent
732c3826cd
commit
821a2f536a
|
|
@ -2,19 +2,22 @@
|
|||
|
||||
DISTNAME= cyrus-imapd-3.0.13
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PKGNAME}/
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=cyrusimap/}
|
||||
GITHUB_RELEASE= ${PKGNAME_NOREV}
|
||||
|
||||
MAINTAINER= mp@petermann-it.de
|
||||
HOMEPAGE= https://www.cyrusimap.org/
|
||||
COMMENT= Cyrus IMAP server
|
||||
#LICENSE= original-bsd # like license
|
||||
|
||||
DEPENDS+= p5-Term-ReadLine>=1.20:../../devel/p5-Term-ReadLine
|
||||
LICENSE= original-bsd # like license
|
||||
DEPENDS+= p5-Term-ReadLine>=1.20:../../devel/p5-Term-ReadLine
|
||||
DEPENDS+= p5-Authen-SASL-Cyrus>=0.13:../../security/p5-Authen-SASL-Cyrus
|
||||
DEPENDS+= cyrus-saslauthd>=2.1.17:../../security/cyrus-saslauthd
|
||||
|
||||
MAKE_JOBS_SAFE= no
|
||||
|
||||
USE_LANGUAGES+= c c++
|
||||
USE_TOOLS+= perl:run makedepend yacc pkg-config sed awk gmake
|
||||
USE_LANGUAGES+= c c++
|
||||
USE_TOOLS+= perl:run makedepend yacc pkg-config sed awk gmake
|
||||
USE_LIBTOOL= yes
|
||||
|
||||
USE_PKGLOCALEDIR= yes
|
||||
|
||||
|
|
@ -27,9 +30,6 @@ CHECK_PORTABILITY_SKIP= configure.lineno
|
|||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
CYRUS_USER?= cyrus
|
||||
CYRUS_GROUP?= mail
|
||||
|
||||
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
|
||||
FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
|
||||
FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP}
|
||||
|
|
@ -65,15 +65,6 @@ FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
|
|||
|
||||
REPLACE_PERL+= tools/rehash
|
||||
|
||||
#SUBST_CLASSES+= sh
|
||||
#SUBST_STAGE.sh= post-build
|
||||
#SUBST_FILES.sh= perl/imap/blib/script/cyradm
|
||||
#SUBST_SED.sh+= -e 's|^\#!.*|\#!/bin/sh|'
|
||||
|
||||
#PERL5_PACKLIST= \
|
||||
# auto/Cyrus/IMAP/.packlist \
|
||||
# auto/Cyrus/SIEVE/managesieve/.packlist
|
||||
|
||||
pre-build:
|
||||
${RUN}${_ULIMIT_CMD}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ lib/libcyrus_com_err.la
|
|||
lib/libcyrus_imap.la
|
||||
lib/libcyrus_min.la
|
||||
lib/libcyrus_sieve.la
|
||||
${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
|
||||
lib/perl5/site_perl/5.30.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm
|
||||
lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Daemon.pm
|
||||
lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Message.pm
|
||||
|
|
|
|||
|
|
@ -6,25 +6,28 @@ suggestions or active support.
|
|||
|
||||
Done:
|
||||
|
||||
- Make it build the most basic way [DONE]
|
||||
|
||||
Next steps:
|
||||
- Make it build the most basic way
|
||||
|
||||
- Make it install
|
||||
|
||||
- Update PLIST (take care of ldap / http options)
|
||||
|
||||
- Integrate / regenerate documentation at build time
|
||||
|
||||
- Evaluation of the patches of the existing Cyrus-imap-pkgs and
|
||||
their applicability for cyrus-imap 3
|
||||
|
||||
- Possibly create further patches for cyrus-imap 3 (especially with
|
||||
regard to the newly added functions CalDAV / CardDAV), if necessary
|
||||
|
||||
- Review and adjustment of scripts / provided files (configuration
|
||||
examples, man pages)
|
||||
|
||||
- Performed first integration tests (client connection to IMAP,
|
||||
authenticated via saslauthd with ldap)
|
||||
|
||||
Next steps:
|
||||
|
||||
- Integrate / regenerate documentation at build time
|
||||
|
||||
- Possibly create further patches for cyrus-imap 3 (especially with
|
||||
regard to the newly added functions CalDAV / CardDAV), if necessary
|
||||
|
||||
- Fine-tuning of the build
|
||||
|
||||
Bugs:
|
||||
|
|
|
|||
|
|
@ -4,10 +4,3 @@ SHA1 (cyrus-imapd-3.0.13.tar.gz) = 69d29e09ae4e4f3c8ae0c49a1024b7ec4dffbf57
|
|||
RMD160 (cyrus-imapd-3.0.13.tar.gz) = b789c903620e83160fce4de3e06bbe0c842f7957
|
||||
SHA512 (cyrus-imapd-3.0.13.tar.gz) = 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
|
||||
Size (cyrus-imapd-3.0.13.tar.gz) = 10840005 bytes
|
||||
SHA1 (patch-ac) = c3b0f801b17bad99a2d84c4885aadbdfca2c28ce
|
||||
SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
|
||||
SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
|
||||
SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
|
||||
SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
|
||||
SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b
|
||||
SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ rcd_dir=`@DIRNAME@ $0`
|
|||
|
||||
name="cyrus"
|
||||
rcvar=$name
|
||||
command="@PREFIX@/bin/master"
|
||||
command="@PREFIX@/libexec/master"
|
||||
command_args="-d"
|
||||
pidfile="@VARBASE@/run/cyrus-master.pid"
|
||||
sig_stop=QUIT
|
||||
|
|
@ -28,6 +28,9 @@ extra_commands="mkimap reload"
|
|||
mkimap_cmd="cyrus_mkimap"
|
||||
start_precmd="cyrus_prestart"
|
||||
|
||||
# required to provide perl in PATH for mkimap
|
||||
PATH=$PATH:/usr/pkg/bin:/usr/pkg/sbin
|
||||
|
||||
cyrus_prestart()
|
||||
{
|
||||
# Check to see if "configdirectory" is present before we start
|
||||
|
|
|
|||
|
|
@ -12,30 +12,30 @@ admins: cyrus
|
|||
###################################################################
|
||||
|
||||
# Configuration directory
|
||||
configdirectory: /var/lib/cyrus
|
||||
# OLD pkgsrc: configdirectory: /var/imap
|
||||
# DEFAULT configdirectory: /var/lib/cyrus
|
||||
configdirectory: /var/imap
|
||||
|
||||
# Directories for proc and lock files
|
||||
proc_path: /run/cyrus/proc
|
||||
mboxname_lockpath: /run/cyrus/lock
|
||||
#proc_path: /run/cyrus/proc
|
||||
#mboxname_lockpath: /run/cyrus/lock
|
||||
|
||||
# Locations for DB files
|
||||
# The following DB are recreated upon initialization, so should live in
|
||||
# ephemeral storage for best performance.
|
||||
duplicate_db_path: /run/cyrus/deliver.db
|
||||
ptscache_db_path: /run/cyrus/ptscache.db
|
||||
statuscache_db_path: /run/cyrus/statuscache.db
|
||||
tls_sessions_db_path: /run/cyrus/tls_sessions.db
|
||||
#duplicate_db_path: /run/cyrus/deliver.db
|
||||
#ptscache_db_path: /run/cyrus/ptscache.db
|
||||
#statuscache_db_path: /run/cyrus/statuscache.db
|
||||
#tls_sessions_db_path: /run/cyrus/tls_sessions.db
|
||||
|
||||
# Which partition to use for default mailboxes
|
||||
defaultpartition: default
|
||||
partition-default: /var/spool/cyrus/mail
|
||||
# OLD pkgsrc: partition-default: /var/spool/imap
|
||||
# DEFAULT partition-default: /var/spool/cyrus/mail
|
||||
partition-default: /var/spool/imap
|
||||
|
||||
# If sieveusehomedir is false (the default), this directory is searched
|
||||
# for Sieve scripts.
|
||||
sievedir: /var/spool/sieve
|
||||
# OLD pkgsrc: sievedir:/var/sieve
|
||||
# DEFAULT sievedir: /var/spool/sieve
|
||||
sievedir:/var/sieve
|
||||
# OLD pkgsrc: hashimapspool: false
|
||||
|
||||
###################################################################
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et
|
|||
CONFIGURE_ARGS+= --without-krb
|
||||
CONFIGURE_ARGS+= --disable-gssapi
|
||||
CHECK_BUILTIN.heimdal:= yes
|
||||
. include "../../security/heimdal/builtin.mk"
|
||||
. include "../../security/heimdal/buildlink3.mk"
|
||||
CHECK_BUILTIN.heimdal:= no
|
||||
CHECK_BUILTIN.mit-krb5:= yes
|
||||
. include "../../security/mit-krb5/builtin.mk"
|
||||
. include "../../security/mit-krb5/buildlink3.mk"
|
||||
CHECK_BUILTIN.mit-krb5:= no
|
||||
. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \
|
||||
!empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \
|
||||
|
|
|
|||
Loading…
Reference in New Issue