diff options
Diffstat (limited to 'mail/cyrus-imapd24/files')
19 files changed, 0 insertions, 860 deletions
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 deleted file mode 100644 index 7670fddd294c..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 +++ /dev/null @@ -1,31 +0,0 @@ -Index: aclocal.m4 -diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Thu Jan 15 23:36:46 2004 -+++ aclocal.m4 Sat Jan 17 22:58:54 2004 -@@ -505,7 +505,7 @@ - BDB_LIBADD="" - fi - -- for dbname in 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 ${with_bdb} 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 - AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; - dblib="berkeley"; break, dblib="no") -@@ -547,7 +547,7 @@ - dnl Note that FreeBSD puts it in a wierd place - dnl (but they should use with-bdb-incdir) - AC_CHECK_HEADER(db.h, -- CYRUS_BERKELEY_DB_CHK_LIB(), -+ BDB_LIBADD="$BDB_LIBADD -l$with_bdb"; dblib="berkeley", - dblib="no") - - CPPFLAGS=$cmu_save_CPPFLAGS -@@ -1786,7 +1786,7 @@ - LIB_UCDSNMP="" - if test "$with_ucdsnmp" != no; then - AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?]) -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - AC_CHECK_LIB(rpm, rpmdbOpen, - LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) - fi diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in deleted file mode 100644 index 974d0c83fddb..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-configure.in +++ /dev/null @@ -1,21 +0,0 @@ -Index: configure.in -diff -u configure.in.orig configure.in ---- configure.in.orig Wed Jan 7 07:08:07 2004 -+++ configure.in Sun Mar 7 23:53:03 2004 -@@ -925,6 +925,8 @@ - dnl and compile perl/cyradm - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` -+ PERL_CCCDLFLAGS="$cccdlflags" - fi - - dnl for timsieved -@@ -999,6 +1001,7 @@ - AC_SUBST(PERL_SUBDIRS) - AC_SUBST(PERL_DEPSUBDIRS) - AC_SUBST(PERL) -+AC_SUBST(PERL_CCCDLFLAGS) - - AH_TOP([ - /* $Id: configure.in,v 1.277 2004/01/06 22:08:07 rjs3 Exp $ */ diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf deleted file mode 100644 index 0f3d9ab916a4..000000000000 --- a/mail/cyrus-imapd24/files/imapd.conf +++ /dev/null @@ -1,415 +0,0 @@ -# -# $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: <result returned by gethostname(2)> - -# Whether to allow anonymous logins -# -#allowanonymouslogin: no - -# Allow the use of cleartext passwords on the wire. -# -#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: <none> - -# 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: <none> - -# 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: <no default> - -# Prefix to be prepended to newsgroup names to make the corresponding IMAP -# mailbox names. -# -#newsprefix: <none> - -# 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: <none> - -# 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: <unlimited> - -# 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: <none> - -# 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: <no default> - -# 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: <no default> - -# 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 - -# The cyrusdb backend to use for mailbox annotations. -# Allowed values: berkeley, skiplist -# -#annotation_db: skiplist - -# The cyrusdb backend to use for the duplicate delivery suppression -# and sieve. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#duplicate_db: berkeley-nosync - -# The cyrusdb backend to use for the mailbox list. -# Allowed values: flat, berkeley, skiplist -# -#mboxlist_db: skiplist - -# The cyrusdb backend to use for the pts cache. -# Allowed values: berkeley, skiplist -# -#ptscache_db: berkeley - -# The cyrusdb backend to use for the seen state. -# Allowed values: flat, berkeley, skiplist -# -#seenstate_db: skiplist - -# The cyrusdb backend to use for the subscriptions list. -# Allowed values: flat, berkeley, skiplist -# -#subscription_db: flat - -# The cyrusdb backend to use for the TLS cache. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#tlscache_db: berkeley-nosync - -# 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" or "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: <none> - -# File containing the private key belonging to the global server -# certificate. -# -#tls_key_file: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# 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: <none> - -# File containing one or more Certificate Authority (CA) certificates. -# -#tls_ca_file: <none> - -# Path to directory with certificates of CAs. -# -#tls_ca_path: <none> - -# 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 diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd24/files/imapd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in deleted file mode 100644 index 318dfe1d4710..000000000000 --- a/mail/cyrus-imapd24/files/patch-Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -Index: Makefile.in -diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Tue Jan 13 06:02:09 2004 -+++ Makefile.in Sat Apr 3 00:04:36 2004 -@@ -90,13 +90,13 @@ - touch distcvs - - install:: -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8 -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib -+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5 -+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 - @for d in $(SUBDIRS); \ - do \ - (cd $$d; echo "### Making" install "in" `pwd`; \ diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa deleted file mode 100644 index 7a285d51115f..000000000000 --- a/mail/cyrus-imapd24/files/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -Index: man/Makefile.in -diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Sat Nov 8 06:33:54 2003 -+++ man/Makefile.in Fri Apr 2 23:50:30 2004 -@@ -102,7 +102,7 @@ - done - for file in $(MAN8); \ - do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \ -+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ - done - - .c.o: diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac deleted file mode 100644 index a557cd828ee1..000000000000 --- a/mail/cyrus-imapd24/files/patch-ac +++ /dev/null @@ -1,62 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig Thu Jan 15 23:36:50 2004 -+++ configure Sun Mar 7 23:46:32 2004 -@@ -308,7 +308,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -6565,7 +6565,7 @@ - BDB_LIBADD="" - fi - -- for dbname in 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 ${with_bdb} 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 - as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` - echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -6589,11 +6589,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char db_create (); -+#include <db.h> - int - main () - { --db_create (); -+db_create (0, 0, 0); - ; - return 0; - } -@@ -13187,6 +13187,8 @@ - EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` -+ PERL_CCCDLFLAGS="$cccdlflags" - fi - - if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ - #define HAVE_UCDSNMP 1 - _ACEOF - -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 - echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 - if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -14660,6 +14662,7 @@ - s,@LIB_SASL@,$LIB_SASL,;t t - s,@SASLFLAGS@,$SASLFLAGS,;t t - s,@PERL@,$PERL,;t t -+s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t - s,@MD5OBJ@,$MD5OBJ,;t t - s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t - s,@LIB_WRAP@,$LIB_WRAP,;t t diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc deleted file mode 100644 index df4b302b3098..000000000000 --- a/mail/cyrus-imapd24/files/patch-bc +++ /dev/null @@ -1,33 +0,0 @@ -Index: imap/Makefile.in -diff -u imap/Makefile.in.orig imap/Makefile.in ---- imap/Makefile.in.orig Wed Nov 12 13:02:01 2003 -+++ imap/Makefile.in Thu Mar 11 01:16:00 2004 -@@ -132,10 +132,10 @@ - - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd - -@@ -242,13 +242,13 @@ - $(CC) $(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 \ - $(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-imapd24/files/patch-df b/mail/cyrus-imapd24/files/patch-df deleted file mode 100644 index 69a0841343ee..000000000000 --- a/mail/cyrus-imapd24/files/patch-df +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service.c -diff -u master/service.c.orig master/service.c ---- master/service.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service.c Wed Jan 22 22:57:20 2003 -@@ -102,6 +102,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd24/files/patch-dg b/mail/cyrus-imapd24/files/patch-dg deleted file mode 100644 index 5c54d21287d8..000000000000 --- a/mail/cyrus-imapd24/files/patch-dg +++ /dev/null @@ -1,37 +0,0 @@ -Index: tools/mkimap -diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Mon Mar 10 03:39:36 2003 -+++ tools/mkimap Fri Mar 21 17:24:10 2003 -@@ -61,6 +61,9 @@ - - $imapdconf = shift || "/etc/imapd.conf"; - -+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%"; -+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%"; -+ - open CONF, $imapdconf or die "can't open $imapdconf"; - print "reading configure file...\n"; - while (<CONF>) { -@@ -86,6 +89,7 @@ - - print "configuring $d...\n"; - -+mkdir $d, 0755; - chdir $d or die "couldn't change to $d"; - - mkdir "proc", 0755; -@@ -95,11 +99,14 @@ - mkdir "msg", 0755; - mkdir "ptclient", 0755; - -+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; -+ - while ($part = shift @parts) { - print "creating $part...\n"; - mkdir $part, 0755; - chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755; -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; - } - - print "done\n"; diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c deleted file mode 100644 index e1fd1efa8c06..000000000000 --- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c +++ /dev/null @@ -1,23 +0,0 @@ -Index: imtest/imtest.c -diff -u imtest/imtest.c.orig imtest/imtest.c ---- imtest/imtest.c.orig Sun Jul 13 05:10:56 2003 -+++ imtest/imtest.c Fri Jul 18 00:52:29 2003 -@@ -51,6 +51,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -419,8 +420,8 @@ - } - - --char *var_tls_CAfile=""; --char *var_tls_CApath=""; -+static char *var_tls_CAfile=""; -+static char *var_tls_CApath=""; - /* - * This is the setup routine for the SSL client. - * diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in deleted file mode 100644 index 4a6c7f6db522..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun Jan 4 00:16:44 2004 -+++ lib/Makefile.in Thu Mar 11 01:35:47 2004 -@@ -60,7 +60,7 @@ - CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ - LIBS = @LIBS@ - --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ - LDFLAGS = @LDFLAGS@ - - SHELL = /bin/sh -@@ -100,7 +100,7 @@ - all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a - - install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(exec_prefix)/lib -+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(exec_prefix)/lib - $(RANLIB) $(DESTDIR)$(exec_prefix)/lib/libcyrus.a diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions deleted file mode 100644 index c46c80a342a0..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::imapoptions +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/imapoptions -diff -u lib/imapoptions.orig lib/imapoptions ---- lib/imapoptions.orig Thu Mar 20 04:00:39 2003 -+++ lib/imapoptions Fri Mar 21 15:27:44 2003 -@@ -454,7 +454,7 @@ - /* The mechanism used by the server to verify plaintext passwords. - Possible values include "auxprop", "saslauthd", and "pwcheck". */ - --{ "sendmail", "/usr/lib/sendmail", STRING } -+{ "sendmail", "/usr/sbin/sendmail", STRING } - /* The pathname of the sendmail executable. Sieve invokes sendmail - for sending rejections, redirects and vacation responses. */ - -@@ -475,7 +475,7 @@ - /* Maximum number of sieve scripts any user may have, enforced at - submission by timsieved(8). */ - --{ "sievedir", "/usr/sieve", STRING } -+{ "sievedir", "/var/imap/sieve", STRING } - /* If sieveusehomedir is false, this directory is searched for Sieve - scripts. */ - diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in deleted file mode 100644 index 5b421718655a..000000000000 --- a/mail/cyrus-imapd24/files/patch-master::Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Wed Nov 12 13:02:03 2003 -+++ master/Makefile.in Thu Mar 11 01:18:52 2004 -@@ -75,10 +75,10 @@ - all: $(PROGS) $(LOBJS) - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - - .c.o: diff --git a/mail/cyrus-imapd24/files/patch-master::service-thread.c b/mail/cyrus-imapd24/files/patch-master::service-thread.c deleted file mode 100644 index 9a2016c3c64a..000000000000 --- a/mail/cyrus-imapd24/files/patch-master::service-thread.c +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service-thread.c -diff -u master/service-thread.c.orig master/service-thread.c ---- master/service-thread.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service-thread.c Wed Jan 22 23:09:52 2003 -@@ -99,6 +99,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in deleted file mode 100644 index d49703fa25b4..000000000000 --- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: notifyd/Makefile.in -diff -u notifyd/Makefile.in.orig notifyd/Makefile.in ---- notifyd/Makefile.in.orig Wed Nov 12 13:02:10 2003 -+++ notifyd/Makefile.in Fri Feb 13 18:41:07 2004 -@@ -79,7 +79,7 @@ - all: notifyd - - install: -- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path) - - OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o - diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in deleted file mode 100644 index 28d4c44df294..000000000000 --- a/mail/cyrus-imapd24/files/patch-perl::sieve::lib::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: perl/sieve/lib/Makefile.in -diff -u perl/sieve/lib/Makefile.in.orig perl/sieve/lib/Makefile.in ---- perl/sieve/lib/Makefile.in.orig Sun Jan 4 00:16:45 2004 -+++ perl/sieve/lib/Makefile.in Sun Mar 7 23:42:37 2004 -@@ -55,7 +55,7 @@ - IMAP_LIBS = @IMAP_LIBS@ - DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@ - --CFLAGS = -g -+CFLAGS = -g @PERL_CCCDLFLAGS@ - LDFLAGS = -g @LDFLAGS@ - - SHELL = /bin/sh diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in deleted file mode 100644 index 3af248bab22b..000000000000 --- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ -Index: sieve/Makefile.in -diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 -+++ sieve/Makefile.in Thu Mar 11 01:22:05 2004 -@@ -33,12 +33,13 @@ - YACC = @YACC@ - YFLAGS = -d - LEX = @LEX@ -+INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - COMPILE_ET = @COMPILE_ET@ - - DEFS = @DEFS@ - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ - LDFLAGS = @LDFLAGS@ - - MAKEDEPEND = @MAKEDEPEND@ -@@ -58,8 +59,8 @@ - dist: $(BUILT_SOURCES) - - install: sievec -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit -+ $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -m 755 sievec $(DESTDIR)$(service_path) || exit - - test: $(DEPLIBS) libsieve.a test.o - $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in deleted file mode 100644 index 4e0bc2841c2c..000000000000 --- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: timsieved/Makefile.in -diff -u timsieved/Makefile.in.orig timsieved/Makefile.in ---- timsieved/Makefile.in.orig Wed Nov 12 13:02:14 2003 -+++ timsieved/Makefile.in Fri Feb 13 18:51:17 2004 -@@ -79,7 +79,7 @@ - all: timsieved - - install: -- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path) - - OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \ - ../imap/tls.o |