Update to 1.0.12. From the changelog:

* 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

11 files changed, 86 insertions, 61 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 11c9cfed606..1ea9aecb98a 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/09 00:07:46 schmonz Exp $
 #
 
-DISTNAME=	prayer-1.0.8
-PKGREVISION=	5
+DISTNAME=	prayer-1.0.12
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -10,8 +9,8 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
-USE_BUILDLINK3=	YES
-USE_PKGINSTALL=	YES
+USE_BUILDLINK3=	yes
+USE_PKGINSTALL=	yes
 USE_GNU_TOOLS+=	make
 USE_PERL5=	build
 PRAYER_USER=	prayer
@@ -29,14 +28,13 @@ PKG_SYSCONFSUBDIR=	prayer
 EGDIR=			${PREFIX}/share/examples/prayer
 
 RCD_SCRIPTS=		prayer
-RCD_SCRIPT_SRC.prayer=	${FILESDIR}/prayer.rc
 
 CONF_FILES=	${EGDIR}/prayer.cf ${PKG_SYSCONFDIR}/prayer.cf
 CONF_FILES+=	${EGDIR}/prayer-accountd.cf ${PKG_SYSCONFDIR}/prayer-accountd.cf
 CONF_FILES+=	${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html
 CONF_FILES+=	${EGDIR}/welcome.html ${PKG_SYSCONFDIR}/welcome.html
 
-VAR_PREFIX=	/var/spool/prayer
+VAR_PREFIX=	${VARBASE}/spool/prayer
 
 OWN_DIRS+=	${EGDIR}
 OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
diff --git a/mail/prayer/PLIST b/mail/prayer/PLIST
index 2037b490c2f..701d41b4af7 100644
--- a/mail/prayer/PLIST
+++ b/mail/prayer/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/23 22:07:55 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/01/09 00:07:46 schmonz Exp $
 sbin/prayer
 sbin/prayer-cyclog
+sbin/prayer-sem-prune
 sbin/prayer-session
 sbin/prayer-ssl-prune
 share/examples/prayer/motd.html
@@ -41,6 +42,7 @@ share/prayer/help/reply.html
 share/prayer/help/roles_entry.html
 share/prayer/help/roles_list.html
 share/prayer/help/search.html
+share/prayer/help/sieve.html
 share/prayer/help/spam.html
 share/prayer/help/toolbar.html
 share/prayer/help/transfer.html
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index 61beb66753b..30bca7d8b89 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: distinfo,v 1.8 2005/01/09 00:07:46 schmonz Exp $
 
-SHA1 (prayer-1.0.8.tar.gz) = bda62959dae75515530fbc87304a721e17c903e4
-Size (prayer-1.0.8.tar.gz) = 519741 bytes
-SHA1 (patch-aa) = 309dfb2c7d4c38673117cdd6419c8100cf6d98e4
-SHA1 (patch-ab) = d188b7f475af8a81724e221196d1f321cebd9d54
-SHA1 (patch-ac) = f9550de3d8704ea293bc89c572f219e0c41aa8e8
-SHA1 (patch-ad) = e8d1cd82e62d86886acca94c840b55a8b55f7f17
-SHA1 (patch-ae) = b33cdbe6634f370a451a319dd140680949400943
-SHA1 (patch-af) = 969ecdce0496d889dfc3b8d1b7464148b4430ec9
+SHA1 (prayer-1.0.12.tar.gz) = 8ea568f9e0e1fe925102e80451b3c9432f5fed15
+Size (prayer-1.0.12.tar.gz) = 544239 bytes
+SHA1 (patch-aa) = 0161f04e22a8e67b5d5cb0990f7ac90bf4b8c93e
+SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
+SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
+SHA1 (patch-ad) = bd8f517d5bede0fd3d3f4e9a108cd0cd99d7c8ab
+SHA1 (patch-ae) = a04d4206e9b671be0fdce73a5093fb18778a1052
+SHA1 (patch-af) = 730ee832fcb6464d7909ff9f048d7c57ce86aba8
+SHA1 (patch-ag) = d932eeb11171da4084eb56e097a7880e67a18561
diff --git a/mail/prayer/files/prayer.rc b/mail/prayer/files/prayer.sh
index c1f435520a5..bb28d150fa1 100755..100644
--- a/mail/prayer/files/prayer.rc
+++ b/mail/prayer/files/prayer.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prayer.rc,v 1.1 2004/02/28 23:59:47 heinz Exp $
+# $NetBSD: prayer.sh,v 1.1 2005/01/09 00:07:47 schmonz Exp $
 #
 # This shell script takes care of starting and stopping prayer,
 # a program providing web access to a mail server using IMAP
@@ -53,7 +53,7 @@ prayer_start()
 		echo "${command} already running as pid ${prayer_pid}."
 		return 1
 	fi
-	echo "Starting ${name}"
+	echo "Starting ${name}."
 	${command} ${prayer_flags} ${command_args}
 }
 
