diff options
Diffstat (limited to 'mail/cyrus-imapd24/files')
21 files changed, 0 insertions, 853 deletions
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 deleted file mode 100644 index 829d92d23585..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 +++ /dev/null @@ -1,27 +0,0 @@ -Index: cmulocal/ucdsnmp.m4 -diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4 ---- cmulocal/ucdsnmp.m4.orig Tue May 25 10:27:58 2004 -+++ cmulocal/ucdsnmp.m4 Sat Dec 10 16:34:09 2005 -@@ -31,9 +31,12 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) - AC_SUBST(LIB_UCDSNMP) -+ AC_SUBST(LDFLAGS_UCDSNMP) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -59,7 +62,7 @@ - LIB_UCDSNMP="" - if test "$with_snmp" != no; then - AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-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 b/mail/cyrus-imapd24/files/extra-patch-configure deleted file mode 100644 index 8e283ee68870..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2008-04-25 14:34:53.000000000 -0400 -+++ configure 2008-09-17 18:46:12.000000000 -0400 -@@ -14921,7 +14922,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" -+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -15391,7 +15392,7 @@ - GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" - elif test "$gss_impl" = "heimdal"; then - CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" -- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" -+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509" - GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" - elif test "$gss_impl" = "cybersafe03"; then - # Version of CyberSafe with two libraries 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 1a89d771ee93..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-configure.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -diff -u configure.in.orig configure.in ---- configure.in.orig Sat May 29 04:59:21 2004 -+++ configure.in Sat May 29 05:03:04 2004 -@@ -933,7 +933,7 @@ - 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-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf deleted file mode 100644 index 3c73402c12de..000000000000 --- a/mail/cyrus-imapd24/files/imapd.conf +++ /dev/null @@ -1,418 +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. -# -#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 imap status cache. -# Allowed values: berkeley, berkeley-nosync, berkeley-hash, -# berkeley-hash-nosync, skiplist -# -#statuscache_db: berkeley-nosync - -# 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.in b/mail/cyrus-imapd24/files/imapd.sh.in deleted file mode 100644 index 489c6301d6c4..000000000000 --- a/mail/cyrus-imapd24/files/imapd.sh.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 - -. %%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 71800e59efb8..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 Sat May 15 05:59:10 2004 -+++ Makefile.in Wed May 19 00:23:11 2004 -@@ -97,13 +97,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}$(mandir)/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib -+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/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-configure b/mail/cyrus-imapd24/files/patch-configure deleted file mode 100644 index 4a15c870d4aa..000000000000 --- a/mail/cyrus-imapd24/files/patch-configure +++ /dev/null @@ -1,40 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig 2009-03-13 21:19:01.000000000 +0900 -+++ configure 2009-03-15 16:16:50.000000000 +0900 -@@ -642,6 +642,7 @@ - IMAP_COM_ERR_LIBS - LIB_RT - LIB_UCDSNMP -+LDFLAGS_UCDSNMP - SNMP_CONFIG - LIB_WRAP - CMU_LIB_SUBDIR -@@ -19030,6 +19031,7 @@ - EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - - fi -@@ -19984,7 +19986,9 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_NETSNMP 1 -@@ -20224,7 +20228,7 @@ - #define HAVE_UCDSNMP 1 - _ACEOF - -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - { $as_echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 - $as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; } - if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then diff --git a/mail/cyrus-imapd24/files/patch-imap::Makefile.in b/mail/cyrus-imapd24/files/patch-imap::Makefile.in deleted file mode 100644 index 163deb2807c3..000000000000 --- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ -Index: imap/Makefile.in -diff -u imap/Makefile.in.orig imap/Makefile.in ---- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005 -+++ imap/Makefile.in Sat Dec 10 16:46:31 2005 -@@ -130,10 +130,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 - ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd -@@ -219,13 +219,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 proxy.o backend.o tls.o mutex_fake.o libimap.a \ - $(DEPLIBS) $(SERVICE) 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 30b84fb9556a..000000000000 --- a/mail/cyrus-imapd24/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 Sun Jul 13 05:10:56 2003 -+++ imtest/imtest.c Fri Jul 18 00:52:29 2003 -@@ -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 543ece89f131..000000000000 --- a/mail/cyrus-imapd24/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 Thu Mar 11 06:25:39 2004 -+++ lib/Makefile.in Wed May 19 00:34:19 2004 -@@ -102,7 +102,7 @@ - all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a - - install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) -+ $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/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 8c79e3b2e8f4..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 2008-10-12 21:22:03.000000000 +0900 -+++ lib/imapoptions 2008-10-12 21:23:33.000000000 +0900 -@@ -893,7 +893,7 @@ - { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")} - /* The cyrusdb backend to use for the seen state. */ - --{ "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. */ - -@@ -956,7 +956,7 @@ - /* If enabled, timsieved will expect a capability response after a successful - SASL authentication, per draft-martin-mangesieve-12.txt . */ - --{ "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-lib::imapurl.c b/mail/cyrus-imapd24/files/patch-lib::imapurl.c deleted file mode 100644 index 78bd54cd4fbd..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::imapurl.c +++ /dev/null @@ -1,12 +0,0 @@ -Index: lib/imapurl.c -diff -u -p lib/imapurl.c.orig lib/imapurl.c ---- lib/imapurl.c.orig 2009-03-31 13:11:22.000000000 +0900 -+++ lib/imapurl.c 2009-09-10 00:28:05.287769072 +0900 -@@ -50,6 +50,7 @@ - #include <errno.h> - #include <limits.h> - #include <time.h> -+#include <sys/types.h> - - #include "imapurl.h" - #include "xmalloc.h" diff --git a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c deleted file mode 100644 index 5cbb64001209..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/libcyr_cfg.c -diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c ---- lib/libcyr_cfg.c.orig Wed Mar 10 00:05:58 2004 -+++ lib/libcyr_cfg.c Fri Feb 25 00:06:44 2005 -@@ -52,7 +52,7 @@ - #include "libcyr_cfg.h" - #include "cyrusdb.h" - --#if defined(__GNUC__) && __GNUC__ > 1 -+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER) - /* We can use the GCC union constructor extension */ - #define CFGVAL(t,v) (union cyrus_config_value)((t)(v)) - #else diff --git a/mail/cyrus-imapd24/files/patch-man::Makefile.in b/mail/cyrus-imapd24/files/patch-man::Makefile.in deleted file mode 100644 index 1b0061897d43..000000000000 --- a/mail/cyrus-imapd24/files/patch-man::Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ -Index: man/Makefile.in -diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Wed May 11 00:02:35 2005 -+++ man/Makefile.in Sat Dec 10 15:26:05 2005 -@@ -50,6 +50,7 @@ - SHELL = /bin/sh - - prefix = @prefix@ -+cyrus_prefix = @cyrus_prefix@ - - mandir = @mandir@ - -@@ -95,7 +96,7 @@ - done - for file in $(MAN8); \ - do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ -+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ - done - - clean: 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 c828109f247e..000000000000 --- a/mail/cyrus-imapd24/files/patch-master::Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Sat May 29 03:03:05 2004 -+++ master/Makefile.in Wed Jul 21 04:13:16 2004 -@@ -58,7 +58,7 @@ - DEPLIBS = @DEPLIBS@ - - CFLAGS = @CFLAGS@ --LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ -+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@ - LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ - - SHELL = /bin/sh -@@ -76,10 +76,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-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::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL deleted file mode 100644 index 66140bf53219..000000000000 --- a/mail/cyrus-imapd24/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-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL deleted file mode 100644 index bde3d77b763e..000000000000 --- a/mail/cyrus-imapd24/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-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in deleted file mode 100644 index ef0d76b256be..000000000000 --- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -Index: sieve/Makefile.in -diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig 2008-07-11 01:37:20.000000000 +0900 -+++ sieve/Makefile.in 2008-10-12 21:26:13.000000000 +0900 -@@ -54,6 +54,7 @@ - YACC = @YACC@ - YFLAGS = -d - LEX = @LEX@ -+INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - COMPILE_ET = @COMPILE_ET@ - -@@ -80,9 +81,9 @@ - dist: $(BUILT_SOURCES) - - install: sievec sieved -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit -- $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit -+ $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit -+ $(INSTALL) -s -c -m 755 sieved $(DESTDIR)$(service_path) || exit - - test: $(DEPLIBS) libsieve.a test.o ../imap/message.o - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \ 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 diff --git a/mail/cyrus-imapd24/files/patch-tools::mkimap b/mail/cyrus-imapd24/files/patch-tools::mkimap deleted file mode 100644 index 9ee1539e3776..000000000000 --- a/mail/cyrus-imapd24/files/patch-tools::mkimap +++ /dev/null @@ -1,38 +0,0 @@ -Index: tools/mkimap -diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Fri Dec 2 07:30:22 2005 -+++ tools/mkimap Sat Dec 10 14:08:11 2005 -@@ -90,6 +90,9 @@ - - $imapdconf = shift || "/etc/imapd.conf"; - -+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%"; -+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%"; -+ - push @configs, $imapdconf; - - while ($conf = shift @configs) { -@@ -100,6 +103,7 @@ - - print "configuring $d...\n"; - -+mkdir $d, 0755; - chdir $d or die "couldn't change to $d"; - - mkdir "proc", 0755 || warn "can't create $d/proc: $!"; -@@ -110,12 +114,15 @@ - mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; - mkdir "sync", 0755 || warn "can't create $d/sync: $!"; - -+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; -+ - while ($part = shift @parts) { - print "creating $part...\n"; - mkdir $part, 0755 || warn "can't create $part: $!"; - chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; - mkdir "sync.", 0755 || warn "can't create $part/sync.: $!"; -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; - } - - print "done\n"; |