diff options
Diffstat (limited to 'mail/cyrus-imapd2/files')
22 files changed, 0 insertions, 755 deletions
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf deleted file mode 100644 index 8a6f77561179..000000000000 --- a/mail/cyrus-imapd2/files/imapd.conf +++ /dev/null @@ -1,373 +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 the SASL PLAIN mechanism. -# -#allowplaintext: yes - -# The percent of quota utilization over which the server generates -# warnings. -# -#quotawarn: 90 - -# The length of the IMAP server's inactivity autologout timer, in minutes. -# The minimum value is 30, the default. -# -#timeout: 30 - -# The interval (in seconds) for polling the mailbox for changes while -# running the IDLE command. This option is used when idled can not be -# contacted or when polling is used exclusively. The minimum value is -# 1. A value of 0 will disable polling (and disable IDLE if polling -# is the only method available). -# -#imapidlepoll: 60 - -# If enabled, the server responds to an ID command with a parameter -# list containing: version, vendor, support-url, os, os-version, -# command, arguments, environment. Otherwise the server returns NIL. -# -#imapidresponse: yes - -# Set the length of the POP server's inactivity autologout timer, in -# minutes. The minimum value is 10, the default. -# -#poptimeout: 10 - -# Set the minimum amount of time the server forces users to wait between -# successive POP logins, in minutes. The default is 0. -# -#popminpoll: 0 - -# The number of days advertised as being the minimum a message may be -# left on the POP server before it is deleted (via the CAPA command, -# defined in the POP3 Extension Mechanism, which some clients may -# support). "NEVER", the default, may be specified with a negative -# number. The Cyrus POP3 server never deletes mail, no matter what -# the value of this parameter is. However, if a site implements a -# less liberal policy, it needs to change this parameter accordingly. -# -#popexpiretime: 0 - -# The list of userids with administrative rights. Separate each userid -# with a space. We recommend that administrator userids be separate from -# standard userids. Sites using Kerberos authentication may use separate -# "admin" instances. -# -#admins: <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 - -# 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 - -# 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. -# -#tls_imap_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. -# -#tls_imap_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. -# -#tls_pop3_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. -# -#tls_pop3_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. -# -#tls_lmtp_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. -# -#tls_lmtp_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. -# -#tls_sieve_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. -# -#tls_sieve_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-imapd2/files/imapd.in b/mail/cyrus-imapd2/files/imapd.in deleted file mode 100644 index 1af0b40f32df..000000000000 --- a/mail/cyrus-imapd2/files/imapd.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: shutdown - -# 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 - -. /etc/rc.subr - -name="cyrus_imapd" -rcvar=cyrus_imapd_enable -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-imapd2/files/patch-Makefile.in b/mail/cyrus-imapd2/files/patch-Makefile.in deleted file mode 100644 index 501cf110817d..000000000000 --- a/mail/cyrus-imapd2/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile.in -diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Thu Nov 20 01:45:26 2003 -+++ Makefile.in Sat Apr 3 03:15:59 2004 -@@ -98,7 +98,7 @@ - $(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 -+ $(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8 - @for d in $(SUBDIRS); \ - do \ - (cd $$d; echo "### Making" install "in" `pwd`; \ diff --git a/mail/cyrus-imapd2/files/patch-aa b/mail/cyrus-imapd2/files/patch-aa deleted file mode 100644 index f5cb366c56f6..000000000000 --- a/mail/cyrus-imapd2/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 Tue May 13 04:43:51 2003 -+++ man/Makefile.in Sat Apr 3 03:17:17 2004 -@@ -97,7 +97,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-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac deleted file mode 100644 index 0e94342e36bb..000000000000 --- a/mail/cyrus-imapd2/files/patch-ac +++ /dev/null @@ -1,39 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig Mon Mar 8 01:36:22 2004 -+++ configure Mon Mar 8 01:44:26 2004 -@@ -3023,7 +3023,7 @@ - BDB_LIBADD="" - fi - -- for dbname in 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.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 - echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 - echo "configure:3030: checking for db_create in -l$dbname" >&5 -@@ -6950,6 +6950,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 -@@ -7305,7 +7307,7 @@ - #define HAVE_UCDSNMP 1 - EOF - -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6 - echo "configure:7311: checking for rpmdbOpen in -lrpm" >&5 - ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'` -@@ -7579,6 +7581,7 @@ - s%@LIB_SASL@%$LIB_SASL%g - s%@SASLFLAGS@%$SASLFLAGS%g - s%@PERL@%$PERL%g -+s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g - s%@MD5OBJ@%$MD5OBJ%g - s%@SNMP_SUBDIRS@%$SNMP_SUBDIRS%g - s%@LIB_WRAP@%$LIB_WRAP%g diff --git a/mail/cyrus-imapd2/files/patch-acap::Makefile.in b/mail/cyrus-imapd2/files/patch-acap::Makefile.in deleted file mode 100644 index 4015013eb362..000000000000 --- a/mail/cyrus-imapd2/files/patch-acap::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: acap/Makefile.in -diff -u acap/Makefile.in.orig acap/Makefile.in ---- acap/Makefile.in.orig Mon Jul 14 00:04:56 2003 -+++ acap/Makefile.in Mon Mar 8 02:10:58 2004 -@@ -54,7 +54,7 @@ - CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib - LIBS = @LIBS@ - --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ - LDFLAGS = @LDFLAGS@ - - SHELL = /bin/sh diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc deleted file mode 100644 index 5cfa94b53a1f..000000000000 --- a/mail/cyrus-imapd2/files/patch-bc +++ /dev/null @@ -1,28 +0,0 @@ -Index: imap/Makefile.in -diff -u imap/Makefile.in.orig imap/Makefile.in ---- imap/Makefile.in.orig Tue Mar 25 02:54:43 2003 -+++ imap/Makefile.in Sat May 3 03:05:40 2003 -@@ -61,7 +61,7 @@ - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - --DEFS = @DEFS@ @LOCALDEFS@ -+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../sieve -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ - IMAP_LIBS = @IMAP_LIBS@ - SIEVE_LIBS = @SIEVE_LIBS@ -@@ -243,12 +243,12 @@ - mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - pop3d: pop3d.o tls.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o tls.o $(SERVICE) \ diff --git a/mail/cyrus-imapd2/files/patch-bd b/mail/cyrus-imapd2/files/patch-bd deleted file mode 100644 index 83a7d53f4c40..000000000000 --- a/mail/cyrus-imapd2/files/patch-bd +++ /dev/null @@ -1,14 +0,0 @@ -*** imap/config.c.orig Thu Mar 9 19:07:14 2000 ---- imap/config.c Thu Mar 9 19:06:48 2000 -*************** -*** 39,45 **** ---- 39,47 ---- - - extern int errno; - -+ #if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+ #endif - - struct configlist { - char *key; diff --git a/mail/cyrus-imapd2/files/patch-be b/mail/cyrus-imapd2/files/patch-be deleted file mode 100644 index 707298b92662..000000000000 --- a/mail/cyrus-imapd2/files/patch-be +++ /dev/null @@ -1,13 +0,0 @@ ---- imap/krbck.c.orig Sat Dec 21 02:08:21 1996 -+++ imap/krbck.c Wed Oct 8 13:56:58 1997 -@@ -29,7 +29,9 @@ - - #define EXIT_CHOKE (int) 10 - --#define CONFIG_FILENAME "/etc/imapd.conf" -+#if !defined(CONFIG_FILENAME) -+ #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif - #define MAX_FILENAME_LEN 255 - - int errno; diff --git a/mail/cyrus-imapd2/files/patch-config.h.in b/mail/cyrus-imapd2/files/patch-config.h.in deleted file mode 100644 index 21d0bcd1b1c6..000000000000 --- a/mail/cyrus-imapd2/files/patch-config.h.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: config.h.in -diff -u config.h.in.orig config.h.in ---- config.h.in.orig Tue Aug 19 04:47:14 2003 -+++ config.h.in Tue Aug 19 04:50:46 2003 -@@ -364,7 +364,7 @@ - #endif - - /* sendmail configuration parameters */ --#define DEFAULT_SENDMAIL ("/usr/lib/sendmail") -+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail") - #define DEFAULT_POSTMASTER ("postmaster") - - #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL)) diff --git a/mail/cyrus-imapd2/files/patch-dc b/mail/cyrus-imapd2/files/patch-dc deleted file mode 100644 index 10bec3adc883..000000000000 --- a/mail/cyrus-imapd2/files/patch-dc +++ /dev/null @@ -1,13 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Tue Feb 4 20:30:08 2003 -+++ master/Makefile.in Tue Feb 4 20:31:00 2003 -@@ -52,7 +52,7 @@ - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - --DEFS = @DEFS@ @LOCALDEFS@ -+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\" - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ - diff --git a/mail/cyrus-imapd2/files/patch-dd b/mail/cyrus-imapd2/files/patch-dd deleted file mode 100644 index 94c0d694fa90..000000000000 --- a/mail/cyrus-imapd2/files/patch-dd +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/masterconf.c -diff -u master/masterconf.c.orig master/masterconf.c ---- master/masterconf.c.orig Wed May 24 05:56:30 2000 -+++ master/masterconf.c Sat Jan 6 06:07:22 2001 -@@ -60,7 +60,9 @@ - - extern int errno; - -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - struct configlist { - char *key; diff --git a/mail/cyrus-imapd2/files/patch-df b/mail/cyrus-imapd2/files/patch-df deleted file mode 100644 index 69a0841343ee..000000000000 --- a/mail/cyrus-imapd2/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-imapd2/files/patch-dg b/mail/cyrus-imapd2/files/patch-dg deleted file mode 100644 index b413044ffd6c..000000000000 --- a/mail/cyrus-imapd2/files/patch-dg +++ /dev/null @@ -1,39 +0,0 @@ -Index: tools/mkimap -diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Fri Sep 28 01:02:34 2001 -+++ tools/mkimap Tue Jan 28 18:00:32 2003 -@@ -64,6 +64,9 @@ - $nosievedir = 0; - $hashispool = 0; - -+$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>) { -@@ -117,6 +120,8 @@ - mkdir "log", 0755; - mkdir "msg", 0755; - -+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; -+ - # create the sieve stuff - if (!$nosievedir) { - print "creating $sievedir...\n"; -@@ -125,6 +130,7 @@ - if (chdir $sievedir) { - foreach $i ("a".."z") { mkdir "$i", 0755; } - } -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $sievedir"; - } - - $flag = 0; -@@ -136,6 +142,7 @@ - chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755; - if ($hashispool) { foreach $i ("a".."z") { mkdir $i, 0755; } } -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; - } - - print "done\n"; diff --git a/mail/cyrus-imapd2/files/patch-imap::imapd.h b/mail/cyrus-imapd2/files/patch-imap::imapd.h deleted file mode 100644 index 174bdc896d25..000000000000 --- a/mail/cyrus-imapd2/files/patch-imap::imapd.h +++ /dev/null @@ -1,22 +0,0 @@ -Index: imap/imapd.h -diff -u imap/imapd.h.orig imap/imapd.h ---- imap/imapd.h.orig Fri Feb 14 05:15:25 2003 -+++ imap/imapd.h Fri Dec 15 11:35:44 2006 -@@ -54,17 +54,8 @@ - /* Authorization state for logged in userid */ - extern struct auth_state *imapd_authstate; - --/* True if user is an admin */ --extern int imapd_userisadmin; -- --/* Currently open mailbox */ --extern struct mailbox *imapd_mailbox; -- - /* Number of messages in currently open mailbox */ - extern int imapd_exists; -- --/* Name of client host */ --extern char imapd_clienthost[]; - - /* List of strings, for fetch and search argument blocks */ - struct strlist { diff --git a/mail/cyrus-imapd2/files/patch-imtest::imtest.c b/mail/cyrus-imapd2/files/patch-imtest::imtest.c deleted file mode 100644 index 8e082841d319..000000000000 --- a/mail/cyrus-imapd2/files/patch-imtest::imtest.c +++ /dev/null @@ -1,15 +0,0 @@ -Index: imtest/imtest.c -diff -u imtest/imtest.c.orig imtest/imtest.c ---- imtest/imtest.c.orig Wed Mar 19 10:29:22 2003 -+++ imtest/imtest.c Sun May 11 16:47:11 2003 -@@ -417,8 +417,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-imapd2/files/patch-lib::Makefile.in b/mail/cyrus-imapd2/files/patch-lib::Makefile.in deleted file mode 100644 index 8243d414d431..000000000000 --- a/mail/cyrus-imapd2/files/patch-lib::Makefile.in +++ /dev/null @@ -1,13 +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 Sun Mar 7 23:44:51 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 diff --git a/mail/cyrus-imapd2/files/patch-master::service-thread.c b/mail/cyrus-imapd2/files/patch-master::service-thread.c deleted file mode 100644 index 9a2016c3c64a..000000000000 --- a/mail/cyrus-imapd2/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-imapd2/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd2/files/patch-perl::imap::Makefile.PL deleted file mode 100644 index eb67dcfcf5b9..000000000000 --- a/mail/cyrus-imapd2/files/patch-perl::imap::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/imap/Makefile.PL -diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL ---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003 -+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004 -@@ -70,3 +70,10 @@ - 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC", - 'EXE_FILES' => [cyradm], - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in b/mail/cyrus-imapd2/files/patch-perl::sieve::lib::Makefile.in deleted file mode 100644 index 28d4c44df294..000000000000 --- a/mail/cyrus-imapd2/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-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL deleted file mode 100644 index 9b28ce08bdc6..000000000000 --- a/mail/cyrus-imapd2/files/patch-perl::sieve::managesieve::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/sieve/managesieve/Makefile.PL -diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL ---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003 -+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004 -@@ -64,3 +64,10 @@ - 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' - 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC", - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: (all )?pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd2/files/patch-sieve::Makefile.in b/mail/cyrus-imapd2/files/patch-sieve::Makefile.in deleted file mode 100644 index 75245207c3a4..000000000000 --- a/mail/cyrus-imapd2/files/patch-sieve::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: sieve/Makefile.in -diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Sun Jul 13 23:40:05 2003 -+++ sieve/Makefile.in Mon Mar 8 01:38:00 2004 -@@ -35,7 +35,7 @@ - - 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@ |