@@ -65,7 +65,7 @@ prayer_stop()
 		echo "${command} not running? (check ${pidfile})."
 		return 1
 	fi
-	echo "Stopping ${name}"
+	echo "Stopping ${name}."
 	kill -HUP ${prayer_pid}
 	prayer_session_pid=`cat @VAR_PREFIX@/pid/prayer-session`
 	if [ -n "${prayer_session_pid}" ]; then
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
index 2600370ab9a..feaa79e8d47 100644
--- a/mail/prayer/patches/patch-aa
+++ b/mail/prayer/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: patch-aa,v 1.6 2005/01/09 00:07:47 schmonz Exp $
 
---- Config.orig	Thu May 29 11:49:38 2003
+--- Config.orig	2005-01-06 07:51:08.000000000 -0500
 +++ Config
-@@ -14,9 +14,9 @@ FENCE_ENABLE         = false  # Use Elec
- DIRECT_ENABLE        = false  # Experimental. Leave this switched off... 
+@@ -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_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
++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.
-@@ -30,13 +30,13 @@ CC           = gcc
+@@ -31,13 +31,13 @@ CC           = gcc
  # Location of make program (GNU make required)
  MAKE         = gmake
  # Location of install program (GNU install or compatible required)
@@ -27,11 +27,11 @@ $NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
 -BASECFLAGS   = -Wall -g -O2
 -BASELDFLAGS  = -g -O2
 +BASECFLAGS   = -Wall
-+BASELDFLAGS  =
++BASELDFLAGS  = 
  BASE_LIBS    = -lcrypt
  
  # Base Compiler options for Sun SUNWspro compiler
-@@ -56,9 +56,9 @@ BASE_LIBS    = -lcrypt
+@@ -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.
  #
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
  CCLIENT_SSL_ENABLE  = true
  
  #
-@@ -101,8 +101,8 @@ PAM_INCLUDE =
+@@ -102,8 +102,8 @@ PAM_INCLUDE =
  PAM_LIBS    = -lpam
  
  # Kerberos (required if CCLIENT_KERB_ENABLE set)
@@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
  
  # SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
  #
-@@ -126,8 +126,8 @@ DB_INCLUDE=
+@@ -127,8 +127,8 @@ DB_INCLUDE=
  DB_LIBS=-ldb
  
  # Following suitable for FreeBSD with DB 4 package installed
@@ -66,16 +66,16 @@ $NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
  
  ############################################################################
  
-@@ -148,7 +148,7 @@ RW_GROUP   = prayer
+@@ -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
++#PREFIX    = /usr/local/prayer
  RO_USER   = root
  RO_GROUP  = prayer
  
-@@ -163,6 +163,6 @@ PRIVATE_DIR  = 0750
+@@ -164,6 +164,6 @@ PRIVATE_DIR  = 0750
  PRIVATE_FILE = 0640
  
  # Location of configuration files and binaries
diff --git a/mail/prayer/patches/patch-ab b/mail/prayer/patches/patch-ab
index d33521024e5..9d8b3c13e3e 100644
--- a/mail/prayer/patches/patch-ab
+++ b/mail/prayer/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/09 00:07:47 schmonz Exp $
 
---- files/install.sh.orig	Mon May 19 14:34:10 2003
+--- files/install.sh.orig	2004-06-18 09:58:46.000000000 -0400
 +++ files/install.sh
-@@ -67,21 +67,24 @@ if [ ! -d ${PREFIX}/etc ]; then
+@@ -67,21 +67,25 @@ if [ ! -d ${PREFIX}/etc ]; then
      ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
  fi
  
@@ -19,6 +19,7 @@ $NetBSD: patch-ab,v 1.3 2004/02/28 23:50:59 heinz Exp $
 +if [ ! -d "${PREFIX}/share/prayer" ]; then
 +    mkdir "${PREFIX}/share/prayer"
 +fi
++
  for i in help icons
  do
 -    if [ -d "${PREFIX}/${i}" ]; then
diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac
index c8c7cdfb0c9..bf21de0935a 100644
--- a/mail/prayer/patches/patch-ac
+++ b/mail/prayer/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
 
---- files/Makefile.orig	Sun May 11 16:59:12 2003
+--- files/Makefile.orig	2003-05-11 10:59:12.000000000 -0400
 +++ files/Makefile
 @@ -14,10 +14,10 @@ endif
  all:	./etc/prayer.cf ./init.d/prayer
diff --git a/mail/prayer/patches/patch-ad b/mail/prayer/patches/patch-ad
index ddb58915d63..841005ab825 100644
--- a/mail/prayer/patches/patch-ad
+++ b/mail/prayer/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: patch-ad,v 1.4 2005/01/09 00:07:47 schmonz Exp $
 
---- prayer/Makefile.orig	Wed May 21 16:41:16 2003
+--- prayer/Makefile.orig	2005-01-06 07:24:44.000000000 -0500
 +++ prayer/Makefile
