85e50a7d96
* Apparently "mutex" is already claimed by a system header on Solaris. * File locking on Linux (probably other operating systems) is pretty dumb when lots of processes are trying to lock a single file for serialisation: all of the processes are woken each time that the file is unlocked. Most of the process will simply loop inside the kernel and attempt to lock again. Presumably this approach makes nonblocking locks and EINTR easier to do, but it does mean that you can get occasional load average spikes. Add MUTEX_SEMAPHORE to implement System V semaphore based lock, which does not have this problem in Linux. Warning: System V semaphores are a finite resource, and they are not released automatically. See: prayer-sem-prune. * Quotas now reported in MBytes rather than KBytes. * Add download links for text/html and text/plain attachments * Fix bug with body->type TYPEMESSAGE: c-client API very poorly documented :( * Strip out common HTML entity encodings that might be used in HREFs with text/html attachments. * Fix mydb_db3.c to work with DB4. * Integrate into Tony's funky packaging system for Hermes and PPSW. * Add interface to automatic spam folder pruning utility that I wrote for Cyrus (controlled through special Sieve files). * Fix uploads where mailboxes contain NUL characters (translate to space?) * Assorted minor bugfixes * Fix nasty /redirect bug that I managed to introduce by switching from url_encode to canon_encode to work around bug in Opera. Missing a url_encode: infinite loop from dumb UAs :(. Otherwise identical to 1.0.9. * Few minor bug fixes, covered in CVS history. pkgsrc changes: * Rename the source rc.d script in the default RCD_SCRIPTS style. * Respect ${VARBASE}. * Avoid the DB_VERB_CHKPOINT flag with latest db4 (where it's been removed). * Patch from jdc@ for 64-bit big-endian hosts. XXX rc.d script doesn't stop all the prayer slaves
86 lines
3 KiB
Text
86 lines
3 KiB
Text
$NetBSD: patch-aa,v 1.6 2005/01/09 00:07:47 schmonz Exp $
|
|
|
|
--- Config.orig 2005-01-06 07:51:08.000000000 -0500
|
|
+++ Config
|
|
@@ -15,9 +15,9 @@ DIRECT_ENABLE = false # Experime
|
|
MUTEX_SEMAPHORE = false # Use SYSV mutexes rather than file locking
|
|
|
|
# Following depend on the way that you have configured c-client
|
|
-CCLIENT_SSL_ENABLE = false # C-client was built with SSL support
|
|
+CCLIENT_SSL_ENABLE = true # C-client was built with SSL support
|
|
CCLIENT_PAM_ENABLE = false # C-client was built with PAM support
|
|
-CCLIENT_KERB_ENABLE = false # C-client was built with Kerberos support
|
|
+CCLIENT_KERB_ENABLE = true # C-client was built with Kerberos support
|
|
|
|
# Probably don't need the following
|
|
ACCOUNTD_ENABLE = false # Only of use in Cambridge at the moment.
|
|
@@ -31,13 +31,13 @@ CC = gcc
|
|
# Location of make program (GNU make required)
|
|
MAKE = gmake
|
|
# Location of install program (GNU install or compatible required)
|
|
-INSTALL = install
|
|
+INSTALL = install -c
|
|
|
|
# Base Compiler options for GCC.
|
|
#BASECFLAGS = -Wall -g
|
|
#BASELDFLAGS = -g
|
|
-BASECFLAGS = -Wall -g -O2
|
|
-BASELDFLAGS = -g -O2
|
|
+BASECFLAGS = -Wall
|
|
+BASELDFLAGS =
|
|
BASE_LIBS = -lcrypt
|
|
|
|
# Base Compiler options for Sun SUNWspro compiler
|
|
@@ -57,9 +57,9 @@ BASE_LIBS = -lcrypt
|
|
# which points to ../../imap/c-client. This just reduces the amount of
|
|
# noise output on each line when building the package.
|
|
#
|
|
-CCLIENT_DIR=./c-client
|
|
-CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
|
|
-CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a
|
|
+CCLIENT_DIR=${BUILDLINK_PREFIX.imap-uw}
|
|
+CCLIENT_INCLUDE=-I $(CCLIENT_DIR)/include/c-client
|
|
+CCLIENT_LIB=$(CCLIENT_DIR)/lib/libc-client.a
|
|
CCLIENT_SSL_ENABLE = true
|
|
|
|
#
|
|
@@ -102,8 +102,8 @@ PAM_INCLUDE =
|
|
PAM_LIBS = -lpam
|
|
|
|
# Kerberos (required if CCLIENT_KERB_ENABLE set)
|
|
-KERB_INCLUDE = -I/usr/kerberos/include
|
|
-KERB_LIBS = -L/usr/kerberos/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
|
|
+KERB_INCLUDE = -I/usr/include
|
|
+KERB_LIBS = -L/usr/lib -lgssapi -lcom_err -lkrb5 -lasn1 -lroken -ldes
|
|
|
|
# SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
|
|
#
|
|
@@ -127,8 +127,8 @@ DB_INCLUDE=
|
|
DB_LIBS=-ldb
|
|
|
|
# Following suitable for FreeBSD with DB 4 package installed
|
|
-#DB_INCLUDE=-I/usr/local/include/db4
|
|
-#DB_LIBS=-L/usr/local/lib -ldb4
|
|
+DB_INCLUDE=-I${BUILDLINK_PREFIX.db4}/include/db4
|
|
+DB_LIBS=-L${BUILDLINK_PREFIX.db4}/lib -ldb4
|
|
|
|
############################################################################
|
|
|
|
@@ -149,7 +149,7 @@ RW_GROUP = prayer
|
|
# Default configuration and permissions does not allow prayer user to
|
|
# update prayer configuration file.
|
|
|
|
-PREFIX = /usr/local/prayer
|
|
+#PREFIX = /usr/local/prayer
|
|
RO_USER = root
|
|
RO_GROUP = prayer
|
|
|
|
@@ -164,6 +164,6 @@ PRIVATE_DIR = 0750
|
|
PRIVATE_FILE = 0640
|
|
|
|
# Location of configuration files and binaries
|
|
-PRAYER_CONFIG_FILE = ${PREFIX}/etc/prayer.cf
|
|
+PRAYER_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer.cf
|
|
BIN_DIR = ${PREFIX}/sbin
|
|
-ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
|
|
+ACCOUNTD_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer-accountd.cf
|