diff options
| author | nia <nia@pkgsrc.org> | 2020-05-14 16:58:41 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-05-14 16:58:41 +0000 |
| commit | e362c58daa8ca81ebf33c2fc70e27293ba38f94a (patch) | |
| tree | 62c2966e1bae95949b8a4a4d9fd84e771152c2c3 /mail | |
| parent | 13d60161076398539fef77f98130ab9df2694208 (diff) | |
| download | pkgsrc-e362c58daa8ca81ebf33c2fc70e27293ba38f94a.tar.gz | |
Remove old cyrus-imapds that no longer build with pkgsrc OpenSSL
Diffstat (limited to 'mail')
53 files changed, 1 insertions, 2183 deletions
diff --git a/mail/Makefile b/mail/Makefile index eade8f5a691..2dc81690675 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.549 2020/04/30 09:11:34 wiz Exp $ +# $NetBSD: Makefile,v 1.550 2020/05/14 16:58:41 nia Exp $ # COMMENT= Electronic mail utilities @@ -53,8 +53,6 @@ SUBDIR+= courier-mta SUBDIR+= courier-unicode SUBDIR+= cucipop SUBDIR+= cue -SUBDIR+= cyrus-imapd -SUBDIR+= cyrus-imapd23 SUBDIR+= cyrus-imapd24 SUBDIR+= dbmail SUBDIR+= dcc diff --git a/mail/cyrus-imapd/DEINSTALL b/mail/cyrus-imapd/DEINSTALL deleted file mode 100644 index 3c275cc0a14..00000000000 --- a/mail/cyrus-imapd/DEINSTALL +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.4 2005/03/02 21:42:48 wiz Exp $ - -IMAPDCONF=@IMAPDCONF@ - -case ${STAGE} in -DEINSTALL) - if [ -f ${IMAPDCONF} ]; then - IMAPDIRS=` - ${AWK} '/configdirectory:/ { print $2 }; \ - /partition-.*:/ { print $2 }; \ - /sievedir:/ { print $2 }' \ - ${IMAPDCONF} | ${SORT} -ur` - _IMAPDIRS= - for dir in ${IMAPDIRS}; do - ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE} - if [ -d ${dir} ]; then - _IMAPDIRS="${_IMAPDIRS} ${dir}" - fi - done - if [ -n "${_IMAPDIRS}" ]; then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove -the following directories: - -EOF - for dir in ${_IMAPDIRS}; do - if [ -d "${dir}" ]; then - ${ECHO} " ${dir}" - fi - done - ${CAT} << EOF -=========================================================================== -EOF - fi - fi - ;; -esac diff --git a/mail/cyrus-imapd/DESCR b/mail/cyrus-imapd/DESCR deleted file mode 100644 index e742d558a95..00000000000 --- a/mail/cyrus-imapd/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -IMAP (Internet Message Access Protocol) is an Internet standards-track -protocol for accessing messages (mail, bboards, news, etc). The Cyrus -IMAP server differs from other IMAP server implementations in that it -is generally intended to be run on "sealed" servers, where normal users -are not permitted to log in. The mailbox database is stored in parts of -the filesystem that are private to the Cyrus IMAP system. All user -access to mail is through the IMAP, POP3, or KPOP protocols. diff --git a/mail/cyrus-imapd/MESSAGE b/mail/cyrus-imapd/MESSAGE deleted file mode 100644 index 4536075fb96..00000000000 --- a/mail/cyrus-imapd/MESSAGE +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.3 2005/03/02 21:42:48 wiz Exp $ - -Please refer to: - - ${PREFIX}/share/doc/html/cyrus-imapd/install.html - -for more detailed instructions on setting up the environment before -starting the Cyrus IMAP server. In particular, several services may -need to be added to /etc/services. - -Anyone upgrading from an earlier version of the Cyrus IMAP server should -read: - - ${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html - -=========================================================================== diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile deleted file mode 100644 index b7a115a6576..00000000000 --- a/mail/cyrus-imapd/Makefile +++ /dev/null @@ -1,202 +0,0 @@ -# $NetBSD: Makefile,v 1.115 2020/04/24 11:23:07 nia Exp $ - -DISTNAME= cyrus-imapd-2.2.13p1 -PKGREVISION= 20 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ -MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.cyrusimap.org/ -COMMENT= Cyrus IMAP server - -BROKEN= "Fails to build with OpenSSL 1.1" - -MAKE_JOBS_SAFE= no - -USE_TOOLS+= perl -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -PERL5_CONFIGURE= no -BDB_ACCEPTED= db3 db4 db5 - -.include "../../mk/bsd.prefs.mk" - -# CYRUS_USER username of the Cyrus administrator -# CYRUS_GROUP group of the Cyrus administrator -# -CYRUS_USER?= cyrus -CYRUS_GROUP?= mail - -PKG_GROUPS_VARS+= CYRUS_GROUP -PKG_USERS_VARS+= CYRUS_USER -FILES_SUBST+= CYRUS_USER=${CYRUS_USER} -FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP} - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} -CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} -CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus -CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} -CONFIGURE_ARGS+= --with-perl=${PERL5:Q} -CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes - -CONFIGURE_ARGS+= --enable-listext -CONFIGURE_ARGS+= --enable-murder -CONFIGURE_ARGS+= --enable-nntp -CONFIGURE_ARGS+= --without-zephyr -CONFIGURE_ARGS+= --without-ucdsnmp - -CONFIGURE_ARGS+= andrew_runpath_switch=${COMPILER_RPATH_FLAG} - -LDFLAGS.SunOS+= -lsocket - -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd -PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 ldap -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -.if !empty(PKG_OPTIONS:Mkerberos4) -. if exists(/usr/include/kerberosIV/krb.h) -CONFIGURE_ARGS+= --with-krb=/usr -. endif -.elif !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} -GSSIMPL.heimdal= heimdal -GSSIMPL.mit-krb5= mit -CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et -.else -CONFIGURE_ARGS+= --without-krb -CONFIGURE_ARGS+= --disable-gssapi -CHECK_BUILTIN.heimdal:= yes -. include "../../security/heimdal/builtin.mk" -CHECK_BUILTIN.heimdal:= no -CHECK_BUILTIN.mit-krb5:= yes -. include "../../security/mit-krb5/builtin.mk" -CHECK_BUILTIN.mit-krb5:= no -. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \ - !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \ - exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) -CPPFLAGS+= -I/usr/include/krb5 -CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et -. elif ${OPSYS} != "Linux" && \ - exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h) -CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et -. else -CONFIGURE_ARGS+= --with-com-err=yes -. endif -.endif - -PLIST_VARS+= ldap -.if !empty(PKG_OPTIONS:Mldap) -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} -PLIST.ldap= yes -. include "../../databases/openldap-client/buildlink3.mk" -.endif - -# CYRUS_IDLE selects the method used to implement IMAP IDLE. Valid values -# are "poll", "idled" or "no". The default is "poll". -# -CYRUS_IDLE?= poll -BUILD_DEFS+= CYRUS_IDLE -PLIST_VARS+= idled -.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \ - (${CYRUS_IDLE} != "no") -PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no" -.endif -CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q} -.if ${CYRUS_IDLE} == "idled" -PLIST.idled= yes -.endif - -MAKE_ENV+= PERL=${PERL5:Q} - -HTMLDIR= ${PREFIX}/share/doc/cyrus-imapd -EGDIR= ${PREFIX}/share/examples/cyrus-imapd -CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf -CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf -RCD_SCRIPTS= cyrus -FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf - -# Fix path to /bin/sh that was replaced by Perl's MakeMaker to -# point to the shell in the tools directory. -# -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 - -.include "../../lang/perl5/module.mk" -.include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../security/tcp_wrappers/buildlink3.mk" -.include "../../mk/bdb.buildlink3.mk" - -CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE} - -# Only imap/mupdate needs to be build with pthreads support, so selectively -# enable it via patches for just that one program. -# -.include "../../mk/pthread.buildlink3.mk" - -# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid -# manpage conflicts with other packages. Also change references to -# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf". -# -post-patch: - cd ${WRKSRC}/man; \ - set -- deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8 \ - nntpd 8 notifyd 8 pop3d 8 quota 8; \ - while [ $$# -gt 0 ]; do \ - man=$$1.$$2; \ - for file in Makefile.in *.[0-9]; do \ - ${SED} -e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \ - -e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \ - $$file > $$file.fixed; \ - ${MV} -f $$file.fixed $$file; \ - done; \ - if [ -f $$man ]; then \ - ${MV} $$man cyrus-$$man; \ - fi; \ - shift 2; \ - done - ${FIND} ${WRKSRC} -type f -print | \ - ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \ - while read file; do \ - ${SED} -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ - -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ - $$file > $$file.fixed; \ - ${MV} -f $$file.fixed $$file; \ - done - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR} - cd ${WRKSRC}/master/conf; for file in *.conf; do \ - ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}; \ - done - ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR} - cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \ - ${INSTALL_DATA} $$file ${DESTDIR}${HTMLDIR}; \ - done - -.include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST deleted file mode 100644 index 540a7e3a2fb..00000000000 --- a/mail/cyrus-imapd/PLIST +++ /dev/null @@ -1,165 +0,0 @@ -@comment $NetBSD: PLIST,v 1.14 2019/10/12 20:07:40 rillig Exp $ -bin/imtest -bin/installsieve -bin/lmtptest -bin/mupdatetest -bin/nntptest -bin/pop3test -bin/sieveshell -bin/sivtest -bin/smtptest -cyrus/bin/arbitron -cyrus/bin/chk_cyrus -cyrus/bin/ctl_cyrusdb -cyrus/bin/ctl_deliver -cyrus/bin/ctl_mboxlist -cyrus/bin/cvt_cyrusdb -cyrus/bin/cyr_expire -cyrus/bin/cyrdump -cyrus/bin/deliver -cyrus/bin/fetchnews -cyrus/bin/fud -${PLIST.idled}cyrus/bin/idled -cyrus/bin/imapd -cyrus/bin/ipurge -cyrus/bin/lmtpd -cyrus/bin/lmtpproxyd -cyrus/bin/masssievec -cyrus/bin/master -cyrus/bin/mbexamine -cyrus/bin/mbpath -cyrus/bin/mkimap -cyrus/bin/mknewsgroups -cyrus/bin/mupdate -cyrus/bin/nntpd -cyrus/bin/notifyd -cyrus/bin/pop3d -cyrus/bin/pop3proxyd -cyrus/bin/proxyd -${PLIST.ldap}cyrus/bin/ptdump -${PLIST.ldap}cyrus/bin/ptexpire -${PLIST.ldap}cyrus/bin/ptloader -cyrus/bin/quota -cyrus/bin/reconstruct -cyrus/bin/rehash -cyrus/bin/sievec -cyrus/bin/smmapd -cyrus/bin/squatter -cyrus/bin/timsieved -cyrus/bin/tls_prune -cyrus/bin/translatesieve -include/cyrus/acl.h -include/cyrus/assert.h -include/cyrus/auth.h -include/cyrus/bsearch.h -include/cyrus/charset.h -include/cyrus/cyrusdb.h -include/cyrus/glob.h -include/cyrus/gmtoff.h -include/cyrus/hash.h -include/cyrus/imapopts.h -include/cyrus/imapurl.h -include/cyrus/imclient.h -include/cyrus/imparse.h -include/cyrus/iptostring.h -include/cyrus/libconfig.h -include/cyrus/libcyr_cfg.h -include/cyrus/lock.h -include/cyrus/lsort.h -include/cyrus/map.h -include/cyrus/mkgmtime.h -include/cyrus/mpool.h -include/cyrus/nonblock.h -include/cyrus/parseaddr.h -include/cyrus/prot.h -include/cyrus/retry.h -include/cyrus/rfc822date.h -include/cyrus/strhash.h -include/cyrus/strhash.o -include/cyrus/stristr.h -include/cyrus/sysexits.h -include/cyrus/util.h -include/cyrus/xmalloc.h -include/cyrus/xstrlcat.h -include/cyrus/xstrlcpy.h -lib/libcyrus.a -lib/libcyrus_min.a -man/man1/imtest.1 -man/man1/installsieve.1 -man/man1/lmtptest.1 -man/man1/mupdatetest.1 -man/man1/nntptest.1 -man/man1/pop3test.1 -man/man1/sieveshell.1 -man/man1/sivtest.1 -man/man1/smtptest.1 -man/man3/imclient.3 -man/man5/cyrus.conf.5 -man/man5/imapd.conf.5 -man/man5/krb.equiv.5 -man/man8/arbitron.8 -man/man8/chk_cyrus.8 -man/man8/ctl_cyrusdb.8 -man/man8/ctl_deliver.8 -man/man8/ctl_mboxlist.8 -man/man8/cvt_cyrusdb.8 -man/man8/cyr_expire.8 -man/man8/cyrus-deliver.8 -man/man8/cyrus-fetchnews.8 -man/man8/cyrus-idled.8 -man/man8/cyrus-imapd.8 -man/man8/cyrus-lmtpd.8 -man/man8/cyrus-master.8 -man/man8/cyrus-nntpd.8 -man/man8/cyrus-notifyd.8 -man/man8/cyrus-pop3d.8 -man/man8/cyrus-quota.8 -man/man8/fud.8 -man/man8/ipurge.8 -man/man8/mbexamine.8 -man/man8/mbpath.8 -man/man8/reconstruct.8 -man/man8/rmnews.8 -man/man8/smmapd.8 -man/man8/squatter.8 -man/man8/syncnews.8 -man/man8/timsieved.8 -man/man8/tls_prune.8 -share/doc/cyrus-imapd/altnamespace.html -share/doc/cyrus-imapd/anoncvs.html -share/doc/cyrus-imapd/bugs.html -share/doc/cyrus-imapd/changes.html -share/doc/cyrus-imapd/cyrusv2.mc -share/doc/cyrus-imapd/faq.html -share/doc/cyrus-imapd/feedback.html -share/doc/cyrus-imapd/index.html -share/doc/cyrus-imapd/install-admin-mb.html -share/doc/cyrus-imapd/install-auth.html -share/doc/cyrus-imapd/install-compile.html -share/doc/cyrus-imapd/install-configure.html -share/doc/cyrus-imapd/install-murder.html -share/doc/cyrus-imapd/install-netnews.html -share/doc/cyrus-imapd/install-perf.html -share/doc/cyrus-imapd/install-prereq.html -share/doc/cyrus-imapd/install-sieve.html -share/doc/cyrus-imapd/install-snmpmon.html -share/doc/cyrus-imapd/install-testing.html -share/doc/cyrus-imapd/install-upgrade.html -share/doc/cyrus-imapd/install-virtdomains.html -share/doc/cyrus-imapd/install.html -share/doc/cyrus-imapd/mailing-list.html -share/doc/cyrus-imapd/man.html -share/doc/cyrus-imapd/notes.html -share/doc/cyrus-imapd/os.html -share/doc/cyrus-imapd/overview.html -share/doc/cyrus-imapd/questions.html -share/doc/cyrus-imapd/readme.html -share/doc/cyrus-imapd/sieve-protocol.html -share/doc/cyrus-imapd/sieve.html -share/doc/cyrus-imapd/specs.html -share/examples/cyrus-imapd/cmu-backend.conf -share/examples/cyrus-imapd/cmu-frontend.conf -share/examples/cyrus-imapd/imapd.conf -share/examples/cyrus-imapd/normal.conf -share/examples/cyrus-imapd/prefork.conf -share/examples/cyrus-imapd/small.conf diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo deleted file mode 100644 index 4d9acdb5287..00000000000 --- a/mail/cyrus-imapd/distinfo +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: distinfo,v 1.34 2015/11/03 23:27:02 agc Exp $ - -SHA1 (cyrus-imapd-2.2.13p1.tar.gz) = b9bc268c40fbb60aeb5253d61c4bfe5cffd3fb15 -RMD160 (cyrus-imapd-2.2.13p1.tar.gz) = 1604f07491d41f05563181bce46ff1b7a6e5f739 -SHA512 (cyrus-imapd-2.2.13p1.tar.gz) = 5ab8990791add961987aadf96627b8a4d733e72a5cf654da34171a7c4d95a0c3dcc3113095a287be3c1843aeec39f58c33cdfccafe1f2f2d90652f88698834c9 -Size (cyrus-imapd-2.2.13p1.tar.gz) = 2045823 bytes -SHA1 (patch-aa) = 379da5df874f3514d654d895e8b8e56a6f26c63d -SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1 -SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d -SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d -SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54 -SHA1 (patch-af) = 1a33ee4f4ce42e03a86f358dc5a99d35e7c86252 -SHA1 (patch-ag) = e51020accbd2a259a9abe27e5d220e61c9ab314e -SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c -SHA1 (patch-am) = 6e67366a0ad01cf075c23c5a32f1c9d456e1498f -SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b -SHA1 (patch-aq) = f0be966a4219db43ba51c7f25a088addb036a0c0 -SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e -SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33 -SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15 -SHA1 (patch-ca) = cc3e9cb9c56e8d51062bf9d691454ea90ce25b09 -SHA1 (patch-cb) = a8281c11f93f8f91d6c80d43ca9e20bc658d8813 -SHA1 (patch-cc) = 3ee1d64fe5f228aab4fceca3cbd45839d3659dd0 -SHA1 (patch-perl_imap_IMAP.xs) = f7d89d242719eac75327f4497c43f39753fe1eb0 diff --git a/mail/cyrus-imapd/files/cyrus.sh b/mail/cyrus-imapd/files/cyrus.sh deleted file mode 100644 index 775a8bb648a..00000000000 --- a/mail/cyrus-imapd/files/cyrus.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: cyrus.sh,v 1.3 2005/03/02 21:42:48 wiz Exp $ -# -# PROVIDE: cyrus -# REQUIRE: DAEMON -# BEFORE: mail -# -# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set -# cyrus=YES in /etc/rc.conf. - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -rcd_dir=`@DIRNAME@ $0` - -name="cyrus" -rcvar=$name -command="@PREFIX@/cyrus/bin/master" -command_args="-d" -pidfile="/var/run/cyrus-master.pid" -required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@" -extra_commands="mkimap reload" - -mkimap_cmd="cyrus_mkimap" -start_precmd="cyrus_prestart" - -cyrus_prestart() -{ - # Check to see if "configdirectory" is present before we start - # the Cyrus IMAP server. Otherwise, we run mkimap to generate - # the necessary directories. - # - if [ -f @IMAPDCONF@ ]; then - configdir=` \ - @AWK@ '/^configdirectory:/ { print $2; exit };' \ - @IMAPDCONF@ \ - ` - if [ -z "$configdir" ]; then - @ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting" - exit 1 - fi - if [ ! -d "$configdir" ]; then - $rcd_dir/cyrus mkimap - fi - fi -} - -cyrus_mkimap() -{ - # Generate the prerequisite directory structure for Cyrus IMAP. - if [ -f @IMAPDCONF@ ]; then - @AWK@ '/^configdirectory:/ { print $2 }; \ - /^partition-.*:/ { print $2 }; \ - /^sievedir:/ { print $2 }' \ - @IMAPDCONF@ | \ - while read dir; do - if [ ! -d "$dir" ]; then - @MKDIR@ "$dir" - @CHMOD@ 750 "$dir" - @CHOWN@ @CYRUS_USER@ "$dir" - @CHGRP@ @CYRUS_GROUP@ "$dir" - fi - done - @SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap" - fi -} - -if [ -f /etc/rc.subr -a -f /etc/rc.conf \ - -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - eval ${start_precmd} - ${command} ${cyrus_flags} ${command_args} -fi diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf deleted file mode 100644 index 66ca8cb4e0c..00000000000 --- a/mail/cyrus-imapd/files/imapd.conf +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: imapd.conf,v 1.5 2005/03/02 21:42:48 wiz Exp $ -# -# Cyrus IMAP server configuration file. Refer to imapd.conf(5) for -# more options. - -configdirectory: /var/imap -partition-default: /var/spool/imap -sieveusehomedir: true -hashimapspool: false - -admins: cyrus - -# Use the saslauthd daemon to verify plaintext passwords. Please ensure that -# the saslauthd daemon is running before trying to authenticate. -# -sasl_pwcheck_method: saslauthd - -# The server certificate and key files must be specified for the -# server to repond to IMAPS or POP3S requests. See imapd.conf(5) for -# a complete listing of tls_* options. -# -#tls_cert_file: /var/imap/server.pem -#tls_key_file: /var/imap/server.pem diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa deleted file mode 100644 index bdd2f9cef9f..00000000000 --- a/mail/cyrus-imapd/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2006/10/04 12:18:14 obache Exp $ - ---- tools/config2header.orig 2005-04-19 20:54:32.000000000 +0200 -+++ tools/config2header -@@ -77,6 +77,14 @@ while ($#ARGV >= 0) { - - my $use_gcc_extension = ($CC and $CC eq 'gcc'); - -+# -+# Skip any CC options such as -pipe -+# The last two parameters are the .c and .h files -+# -+while ($#ARGV > 1) { -+ shift @ARGV; -+} -+ - die "wrong number of arguments" if ($#ARGV != 1); - my ($cfile, $hfile) = @ARGV; - diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab deleted file mode 100644 index 5ac87069254..00000000000 --- a/mail/cyrus-imapd/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2005/05/21 03:31:26 rh Exp $ - ---- sieve/sievec.c.orig 2004-03-12 01:23:20.000000000 +1000 -+++ sieve/sievec.c -@@ -63,6 +63,10 @@ - #include <sys/stat.h> - #include <fcntl.h> - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - /* config.c stuff */ - const int config_need_data = 0; - diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac deleted file mode 100644 index 08272ca1995..00000000000 --- a/mail/cyrus-imapd/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2005/05/21 03:31:26 rh Exp $ - ---- sieve/sieved.c.orig 2004-06-30 06:05:32.000000000 +1000 -+++ sieve/sieved.c -@@ -42,6 +42,10 @@ OF OR IN CONNECTION WITH THE USE OR PERF - - #include "map.h" - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - void dump2(bytecode_input_t *d, int len); - int dump2_test(bytecode_input_t * d, int i); - diff --git a/mail/cyrus-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad deleted file mode 100644 index aaaa52a32b2..00000000000 --- a/mail/cyrus-imapd/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2005/05/21 06:58:03 rh Exp $ - ---- imap/message.c.orig 2004-09-17 03:58:54.000000000 +1000 -+++ imap/message.c -@@ -72,6 +72,10 @@ - #include "global.h" - #include "retry.h" - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - /* Message being parsed */ - struct msg { - const char *base; diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae deleted file mode 100644 index 02384394cec..00000000000 --- a/mail/cyrus-imapd/patches/patch-ae +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2006/10/09 12:46:01 obache Exp $ - ---- imap/backend.c.orig 2006-02-08 05:57:27.000000000 +0900 -+++ imap/backend.c -@@ -264,25 +264,28 @@ static void timed_out(int sig) - } - } - --struct backend *backend_connect(struct backend *ret, const char *server, -+struct backend *backend_connect(struct backend *ret_backend, const char *server, - struct protocol_t *prot, const char *userid, - const char **auth_status) - { - /* need to (re)establish connection to server or create one */ - int sock = -1; - int r; -- int err = 0; -+ int err = -1; - struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res; - struct sockaddr_un sunsock; - char buf[2048], *mechlist = NULL; - struct sigaction action; -+ struct backend *ret; - -- if (!ret) { -+ if (!ret_backend) { - ret = xmalloc(sizeof(struct backend)); - memset(ret, 0, sizeof(struct backend)); - strlcpy(ret->hostname, server, sizeof(ret->hostname)); - ret->timeout = NULL; - } -+ else -+ ret = ret_backend; - - if (server[0] == '/') { /* unix socket */ - res0 = &hints; -@@ -312,7 +315,7 @@ struct backend *backend_connect(struct b - if (err) { - syslog(LOG_ERR, "getaddrinfo(%s) failed: %s", - server, gai_strerror(err)); -- free(ret); -+ if (!ret_backend) free(ret); - return NULL; - } - /* Get addrinfo struct for local interface. */ -@@ -363,7 +366,7 @@ struct backend *backend_connect(struct b - if (res0 != &hints) - freeaddrinfo(res0); - syslog(LOG_ERR, "connect(%s) failed: %m", server); -- free(ret); -+ if (!ret_backend) free(ret); - return NULL; - } - memcpy(&ret->addr, res->ai_addr, res->ai_addrlen); -@@ -381,7 +384,7 @@ struct backend *backend_connect(struct b - syslog(LOG_ERR, - "backend_connect(): couldn't read initial greeting: %s", - ret->in->error ? ret->in->error : "(null)"); -- free(ret); -+ if (!ret_backend) free(ret); - close(sock); - return NULL; - } -@@ -396,13 +399,15 @@ struct backend *backend_connect(struct b - if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) { - syslog(LOG_ERR, "couldn't authenticate to backend server: %s", - sasl_errstring(r, NULL, NULL)); -- free(ret); -+ if (!ret_backend) free(ret); - close(sock); - ret = NULL; - } - } - - if (mechlist) free(mechlist); -+ -+ if (!ret_backend) ret_backend = ret; - - return ret; - } diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af deleted file mode 100644 index 5a8a873b0ff..00000000000 --- a/mail/cyrus-imapd/patches/patch-af +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-af,v 1.10 2013/02/26 11:07:52 joerg Exp $ - ---- configure.orig 2009-09-09 13:23:09.000000000 +0000 -+++ configure -@@ -3361,10 +3361,6 @@ cat >>conftest.$ac_ext <<_ACEOF - - #include <stdlib.h> - --int --main () --{ -- - static void foo(void) __attribute__ ((noreturn)); - - static void -@@ -3373,8 +3369,11 @@ foo(void) - exit(1); - } - -- ; -- return 0; -+int -+main () -+{ -+ foo(); -+ return 0; - } - _ACEOF - rm -f conftest.$ac_objext -@@ -7701,7 +7700,7 @@ if test $ac_cv_header_db_h = yes; then - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${BDB_TYPE} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -13460,7 +13459,11 @@ echo "${ECHO_T}$ac_cv_header_gssapi_gssa - - fi - if test $ac_cv_header_gssapi_gssapi_h = yes; then -- : -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GSSAPI_H -+_ACEOF -+ - else - { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5 - echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no -@@ -15337,6 +15340,7 @@ elif test "${with_perl}" != "no"; then - EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - - fi diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag deleted file mode 100644 index e9f7b21a76b..00000000000 --- a/mail/cyrus-imapd/patches/patch-ag +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2010/06/02 12:56:39 adam Exp $ - ---- lib/cyrusdb_berkeley.c.orig 2006-03-17 16:12:32.000000000 +0000 -+++ lib/cyrusdb_berkeley.c -@@ -104,7 +104,7 @@ static void db_panic(DB_ENV *dbenv __att - exit(EC_TEMPFAIL); - } - --#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) -+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - static void db_err(const DB_ENV *dbenv __attribute__((unused)), - const char *db_prfx, const char *buffer) - #else -@@ -160,7 +160,7 @@ static int init(const char *dbdir, int m - #endif - } - --#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) -+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - dbenv->set_msgcall(dbenv, db_msg); - #endif - dbenv->set_errcall(dbenv, db_err); -@@ -173,7 +173,15 @@ static int init(const char *dbdir, int m - syslog(LOG_WARNING, - "DBERROR: invalid berkeley_locks_max value, using internal default"); - } else { -+#if DB_VERSION_MAJOR >= 4 -+ r = dbenv->set_lk_max_locks(dbenv, opt); -+ if (!r) -+ r = dbenv->set_lk_max_lockers(dbenv, opt); -+ if (!r) -+ r = dbenv->set_lk_max_objects(dbenv, opt); -+#else - r = dbenv->set_lk_max(dbenv, opt); -+#endif - if (r) { - dbenv->err(dbenv, r, "set_lk_max"); - syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r)); -@@ -270,7 +278,7 @@ static int mysync(void) - - assert(dbinit); - --#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) - do { - #endif - #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0)) -@@ -278,7 +286,7 @@ static int mysync(void) - #else - r = txn_checkpoint(dbenv, 0, 0); - #endif --#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) - } while (r == DB_INCOMPLETE); /* Never returned by BDB 4.1 */ - #endif - if (r) { -@@ -393,7 +401,7 @@ static int myopen(const char *fname, DBT - } - /* xxx set comparator! */ - --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - r = db->open(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664); - #else - r = db->open(db, fname, NULL, type, dbflags, 0664); diff --git a/mail/cyrus-imapd/patches/patch-al b/mail/cyrus-imapd/patches/patch-al deleted file mode 100644 index 642918e523c..00000000000 --- a/mail/cyrus-imapd/patches/patch-al +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-al,v 1.3 2007/03/09 14:46:08 obache Exp $ - ---- imtest/imtest.c.orig 2006-01-21 05:31:23.000000000 +0900 -+++ imtest/imtest.c -@@ -47,7 +47,9 @@ - #include <sys/time.h> - #include <sys/types.h> - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - #include <sys/stat.h> - #include <fcntl.h> - -@@ -72,6 +74,10 @@ - #include <netinet/in.h> - #include <netdb.h> - -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ - #include <sasl/sasl.h> - #include <sasl/saslutil.h> - -@@ -886,6 +892,12 @@ imt_stat getauthline(struct sasl_cmd_t * - } - - if (*str != '\r') { -+ /* trim CRLF */ -+ char *p = str + strlen(str) - 1; -+ if (p >= str && *p == '\n') *p-- = '\0'; -+ if (p >= str && *p == '\r') *p-- = '\0'; -+ -+ /* alloc space for decoded response */ - len = strlen(str) + 1; - *line = malloc(len); - if ((*line) == NULL) { diff --git a/mail/cyrus-imapd/patches/patch-am b/mail/cyrus-imapd/patches/patch-am deleted file mode 100644 index 686ed697e0e..00000000000 --- a/mail/cyrus-imapd/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.3 2009/09/10 05:13:56 obache Exp $ - ---- configure.in.orig 2005-10-13 19:56:14.000000000 +0000 -+++ configure.in -@@ -939,7 +939,7 @@ dnl and compile perl/cyradm - dnl add perl cccdlflags when building libraries -- this ensures that the - dnl libraries will be compiled as PIC if perl requires PIC objects - dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris -- --dnl eval `${PERL} -V:cccdlflags` -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - AC_SUBST(PERL_CCCDLFLAGS) - fi diff --git a/mail/cyrus-imapd/patches/patch-ap b/mail/cyrus-imapd/patches/patch-ap deleted file mode 100644 index 688c004d7df..00000000000 --- a/mail/cyrus-imapd/patches/patch-ap +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2005/03/02 21:42:48 wiz Exp $ - ---- imap/Makefile.in.orig 2004-05-28 14:03:02.000000000 -0400 -+++ imap/Makefile.in -@@ -185,6 +185,9 @@ mupdate_err.c: mupdate_err.et - - mupdate_err.h: mupdate_err.c - -+mutex_pthread.o: mutex_pthread.c -+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $< -+ - ### Services - idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -@@ -241,16 +244,16 @@ proxyd.pure: $(PROXYDOBJS) mutex_fake.o - - mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ - libimap.a $(DEPLIBS) -- $(CC) $(LDFLAGS) -o mupdate \ -+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) -- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ -+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \ diff --git a/mail/cyrus-imapd/patches/patch-aq b/mail/cyrus-imapd/patches/patch-aq deleted file mode 100644 index 59e75ac339f..00000000000 --- a/mail/cyrus-imapd/patches/patch-aq +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-aq,v 1.4 2009/05/15 23:29:01 obache Exp $ - ---- imap/fetchnews.c.orig 2005-03-23 00:40:11.000000000 +0000 -+++ imap/fetchnews.c -@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) - - if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); - -- while ((opt = getopt(argc, argv, "C:s:w:f:a:p:n:y")) != EOF) { -+ while ((opt = getopt(argc, argv, "C:s:w:f:a:p:ny")) != EOF) { - switch (opt) { - case 'C': /* alt config file */ - alt_config = optarg; -@@ -371,7 +371,8 @@ int main(int argc, char *argv[]) - prot_fgets(buf, sizeof(buf), pin); - - if (newnews) { -- struct tm ctime, *ptime; -+ struct tm ctime, ptime, ltime; -+ time_t l_time, l_gmt; - - /* fetch the server's current time */ - prot_printf(pout, "DATE\r\n"); -@@ -416,8 +417,11 @@ int main(int argc, char *argv[]) - - /* ask for new articles */ - if (stamp) stamp -= 180; /* adjust back 3 minutes */ -- ptime = gmtime(&stamp); -- strftime(buf, sizeof(buf), datefmt, ptime); -+ gmtime_r(&stamp, &ptime); -+ localtime_r(&stamp, <ime); -+ l_gmt = mktime(&ptime); -+ l_time = mktime(<ime);; -+ strftime(buf, sizeof(buf), datefmt, &ptime); - prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf); - - if (!prot_fgets(buf, sizeof(buf), pin) || strncmp("230", buf, 3)) { -@@ -433,7 +437,9 @@ int main(int argc, char *argv[]) - We can't change this, otherwise we'd be incompatible - with an old localtime timestamp. - */ -- stamp -= timezone; -+ stamp += l_time - l_gmt; -+ if (ltime.tm_isdst) -+ stamp += 3600; - } - - if (!newnews) { diff --git a/mail/cyrus-imapd/patches/patch-ba b/mail/cyrus-imapd/patches/patch-ba deleted file mode 100644 index c186b7f9453..00000000000 --- a/mail/cyrus-imapd/patches/patch-ba +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2005/03/02 21:42:48 wiz Exp $ - ---- imap/mboxlist.c.orig Sun Nov 28 15:04:44 2004 -+++ imap/mboxlist.c Sun Nov 28 15:05:06 2004 -@@ -60,7 +60,9 @@ - #include <syslog.h> - - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include "acl.h" - #include "annotate.h" diff --git a/mail/cyrus-imapd/patches/patch-bb b/mail/cyrus-imapd/patches/patch-bb deleted file mode 100644 index f584833af94..00000000000 --- a/mail/cyrus-imapd/patches/patch-bb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2005/03/02 21:42:48 wiz Exp $ - ---- imap/cvt_cyrusdb.c.orig Sun Nov 28 15:09:29 2004 -+++ imap/cvt_cyrusdb.c Sun Nov 28 15:10:33 2004 -@@ -60,7 +60,9 @@ - #include <syslog.h> - - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include "acl.h" - #include "assert.h" diff --git a/mail/cyrus-imapd/patches/patch-bc b/mail/cyrus-imapd/patches/patch-bc deleted file mode 100644 index b940c725d53..00000000000 --- a/mail/cyrus-imapd/patches/patch-bc +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2005/03/02 21:42:48 wiz Exp $ - ---- perl/sieve/lib/request.c.orig Sun Nov 28 15:14:46 2004 -+++ perl/sieve/lib/request.c Sun Nov 28 15:14:47 2004 -@@ -51,7 +51,9 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include <stdlib.h> - #include <stdio.h> diff --git a/mail/cyrus-imapd/patches/patch-ca b/mail/cyrus-imapd/patches/patch-ca deleted file mode 100644 index d0706ebc169..00000000000 --- a/mail/cyrus-imapd/patches/patch-ca +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $ - ---- perl/Makefile.in.orig 2003-10-22 14:50:17.000000000 -0400 -+++ perl/Makefile.in -@@ -82,7 +82,7 @@ all:: - BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ - OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ - SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ -- $(PERL) Makefile.PL PREFIX=$(prefix); \ -+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ - fi; \ - $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ - done diff --git a/mail/cyrus-imapd/patches/patch-cb b/mail/cyrus-imapd/patches/patch-cb deleted file mode 100644 index a3b31554f1f..00000000000 --- a/mail/cyrus-imapd/patches/patch-cb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $ - ---- perl/sieve/Makefile.in.orig 2003-10-22 14:50:24.000000000 -0400 -+++ perl/sieve/Makefile.in -@@ -84,7 +84,7 @@ all:: - BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ - OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ - SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ -- $(PERL) Makefile.PL PREFIX=$(prefix); \ -+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ - fi; \ - $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ - done diff --git a/mail/cyrus-imapd/patches/patch-cc b/mail/cyrus-imapd/patches/patch-cc deleted file mode 100644 index 90f8bca9f50..00000000000 --- a/mail/cyrus-imapd/patches/patch-cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2005/11/19 11:50:56 rillig Exp $ - -The SunPro compiler does not like non-static inline functions. - ---- sieve/bc_emit.c.orig Wed Oct 22 20:03:24 2003 -+++ sieve/bc_emit.c Sat Nov 19 12:48:06 2005 -@@ -45,7 +45,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF - void dump(bytecode_info_t *d); - #endif - --inline int write_int (int fd, int x) -+static inline int write_int (int fd, int x) - { - int y=htonl(x); - return (write(fd, &y, sizeof(int))); diff --git a/mail/cyrus-imapd/patches/patch-perl_imap_IMAP.xs b/mail/cyrus-imapd/patches/patch-perl_imap_IMAP.xs deleted file mode 100644 index 2da0376c06f..00000000000 --- a/mail/cyrus-imapd/patches/patch-perl_imap_IMAP.xs +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-perl_imap_IMAP.xs,v 1.1 2011/10/15 07:17:00 obache Exp $ - -* fix compilation on perl 5.14, from cyrus-imapd-2.4 branch. - ---- perl/imap/IMAP.xs.orig 2003-11-25 21:28:23.000000000 +0000 -+++ perl/imap/IMAP.xs -@@ -122,10 +122,10 @@ void imclient_xs_cb(struct imclient *cli - SAVETMPS; - PUSHMARK(SP); - XPUSHs(sv_2mortal(newSVpv("-client", 0))); -- rv = newSVsv(&sv_undef); -+ rv = newSVsv(&PL_sv_undef); - sv_setref_pv(rv, NULL, (void *) rock->client); - XPUSHs(rv); -- if (rock->prock != &sv_undef) { -+ if (rock->prock != &PL_sv_undef) { - XPUSHs(sv_2mortal(newSVpv("-rock", 0))); - XPUSHs(sv_mortalcopy(rock->prock)); - } -@@ -389,7 +389,7 @@ CODE: - ST(0) = sv_newmortal(); - - if(client->authenticated) { -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - return; - } - -@@ -411,10 +411,10 @@ CODE: - rc = imclient_authenticate(client->imclient, mechlist, service, user, - minssf, maxssf); - if (rc) -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - else { - client->authenticated = 1; -- ST(0) = &sv_yes; -+ ST(0) = &PL_sv_yes; - } - - void -@@ -474,7 +474,7 @@ PPCODE: - (val = hv_fetch(cb, "Rock", 4, 0))) - prock = *val; - else -- prock = &sv_undef; -+ prock = &PL_sv_undef; - /* - * build our internal rock, which is used by our internal - * callback handler to invoke the Perl callback -@@ -485,7 +485,7 @@ PPCODE: - rock = (struct xsccb *) safemalloc(sizeof *rock); - /* bump refcounts on these so they don't go away */ - rock->pcb = SvREFCNT_inc(pcb); -- if (!prock) prock = &sv_undef; -+ if (!prock) prock = &PL_sv_undef; - rock->prock = SvREFCNT_inc(prock); - rock->client = client; - rock->autofree = 0; -@@ -612,9 +612,9 @@ PPCODE: - EXTEND(SP, 1); - pcb = av_shift(av); - if (strcmp(SvPV(pcb, arg), "OK") == 0) -- PUSHs(&sv_yes); -+ PUSHs(&PL_sv_yes); - else -- PUSHs(&sv_no); -+ PUSHs(&PL_sv_no); - pcb = perl_get_sv("@", TRUE); - sv_setsv(pcb, av_shift(av)); - if (av_len(av) != -1) { -@@ -647,9 +647,9 @@ PPCODE: - EXTEND(SP, 2); - PUSHs(sv_2mortal(newSViv(fd))); - if (writep) -- PUSHs(&sv_yes); -+ PUSHs(&PL_sv_yes); - else -- PUSHs(&sv_no); -+ PUSHs(&PL_sv_no); - - void - imclient_fromURL(client,url) diff --git a/mail/cyrus-imapd23/DEINSTALL b/mail/cyrus-imapd23/DEINSTALL deleted file mode 100644 index 1cc436e409a..00000000000 --- a/mail/cyrus-imapd23/DEINSTALL +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - -IMAPDCONF=@IMAPDCONF@ - -case ${STAGE} in -DEINSTALL) - if [ -f ${IMAPDCONF} ]; then - IMAPDIRS=` - ${AWK} '/configdirectory:/ { print $2 }; \ - /partition-.*:/ { print $2 }; \ - /sievedir:/ { print $2 }' \ - ${IMAPDCONF} | ${SORT} -ur` - _IMAPDIRS= - for dir in ${IMAPDIRS}; do - ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE} - if [ -d ${dir} ]; then - _IMAPDIRS="${_IMAPDIRS} ${dir}" - fi - done - if [ -n "${_IMAPDIRS}" ]; then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove -the following directories: - -EOF - for dir in ${_IMAPDIRS}; do - if [ -d "${dir}" ]; then - ${ECHO} " ${dir}" - fi - done - ${CAT} << EOF -=========================================================================== -EOF - fi - fi - ;; -esac diff --git a/mail/cyrus-imapd23/DESCR b/mail/cyrus-imapd23/DESCR deleted file mode 100644 index e742d558a95..00000000000 --- a/mail/cyrus-imapd23/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -IMAP (Internet Message Access Protocol) is an Internet standards-track -protocol for accessing messages (mail, bboards, news, etc). The Cyrus -IMAP server differs from other IMAP server implementations in that it -is generally intended to be run on "sealed" servers, where normal users -are not permitted to log in. The mailbox database is stored in parts of -the filesystem that are private to the Cyrus IMAP system. All user -access to mail is through the IMAP, POP3, or KPOP protocols. diff --git a/mail/cyrus-imapd23/MESSAGE b/mail/cyrus-imapd23/MESSAGE deleted file mode 100644 index b248f8703f2..00000000000 --- a/mail/cyrus-imapd23/MESSAGE +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2010/10/30 11:48:06 obache Exp $ - -Please refer to: - - ${PREFIX}/share/doc/cyrus-imapd/install.html - -for more detailed instructions on setting up the environment before -starting the Cyrus IMAP server. In particular, several services may -need to be added to /etc/services. - -Anyone upgrading from an earlier version of the Cyrus IMAP server should -read: - - ${PREFIX}/share/doc/cyrus-imapd/install-upgrade.html - -=========================================================================== diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile deleted file mode 100644 index 455ba42d518..00000000000 --- a/mail/cyrus-imapd23/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -# $NetBSD: Makefile,v 1.59 2020/04/24 11:23:08 nia Exp $ - -DISTNAME= cyrus-imapd-2.3.18 -PKGREVISION= 33 -CATEGORIES= mail -MASTER_SITES= http://cyrusimap.org/releases/ -MASTER_SITES+= https://www.cyrusimap.org/releases/old/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.cyrusimap.org/ -COMMENT= Cyrus IMAP server -#LICENSE= original-bsd # like license - -BROKEN= "Fails to build with OpenSSL 1.1" - -BUILD_DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 - -USE_TOOLS+= perl makedepend -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -PERL5_CONFIGURE= no - -BUILD_DEFS+= VARBASE - -CHECK_PORTABILITY_SKIP= configure.lineno - -.include "../../mk/bsd.prefs.mk" - -# CYRUS_USER username of the Cyrus administrator -# CYRUS_GROUP group of the Cyrus administrator -# -CYRUS_USER?= cyrus -CYRUS_GROUP?= mail - -BUILD_DEFS+= CYRUS_USER CYRUS_GROUP -FILES_SUBST+= CYRUS_USER=${CYRUS_USER} -FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP} - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} -CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} -CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus -CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/cyrus-master.pid -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} -CONFIGURE_ARGS+= --with-perl=${PERL5:Q} -CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes - -CONFIGURE_ARGS+= --enable-idled -CONFIGURE_ARGS+= --enable-listext -CONFIGURE_ARGS+= --enable-murder -CONFIGURE_ARGS+= --enable-nntp -CONFIGURE_ARGS+= --enable-replication - -CONFIGURE_ARGS+= andrew_cv_runpath_switch=${COMPILER_RPATH_FLAG} - -.include "options.mk" - -MAKE_ENV+= PERL=${PERL5:Q} - -HTMLDIR= ${PREFIX}/share/doc/cyrus-imapd -EGDIR= ${PREFIX}/share/examples/cyrus-imapd -CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf -CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf -RCD_SCRIPTS= cyrus -FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf - -# Fix path to /bin/sh that was replaced by Perl's MakeMaker to -# point to the shell in the tools directory. -# -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} \ - cd ${WRKSRC} && ${BUILD_MAKE_CMD} depend - -.include "../../lang/perl5/module.mk" -BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.17 -.include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../security/tcp_wrappers/buildlink3.mk" - -# Only imap/mupdate needs to be build with pthreads support, so selectively -# enable it via patches for just that one program. -# -.include "../../mk/pthread.buildlink3.mk" - -# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid -# manpage conflicts with other packages. Also change references to -# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf". -# -post-patch: - cd ${WRKSRC}/man; \ - set -- deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8 \ - nntpd 8 notifyd 8 pop3d 8 quota 8; \ - while [ $$# -gt 0 ]; do \ - man=$$1.$$2; \ - for file in Makefile.in *.[0-9]; do \ - sed -e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \ - -e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \ - $$file > $$file.fixed; \ - mv -f $$file.fixed $$file; \ - done; \ - if [ -f $$man ]; then \ - mv $$man cyrus-$$man; \ - fi; \ - shift 2; \ - done - find ${WRKSRC} -type f -print | \ - xargs -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \ - while read file; do \ - sed -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ - -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ - $${file} > $${file}.fixed; \ - mv -f $${file}.fixed $${file}; \ - done - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/migrate-metadata ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR} - cd ${WRKSRC}/master/conf; for file in *.conf; do \ - ${INSTALL_DATA} $${file} ${DESTDIR}${EGDIR}; \ - done - ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR} - cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \ - ${INSTALL_DATA} $${file} ${DESTDIR}${HTMLDIR}; \ - done - -.include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus-imapd23/PLIST b/mail/cyrus-imapd23/PLIST deleted file mode 100644 index 9d4ee689292..00000000000 --- a/mail/cyrus-imapd23/PLIST +++ /dev/null @@ -1,189 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:02 jperkin Exp $ -bin/imtest -bin/installsieve -bin/lmtptest -bin/mupdatetest -bin/nntptest -bin/pop3test -bin/sieveshell -bin/sivtest -bin/smtptest -bin/synctest -cyrus/bin/arbitron -cyrus/bin/chk_cyrus -cyrus/bin/ctl_cyrusdb -cyrus/bin/ctl_deliver -cyrus/bin/ctl_mboxlist -cyrus/bin/cvt_cyrusdb -cyrus/bin/cyr_dbtool -cyrus/bin/cyr_df -cyrus/bin/cyr_expire -cyrus/bin/cyr_synclog -cyrus/bin/cyrdump -cyrus/bin/deliver -cyrus/bin/fetchnews -cyrus/bin/fud -cyrus/bin/idled -cyrus/bin/imapd -cyrus/bin/ipurge -cyrus/bin/lmtpd -cyrus/bin/lmtpproxyd -cyrus/bin/make_md5 -cyrus/bin/make_sha1 -cyrus/bin/masssievec -cyrus/bin/master -cyrus/bin/mbexamine -cyrus/bin/mbpath -cyrus/bin/migrate-metadata -cyrus/bin/mkimap -cyrus/bin/mknewsgroups -cyrus/bin/mupdate -cyrus/bin/nntpd -cyrus/bin/notifyd -cyrus/bin/pop3d -cyrus/bin/pop3proxyd -cyrus/bin/proxyd -${PLIST.ldap}cyrus/bin/ptdump -${PLIST.ldap}cyrus/bin/ptexpire -${PLIST.ldap}cyrus/bin/ptloader -cyrus/bin/quota -cyrus/bin/reconstruct -cyrus/bin/rehash -cyrus/bin/sievec -cyrus/bin/sieved -cyrus/bin/smmapd -cyrus/bin/squatter -cyrus/bin/sync_client -cyrus/bin/sync_reset -cyrus/bin/sync_server -cyrus/bin/timsieved -cyrus/bin/tls_prune -cyrus/bin/translatesieve -cyrus/bin/unexpunge -include/cyrus/acl.h -include/cyrus/assert.h -include/cyrus/auth.h -include/cyrus/bsearch.h -include/cyrus/byteorder64.h -include/cyrus/charset.h -include/cyrus/cyrusdb.h -include/cyrus/glob.h -include/cyrus/gmtoff.h -include/cyrus/hash.h -include/cyrus/hmac-md5.h -include/cyrus/imapopts.h -include/cyrus/imapurl.h -include/cyrus/imclient.h -include/cyrus/imparse.h -include/cyrus/iptostring.h -include/cyrus/libconfig.h -include/cyrus/libcyr_cfg.h -include/cyrus/lock.h -include/cyrus/lsort.h -include/cyrus/map.h -include/cyrus/md5.h -include/cyrus/mkgmtime.h -include/cyrus/mpool.h -include/cyrus/nonblock.h -include/cyrus/parseaddr.h -include/cyrus/prot.h -include/cyrus/retry.h -include/cyrus/rfc822date.h -include/cyrus/strhash.h -include/cyrus/stristr.h -include/cyrus/sysexits.h -include/cyrus/util.h -include/cyrus/xmalloc.h -include/cyrus/xstrlcat.h -include/cyrus/xstrlcpy.h -lib/libcyrus.a -lib/libcyrus_min.a -man/man1/imtest.1 -man/man1/installsieve.1 -man/man1/lmtptest.1 -man/man1/mupdatetest.1 -man/man1/nntptest.1 -man/man1/pop3test.1 -man/man1/sieveshell.1 -man/man1/sivtest.1 -man/man1/smtptest.1 -man/man3/imclient.3 -man/man5/cyrus.conf.5 -man/man5/imapd.conf.5 -man/man5/krb.equiv.5 -man/man8/arbitron.8 -man/man8/chk_cyrus.8 -man/man8/ctl_cyrusdb.8 -man/man8/ctl_deliver.8 -man/man8/ctl_mboxlist.8 -man/man8/cvt_cyrusdb.8 -man/man8/cyr_dbtool.8 -man/man8/cyr_df.8 -man/man8/cyr_expire.8 -man/man8/cyr_synclog.8 -man/man8/cyrus-deliver.8 -man/man8/cyrus-fetchnews.8 -man/man8/cyrus-idled.8 -man/man8/cyrus-imapd.8 -man/man8/cyrus-lmtpd.8 -man/man8/cyrus-master.8 -man/man8/cyrus-nntpd.8 -man/man8/cyrus-notifyd.8 -man/man8/cyrus-pop3d.8 -man/man8/cyrus-quota.8 -man/man8/fud.8 -man/man8/ipurge.8 -man/man8/make_md5.8 -man/man8/make_sha1.8 -man/man8/mbexamine.8 -man/man8/mbpath.8 -man/man8/reconstruct.8 -man/man8/rmnews.8 -man/man8/smmapd.8 -man/man8/squatter.8 -man/man8/sync_client.8 -man/man8/sync_reset.8 -man/man8/sync_server.8 -man/man8/syncnews.8 -man/man8/timsieved.8 -man/man8/tls_prune.8 -man/man8/unexpunge.8 -share/doc/cyrus-imapd/altnamespace.html -share/doc/cyrus-imapd/anoncvs.html -share/doc/cyrus-imapd/bugs.html -share/doc/cyrus-imapd/changes.html -share/doc/cyrus-imapd/cyrusv2.mc -share/doc/cyrus-imapd/faq.html -share/doc/cyrus-imapd/feedback.html -share/doc/cyrus-imapd/index.html -share/doc/cyrus-imapd/install-admin-mb.html -share/doc/cyrus-imapd/install-auth.html -share/doc/cyrus-imapd/install-compile.html -share/doc/cyrus-imapd/install-configure.html -share/doc/cyrus-imapd/install-murder.html -share/doc/cyrus-imapd/install-netnews.html -share/doc/cyrus-imapd/install-perf.html -share/doc/cyrus-imapd/install-prereq.html -share/doc/cyrus-imapd/install-replication.html -share/doc/cyrus-imapd/install-sieve.html -share/doc/cyrus-imapd/install-snmpmon.html -share/doc/cyrus-imapd/install-testing.html -share/doc/cyrus-imapd/install-upgrade.html -share/doc/cyrus-imapd/install-virtdomains.html -share/doc/cyrus-imapd/install.html -share/doc/cyrus-imapd/mailing-list.html -share/doc/cyrus-imapd/man.html -share/doc/cyrus-imapd/notes.html -share/doc/cyrus-imapd/os.html -share/doc/cyrus-imapd/overview.html -share/doc/cyrus-imapd/questions.html -share/doc/cyrus-imapd/readme.html -share/doc/cyrus-imapd/sieve-protocol.html -share/doc/cyrus-imapd/sieve.html -share/doc/cyrus-imapd/specs.html -share/examples/cyrus-imapd/cmu-backend.conf -share/examples/cyrus-imapd/cmu-frontend.conf -share/examples/cyrus-imapd/imapd.conf -share/examples/cyrus-imapd/normal.conf -share/examples/cyrus-imapd/prefork.conf -share/examples/cyrus-imapd/small.conf diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo deleted file mode 100644 index 9d916efcb68..00000000000 --- a/mail/cyrus-imapd23/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 23:27:03 agc Exp $ - -SHA1 (cyrus-imapd-2.3.18.tar.gz) = 5051f315ffd84c9a623c6da209528d5aff39ed72 -RMD160 (cyrus-imapd-2.3.18.tar.gz) = b9d351b5c73c4e87019fb8aa0efd0a8a29ac6a40 -SHA512 (cyrus-imapd-2.3.18.tar.gz) = d4149c725b50506b83225167054d0fb6e6a2715ed0f3e0fd0abac8ee846b785dfdc0b33d2230590c171388d21aaa3e049aa37009cf4f08ae0a12c323eca91fa4 -Size (cyrus-imapd-2.3.18.tar.gz) = 2311272 bytes -SHA1 (patch-aa) = c3ab1ed39eb96b6d3bdbe298333c8488e3fb51e7 -SHA1 (patch-ab) = bec4bf47154e1d526124e0b990950d6543909847 -SHA1 (patch-ac) = 98813ae2acc48133e1992d12b495b66a157b8c0c -SHA1 (patch-ad) = b9a68c7a1ab9b36e1c9bfa6d06dbc4f13bb2c99a -SHA1 (patch-ae) = f72486e0e3cf941eabbe6da31b107e8aabecb112 -SHA1 (patch-af) = f007c8d861e003f75260f0544a24ef71f8062494 -SHA1 (patch-ag) = dd38d0c6aa45736ef142cdb4ad95f11e4c23cb03 -SHA1 (patch-ah) = 6daa97e516a5db87579dabd11a7a6f9b83366e27 -SHA1 (patch-ai) = 6cc1c87972cb0fa4b170e76869817b1de1ff7aa6 -SHA1 (patch-aj) = a2d3aba6b2bf4383740f0b1bd48cb6d4027a6d70 -SHA1 (patch-ak) = de75847f1ace85591109096fb3a33d78763cd479 -SHA1 (patch-al) = 70b17f045298492978e3756d4a211f35e90b9bb9 -SHA1 (patch-am) = d06b62f9ea153560d84ec013861839071e4ab700 -SHA1 (patch-ao) = 784363a1802cbaf08e62bbbd2020fe592be0a126 -SHA1 (patch-ap) = 4a794b806b20270e2b9b551bfae21352389e1352 -SHA1 (patch-lib_charset.c) = cf25747c17ce815aa37259a57e4e86a428086afe -SHA1 (patch-perl_imap_IMAP.xs) = 535f2187e9270ad35481869c6ee031ed915abc38 diff --git a/mail/cyrus-imapd23/files/cyrus.sh b/mail/cyrus-imapd23/files/cyrus.sh deleted file mode 100644 index e9bbb206d6e..00000000000 --- a/mail/cyrus-imapd23/files/cyrus.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: cyrus.sh,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ -# -# PROVIDE: cyrus -# REQUIRE: DAEMON -# BEFORE: mail -# -# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set -# cyrus=YES in /etc/rc.conf. - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -rcd_dir=`@DIRNAME@ $0` - -name="cyrus" -rcvar=$name -command="@PREFIX@/cyrus/bin/master" -command_args="-d" -pidfile="@VARBASE@/run/cyrus-master.pid" -required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@" -extra_commands="mkimap reload" - -mkimap_cmd="cyrus_mkimap" -start_precmd="cyrus_prestart" - -cyrus_prestart() -{ - # Check to see if "configdirectory" is present before we start - # the Cyrus IMAP server. Otherwise, we run mkimap to generate - # the necessary directories. - # - if [ -f @IMAPDCONF@ ]; then - configdir=` \ - @AWK@ '/^configdirectory:/ { print $2; exit };' \ - @IMAPDCONF@ \ - ` - if [ -z "$configdir" ]; then - @ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting" - exit 1 - fi - if [ ! -d "$configdir" ]; then - $rcd_dir/cyrus mkimap - fi - fi -} - -cyrus_mkimap() -{ - # Generate the prerequisite directory structure for Cyrus IMAP. - if [ -f @IMAPDCONF@ ]; then - @AWK@ '/^configdirectory:/ { print $2 }; \ - /^partition-.*:/ { print $2 }; \ - /^sievedir:/ { print $2 }' \ - @IMAPDCONF@ | \ - while read dir; do - if [ ! -d "$dir" ]; then - @MKDIR@ "$dir" - @CHMOD@ 750 "$dir" - @CHOWN@ @CYRUS_USER@ "$dir" - @CHGRP@ @CYRUS_GROUP@ "$dir" - fi - done - @SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap" - fi -} - -if [ -f /etc/rc.subr -a -f /etc/rc.conf \ - -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - eval ${start_precmd} - ${command} ${cyrus_flags} ${command_args} -fi diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf deleted file mode 100644 index 80d473a3be0..00000000000 --- a/mail/cyrus-imapd23/files/imapd.conf +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: imapd.conf,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ -# -# Cyrus IMAP server configuration file. Refer to imapd.conf(5) for -# more options. - -configdirectory: /var/imap -partition-default: /var/spool/imap -sieveusehomedir: false -sievedir: /var/sieve -hashimapspool: false - -admins: cyrus - -# If use the saslauthd daemon to verify plaintext passwords, please ensure that -# the saslauthd daemon is running before trying to authenticate. -# -#sasl_pwcheck_method: saslauthd -sasl_pwcheck_method: auxprop - -# The server certificate and key files must be specified for the -# server to repond to IMAPS or POP3S requests. See imapd.conf(5) for -# a complete listing of tls_* options. -# -#tls_cert_file: /var/imap/server.pem -#tls_key_file: /var/imap/server.pem diff --git a/mail/cyrus-imapd23/options.mk b/mail/cyrus-imapd23/options.mk deleted file mode 100644 index 0d07713443d..00000000000 --- a/mail/cyrus-imapd23/options.mk +++ /dev/null @@ -1,98 +0,0 @@ -# $NetBSD: options.mk,v 1.6 2015/01/08 17:01:23 joerg Exp $ -# - -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd -PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 ldap snmp -PKG_SUPPORTED_OPTIONS+= bdb mysql pgsql sqlite -PKG_SUGGESTED_OPTIONS= bdb - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= ldap - -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -.if !empty(PKG_OPTIONS:Mkerberos4) -. if exists(/usr/include/kerberosIV/krb.h) -PKG_USE_KERBEROS= yes -CONFIGURE_ARGS+= --with-krb=/usr -. endif -.elif !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} -GSSIMPL.heimdal= heimdal -GSSIMPL.mit-krb5= mit -CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et -.else -CONFIGURE_ARGS+= --without-krb -CONFIGURE_ARGS+= --disable-gssapi -CHECK_BUILTIN.heimdal:= yes -. include "../../security/heimdal/builtin.mk" -CHECK_BUILTIN.heimdal:= no -CHECK_BUILTIN.mit-krb5:= yes -. include "../../security/mit-krb5/builtin.mk" -CHECK_BUILTIN.mit-krb5:= no -. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \ - !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \ - exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) -CPPFLAGS+= -I/usr/include/krb5 -CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et -. elif ${OPSYS} != "Linux" && \ - exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h) -CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et -. else -CONFIGURE_ARGS+= --with-com-err=yes -. endif -.endif - -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} -PLIST.ldap= yes -.else -CONFIGURE_ARGS+= --without-ldap -.endif - -.if !empty(PKG_OPTIONS:Msnmp) -. include "../../net/net-snmp/buildlink3.mk" -CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} -USE_TOOLS+= perl:run -.else -CONFIGURE_ARGS+= --without-snmp -.endif - -.if !empty(PKG_OPTIONS:Mbdb) -BDB_ACCEPTED= db3 db4 db5 -. include "../../mk/bdb.buildlink3.mk" -CONFIGURE_ARGS+= --with-bdb=${BDB_TYPE} -CONFIGURE_ARGS+= --with-bdb-incdir=${BDBBASE}/include/${BDB_TYPE} -CONFIGURE_ARGS+= --with-bdb-libdir=${BDBBASE}/lib -.else -CONFIGURE_ARGS+= --without-bdb -.endif - -.if !empty(PKG_OPTIONS:Mmysql) -. include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} -.else -CONFIGURE_ARGS+= --without-mysql -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} -.else -CONFIGURE_ARGS+= --without-pgsql -.endif - -.if !empty(PKG_OPTIONS:Msqlite) -. include "../../databases/sqlite3/buildlink3.mk" -CONFIGURE_ARGS+= --with-sqlite=${BUILDLINK_PREFIX.sqlite3} -.else -CONFIGURE_ARGS+= --without-sqlite -.endif diff --git a/mail/cyrus-imapd23/patches/patch-aa b/mail/cyrus-imapd23/patches/patch-aa deleted file mode 100644 index 2c51cd4cb3f..00000000000 --- a/mail/cyrus-imapd23/patches/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2011/09/09 11:56:19 obache Exp $ - ---- configure.in.orig 2011-09-08 18:02:23.000000000 +0000 -+++ configure.in -@@ -391,11 +391,11 @@ if test "$sievedir" != "no"; then - AC_CHECK_LIB(fl,main) - - AC_CHECK_HEADERS(pcreposix.h rxposix.h) -- if test "$ac_cv_header_pcreposix_h" == "yes"; then -+ if test "$ac_cv_header_pcreposix_h" = "yes"; then - LIBS="$LIBS -lpcre -lpcreposix"; - AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) - else -- if test "$ac_cv_header_rxposix_h" == "yes"; then -+ if test "$ac_cv_header_rxposix_h" = "yes"; then - LIBS="$LIBS -lrx" - AC_DEFINE(ENABLE_REGEX, [], - [Do we have a regex library?]) -@@ -1146,7 +1146,7 @@ dnl libraries will be compiled as PIC if - dnl -- this is needed on NetBSD, FreeBSD, and Linux, but seems to - dnl cause problems on atleast Solaris -- - case "${target_os}" in -- linux*|netbsd*|freebsd*) -+ linux*|netbsd*|freebsd*|dragonfly*) - AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}") - eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" diff --git a/mail/cyrus-imapd23/patches/patch-ab b/mail/cyrus-imapd23/patches/patch-ab deleted file mode 100644 index bfe3b77b226..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2011/09/09 11:56:19 obache Exp $ - ---- configure.orig 2011-09-08 18:03:46.000000000 +0000 -+++ configure -@@ -7171,13 +7171,13 @@ fi - - done - -- if test "$ac_cv_header_pcreposix_h" == "yes"; then -+ if test "$ac_cv_header_pcreposix_h" = "yes"; then - LIBS="$LIBS -lpcre -lpcreposix"; - - $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h - - else -- if test "$ac_cv_header_rxposix_h" == "yes"; then -+ if test "$ac_cv_header_rxposix_h" = "yes"; then - LIBS="$LIBS -lrx" - - $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h -@@ -10411,7 +10411,7 @@ elif test "${with_perl}" != "no"; then - PERL_SUBDIRS="imap" - PERL="${with_perl}" - case "${target_os}" in -- linux*|netbsd*|freebsd*) -+ linux*|netbsd*|freebsd*|dragonfly*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5 - $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; } - eval `${PERL} -V:cccdlflags` diff --git a/mail/cyrus-imapd23/patches/patch-ac b/mail/cyrus-imapd23/patches/patch-ac deleted file mode 100644 index 8fe39ac7e87..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ac +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2012/06/09 06:28:58 dholland Exp $ - -- fix MAKE_JOBS issue -- fix thread handling - ---- imap/Makefile.in.orig 2011-10-04 19:59:14.000000000 +0000 -+++ imap/Makefile.in -@@ -124,7 +124,7 @@ BUILTSOURCES = imap_err.c imap_err.h pus - lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ - nntp_err.c nntp_err.h - --all: xversion $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) -+all: xversion $(BUILTSOURCES) .WAIT $(PROGS) $(SUIDPROGS) - - pure: imapd.pure lmtpd.pure mupdate.pure - -@@ -182,6 +182,9 @@ mupdate_err.c: mupdate_err.et - - mupdate_err.h: mupdate_err.c - -+mutex_pthread.o: mutex_pthread.c -+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $< -+ - ### Services - idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -@@ -216,16 +219,16 @@ imapd.quant: $(IMAPDOBJS) mutex_fake.o l - - mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ - libimap.a $(DEPLIBS) -- $(CC) $(LDFLAGS) -o mupdate \ -+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) -- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ -+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ - $(DEPLIBS) $(SERVICE) diff --git a/mail/cyrus-imapd23/patches/patch-ad b/mail/cyrus-imapd23/patches/patch-ad deleted file mode 100644 index a371434f99f..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- imap/cvt_cyrusdb.c.orig 2009-02-11 19:11:32.000000000 +0000 -+++ imap/cvt_cyrusdb.c -@@ -59,7 +59,9 @@ - #include <syslog.h> - - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include "acl.h" - #include "assert.h" diff --git a/mail/cyrus-imapd23/patches/patch-ae b/mail/cyrus-imapd23/patches/patch-ae deleted file mode 100644 index ca3486b089a..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- imap/mboxlist.c.orig 2009-11-17 03:34:30.000000000 +0000 -+++ imap/mboxlist.c -@@ -59,7 +59,9 @@ - #include <syslog.h> - - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include "acl.h" - #include "annotate.h" diff --git a/mail/cyrus-imapd23/patches/patch-af b/mail/cyrus-imapd23/patches/patch-af deleted file mode 100644 index e33c9b7acdf..00000000000 --- a/mail/cyrus-imapd23/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- imap/message.c.orig 2009-11-19 21:52:55.000000000 +0000 -+++ imap/message.c -@@ -74,6 +74,10 @@ - #include "global.h" - #include "retry.h" - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - /* Message being parsed */ - struct msg { - const char *base; diff --git a/mail/cyrus-imapd23/patches/patch-ag b/mail/cyrus-imapd23/patches/patch-ag deleted file mode 100644 index 4a4746da625..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- imtest/imtest.c.orig 2009-09-24 13:35:05.000000000 +0000 -+++ imtest/imtest.c -@@ -49,7 +49,9 @@ - #include <sys/time.h> - #include <sys/types.h> - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - #include <sys/stat.h> - #include <fcntl.h> - -@@ -74,6 +76,10 @@ - #include <netinet/in.h> - #include <netdb.h> - -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ - #include <sasl/sasl.h> - #include <sasl/saslutil.h> - diff --git a/mail/cyrus-imapd23/patches/patch-ah b/mail/cyrus-imapd23/patches/patch-ah deleted file mode 100644 index a3b621d06c5..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- perl/Makefile.in.orig 2009-05-06 13:48:04.000000000 +0000 -+++ perl/Makefile.in -@@ -86,7 +86,7 @@ all:: - BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ - OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ - SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ -- $(PERL) Makefile.PL PREFIX=$(prefix); \ -+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ - fi; \ - $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ - done diff --git a/mail/cyrus-imapd23/patches/patch-ai b/mail/cyrus-imapd23/patches/patch-ai deleted file mode 100644 index 321375e72e9..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- perl/sieve/Makefile.in.orig 2009-05-06 13:48:04.000000000 +0000 -+++ perl/sieve/Makefile.in -@@ -86,7 +86,7 @@ all:: - BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ - OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ - SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ -- $(PERL) Makefile.PL PREFIX=$(prefix); \ -+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ - fi; \ - $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ - done diff --git a/mail/cyrus-imapd23/patches/patch-aj b/mail/cyrus-imapd23/patches/patch-aj deleted file mode 100644 index 950a5dbdcf6..00000000000 --- a/mail/cyrus-imapd23/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- perl/sieve/lib/request.c.orig 2008-04-04 12:47:21.000000000 +0000 -+++ perl/sieve/lib/request.c -@@ -52,7 +52,9 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <sys/ipc.h> -+#if !defined(__APPLE__) - #include <sys/msg.h> -+#endif - - #include <stdlib.h> - #include <stdio.h> diff --git a/mail/cyrus-imapd23/patches/patch-ak b/mail/cyrus-imapd23/patches/patch-ak deleted file mode 100644 index ae9f31012c7..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- sieve/sievec.c.orig 2009-03-25 23:58:04.000000000 +0000 -+++ sieve/sievec.c -@@ -63,6 +63,10 @@ - #include <sys/stat.h> - #include <fcntl.h> - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - /* config.c stuff */ - const int config_need_data = 0; - diff --git a/mail/cyrus-imapd23/patches/patch-al b/mail/cyrus-imapd23/patches/patch-al deleted file mode 100644 index 30b6b82c12f..00000000000 --- a/mail/cyrus-imapd23/patches/patch-al +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- sieve/sieved.c.orig 2009-03-25 23:58:05.000000000 +0000 -+++ sieve/sieved.c -@@ -63,6 +63,10 @@ - - #include "map.h" - -+#ifdef __APPLE__ -+struct et_list *_et_list = NULL; -+#endif -+ - /* config.c stuff */ - const int config_need_data = 0; - diff --git a/mail/cyrus-imapd23/patches/patch-am b/mail/cyrus-imapd23/patches/patch-am deleted file mode 100644 index 299976bb357..00000000000 --- a/mail/cyrus-imapd23/patches/patch-am +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- tools/config2header.orig 2009-12-02 22:50:29.000000000 +0000 -+++ tools/config2header -@@ -79,6 +79,14 @@ while ($#ARGV >= 0) { - - my $use_gcc_extension = ($CC and $CC eq 'gcc'); - -+# -+# Skip any CC options such as -pipe -+# The last two parameters are the .c and .h files -+# -+while ($#ARGV > 1) { -+ shift @ARGV; -+} -+ - die "wrong number of arguments" if ($#ARGV != 1); - my ($cfile, $hfile) = @ARGV; - diff --git a/mail/cyrus-imapd23/patches/patch-ao b/mail/cyrus-imapd23/patches/patch-ao deleted file mode 100644 index fa2053d032f..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $ - ---- imap/imap_err.et.orig 2009-12-02 02:09:43.000000000 +0000 -+++ imap/imap_err.et -@@ -198,10 +198,10 @@ ec IMAP_NO_MSGGONE, - "Message %d no longer exists" - - ec IMAP_NO_CHECKSEEN, -- "Unable to checkpoint \\Seen state" -+ "Unable to checkpoint \\\\Seen state" - - ec IMAP_NO_CHECKPRESERVE, -- "Unable to preserve \\Seen state" -+ "Unable to preserve \\\\Seen state" - - ec IMAP_NO_NOSUCHMSG, - "No matching messages" diff --git a/mail/cyrus-imapd23/patches/patch-ap b/mail/cyrus-imapd23/patches/patch-ap deleted file mode 100644 index 199d84a277c..00000000000 --- a/mail/cyrus-imapd23/patches/patch-ap +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2010/06/03 06:55:54 obache Exp $ - -Fix building with db5. - ---- lib/cyrusdb_berkeley.c.orig 2009-03-10 02:56:22.000000000 +0000 -+++ lib/cyrusdb_berkeley.c -@@ -108,7 +108,7 @@ static void db_panic(DB_ENV *dbenv __att - exit(EC_TEMPFAIL); - } - --#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) - static void db_err(const DB_ENV *dbenv __attribute__((unused)), - const char *db_prfx, const char *buffer) - #else -@@ -164,7 +164,7 @@ static int init(const char *dbdir, int m - #endif - } - --#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)) - dbenv->set_msgcall(dbenv, db_msg); - #endif - dbenv->set_errcall(dbenv, db_err); -@@ -282,7 +282,7 @@ static int mysync(void) - - assert(dbinit); - --#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+#if !((DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))) - do { - #endif - #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0)) -@@ -290,7 +290,7 @@ static int mysync(void) - #else - r = txn_checkpoint(dbenv, 0, 0); - #endif --#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+#if !((DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) - } while (r == DB_INCOMPLETE); /* Never returned by BDB 4.1 */ - #endif - if (r) { -@@ -413,7 +413,7 @@ static int myopen(const char *fname, DBT - /* xxx set comparator! */ - if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar); - --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - r = (db->open)(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664); - #else - r = (db->open)(db, fname, NULL, type, dbflags, 0664); diff --git a/mail/cyrus-imapd23/patches/patch-lib_charset.c b/mail/cyrus-imapd23/patches/patch-lib_charset.c deleted file mode 100644 index ae1fd5d492b..00000000000 --- a/mail/cyrus-imapd23/patches/patch-lib_charset.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_charset.c,v 1.1 2012/11/23 12:35:57 joerg Exp $ - ---- lib/charset.c.orig 2012-11-21 16:19:54.000000000 +0000 -+++ lib/charset.c -@@ -861,7 +861,7 @@ void mimeheader_cat(struct convert_rock - int len; - char *res; - -- if (!s) return 0; -+ if (!s) return; - - /* set up the conversion path */ - input = table_init(0, target); diff --git a/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs b/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs deleted file mode 100644 index 3a62e22c9d3..00000000000 --- a/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-perl_imap_IMAP.xs,v 1.1 2011/09/09 11:56:19 obache Exp $ - -* fix compilation on perl 5.14, from cyrus-imapd-2.4 branch. - ---- perl/imap/IMAP.xs.orig 2011-09-08 18:02:23.000000000 +0000 -+++ perl/imap/IMAP.xs -@@ -124,10 +124,10 @@ void imclient_xs_cb(struct imclient *cli - SAVETMPS; - PUSHMARK(SP); - XPUSHs(sv_2mortal(newSVpv("-client", 0))); -- rv = newSVsv(&sv_undef); -+ rv = newSVsv(&PL_sv_undef); - sv_setref_pv(rv, NULL, (void *) rock->client); - XPUSHs(rv); -- if (rock->prock != &sv_undef) { -+ if (rock->prock != &PL_sv_undef) { - XPUSHs(sv_2mortal(newSVpv("-rock", 0))); - XPUSHs(sv_mortalcopy(rock->prock)); - } -@@ -392,7 +392,7 @@ CODE: - ST(0) = sv_newmortal(); - - if(client->authenticated) { -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - return; - } - -@@ -414,10 +414,10 @@ CODE: - rc = imclient_authenticate(client->imclient, mechlist, service, user, - minssf, maxssf); - if (rc) -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - else { - client->authenticated = 1; -- ST(0) = &sv_yes; -+ ST(0) = &PL_sv_yes; - } - - int -@@ -449,12 +449,12 @@ CODE: - #ifdef HAVE_SSL - rc = imclient_starttls(client->imclient, tls_cert_file, tls_key_file, CAfile, CApath); - if (rc) -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - else { -- ST(0) = &sv_yes; -+ ST(0) = &PL_sv_yes; - } - #else -- ST(0) = &sv_no; -+ ST(0) = &PL_sv_no; - #endif /* HAVE_SSL */ - - void -@@ -514,7 +514,7 @@ PPCODE: - (val = hv_fetch(cb, "Rock", 4, 0))) - prock = *val; - else -- prock = &sv_undef; -+ prock = &PL_sv_undef; - /* - * build our internal rock, which is used by our internal - * callback handler to invoke the Perl callback -@@ -525,7 +525,7 @@ PPCODE: - rock = (struct xsccb *) safemalloc(sizeof *rock); - /* bump refcounts on these so they don't go away */ - rock->pcb = SvREFCNT_inc(pcb); -- if (!prock) prock = &sv_undef; -+ if (!prock) prock = &PL_sv_undef; - rock->prock = SvREFCNT_inc(prock); - rock->client = client; - rock->autofree = 0; -@@ -652,9 +652,9 @@ PPCODE: - EXTEND(SP, 1); - pcb = av_shift(av); - if (strcmp(SvPV(pcb, arg), "OK") == 0) -- PUSHs(&sv_yes); -+ PUSHs(&PL_sv_yes); - else -- PUSHs(&sv_no); -+ PUSHs(&PL_sv_no); - pcb = perl_get_sv("@", TRUE); - sv_setsv(pcb, av_shift(av)); - if (av_len(av) != -1) { -@@ -687,9 +687,9 @@ PPCODE: - EXTEND(SP, 2); - PUSHs(sv_2mortal(newSViv(fd))); - if (writep) -- PUSHs(&sv_yes); -+ PUSHs(&PL_sv_yes); - else -- PUSHs(&sv_no); -+ PUSHs(&PL_sv_no); - - void - imclient_fromURL(client,url) |