-@@ -89,8 +89,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
+@@ -94,8 +94,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
    SESSION_LIBS += $(KERB_LIBS)
  endif
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.3 2004/02/28 23:50:59 heinz Exp $
  
  SHARED_OBJS = \
   pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
-@@ -158,15 +158,15 @@ clean:
+@@ -163,17 +163,17 @@ clean:
  	-rm -f $(BIN) test core *.o *.flc *~ \#*\#
  
  install: all
@@ -30,6 +30,9 @@ $NetBSD: patch-ad,v 1.3 2004/02/28 23:50:59 heinz Exp $
 +	$(BSD_INSTALL_PROGRAM)  \
  	  prayer-ssl-prune $(BROOT)$(BIN_DIR)
 -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(BSD_INSTALL_PROGRAM)  \
+ 	  prayer-sem-prune $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
 +	$(BSD_INSTALL_SCRIPT)  \
  	  prayer-cyclog    $(BROOT)$(BIN_DIR)
  
diff --git a/mail/prayer/patches/patch-ae b/mail/prayer/patches/patch-ae
index 39f39b3b3f0..361629e31ec 100644
--- a/mail/prayer/patches/patch-ae
+++ b/mail/prayer/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2003/07/28 15:51:25 adam Exp $
+$NetBSD: patch-ae,v 1.3 2005/01/09 00:07:47 schmonz Exp $
 
---- files/etc/prayer.cf.SRC.orig	2003-05-11 16:59:12.000000000 +0200
-+++ files/etc/prayer.cf.SRC	2003-07-28 17:33:34.000000000 +0200
-@@ -368,25 +368,25 @@
+--- files/etc/prayer.cf.SRC.orig	2004-04-30 11:02:21.000000000 -0400
++++ files/etc/prayer.cf.SRC
+@@ -376,25 +376,25 @@ ispell_path         = /usr/bin/ispell
  #  <login_suffix_path>
  
  # Login page prefix
@@ -18,7 +18,8 @@ $NetBSD: patch-ae,v 1.2 2003/07/28 15:51:25 adam Exp $
 +#login_suffix_path   = "__PKG_SYSCONFDIR__/login_suffix.html"
  
  # Session banner (local HTML inserted into each page of login session)
- #session_banner_path = "$prefix/etc/session_banner.html"
+-#session_banner_path = "$prefix/etc/session_banner.html"
++#session_banner_path = "__PKG_SYSCONFDIR__/session_banner.html"
  
  # Welcome text displayed when user first logs in
 -welcome_path        = "$prefix/etc/welcome.html"
diff --git a/mail/prayer/patches/patch-af b/mail/prayer/patches/patch-af
index e3c6a380021..daef5511466 100644
--- a/mail/prayer/patches/patch-af
+++ b/mail/prayer/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.4 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: patch-af,v 1.5 2005/01/09 00:07:47 schmonz Exp $
 
---- prayer/mydb_db3.c.orig	Tue Apr 15 15:00:03 2003
+--- prayer/mydb_db3.c.orig	2004-06-18 11:25:12.000000000 -0400
 +++ prayer/mydb_db3.c
-@@ -80,8 +80,11 @@ extern void fatal(const char *, int);
- /* --- cut here --- */
+@@ -133,9 +133,11 @@ static int myinit(const char *dbdir, int
+     dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
+     dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR, 1);
+   }
++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
+   if (CONFIG_DB_VERBOSE > 1) {
+     dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, 1);
+   }
++#endif
+   dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
  
- #if DB_VERSION_MAJOR >= 4
-+#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4)
- #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4)
- #define txn_id(xx1) (xx1)->id(xx1)
-+#define txn_abort(xx1) (xx1)->abort(xx1)
-+#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2)
- #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3)
- #elif DB_VERSION_MINOR == 3
- #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3)
+   r = dbenv->set_lk_max(dbenv, 50000);
diff --git a/mail/prayer/patches/patch-ag b/mail/prayer/patches/patch-ag
new file mode 100644
index 00000000000..a3846b31845
--- /dev/null
+++ b/mail/prayer/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.1 2005/01/09 00:07:47 schmonz Exp $
+
+--- prayer/response.c	2003-04-15 14:00:03.000000000 +0100
++++ prayer/response.c	2005-01-05 18:32:01.000000000 +0000
+@@ -694,7 +694,12 @@
+     } else
+         bputs(b, "Content-Type: text/plain" CRLF);
+
+-    bprintf(b, "Content-Length: %lu" CRLF, sbuf.st_size);
++    /* Hack: cast sbuf.st_size to long here as we are only dealing
++     * with small files.  Otherwise, we will send "Content-Length: 0"
++     * for the images from big-endian hosts where st_size is 64 bits,
++     * which confuses browsers.
++     */
++    bprintf(b, "Content-Length: %lu" CRLF, (long)sbuf.st_size);
+
+     /* Following stolen from Apache:
+      *
+