Index: head/mail/cyrus-imapd2/Makefile =================================================================== --- head/mail/cyrus-imapd2/Makefile (revision 81846) +++ head/mail/cyrus-imapd2/Makefile (revision 81847) @@ -1,190 +1,189 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd PORTVERSION= 2.1.13 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ PATCHFILES= ${DISTNAME}-ipv6-20030503.diff.gz MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2 +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITH_SKIPLIST) WITH_SKIPLIST_MBOX= YES WITH_SKIPLIST_SEEN= YES .endif .if defined(WITH_SKIPLIST_MBOX) CONFIGURE_ARGS+=--with-mboxlist-db=skiplist .endif .if defined(WITH_SKIPLIST_SEEN) CONFIGURE_ARGS+=--with-seen-db=skiplist .endif .if defined(WITH_MURDER) CONFIGURE_ARGS+=--enable-murder CFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} PLIST_SUB+= MURDER="" .else PLIST_SUB+= MURDER="@comment " .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .endif CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ pop3test.1 sieveshell.1 sivtest.1 smtptest.1 MAN3= imclient.3 MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 MAN8= arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \ ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \ deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \ mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \ squatter.8 syncnews.8 timsieved.8 tls_prune.8 DOCS= altnamespace anoncvs bugs changes faq feedback index \ install install-admin-mb install-auth install-compile \ install-configure install-murder install-perf \ install-prereq install-sieve install-snmpmon install-testing \ install-upgrade mailing-list man notes os overview questions \ readme sieve sieve-protocol specs PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" #.if !defined(WITH_OPENSSL_BASE) CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} #.endif pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO} ""; \ ${ECHO} "It seems you have installed newer db than db3. If"; \ ${ECHO} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO} "specify same version by WITH_BDB_VER. For"; \ ${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO} ""; \ fi .endif post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man ${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus-imapd2 @${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \ ${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus-imapd2 @${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus-imapd2/text @${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST} .endfor @${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${PREFIX}/cyrus/bin/mkimap @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/cyrus-imapd2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.82 \ No newline at end of property +1.83 \ No newline at end of property Index: head/mail/cyrus-imapd2/files/imapd.conf =================================================================== --- head/mail/cyrus-imapd2/files/imapd.conf (revision 81846) +++ head/mail/cyrus-imapd2/files/imapd.conf (revision 81847) @@ -1,373 +1,373 @@ # # $FreeBSD$ # # Sample configurations file for Cyrus IMAPd # Most lines in this file are commented; in this case the default is used. # The commented lines (usually) contain the default value # The pathname of the IMAP configuration directory # configdirectory: /var/imap # The partition name used by default for new mailboxes # #defaultpartition: default # The directory for the different partitions # partition-default: /var/spool/imap # Use the UNIX separator character '/' for delimiting levels of # mailbox hierarchy. The default is to use the netnews separator # character '.'. #unixhierarchysep: no # Use the alternate IMAP namespace, where personal folders reside at # the same level in the hierarchy as INBOX. # #altnamespace: no # If using the alternate IMAP namespace, the prefix for the other # users namespace. The hierarchy delimiter will be automatically # appended. # #userprefix: Other Users # If using the alternate IMAP namespace, the prefix for the shared # namespace. The hierarchy delimiter will be automatically appended. # #sharedprefix: Shared Folders # The umask value used by various Cyrus IMAP programs # #umask: 077 # This is the hostname visible in the greeting messages of the POP, # IMAP and LMTP daemons. If it is unset, then the result returned from # gethostname(2) is used. # #servername: # Whether to allow anonymous logins # #allowanonymouslogin: no # Allow the use of the SASL PLAIN mechanism. # #allowplaintext: yes # The percent of quota utilization over which the server generates # warnings. # #quotawarn: 90 # The length of the IMAP server's inactivity autologout timer, in minutes. # The minimum value is 30, the default. # #timeout: 30 # The interval (in seconds) for polling the mailbox for changes while # running the IDLE command. This option is used when idled can not be # contacted or when polling is used exclusively. The minimum value is # 1. A value of 0 will disable polling (and disable IDLE if polling # is the only method available). # #imapidlepoll: 60 # If enabled, the server responds to an ID command with a parameter # list containing: version, vendor, support-url, os, os-version, # command, arguments, environment. Otherwise the server returns NIL. # #imapidresponse: yes # Set the length of the POP server's inactivity autologout timer, in # minutes. The minimum value is 10, the default. # #poptimeout: 10 # Set the minimum amount of time the server forces users to wait between # successive POP logins, in minutes. The default is 0. # #popminpoll: 0 # The number of days advertised as being the minimum a message may be # left on the POP server before it is deleted (via the CAPA command, # defined in the POP3 Extension Mechanism, which some clients may # support). "NEVER", the default, may be specified with a negative # number. The Cyrus POP3 server never deletes mail, no matter what # the value of this parameter is. However, if a site implements a # less liberal policy, it needs to change this parameter accordingly. # #popexpiretime: 0 # The list of userids with administrative rights. Separate each userid # with a space. We recommend that administrator userids be separate from # standard userids. Sites using Kerberos authentication may use separate # "admin" instances. # #admins: # A list of users and groups that are allowed to proxy for other # users, seperated by spaces. Any user listed in this will be allowed # to login for any other user: use with caution. # #proxyservers: # The Access Control List (ACL) placed on a newly-created (non-user) # mailbox that does not have a parent mailbox. # #defaultacl: anyone lrs # The pathname of the news spool directory. Only used if the partition-news # configuration option is set. # #newsspool: # Prefix to be prepended to newsgroup names to make the corresponding IMAP # mailbox names. # #newsprefix: # If nonzero, normal users may create their own IMAP accounts by creating # the mailbox INBOX. The user's quota is set to the value if it is positive, # otherwise the user has unlimited quota. # #autocreatequota: 0 # Include notations in the protocol telemetry logs indicating the number # of seconds since the last command or response. # #logtimestamps: no # Number of seconds to pause after a successful plaintext login. For systems # that support strong authentication, this permits users to perceive a cost # of using plaintext passwords. # #plaintextloginpause: 0 # The pathname of srvtab file containing the server's private key. # This option is passed to the SASL library and overrides its default # setting. # #srvtab: /etc/srvtab # The list of remote realms whose users may log in using cross-realm # authentications. Seperate each realm name by a space. This option is # only used when the server is compiled with Kerberos authentication. # #loginrealms: # If enabled, any authentication identity which has a rights on a user's # INBOX may log in as that user. This option is only used when the server # is compiled with Kerberos authentication. # #loginuseacl: no # If enabled, lmtpd attempts to only write one copy of a message per # partition and create hard links, resulting in a potentially large # disk savings. # #singleinstancestore: yes # If enabled, lmtpd will suppress delivery of a message to a mailbox # if a message with the same message-id (or resent-message-id) is # recorded as having already been delivered to the mailbox. Records # the mailbox and message-id/resent-message-id of all successful # deliveries. # Note that duplicate delivery suppression is required for Sieve. # Disabling duplicate delivery suppression will also disable Sieve, # and as such should only be disabled for performance reasons. # #duplicatesuppression: yes # If enabled, lmtpd rejects messages with 8-bit characters in the # headers. Otherwise, 8-bit characters are changed to `X'. (A proper # soultion to non-ASCII characters in headers is offered by RFC 2047 # and its predecessors.) # #reject8bit: no # Maximum incoming LMTP message size. If set, lmtpd will reject # messages larger than maxmessagesize bytes. The default is to allow # messages of any size. # #maxmessagesize: # Userid used to deliver messages to shared folders. For example, if # set to "bb", email sent to "bb+shared.blah" would be delivered to # the "shared.blah" folder. By default, an email address of # "+shared.blah" would be used. #postuser: # If enabled at compile time, this specifies a URL to reply when # Netscape asks the server where the mail administration HTTP server # is. The default is a site at CMU with a hopefully informative # message; administrators should set this to a local resource with # some information of greater use. # #netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html # Notifyd(8) method to use for "MAIL" notifications. If not set, # "MAIL" notifications are disabled. # #mailnotifier: # Notifyd(8) method to use for "SIEVE" notifications. If not set, # "SIEVE" notifications are disabled. # # This method is only used when no method is specified in the script. # #sievenotifier: # If enabled, lmtpd will look for Sieve scripts in user's home # directories: ~user/.sieve. # sieveusehomedir: false # If sieveusehomedir is false, this directory is searched for Sieve scripts. # The active Sieve script is s called "default", placed in the users sieve # sieve directory (ie. /var/imap/sieve/u/user). # sievedir: /var/imap/sieve # The pathname of the sendmail executable. Sieve uses sendmail for # sending rejections, redirects and vaca- tion responses. # #sendmail: /usr/sbin/sendmail # Username that is used as the 'From' address in rejection MDNs # produced by sieve. # #postmaster: postmaster # If enabled, the partitions will also be hashed, in addition to the hashing # done on configuration directories. This is recommended if one partition has # a very bushy mailbox tree. # #hashimapspool: false # Maximum size (in kilobytes) any sieve script can be, enforced at # submission by timsieved(8). # #sieve_maxscriptsize: 32 # Maximum number of sieve scripts any user may have, enforced at # submission by timsieved(8). # #sieve_maxscripts: 5 # Maximum SSF (security strength factor) that the server will allow a # client to negotiate. # #sasl_maximum_layer: 256 # The minimum SSF that the server will allow a client to negotiate. A # value of 1 requires integrity protection; any higher value requires # some amount of encryption. # #sasl_minimum_layer: 0 # The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop", "saslauthd", and "pwcheck" +# values include "auxprop" or "saslauthd" # -sasl_pwcheck_method: saslauthd +sasl_pwcheck_method: auxprop # If enabled, the SASL library will automatically create authentication # secrets when given a plaintext password. See the SASL documentation. # #sasl_auto_transition: no # Location of the opiekeys file # #sasl_opiekeys: /etc/opiekeys # File containing the global certificate used for ALL services (imap, # pop3, lmtp). # #tls_cert_file: # File containing the private key belonging to the global server # certificate. # #tls_key_file: # File containing the certificate used for imap ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for imap. # #tls_imap_cert_file: # File containing the private key belonging to the imap-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for imap. # #tls_imap_key_file: # File containing the certificate used for pop3 ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for pop3. # #tls_pop3_cert_file: # File containing the private key belonging to the pop3-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for pop3. # #tls_pop3_key_file: # File containing the certificate used for lmtp ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for lmtp. # #tls_lmtp_cert_file: # File containing the private key belonging to the lmtp-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for lmtp. # #tls_lmtp_key_file: # File containing the certificate used for sieve ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for sieve. # #tls_sieve_cert_file: # File containing the private key belonging to the sieve-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for sieve. # #tls_sieve_key_file: # File containing one or more Certificate Authority (CA) certificates. # #tls_ca_file: # Path to directory with certificates of CAs. # #tls_ca_path: # The length of time (in minutes) that a TLS session will be cached # for later reuse. The maximum value is 1440 (24 hours), the default. # A value of 0 will disable session caching. # #tls_session_timeout: 1440 # The right that a user needs to delete a mailbox. # #deleteright: c # Unix domain socket that lmtpd listens on, used by deliver(8). # #lmtpsocket: /var/imap/socket/lmtp # Unix domain socket that idled listens on. # #idlesocket: /var/imap/socket/idle # Unix domain socket that the new mail notification daemon listens on. # #notifysocket: /var/imap/socket/notify # # EOF Property changes on: head/mail/cyrus-imapd2/files/imapd.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/mail/cyrus-imapd2/pkg-deinstall =================================================================== --- head/mail/cyrus-imapd2/pkg-deinstall (revision 81846) +++ head/mail/cyrus-imapd2/pkg-deinstall (revision 81847) @@ -1,73 +1,60 @@ #!/bin/sh # # $FreeBSD$ # # Created by: hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same rm $1 ;; 1) # config file exists and differs ;; *) # no config file exists ;; esac } -# Uninstall timseived's Cyrus.conf file. - -cyrus_conf() { - if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - fi -} - # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw if [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome=/nonexistent if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } case $2 in DEINSTALL) cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf ;; POST-DEINSTALL) modify_cyrus_user ;; esac Property changes on: head/mail/cyrus-imapd2/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd2/pkg-install =================================================================== --- head/mail/cyrus-imapd2/pkg-install (revision 81846) +++ head/mail/cyrus-imapd2/pkg-install (revision 81847) @@ -1,72 +1,63 @@ #!/bin/sh #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw shell=/bin/csh uhome=${PKG_PREFIX}/cyrus if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same ;; 1) # config file exists and differs echo "** Make sure $1 is in sync with this version"; echo " of the port. See $1.dist for details."; ;; *) # no config file exists, copy it install -c -m 644 $1.dist $1 ;; esac } -# Install timseived's Cyrus.conf file - -cyrus_conf() { - if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi -} - case $2 in PRE-INSTALL) ;; POST-INSTALL) modify_cyrus_user cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf if grep 'sieve' /etc/services; then echo else echo echo "** Please add an entry for the sieve protocol (2000/tcp)" echo " to /etc/services" echo fi ;; esac Property changes on: head/mail/cyrus-imapd2/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/mail/cyrus-imapd22/Makefile =================================================================== --- head/mail/cyrus-imapd22/Makefile (revision 81846) +++ head/mail/cyrus-imapd22/Makefile (revision 81847) @@ -1,224 +1,223 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd PORTVERSION= 2.2.0.a #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} DISTNAME= ${PORTNAME}-2.2.0-ALPHA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2 +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .endif .if defined(WITH_NNTP) CONFIGURE_ARGS+=--enable-nntp PLIST_SUB+= NNTP="" .else PLIST_SUB+= NNTP="@comment " .endif .if defined(WITH_MURDER) CONFIGURE_ARGS+=--enable-murder CFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} PLIST_SUB+= MURDER="" .else PLIST_SUB+= MURDER="@comment " .endif .if defined(WITH_FULLDIRHASH) CONFIGURE_ARGS+=--enable-fulldirhash .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .endif .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif .if defined(WITH_DRAC) EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch \ ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4 USE_AUTOCONF= YES CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .endif CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 MAN3= imclient.3 MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 deliver.8 \ expirenews.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \ rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8 DOCS= altnamespace anoncvs bugs changes faq feedback index \ install install-admin-mb install-auth install-compile \ install-configure install-murder install-netnews \ install-perf install-prereq install-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" .if !defined(WITH_OPENSSL_BASE) CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO} ""; \ ${ECHO} "It seems you have installed newer db than db3. If"; \ ${ECHO} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO} "specify same version by WITH_BDB_VER. For"; \ ${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO} ""; \ fi .endif post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif .if defined(WITH_DRAC) pre-configure: cd ${WRKSRC} && ${AUTOHEADER} .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor .for file in cyrusv2.mc murder.png netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${PREFIX}/cyrus/bin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${PREFIX}/cyrus/bin/masssievec @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/cyrus-imapd22/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.80 \ No newline at end of property +1.81 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/imapd.conf =================================================================== --- head/mail/cyrus-imapd22/files/imapd.conf (revision 81846) +++ head/mail/cyrus-imapd22/files/imapd.conf (revision 81847) @@ -1,379 +1,379 @@ # # $FreeBSD$ # # Sample configurations file for Cyrus IMAPd # Most lines in this file are commented; in this case the default is used. # The commented lines (usually) contain the default value # The pathname of the IMAP configuration directory # configdirectory: /var/imap # The partition name used by default for new mailboxes # #defaultpartition: default # The directory for the different partitions # partition-default: /var/spool/imap # Use the UNIX separator character '/' for delimiting levels of # mailbox hierarchy. The default is to use the netnews separator # character '.'. #unixhierarchysep: no # Use the alternate IMAP namespace, where personal folders reside at # the same level in the hierarchy as INBOX. # #altnamespace: no # If using the alternate IMAP namespace, the prefix for the other # users namespace. The hierarchy delimiter will be automatically # appended. # #userprefix: Other Users # If using the alternate IMAP namespace, the prefix for the shared # namespace. The hierarchy delimiter will be automatically appended. # #sharedprefix: Shared Folders # The umask value used by various Cyrus IMAP programs # #umask: 077 # This is the hostname visible in the greeting messages of the POP, # IMAP and LMTP daemons. If it is unset, then the result returned from # gethostname(2) is used. # #servername: # Whether to allow anonymous logins # #allowanonymouslogin: no # Allow the use of the SASL PLAIN mechanism. # #allowplaintext: yes # The percent of quota utilization over which the server generates # warnings. # #quotawarn: 90 # The length of the IMAP server's inactivity autologout timer, in minutes. # The minimum value is 30, the default. # #timeout: 30 # The interval (in seconds) for polling the mailbox for changes while # running the IDLE command. This option is used when idled can not be # contacted or when polling is used exclusively. The minimum value is # 1. A value of 0 will disable polling (and disable IDLE if polling # is the only method available). # #imapidlepoll: 60 # If enabled, the server responds to an ID command with a parameter # list containing: version, vendor, support-url, os, os-version, # command, arguments, environment. Otherwise the server returns NIL. # #imapidresponse: yes # Set the length of the POP server's inactivity autologout timer, in # minutes. The minimum value is 10, the default. # #poptimeout: 10 # Set the minimum amount of time the server forces users to wait between # successive POP logins, in minutes. The default is 0. # #popminpoll: 0 # The number of days advertised as being the minimum a message may be # left on the POP server before it is deleted (via the CAPA command, # defined in the POP3 Extension Mechanism, which some clients may # support). "NEVER", the default, may be specified with a negative # number. The Cyrus POP3 server never deletes mail, no matter what # the value of this parameter is. However, if a site implements a # less liberal policy, it needs to change this parameter accordingly. # #popexpiretime: 0 # The list of userids with administrative rights. Separate each userid # with a space. We recommend that administrator userids be separate from # standard userids. Sites using Kerberos authentication may use separate # "admin" instances. # #admins: # A list of users and groups that are allowed to proxy for other # users, seperated by spaces. Any user listed in this will be allowed # to login for any other user: use with caution. # #proxyservers: # The Access Control List (ACL) placed on a newly-created (non-user) # mailbox that does not have a parent mailbox. # #defaultacl: anyone lrs # The pathname of the news spool directory. Only used if the partition-news # configuration option is set. # #newsspool: # Prefix to be prepended to newsgroup names to make the corresponding IMAP # mailbox names. # #newsprefix: # If nonzero, normal users may create their own IMAP accounts by creating # the mailbox INBOX. The user's quota is set to the value if it is positive, # otherwise the user has unlimited quota. # #autocreatequota: 0 # Include notations in the protocol telemetry logs indicating the number # of seconds since the last command or response. # #logtimestamps: no # Number of seconds to pause after a successful plaintext login. For systems # that support strong authentication, this permits users to perceive a cost # of using plaintext passwords. # #plaintextloginpause: 0 # The pathname of srvtab file containing the server's private key. # This option is passed to the SASL library and overrides its default # setting. # #srvtab: /etc/srvtab # The list of remote realms whose users may log in using cross-realm # authentications. Seperate each realm name by a space. This option is # only used when the server is compiled with Kerberos authentication. # #loginrealms: # If enabled, any authentication identity which has a rights on a user's # INBOX may log in as that user. This option is only used when the server # is compiled with Kerberos authentication. # #loginuseacl: no # If enabled, lmtpd attempts to only write one copy of a message per # partition and create hard links, resulting in a potentially large # disk savings. # #singleinstancestore: yes # If enabled, lmtpd will suppress delivery of a message to a mailbox # if a message with the same message-id (or resent-message-id) is # recorded as having already been delivered to the mailbox. Records # the mailbox and message-id/resent-message-id of all successful # deliveries. # Note that duplicate delivery suppression is required for Sieve. # Disabling duplicate delivery suppression will also disable Sieve, # and as such should only be disabled for performance reasons. # #duplicatesuppression: yes # If enabled, lmtpd rejects messages with 8-bit characters in the # headers. Otherwise, 8-bit characters are changed to `X'. (A proper # soultion to non-ASCII characters in headers is offered by RFC 2047 # and its predecessors.) # #reject8bit: no # Maximum incoming LMTP message size. If set, lmtpd will reject # messages larger than maxmessagesize bytes. The default is to allow # messages of any size. # #maxmessagesize: # Userid used to deliver messages to shared folders. For example, if # set to "bb", email sent to "bb+shared.blah" would be delivered to # the "shared.blah" folder. By default, an email address of # "+shared.blah" would be used. #postuser: # If enabled at compile time, this specifies a URL to reply when # Netscape asks the server where the mail administration HTTP server # is. The default is a site at CMU with a hopefully informative # message; administrators should set this to a local resource with # some information of greater use. # #netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html # Notifyd(8) method to use for "MAIL" notifications. If not set, # "MAIL" notifications are disabled. # #mailnotifier: # Notifyd(8) method to use for "SIEVE" notifications. If not set, # "SIEVE" notifications are disabled. # # This method is only used when no method is specified in the script. # #sievenotifier: # If enabled, lmtpd will look for Sieve scripts in user's home # directories: ~user/.sieve. # sieveusehomedir: false # If sieveusehomedir is false, this directory is searched for Sieve scripts. # The active Sieve script is s called "default", placed in the users sieve # sieve directory (ie. /var/imap/sieve/u/user). # sievedir: /var/imap/sieve # The pathname of the sendmail executable. Sieve uses sendmail for # sending rejections, redirects and vaca- tion responses. # #sendmail: /usr/sbin/sendmail # Username that is used as the 'From' address in rejection MDNs # produced by sieve. # #postmaster: postmaster # If enabled, the partitions will also be hashed, in addition to the hashing # done on configuration directories. This is recommended if one partition has # a very bushy mailbox tree. # #hashimapspool: false # Maximum size (in kilobytes) any sieve script can be, enforced at # submission by timsieved(8). # #sieve_maxscriptsize: 32 # Maximum number of sieve scripts any user may have, enforced at # submission by timsieved(8). # #sieve_maxscripts: 5 # Maximum SSF (security strength factor) that the server will allow a # client to negotiate. # #sasl_maximum_layer: 256 # The minimum SSF that the server will allow a client to negotiate. A # value of 1 requires integrity protection; any higher value requires # some amount of encryption. # #sasl_minimum_layer: 0 # The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop", "saslauthd", and "pwcheck" +# values include "auxprop" or "saslauthd" # -sasl_pwcheck_method: saslauthd +sasl_pwcheck_method: auxprop # If enabled, the SASL library will automatically create authentication # secrets when given a plaintext password. See the SASL documentation. # #sasl_auto_transition: no # Whitespace separated list of mechanisms to allow (e.g. 'plain otp'). # Used to restrict the mechanisms to a subset of the installed # plugins. The default is all available. # #sasl_mech_list: cram-md5 digest-md5 # Location of the opiekeys file # #sasl_opiekeys: /etc/opiekeys # File containing the global certificate used for ALL services (imap, # pop3, lmtp). # #tls_cert_file: # File containing the private key belonging to the global server # certificate. # #tls_key_file: # File containing the certificate used for imap ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for imap. # #imap_tls_cert_file: # File containing the private key belonging to the imap-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for imap. # #imap_tls_key_file: # File containing the certificate used for pop3 ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for pop3. # #pop3_tls_cert_file: # File containing the private key belonging to the pop3-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for pop3. # #pop3_tls_key_file: # File containing the certificate used for lmtp ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for lmtp. # #lmtp_tls_cert_file: # File containing the private key belonging to the lmtp-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for lmtp. # #lmtp_tls_key_file: # File containing the certificate used for sieve ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for sieve. # #sieve_tls_cert_file: # File containing the private key belonging to the sieve-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for sieve. # #sieve_tls_key_file: # File containing one or more Certificate Authority (CA) certificates. # #tls_ca_file: # Path to directory with certificates of CAs. # #tls_ca_path: # The length of time (in minutes) that a TLS session will be cached # for later reuse. The maximum value is 1440 (24 hours), the default. # A value of 0 will disable session caching. # #tls_session_timeout: 1440 # The right that a user needs to delete a mailbox. # #deleteright: c # Unix domain socket that lmtpd listens on, used by deliver(8). # #lmtpsocket: /var/imap/socket/lmtp # Unix domain socket that idled listens on. # #idlesocket: /var/imap/socket/idle # Unix domain socket that the new mail notification daemon listens on. # #notifysocket: /var/imap/socket/notify # # EOF Property changes on: head/mail/cyrus-imapd22/files/imapd.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd22/pkg-deinstall =================================================================== --- head/mail/cyrus-imapd22/pkg-deinstall (revision 81846) +++ head/mail/cyrus-imapd22/pkg-deinstall (revision 81847) @@ -1,73 +1,60 @@ #!/bin/sh # # $FreeBSD$ # # Created by: hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same rm $1 ;; 1) # config file exists and differs ;; *) # no config file exists ;; esac } -# Uninstall timseived's Cyrus.conf file. - -cyrus_conf() { - if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - fi -} - # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw if [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome=/nonexistent if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } case $2 in DEINSTALL) cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf ;; POST-DEINSTALL) modify_cyrus_user ;; esac Property changes on: head/mail/cyrus-imapd22/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd22/pkg-install =================================================================== --- head/mail/cyrus-imapd22/pkg-install (revision 81846) +++ head/mail/cyrus-imapd22/pkg-install (revision 81847) @@ -1,72 +1,63 @@ #!/bin/sh #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw shell=/bin/csh uhome=${PKG_PREFIX}/cyrus if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same ;; 1) # config file exists and differs echo "** Make sure $1 is in sync with this version"; echo " of the port. See $1.dist for details."; ;; *) # no config file exists, copy it install -c -m 644 $1.dist $1 ;; esac } -# Install timseived's Cyrus.conf file - -cyrus_conf() { - if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi -} - case $2 in PRE-INSTALL) ;; POST-INSTALL) modify_cyrus_user cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf if grep 'sieve' /etc/services; then echo else echo echo "** Please add an entry for the sieve protocol (2000/tcp)" echo " to /etc/services" echo fi ;; esac Property changes on: head/mail/cyrus-imapd22/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/mail/cyrus-imapd23/Makefile =================================================================== --- head/mail/cyrus-imapd23/Makefile (revision 81846) +++ head/mail/cyrus-imapd23/Makefile (revision 81847) @@ -1,224 +1,223 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd PORTVERSION= 2.2.0.a #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} DISTNAME= ${PORTNAME}-2.2.0-ALPHA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2 +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .endif .if defined(WITH_NNTP) CONFIGURE_ARGS+=--enable-nntp PLIST_SUB+= NNTP="" .else PLIST_SUB+= NNTP="@comment " .endif .if defined(WITH_MURDER) CONFIGURE_ARGS+=--enable-murder CFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} PLIST_SUB+= MURDER="" .else PLIST_SUB+= MURDER="@comment " .endif .if defined(WITH_FULLDIRHASH) CONFIGURE_ARGS+=--enable-fulldirhash .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .endif .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif .if defined(WITH_DRAC) EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch \ ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4 USE_AUTOCONF= YES CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .endif CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 MAN3= imclient.3 MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 deliver.8 \ expirenews.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \ rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8 DOCS= altnamespace anoncvs bugs changes faq feedback index \ install install-admin-mb install-auth install-compile \ install-configure install-murder install-netnews \ install-perf install-prereq install-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" .if !defined(WITH_OPENSSL_BASE) CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO} ""; \ ${ECHO} "It seems you have installed newer db than db3. If"; \ ${ECHO} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO} "specify same version by WITH_BDB_VER. For"; \ ${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO} ""; \ fi .endif post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif .if defined(WITH_DRAC) pre-configure: cd ${WRKSRC} && ${AUTOHEADER} .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor .for file in cyrusv2.mc murder.png netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${PREFIX}/cyrus/bin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${PREFIX}/cyrus/bin/masssievec @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/cyrus-imapd23/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.80 \ No newline at end of property +1.81 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/imapd.conf =================================================================== --- head/mail/cyrus-imapd23/files/imapd.conf (revision 81846) +++ head/mail/cyrus-imapd23/files/imapd.conf (revision 81847) @@ -1,379 +1,379 @@ # # $FreeBSD$ # # Sample configurations file for Cyrus IMAPd # Most lines in this file are commented; in this case the default is used. # The commented lines (usually) contain the default value # The pathname of the IMAP configuration directory # configdirectory: /var/imap # The partition name used by default for new mailboxes # #defaultpartition: default # The directory for the different partitions # partition-default: /var/spool/imap # Use the UNIX separator character '/' for delimiting levels of # mailbox hierarchy. The default is to use the netnews separator # character '.'. #unixhierarchysep: no # Use the alternate IMAP namespace, where personal folders reside at # the same level in the hierarchy as INBOX. # #altnamespace: no # If using the alternate IMAP namespace, the prefix for the other # users namespace. The hierarchy delimiter will be automatically # appended. # #userprefix: Other Users # If using the alternate IMAP namespace, the prefix for the shared # namespace. The hierarchy delimiter will be automatically appended. # #sharedprefix: Shared Folders # The umask value used by various Cyrus IMAP programs # #umask: 077 # This is the hostname visible in the greeting messages of the POP, # IMAP and LMTP daemons. If it is unset, then the result returned from # gethostname(2) is used. # #servername: # Whether to allow anonymous logins # #allowanonymouslogin: no # Allow the use of the SASL PLAIN mechanism. # #allowplaintext: yes # The percent of quota utilization over which the server generates # warnings. # #quotawarn: 90 # The length of the IMAP server's inactivity autologout timer, in minutes. # The minimum value is 30, the default. # #timeout: 30 # The interval (in seconds) for polling the mailbox for changes while # running the IDLE command. This option is used when idled can not be # contacted or when polling is used exclusively. The minimum value is # 1. A value of 0 will disable polling (and disable IDLE if polling # is the only method available). # #imapidlepoll: 60 # If enabled, the server responds to an ID command with a parameter # list containing: version, vendor, support-url, os, os-version, # command, arguments, environment. Otherwise the server returns NIL. # #imapidresponse: yes # Set the length of the POP server's inactivity autologout timer, in # minutes. The minimum value is 10, the default. # #poptimeout: 10 # Set the minimum amount of time the server forces users to wait between # successive POP logins, in minutes. The default is 0. # #popminpoll: 0 # The number of days advertised as being the minimum a message may be # left on the POP server before it is deleted (via the CAPA command, # defined in the POP3 Extension Mechanism, which some clients may # support). "NEVER", the default, may be specified with a negative # number. The Cyrus POP3 server never deletes mail, no matter what # the value of this parameter is. However, if a site implements a # less liberal policy, it needs to change this parameter accordingly. # #popexpiretime: 0 # The list of userids with administrative rights. Separate each userid # with a space. We recommend that administrator userids be separate from # standard userids. Sites using Kerberos authentication may use separate # "admin" instances. # #admins: # A list of users and groups that are allowed to proxy for other # users, seperated by spaces. Any user listed in this will be allowed # to login for any other user: use with caution. # #proxyservers: # The Access Control List (ACL) placed on a newly-created (non-user) # mailbox that does not have a parent mailbox. # #defaultacl: anyone lrs # The pathname of the news spool directory. Only used if the partition-news # configuration option is set. # #newsspool: # Prefix to be prepended to newsgroup names to make the corresponding IMAP # mailbox names. # #newsprefix: # If nonzero, normal users may create their own IMAP accounts by creating # the mailbox INBOX. The user's quota is set to the value if it is positive, # otherwise the user has unlimited quota. # #autocreatequota: 0 # Include notations in the protocol telemetry logs indicating the number # of seconds since the last command or response. # #logtimestamps: no # Number of seconds to pause after a successful plaintext login. For systems # that support strong authentication, this permits users to perceive a cost # of using plaintext passwords. # #plaintextloginpause: 0 # The pathname of srvtab file containing the server's private key. # This option is passed to the SASL library and overrides its default # setting. # #srvtab: /etc/srvtab # The list of remote realms whose users may log in using cross-realm # authentications. Seperate each realm name by a space. This option is # only used when the server is compiled with Kerberos authentication. # #loginrealms: # If enabled, any authentication identity which has a rights on a user's # INBOX may log in as that user. This option is only used when the server # is compiled with Kerberos authentication. # #loginuseacl: no # If enabled, lmtpd attempts to only write one copy of a message per # partition and create hard links, resulting in a potentially large # disk savings. # #singleinstancestore: yes # If enabled, lmtpd will suppress delivery of a message to a mailbox # if a message with the same message-id (or resent-message-id) is # recorded as having already been delivered to the mailbox. Records # the mailbox and message-id/resent-message-id of all successful # deliveries. # Note that duplicate delivery suppression is required for Sieve. # Disabling duplicate delivery suppression will also disable Sieve, # and as such should only be disabled for performance reasons. # #duplicatesuppression: yes # If enabled, lmtpd rejects messages with 8-bit characters in the # headers. Otherwise, 8-bit characters are changed to `X'. (A proper # soultion to non-ASCII characters in headers is offered by RFC 2047 # and its predecessors.) # #reject8bit: no # Maximum incoming LMTP message size. If set, lmtpd will reject # messages larger than maxmessagesize bytes. The default is to allow # messages of any size. # #maxmessagesize: # Userid used to deliver messages to shared folders. For example, if # set to "bb", email sent to "bb+shared.blah" would be delivered to # the "shared.blah" folder. By default, an email address of # "+shared.blah" would be used. #postuser: # If enabled at compile time, this specifies a URL to reply when # Netscape asks the server where the mail administration HTTP server # is. The default is a site at CMU with a hopefully informative # message; administrators should set this to a local resource with # some information of greater use. # #netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html # Notifyd(8) method to use for "MAIL" notifications. If not set, # "MAIL" notifications are disabled. # #mailnotifier: # Notifyd(8) method to use for "SIEVE" notifications. If not set, # "SIEVE" notifications are disabled. # # This method is only used when no method is specified in the script. # #sievenotifier: # If enabled, lmtpd will look for Sieve scripts in user's home # directories: ~user/.sieve. # sieveusehomedir: false # If sieveusehomedir is false, this directory is searched for Sieve scripts. # The active Sieve script is s called "default", placed in the users sieve # sieve directory (ie. /var/imap/sieve/u/user). # sievedir: /var/imap/sieve # The pathname of the sendmail executable. Sieve uses sendmail for # sending rejections, redirects and vaca- tion responses. # #sendmail: /usr/sbin/sendmail # Username that is used as the 'From' address in rejection MDNs # produced by sieve. # #postmaster: postmaster # If enabled, the partitions will also be hashed, in addition to the hashing # done on configuration directories. This is recommended if one partition has # a very bushy mailbox tree. # #hashimapspool: false # Maximum size (in kilobytes) any sieve script can be, enforced at # submission by timsieved(8). # #sieve_maxscriptsize: 32 # Maximum number of sieve scripts any user may have, enforced at # submission by timsieved(8). # #sieve_maxscripts: 5 # Maximum SSF (security strength factor) that the server will allow a # client to negotiate. # #sasl_maximum_layer: 256 # The minimum SSF that the server will allow a client to negotiate. A # value of 1 requires integrity protection; any higher value requires # some amount of encryption. # #sasl_minimum_layer: 0 # The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop", "saslauthd", and "pwcheck" +# values include "auxprop" or "saslauthd" # -sasl_pwcheck_method: saslauthd +sasl_pwcheck_method: auxprop # If enabled, the SASL library will automatically create authentication # secrets when given a plaintext password. See the SASL documentation. # #sasl_auto_transition: no # Whitespace separated list of mechanisms to allow (e.g. 'plain otp'). # Used to restrict the mechanisms to a subset of the installed # plugins. The default is all available. # #sasl_mech_list: cram-md5 digest-md5 # Location of the opiekeys file # #sasl_opiekeys: /etc/opiekeys # File containing the global certificate used for ALL services (imap, # pop3, lmtp). # #tls_cert_file: # File containing the private key belonging to the global server # certificate. # #tls_key_file: # File containing the certificate used for imap ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for imap. # #imap_tls_cert_file: # File containing the private key belonging to the imap-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for imap. # #imap_tls_key_file: # File containing the certificate used for pop3 ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for pop3. # #pop3_tls_cert_file: # File containing the private key belonging to the pop3-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for pop3. # #pop3_tls_key_file: # File containing the certificate used for lmtp ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for lmtp. # #lmtp_tls_cert_file: # File containing the private key belonging to the lmtp-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for lmtp. # #lmtp_tls_key_file: # File containing the certificate used for sieve ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for sieve. # #sieve_tls_cert_file: # File containing the private key belonging to the sieve-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for sieve. # #sieve_tls_key_file: # File containing one or more Certificate Authority (CA) certificates. # #tls_ca_file: # Path to directory with certificates of CAs. # #tls_ca_path: # The length of time (in minutes) that a TLS session will be cached # for later reuse. The maximum value is 1440 (24 hours), the default. # A value of 0 will disable session caching. # #tls_session_timeout: 1440 # The right that a user needs to delete a mailbox. # #deleteright: c # Unix domain socket that lmtpd listens on, used by deliver(8). # #lmtpsocket: /var/imap/socket/lmtp # Unix domain socket that idled listens on. # #idlesocket: /var/imap/socket/idle # Unix domain socket that the new mail notification daemon listens on. # #notifysocket: /var/imap/socket/notify # # EOF Property changes on: head/mail/cyrus-imapd23/files/imapd.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd23/pkg-deinstall =================================================================== --- head/mail/cyrus-imapd23/pkg-deinstall (revision 81846) +++ head/mail/cyrus-imapd23/pkg-deinstall (revision 81847) @@ -1,73 +1,60 @@ #!/bin/sh # # $FreeBSD$ # # Created by: hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same rm $1 ;; 1) # config file exists and differs ;; *) # no config file exists ;; esac } -# Uninstall timseived's Cyrus.conf file. - -cyrus_conf() { - if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - fi -} - # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw if [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome=/nonexistent if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } case $2 in DEINSTALL) cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf ;; POST-DEINSTALL) modify_cyrus_user ;; esac Property changes on: head/mail/cyrus-imapd23/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd23/pkg-install =================================================================== --- head/mail/cyrus-imapd23/pkg-install (revision 81846) +++ head/mail/cyrus-imapd23/pkg-install (revision 81847) @@ -1,72 +1,63 @@ #!/bin/sh #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw shell=/bin/csh uhome=${PKG_PREFIX}/cyrus if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same ;; 1) # config file exists and differs echo "** Make sure $1 is in sync with this version"; echo " of the port. See $1.dist for details."; ;; *) # no config file exists, copy it install -c -m 644 $1.dist $1 ;; esac } -# Install timseived's Cyrus.conf file - -cyrus_conf() { - if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi -} - case $2 in PRE-INSTALL) ;; POST-INSTALL) modify_cyrus_user cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf if grep 'sieve' /etc/services; then echo else echo echo "** Please add an entry for the sieve protocol (2000/tcp)" echo " to /etc/services" echo fi ;; esac Property changes on: head/mail/cyrus-imapd23/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/mail/cyrus-imapd24/Makefile =================================================================== --- head/mail/cyrus-imapd24/Makefile (revision 81846) +++ head/mail/cyrus-imapd24/Makefile (revision 81847) @@ -1,224 +1,223 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd PORTVERSION= 2.2.0.a #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} DISTNAME= ${PORTNAME}-2.2.0-ALPHA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2 +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .endif .if defined(WITH_NNTP) CONFIGURE_ARGS+=--enable-nntp PLIST_SUB+= NNTP="" .else PLIST_SUB+= NNTP="@comment " .endif .if defined(WITH_MURDER) CONFIGURE_ARGS+=--enable-murder CFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} PLIST_SUB+= MURDER="" .else PLIST_SUB+= MURDER="@comment " .endif .if defined(WITH_FULLDIRHASH) CONFIGURE_ARGS+=--enable-fulldirhash .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .endif .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif .if defined(WITH_DRAC) EXTRA_PATCHES+= ${FILESDIR}/drac_auth.patch \ ${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4 USE_AUTOCONF= YES CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .endif CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 MAN3= imclient.3 MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 deliver.8 \ expirenews.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \ rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8 DOCS= altnamespace anoncvs bugs changes faq feedback index \ install install-admin-mb install-auth install-compile \ install-configure install-murder install-netnews \ install-perf install-prereq install-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" .if !defined(WITH_OPENSSL_BASE) CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO} ""; \ ${ECHO} "It seems you have installed newer db than db3. If"; \ ${ECHO} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO} "specify same version by WITH_BDB_VER. For"; \ ${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO} ""; \ fi .endif post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif .if defined(WITH_DRAC) pre-configure: cd ${WRKSRC} && ${AUTOHEADER} .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor .for file in cyrusv2.mc murder.png netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${PREFIX}/cyrus/bin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${PREFIX}/cyrus/bin/masssievec @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/cyrus-imapd24/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.80 \ No newline at end of property +1.81 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/imapd.conf =================================================================== --- head/mail/cyrus-imapd24/files/imapd.conf (revision 81846) +++ head/mail/cyrus-imapd24/files/imapd.conf (revision 81847) @@ -1,379 +1,379 @@ # # $FreeBSD$ # # Sample configurations file for Cyrus IMAPd # Most lines in this file are commented; in this case the default is used. # The commented lines (usually) contain the default value # The pathname of the IMAP configuration directory # configdirectory: /var/imap # The partition name used by default for new mailboxes # #defaultpartition: default # The directory for the different partitions # partition-default: /var/spool/imap # Use the UNIX separator character '/' for delimiting levels of # mailbox hierarchy. The default is to use the netnews separator # character '.'. #unixhierarchysep: no # Use the alternate IMAP namespace, where personal folders reside at # the same level in the hierarchy as INBOX. # #altnamespace: no # If using the alternate IMAP namespace, the prefix for the other # users namespace. The hierarchy delimiter will be automatically # appended. # #userprefix: Other Users # If using the alternate IMAP namespace, the prefix for the shared # namespace. The hierarchy delimiter will be automatically appended. # #sharedprefix: Shared Folders # The umask value used by various Cyrus IMAP programs # #umask: 077 # This is the hostname visible in the greeting messages of the POP, # IMAP and LMTP daemons. If it is unset, then the result returned from # gethostname(2) is used. # #servername: # Whether to allow anonymous logins # #allowanonymouslogin: no # Allow the use of the SASL PLAIN mechanism. # #allowplaintext: yes # The percent of quota utilization over which the server generates # warnings. # #quotawarn: 90 # The length of the IMAP server's inactivity autologout timer, in minutes. # The minimum value is 30, the default. # #timeout: 30 # The interval (in seconds) for polling the mailbox for changes while # running the IDLE command. This option is used when idled can not be # contacted or when polling is used exclusively. The minimum value is # 1. A value of 0 will disable polling (and disable IDLE if polling # is the only method available). # #imapidlepoll: 60 # If enabled, the server responds to an ID command with a parameter # list containing: version, vendor, support-url, os, os-version, # command, arguments, environment. Otherwise the server returns NIL. # #imapidresponse: yes # Set the length of the POP server's inactivity autologout timer, in # minutes. The minimum value is 10, the default. # #poptimeout: 10 # Set the minimum amount of time the server forces users to wait between # successive POP logins, in minutes. The default is 0. # #popminpoll: 0 # The number of days advertised as being the minimum a message may be # left on the POP server before it is deleted (via the CAPA command, # defined in the POP3 Extension Mechanism, which some clients may # support). "NEVER", the default, may be specified with a negative # number. The Cyrus POP3 server never deletes mail, no matter what # the value of this parameter is. However, if a site implements a # less liberal policy, it needs to change this parameter accordingly. # #popexpiretime: 0 # The list of userids with administrative rights. Separate each userid # with a space. We recommend that administrator userids be separate from # standard userids. Sites using Kerberos authentication may use separate # "admin" instances. # #admins: # A list of users and groups that are allowed to proxy for other # users, seperated by spaces. Any user listed in this will be allowed # to login for any other user: use with caution. # #proxyservers: # The Access Control List (ACL) placed on a newly-created (non-user) # mailbox that does not have a parent mailbox. # #defaultacl: anyone lrs # The pathname of the news spool directory. Only used if the partition-news # configuration option is set. # #newsspool: # Prefix to be prepended to newsgroup names to make the corresponding IMAP # mailbox names. # #newsprefix: # If nonzero, normal users may create their own IMAP accounts by creating # the mailbox INBOX. The user's quota is set to the value if it is positive, # otherwise the user has unlimited quota. # #autocreatequota: 0 # Include notations in the protocol telemetry logs indicating the number # of seconds since the last command or response. # #logtimestamps: no # Number of seconds to pause after a successful plaintext login. For systems # that support strong authentication, this permits users to perceive a cost # of using plaintext passwords. # #plaintextloginpause: 0 # The pathname of srvtab file containing the server's private key. # This option is passed to the SASL library and overrides its default # setting. # #srvtab: /etc/srvtab # The list of remote realms whose users may log in using cross-realm # authentications. Seperate each realm name by a space. This option is # only used when the server is compiled with Kerberos authentication. # #loginrealms: # If enabled, any authentication identity which has a rights on a user's # INBOX may log in as that user. This option is only used when the server # is compiled with Kerberos authentication. # #loginuseacl: no # If enabled, lmtpd attempts to only write one copy of a message per # partition and create hard links, resulting in a potentially large # disk savings. # #singleinstancestore: yes # If enabled, lmtpd will suppress delivery of a message to a mailbox # if a message with the same message-id (or resent-message-id) is # recorded as having already been delivered to the mailbox. Records # the mailbox and message-id/resent-message-id of all successful # deliveries. # Note that duplicate delivery suppression is required for Sieve. # Disabling duplicate delivery suppression will also disable Sieve, # and as such should only be disabled for performance reasons. # #duplicatesuppression: yes # If enabled, lmtpd rejects messages with 8-bit characters in the # headers. Otherwise, 8-bit characters are changed to `X'. (A proper # soultion to non-ASCII characters in headers is offered by RFC 2047 # and its predecessors.) # #reject8bit: no # Maximum incoming LMTP message size. If set, lmtpd will reject # messages larger than maxmessagesize bytes. The default is to allow # messages of any size. # #maxmessagesize: # Userid used to deliver messages to shared folders. For example, if # set to "bb", email sent to "bb+shared.blah" would be delivered to # the "shared.blah" folder. By default, an email address of # "+shared.blah" would be used. #postuser: # If enabled at compile time, this specifies a URL to reply when # Netscape asks the server where the mail administration HTTP server # is. The default is a site at CMU with a hopefully informative # message; administrators should set this to a local resource with # some information of greater use. # #netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html # Notifyd(8) method to use for "MAIL" notifications. If not set, # "MAIL" notifications are disabled. # #mailnotifier: # Notifyd(8) method to use for "SIEVE" notifications. If not set, # "SIEVE" notifications are disabled. # # This method is only used when no method is specified in the script. # #sievenotifier: # If enabled, lmtpd will look for Sieve scripts in user's home # directories: ~user/.sieve. # sieveusehomedir: false # If sieveusehomedir is false, this directory is searched for Sieve scripts. # The active Sieve script is s called "default", placed in the users sieve # sieve directory (ie. /var/imap/sieve/u/user). # sievedir: /var/imap/sieve # The pathname of the sendmail executable. Sieve uses sendmail for # sending rejections, redirects and vaca- tion responses. # #sendmail: /usr/sbin/sendmail # Username that is used as the 'From' address in rejection MDNs # produced by sieve. # #postmaster: postmaster # If enabled, the partitions will also be hashed, in addition to the hashing # done on configuration directories. This is recommended if one partition has # a very bushy mailbox tree. # #hashimapspool: false # Maximum size (in kilobytes) any sieve script can be, enforced at # submission by timsieved(8). # #sieve_maxscriptsize: 32 # Maximum number of sieve scripts any user may have, enforced at # submission by timsieved(8). # #sieve_maxscripts: 5 # Maximum SSF (security strength factor) that the server will allow a # client to negotiate. # #sasl_maximum_layer: 256 # The minimum SSF that the server will allow a client to negotiate. A # value of 1 requires integrity protection; any higher value requires # some amount of encryption. # #sasl_minimum_layer: 0 # The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop", "saslauthd", and "pwcheck" +# values include "auxprop" or "saslauthd" # -sasl_pwcheck_method: saslauthd +sasl_pwcheck_method: auxprop # If enabled, the SASL library will automatically create authentication # secrets when given a plaintext password. See the SASL documentation. # #sasl_auto_transition: no # Whitespace separated list of mechanisms to allow (e.g. 'plain otp'). # Used to restrict the mechanisms to a subset of the installed # plugins. The default is all available. # #sasl_mech_list: cram-md5 digest-md5 # Location of the opiekeys file # #sasl_opiekeys: /etc/opiekeys # File containing the global certificate used for ALL services (imap, # pop3, lmtp). # #tls_cert_file: # File containing the private key belonging to the global server # certificate. # #tls_key_file: # File containing the certificate used for imap ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for imap. # #imap_tls_cert_file: # File containing the private key belonging to the imap-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for imap. # #imap_tls_key_file: # File containing the certificate used for pop3 ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable SSL/TLS for pop3. # #pop3_tls_cert_file: # File containing the private key belonging to the pop3-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable SSL/TLS for pop3. # #pop3_tls_key_file: # File containing the certificate used for lmtp ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for lmtp. # #lmtp_tls_cert_file: # File containing the private key belonging to the lmtp-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for lmtp. # #lmtp_tls_key_file: # File containing the certificate used for sieve ONLY. If not # specified, the global certificate is used. A value of "disabled" # will disable TLS for sieve. # #sieve_tls_cert_file: # File containing the private key belonging to the sieve-specific # server certificate. If not specified, the global private key is # used. A value of "disabled" will disable TLS for sieve. # #sieve_tls_key_file: # File containing one or more Certificate Authority (CA) certificates. # #tls_ca_file: # Path to directory with certificates of CAs. # #tls_ca_path: # The length of time (in minutes) that a TLS session will be cached # for later reuse. The maximum value is 1440 (24 hours), the default. # A value of 0 will disable session caching. # #tls_session_timeout: 1440 # The right that a user needs to delete a mailbox. # #deleteright: c # Unix domain socket that lmtpd listens on, used by deliver(8). # #lmtpsocket: /var/imap/socket/lmtp # Unix domain socket that idled listens on. # #idlesocket: /var/imap/socket/idle # Unix domain socket that the new mail notification daemon listens on. # #notifysocket: /var/imap/socket/notify # # EOF Property changes on: head/mail/cyrus-imapd24/files/imapd.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd24/pkg-deinstall =================================================================== --- head/mail/cyrus-imapd24/pkg-deinstall (revision 81846) +++ head/mail/cyrus-imapd24/pkg-deinstall (revision 81847) @@ -1,73 +1,60 @@ #!/bin/sh # # $FreeBSD$ # # Created by: hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same rm $1 ;; 1) # config file exists and differs ;; *) # no config file exists ;; esac } -# Uninstall timseived's Cyrus.conf file. - -cyrus_conf() { - if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi - rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp - fi -} - # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw if [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome=/nonexistent if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } case $2 in DEINSTALL) cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf ;; POST-DEINSTALL) modify_cyrus_user ;; esac Property changes on: head/mail/cyrus-imapd24/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd24/pkg-install =================================================================== --- head/mail/cyrus-imapd24/pkg-install (revision 81846) +++ head/mail/cyrus-imapd24/pkg-install (revision 81847) @@ -1,72 +1,63 @@ #!/bin/sh #set -vx PKG_BATCH=${BATCH:=NO} PKG_PREFIX=${PKG_PREFIX:=/usr/local} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} # # Modify the 'cyrus' user created from the cyrus-sasl port # modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw shell=/bin/csh uhome=${PKG_PREFIX}/cyrus if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." } checkfile() { diff -bBqw $1 $1.dist >/dev/null 2>&1 case $? in 0) # config file exists, but is the same ;; 1) # config file exists and differs echo "** Make sure $1 is in sync with this version"; echo " of the port. See $1.dist for details."; ;; *) # no config file exists, copy it install -c -m 644 $1.dist $1 ;; esac } -# Install timseived's Cyrus.conf file - -cyrus_conf() { - if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then - echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf - fi -} - case $2 in PRE-INSTALL) ;; POST-INSTALL) modify_cyrus_user cd ${PKG_PREFIX} - cyrus_conf checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf if grep 'sieve' /etc/services; then echo else echo echo "** Please add an entry for the sieve protocol (2000/tcp)" echo " to /etc/services" echo fi ;; esac Property changes on: head/mail/cyrus-imapd24/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property