Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 84 → Rev 85

/tags/1.2.3-2/debian/changelog
0,0 → 1,239
prayer (1.2.3-2) unstable; urgency=low
 
* welcome_is_template.patch wasn't fully incorporated upstream. Remove
the help_dir setting and check in makefile_install_config.patch instead.c
* Make Prayer work on kFreeBSD. Unfortunately there is no support for
SysV semaphores.
* kfreebsd.patch: Include the right headers under glibc. Detect that
semtimedop is a stub.
* debian/Config: Add -lutils to LIBS.
* makefile_install_config.patch: put back a default value for
lock_dir.
* makefile_install_config.patch: Set imap_server to localhost/notls in
default prayer.cf (Closes: #531801).
* Depend on exim4 | mail-transport-agent.
* Increase Standards-Version to 3.8.3.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 31 Aug 2009 23:48:04 +0200
 
prayer (1.2.3-1) unstable; urgency=low
 
* New upstream release.
- Drop repair_ssl_session_db_on_version_mismatch.patch,
remove_old_db_logfiles_from_prayer-ssl-prune.patch,
welcome_is_template.patch, template_find_bug.patch; all incorporated
upstream.
- Update makefile_install_config.patch after welcome.html gone.
* kfreebsd.patch (new): Try to get Prayer to work on Debian
GNU/kFreeBSD.
* Add ${misc:Depends} to Depends for prayer-templates.
* Upgrade to Standards-Version 3.8.1.
+ Add debian/README.source.
* clean_completely.patch (new): Fix a few makefiles that didn't remove
their build targets in the clean target (Closes: #521369). Thanks to
Simon McVittie.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 14 Apr 2009 00:50:31 +0200
 
prayer (1.2.2.1-7) unstable; urgency=high
 
* Since /var/run can be a tmpfs filesystem, don't ship /var/run/prayer
as part of the package but create it in the init script (LP: #304071).
Also, var_prefix, pid_dir and prayer_user will by default be overriden
from the command line to make sure that they get the values expected by
the init script.
 
-- Magnus Holmgren <holmgren@debian.org> Fri, 31 Oct 2008 18:31:28 +0100
 
prayer (1.2.2.1-6) unstable; urgency=low
 
* prayer.init: Correctly check for the presence of the executables.
* Split out templates to a separate arch-indep package.
* Change the default value of the tmp_dir option back to
${var_prefix}/tmp (/var/run/prayer/tmp) because using /tmp may not be
secure.
* usernames_with_at.patch (new, from upstream CVS): If a username
contains an @, it will be assumed to be a valid email address and be
used as envelope sender address and default "From" address when
sending mail (Closes: #497016).
 
-- Magnus Holmgren <holmgren@debian.org> Fri, 31 Oct 2008 18:19:34 +0100
 
prayer (1.2.2.1-5a) unstable; urgency=medium
 
* Prevent dh_installman from interpreting the cf in prayer.cf.5 as a
language code.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 17 Aug 2008 19:24:10 +0200
 
prayer (1.2.2.1-4) unstable; urgency=medium
 
* Urgency medium since fixing fairly serious bug(s).
* debian/Config: Fix handling of CFLAGS, CPPFLAGS and LDFLAGS from the
environment or command line, breaking a circular definition of
LDFLAGS (FTBFS on Ubuntu; LP: #256220).
* unlimit_login_username.patch (new):
- servers/prayer_login.c: Remove 8 character username limit from login
form (Closes: #494517).
* prayer.init, prayer-accountd.init: Sleep 1 second between stop and
start in restart.
* Add manpages prayer(8), prayer-session(8), prayer.cf(5), and
prayer-ssl-prune(8) (groff-mdoc format). Remove half-done Docbook
versions from source package.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 17 Aug 2008 17:38:00 +0200
 
prayer (1.2.2.1-3) unstable; urgency=low
 
* welcome_is_template.patch:
- shared/config.c: Don't require that the help_dir option, which was
removed from the default prayer.cf earlier, is defined
(Closes: #493009).
* makefile_install_config.patch:
- shared/config.c: Likewise don't check for lock_dir (Closes: #494011).
 
-- Magnus Holmgren <holmgren@debian.org> Wed, 06 Aug 2008 21:20:17 +0200
 
prayer (1.2.2.1-2) unstable; urgency=low
 
* Acknowledge NMU, but change the build dependency to
libc-client2007b-dev | libc-client2007-dev | libc-client-dev
(>= 7:2007~), since we need at least that version.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 27 Jul 2008 20:52:18 +0200
 
prayer (1.2.2.1-1.1) unstable; urgency=low
 
* Non-maintainer upload.
* Build-depend on unversioned libc-client-dev to allow BinNMUs.
Closes: bug#492285.
 
-- Jonas Smedegaard <dr@jones.dk> Thu, 24 Jul 2008 23:42:33 +0200
 
prayer (1.2.2.1-1) unstable; urgency=low
 
* New upstream release featuring XHTML templates and fixes to various
bugs created by the reorganisation.
- Drop accountd_makefile_typo.patch; fixed upstream.
* makefile_install_config.patch: Changes to the default config:
- Disable SSL session caching.
- Clean out "direct connection stuff". Remove lock_dir since we use
SysV semaphores.
* Point login_prefix_path, motd_path, and login_suffix_path towards
/etc/prayer.
* Change postponed-mail and sent-mail to Drafts and Sent.
* Improve SSL/TLS configuration:
* makefile_install_config.patch: Point ssl_cert_file and
ssl_privatekey_file to /etc/ssl/*/ssl-cert-snakeoil.*.
+ Add dependency on ssl-cert (>= 1.0.11).
+ prayer.postinst: Add prayer to group ssl-cert on fresh install or
when upgrading from versions prior to this one.
* welcome_is_template.patch (new): Although the welcome screen is now a
template among others, cmd_welcome.c still tried to read the file
specified by welcome_path (welcome.html by default) and wouldn't show
the welcome screen if the option was unset or the file couldn't be
read. This patch removes that check as well as the welcome_path and
help_path options from prayer.cf.
* No longer install welcome.html (see above) and motd.html (no real
content) in /etc/prayer. Install login_prefix.html, login_suffix.html,
and motd.html (the versions found in files/etc.hermes in the
distribution tarball) in /usr/share/doc/prayer/examples instead.
* Do not install prayer-chroot (too experimental, hardcoded chroot path)
or prayer-sem-prune (does nothing that ipcrm cannot do).
* templates_fallback_to_compiled.patch (new): If the
template_use_compiled option is false, nevertheless use compiled-in
templates in template_expand.c if the requested template cannot be
found on disk. Change default template_path to /etc/prayer/templates.
Install said directory as well as subdirectories for available
template sets.
* Update and improve README.Debian.
* Add logrotate dependency.
* makefile_install_config.patch: Remove call to install.sh from
files/Makefile and replace it with single tar pipeline; thus
install.sh no longer needs to be patched.
* remove_old_db_logfiles_from_prayer-ssl-prune.patch (new): Patch
myarchive() in lib/mydb_db3.c so that it only deletes obsolete
transaction logs if dirname = NULL, then call it (via DB->archive())
from ssl_prune_sessions() in lib/ssl.c.
- prayer-db-prune thus unnecessary.
* template_find_bug.patch (new): Fix segfault in template_find() when
template_set specifies a non-existing set. Also update default set.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 24 Jun 2008 01:34:14 +0200
 
prayer (1.2.0-1) unstable; urgency=low
 
* New upstream release featuring a major code reorganisation and a new
template system.
- Drop obsolete folder_list_cosmetics.patch and includes.patch.
- Note: SSL support has been removed from prayer-accountd for now.
* Changed defaults (manual intervention may be needed):
- Let prayer-accountd.pid reside in /var/run; letting the two packages
share /var/run/prayer caused too much trouble.
- prayer.cf (makefile_install_config.patch and debian/Config):
var_prefix set to /var/run/prayer and referred to in other
settings. socket_split_dir disabled by default and default sockets
directory changed to /var/run/prayer/sockets.
* debian/control:
+ Build-depend on latest Berkley DB library (libdb-dev).
+ Add Homepage field.
* repair_ssl_session_db_on_version_mismatch.patch: Recreate session DB
environment when upgrading from a version of Prayer that used an older
BDB library.
* prayer.postinst: Set HOME of prayer user to /var/run/prayer.
* prayer.postrm: Simply remove /var/run/prayer (since accountd doesn't use it)
on remove or disappear and correctly remove statoverrides (Closes: #483176).
Also check that deluser exists; it may be gone at purge time.
* Package build details:
- Reduce makefile_install_config.patch by not changing BROOT into DESTDIR.
- Override CDBS overriding CFLAGS.
* debian/patches/accountd_makefile_typo.patch: Fix typo that caused PAM
not to be used.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 31 May 2008 19:28:21 +0200
 
prayer (1.1.0-2) unstable; urgency=low
 
* Define LDAP_DEPRECATED so that the deprecated LDAP interfaces can be
used.
* makefile_install_config.patch: Modify prayer/Makefile so that the
above definition isn't lost if CFLAGS is overridden.
* Improve prayer.postrm to clean /var/run/prayer on removal and
disappearence.
* Use dpkg-override to allow the administrator to change mode of
/var/run/prayer and /var/log/prayer.
* Add postinst and postrm scripts for prayer-accountd.
* makefile_install_config.patch: Set authtype = pam in accountd.cf so
that accountd will start.
* Bump Standards-Version to 3.7.3. No changes necessary.
* Override Lintian warnings about GPL code linked with OpenSSL. Special
exception has been granted.
* Don't require cdbs 0.4.27-1. Oldstable has 0.4.28-1.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 15 May 2008 22:47:14 +0200
 
prayer (1.1.0-1) unstable; urgency=low
 
* First upload to unstable.
* New upstream release.
+ Requires development version of the c-client library (libc-client2007-dev).
- Drop pidfiles_extension.patch, session_unix_bugs.patch,
session_server_bugs.patch; all incorporated upstream.
- Drop ipv6.patch; incorporated upstream.
- Drop utf8.patch; incorporated and improved upstream.
- Drop hasnochildren_means_noinferiors.patch since upstream now
handles dual-use mailboxes.
* New maintainer email address.
* Update README.Debian, removing lies about TLS not being possible to
disable (Closes: #440462).
* folder_list_cosmetics.patch: Remove space between expand/collapse
arrow and folder icon in the folder list and change the alt texts so
that the tree looks nicer in text browsers.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 13 May 2008 22:31:36 +0200
 
prayer (1.0.18-1) experimental; urgency=low
 
* Initial release (Closes: #392823)
 
-- Magnus Holmgren <magnus@kibibyte.se> Sat, 10 Mar 2007 14:24:21 +0100
/tags/1.2.3-2/debian/control
0,0 → 1,67
Source: prayer
Section: mail
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt,
libc-client2007b-dev | libc-client2007-dev | libc-client-dev (>= 7:2007~),
libldap2-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb-dev
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk
Vcs-Browser: http://svn.kibibyte.se/prayer
Homepage: http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 
Package: prayer
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, ssl-cert (>= 1.0.11),
logrotate, exim4 | mail-transport-agent
Suggests: prayer-accountd, prayer-templates, imap-server, aspell | ispell
Description: standalone IMAP-based webmail server
Prayer is yet another Webmail interface.
.
It is unusual in that it is a complete, standalone, HTTP server and proxy
rather a Apache/mod_php plugin. Prayer maintains persistent connections to
the IMAP server and is written entirely in C. Consequently it is much
faster than most open source Webmail interfaces and puts very little load
on either the machines running the Web server or the backend IMAP servers
(even if traditional Unix format mailfolders are in use).
.
Prayer has very few external dependencies as user preferences are stored on
the IMAP server rather than in a SQL database. It does however implement a
full range of features and user preference settings.
 
Package: prayer-templates
Architecture: all
Depends: ${misc:Depends}
Recommends: prayer (>= 1.2.0)
Replaces: prayer (<< 1.2.2.1-6)
Description: templates for customizing Prayer Webmail
This package contains, in source form, the templates for the HTML
that Prayer outputs.
.
As all the templates are compiled into the session daemon,
prayer-session, you only need to install this package if you need to
customize one or more pages and you want something to start from.
 
Package: prayer-accountd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: prayer
Recommends: exim4
Description: account management daemon for Prayer
Prayer is yet another Webmail interface.
.
It is unusual in that it is a complete, standalone, HTTP server and proxy
rather a Apache/mod_php plugin. Prayer maintains persistent connections to
the IMAP server and is written entirely in C. Consequently it is much
faster than most open source Webmail interfaces and puts very little load
on either the machines running the Web server or the backend IMAP servers
(even if traditional Unix format mailfolders are in use).
.
This package contains a daemon that can do the following for users:
.
* Change passwords
* Change their full name
* Manage mail filtering (requires Exim) and forwarding
* Manage vacation messages and logs
.
NOTE: This package is currently not very useful.
/tags/1.2.3-2/debian/patches/kfreebsd.patch
0,0 → 1,38
--- a/lib/os.c
+++ b/lib/os.c
@@ -26,7 +26,7 @@
#include "os_linux.c"
#elif (defined(SOLARIS))
#include "os_solaris.c"
-#elif (defined(BSD) && BSD >= 199306)
+#elif defined(__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306)
#include "os_bsd.c"
#else
#error "No support for this operating system yet. Sorry!"
--- a/lib/os_bsd.c
+++ b/lib/os_bsd.c
@@ -16,8 +16,12 @@
#include <arpa/inet.h>
#include <signal.h>
#include <netdb.h>
-
+#ifdef __GLIBC__
+#include <sys/file.h>
+#include <pty.h>
+#else
#include <libutil.h>
+#endif
/* ====================================================================== */
--- a/lib/mymutex.c
+++ b/lib/mymutex.c
@@ -9,7 +9,7 @@
#include "lib.h"
-#ifdef MUTEX_SEMAPHORE
+#if defined(MUTEX_SEMAPHORE) && !defined(__stub_semtimedop)
# include "mymutex_sem.c"
#else
# include "mymutex_file.c"
/tags/1.2.3-2/debian/patches/makefile_install_config.patch
0,0 → 1,199
--- a/files/etc/prayer-accountd.cf
+++ b/files/etc/prayer-accountd.cf
@@ -8,6 +8,10 @@
# Default accountd.cf file suitable for RedHat Linux only.
# See distribution for some sample files for FreeBSD and Solaris
+accountd_port = 145
+
+authtype = pam
+
msforward_name = ".MSforward"
forward_name = ".forward"
aliases_name = "vacation.aliases"
--- a/files/Makefile
+++ b/files/Makefile
@@ -65,21 +65,16 @@ install-aconfig:
install-motd:
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/motd.html ${BROOT}${PREFIX}/etc
+ etc/motd.html ${BROOT}/etc/prayer
install:
- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
- RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \
- RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \
- PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
- PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
- PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
- BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
- ./install.sh
- if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}${PREFIX}
+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}/etc/prayer
+
+ tar -c --owner ${RO_USER} --group ${RO_GROUP} icons static | tar -C ${BROOT}${PREFIX} -x
if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
- if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
+ if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
redhat-install-init.d:
install -D -o root -g root -m 755 \
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -20,7 +20,7 @@ var_prefix = "__VAR_PREFIX__"
# User ID to run as if we start off as root
prayer_user = "prayer"
# Group ID to run as if we start off as root
-prayer_group = "prayer"
+prayer_group = "nogroup"
# Run prayer as background process.
# TRUE => will return as soon as valid configuration is found.
@@ -53,7 +53,7 @@ directory_perms = 0750
imapd_user_map = ""
# Default imapd server.
-imapd_server = localhost
+imapd_server = localhost/notls
# Name of Prayer user preferences file on IMAP server
prefs_folder_name = ".prayer"
@@ -266,11 +266,11 @@ http_icon_embed = TRUE
# Locatation of SSL certificate file (only used if SSL ports defined).
# Required if we are going to provide SSL services.
-ssl_cert_file = "$prefix/certs/prayer.pem"
+ssl_cert_file = "/etc/ssl/certs/ssl-cert-snakeoil.pem"
# Locatation of SSL private key file (only used if SSL ports defined).
# Required if we are going to provide SSL services.
-ssl_privatekey_file = "$prefix/certs/prayer.pem"
+ssl_privatekey_file = "/etc/ssl/private/ssl-cert-snakeoil.key"
# Master server will regenerate shared RSA key at this interval:
ssl_rsakey_lifespan = 15m
@@ -278,26 +278,14 @@ ssl_rsakey_lifespan = 15m
# RSA key remains fresh in child process for this long after first actual use.
ssl_rsakey_freshen = 15m
-# SSL session cache timeout.
-ssl_session_timeout = 24h
+# SSL session cache timeout. Uncomment to enable SSL session caching.
+# You should also arrange for prayer-ssl-prune to be run periodically.
+#ssl_session_timeout = 24h
# EGD socket, if system has no /dev/urandom
#egd_socket = "/var/prngd/urandom"
######################################################################
-
-# Direct connection stuff. Experimental! Leave this well alone unless you
-# understand what it is for (DESIGN document provides detail for the curious).
-direct_enable = FALSE
-
-# Following four options just define a set of (non-overlapping) ports for
-# SSL and plaintext use if direct connection mode is enabled.
-direct_ssl_first = 5000
-direct_ssl_count = 1000
-direct_plain_first = 4000
-direct_plain_count = 1000
-
-######################################################################
# Session specific configuration
# Session switches to idle mode after this much time: connections to IMAP
@@ -382,13 +370,13 @@ ispell_path = /usr/bin/ispell
# <login_suffix_path>
# Login page prefix
-#login_prefix_path = "$prefix/etc/login_prefix.html"
+#login_prefix_path = "/etc/login_prefix.html"
# Message of the day file
-#motd_path = "$prefix/etc/motd.html"
+#motd_path = "/etc/prayer/motd.html"
# Login page suffix
-#login_suffix_path = "$prefix/etc/login_suffix.html"
+#login_suffix_path = "/etc/login_suffix.html"
# Login security: Prayer's front page defaults to a login form.
# If the user does not connect via SSL then this can be changed
@@ -409,9 +397,6 @@ ssl_required = FALSE
# Session banner (local HTML inserted into each page of login session)
#session_banner_path = "$prefix/etc/session_banner.html"
-# Location of help files
-help_dir = "$prefix/help"
-
# Location of icon files
icon_dir = "$prefix/icons"
@@ -423,10 +408,11 @@ bin_dir = "__BIN_DIR__"
# Various directories used by the running system
# Logs stored in $log_dir
-log_dir = "$var_prefix/logs"
+log_dir = "/var/log/prayer"
# $lock_dir used for interlocking between prayer processes
-lock_dir = "$var_prefix/locks"
+# (only on Debian GNU/kFreeBSD)
+lock_dir = "$var_prefix"
# $socket_dir is location for unix domain sockets which connect frontend
# to backend in proxy mode of operation.
@@ -434,7 +420,7 @@ socket_dir = "$var_prefix/socke
# Split socket directory into 64 subdirs keyed on first letter of sessionID
# Code provides compatibility in both directions: can switch back and forward
-socket_split_dir = TRUE
+socket_split_dir = FALSE
# Name of Unix domain socket (in $socket_dir) used for initial handshake
# between prayer and prayer-session processes when a user logs in
@@ -448,7 +434,7 @@ ssl_session_dir = "$var_prefix/ssl_s
tmp_dir = "$var_prefix/tmp"
# Location for PID files for prayer and prayer-session master processes.
-pid_dir = "$var_prefix/pid"
+pid_dir = "$var_prefix"
# Interface to Hermes finger database
#lookup_rpasswd = "/data/finger/rpasswd.cdb"
@@ -609,14 +595,14 @@ hiersep = "/"
dualuse = FALSE
# Names of postponed_folder and sent_mail_folder, relative to maildir
-postponed_folder = "postponed-msgs"
-sent_mail_folder = "sent-mail"
+postponed_folder = "Drafts"
+sent_mail_folder = "Sent"
# Default domain for outgoing mail. Defaults to "$hostname".
# default_domain = "<valid mail domain>"
# Language for ispell.
-ispell_language = "british"
+ispell_language = "american"
# Size of small and large compose windows
small_cols = 80
--- a/shared/config.c
+++ b/shared/config.c
@@ -2139,12 +2139,10 @@ BOOL config_check(struct config * config
struct config_http_port *chp;
char hostname[MAX_ADDRESS+1], domainname[MAX_ADDRESS+1];
- TEST_STRING(config->help_dir, "help_dir");
TEST_STRING(config->icon_dir, "icon_dir");
TEST_STRING(config->socket_dir, "socket_dir");
TEST_STRING(config->init_socket_name, "init_socket_name");
TEST_STRING(config->ssl_session_dir, "ssl_session_dir");
- TEST_STRING(config->lock_dir, "lock_dir");
TEST_STRING(config->log_dir, "log_dir");
TEST_STRING(config->tmp_dir, "tmp_dir");
TEST_STRING(config->pid_dir, "pid_dir");
/tags/1.2.3-2/debian/patches/templates_fallback_to_compiled.patch
0,0 → 1,45
--- a/lib/template_expand.c
+++ b/lib/template_expand.c
@@ -496,11 +496,11 @@ template_expand_call(struct template_cal
char *s, *t;
char *err = NIL;
- if (tvals->use_compiled)
+ if (tvals->use_compiled ||
+ !(template = template_parse(tvals->dir, tvals->set,
+ item->name, tvals->pool)))
template = template_find(tvals->set, item->name, tvals->pool);
- else
- template = template_parse(tvals->dir, tvals->set,
- item->name, tvals->pool);
+
if (!template) {
str_printf(state->error,
"Template \"%s\" not found (CALL from template \"%s\")\n",
@@ -579,11 +579,11 @@ template_expand(char *name, struct templ
struct str *error = tvals->error;
char *err;
- if (tvals->use_compiled) {
+ if (tvals->use_compiled ||
+ !(template = template_parse(tvals->dir, tvals->set,
+ name, tvals->pool)))
template = template_find(tvals->set, name, tvals->pool);
- } else {
- template = template_parse(tvals->dir, tvals->set, name, tvals->pool);
- }
+
if (!template) {
str_printf(tvals->error,
"Template %s not found (top level template_expand())",
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -450,7 +447,7 @@ pid_dir = "$var_prefix"
######################################################################
# Template stuff
-template_path = "__PREFIX__/templates"
+template_path = "/etc/prayer/templates"
template_set = "xhtml_strict"
template_use_compiled = TRUE
/tags/1.2.3-2/debian/patches/series
0,0 → 1,6
makefile_install_config.patch
templates_fallback_to_compiled.patch
kfreebsd.patch
unlimit_login_username.patch
usernames_with_at.patch
clean_completely.patch
/tags/1.2.3-2/debian/patches/clean_completely.patch
0,0 → 1,33
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -74,7 +74,7 @@ mymutex.o: mymutex.c mymutex_sem.c mymu
$(CC) $(CFLAGS) $(MUTEX_DEF) -c $<
clean:
- rm -f lib.o $(OBJS) $(WITHSSL_OBJS) $(NOSSL_OBJS) *~ \#*\#
+ rm -f lib.o $(OBJS) $(WITHSSL_OBJS) $(NOSSL_OBJS) *~ \#*\# $(TARGETS)
install: all
cp template_expand template_compile ../bin
--- a/templates/xhtml_strict/Makefile
+++ b/templates/xhtml_strict/Makefile
@@ -108,7 +108,7 @@ install:
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
clean:
- rm -f *.html *.o *.c \#*\# *~
+ rm -f *.html *.o *.c \#*\# *~ $(TARGET)
include Makefile.deps
--- a/templates/xhtml_transitional/Makefile
+++ b/templates/xhtml_transitional/Makefile
@@ -108,7 +108,7 @@ install:
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
clean:
- rm -f *.html *.o *.c \#*\# *~
+ rm -f *.html *.o *.c \#*\# *~ $(TARGET)
include Makefile.deps
/tags/1.2.3-2/debian/patches/unlimit_login_username.patch
0,0 → 1,11
--- a/servers/prayer_login.c
+++ b/servers/prayer_login.c
@@ -118,7 +118,7 @@ prayer_login_generate(struct prayer *pra
bprintf(b, "<input name=\"username\" value=\"");
if (user)
html_quote_string(b, user);
- bputs(b, "\" size=\"8\" maxlength=\"8\" />");
+ bputs(b, "\" size=\"16\" />");
bputs(b, "</td>" CRLF);
bputs(b, "</tr>" CRLF);
/tags/1.2.3-2/debian/patches/usernames_with_at.patch
0,0 → 1,53
--- a/session/draft.c
+++ b/session/draft.c
@@ -1399,10 +1399,12 @@ char *draft_make_msg(struct draft *draft
if (draft->from_address && draft->from_address[0]) {
from_address = draft->from_address;
use_sender = T;
- } else
- from_address
- =
+ } else if (strchr(session->username, '@')) {
+ from_address = pool_strdup(pool, session->username);
+ } else {
+ from_address =
pool_printf(pool, "%s@%s", session->username, default_domain);
+ }
if (draft->from_personal && draft->from_personal[0]) {
from_personal = draft->from_personal;
@@ -1431,9 +1433,14 @@ char *draft_make_msg(struct draft *draft
NIL);
bputs(mb, "" CRLF);
- if (use_sender)
- bprintf(mb, "Sender: %s@%s" CRLF, session->username,
- default_domain);
+ if (use_sender) {
+ if (strchr(session->username, '@')) {
+ bprintf(mb, "Sender: %s" CRLF, session->username);
+ } else {
+ bprintf(mb, "Sender: %s@%s" CRLF, session->username,
+ default_domain);
+ }
+ }
if (!(draft_make_abook_address(session, mb, "To", draft->to) &&
draft_make_abook_address(session, mb, "Cc", draft->cc) &&
--- a/cmd/cmd_prefs.c
+++ b/cmd/cmd_prefs.c
@@ -474,9 +474,12 @@ generate_compose1_form(struct session *s
template_vals_string(tvals, "from_address", prefs->from_address);
if (!(prefs->from_address && prefs->from_address[0])) {
- char *s = pool_printf(request->pool, "%s@%s",
- session->username, prefs->default_domain);
+ char *s = session->username;
+ if (!strchr(session->username, '@')) {
+ s = pool_printf(request->pool, "%s@%s",
+ session->username, prefs->default_domain);
+ }
template_vals_string(tvals, "default_from_address", s);
}
/tags/1.2.3-2/debian/patches/sighandling.patch
0,0 → 1,75
Index: prayer-1.0.18/prayer/os.h
===================================================================
--- prayer-1.0.18.orig/prayer/os.h 2007-03-10 19:56:40.357114747 +0100
+++ prayer-1.0.18/prayer/os.h 2007-03-10 19:57:56.266959171 +0100
@@ -44,6 +44,8 @@ BOOL os_signal_alarm_clear(void);
BOOL os_signal_init();
+BOOL os_signal_hup_term_init(void (*hup_fn) (), void (*term_fn) ());
+
BOOL os_lock_exclusive(int fd);
BOOL os_lock_shared(int fd);
Index: prayer-1.0.18/prayer/session_server.c
===================================================================
--- prayer-1.0.18.orig/prayer/session_server.c 2007-03-10 19:56:40.647152355 +0100
+++ prayer-1.0.18/prayer/session_server.c 2007-03-10 19:57:56.326966954 +0100
@@ -355,6 +355,7 @@ BOOL session_server(struct config *confi
fd_set readfds;
pid_t child;
unsigned long timeout = 0L;
+ BOOL sighup_seen = NIL;
if (config->direct_enable) {
ssl_portlist
@@ -420,6 +421,18 @@ BOOL session_server(struct config *confi
} else {
rc = select(maxfd + 1, &readfds, NIL, NIL, NIL);
}
+ if (sighup_seen) {
+ log_misc("SIGHUP received - reexec daemon");
+ close(sockfd);
+ if (config->direct_enable) {
+ /* Find some way to pass this information along
+ to the new invocation somehow later. */
+ portlist_close_all(ssl_portlist);
+ portlist_close_all(plain_portlist);
+ }
+ log_misc_free();
+ return (T);
+ }
}
while ((rc < 0) && (errno == EINTR));
Index: prayer-1.0.18/prayer/log.c
===================================================================
--- prayer-1.0.18.orig/prayer/log.c 2007-03-10 19:58:03.667919109 +0100
+++ prayer-1.0.18/prayer/log.c 2007-03-10 19:58:11.688959503 +0100
@@ -502,6 +502,13 @@ BOOL log_misc_init(struct config *config
return (log_open(log_misc_ptr, log_name));
}
+void log_misc_free()
+{
+ if ((log_misc_ptr == NIL) || (log_misc_ptr->fd < 0))
+ return;
+ log_free(log_misc_ptr);
+}
+
/* log_misc_ping() *******************************************************
*
* Reopen misc log file if required
Index: prayer-1.0.18/prayer/log.h
===================================================================
--- prayer-1.0.18.orig/prayer/log.h 2007-03-10 19:58:04.067970999 +0100
+++ prayer-1.0.18/prayer/log.h 2007-03-10 19:58:11.648954314 +0100
@@ -45,6 +45,8 @@ void log_record_peer_pid(struct log *log
BOOL
log_misc_init(struct config *config, char *progname, char *misc_log_name);
+void log_misc_free();
+
BOOL log_misc_ping();
void log_misc(char *fmt, ...);
/tags/1.2.3-2/debian/Config
0,0 → 1,146
# $Cambridge: hermes/src/prayer/defaults/Config,v 1.12 2008/05/21 13:25:13 dpc22 Exp $
#
# Prayer - a Webmail Interface
#
# Copyright (c) University of Cambridge 2000 - 2002
# See the file NOTICE for conditions of use and distribution.
#
# Conventional Configure file.
 
SSL_ENABLE = true # SSL requires OpenSSL
SESSION_CACHE_ENABLE = true # SSL session cache Requires Berkeley DB 3 or 4
GZIP_ENABLE = true # Enable on the fly compression of pages
LDAP_ENABLE = true # Add LDAP interface
FENCE_ENABLE = false # Use Electric Fence to catch malloc problems
MUTEX_SEMAPHORE = true # 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_PAM_ENABLE = false # C-client was built with PAM support
CCLIENT_KERB_ENABLE = false # C-client was built with Kerberos support
 
# Probably don't need the following
ACCOUNTD_ENABLE = true # Only of use in Cambridge at the moment.
ACCOUNTD_SSL_ENABLE = true # Enable SSL support in account management daemon
ACCOUNTD_PAM_ENABLE = true # Enable PAM support in account management daemon
ACCOUNTD_USE_BSD_PTY = false # Use Berkeley PTYs rather than Sys V PTYs
 
############################################################################
# Location of compiler
CC = gcc
# Location of make program (GNU make required)
MAKE = make
# Location of install program (GNU install or compatible required)
INSTALL = install
 
# Base Compiler options for GCC (use CFLAGS, CPPFLAGS and LDFLAGS if passed in)
BASECFLAGS := $(CFLAGS)
BASECFLAGS ?= -Wall -g -O2
BASECFLAGS += $(CPPFLAGS)
 
BASELDFLAGS := $(LDFLAGS)
BASELDFLAGS ?= -g
 
# Minimal libraries needed by Linux
BASE_LIBS = -lcrypt -lutil
# FreeBSD needs some extra libraries:
# BASE_LIBS = -lcrypt -liconv -lutil
# Solaris needs even more libararies:
# BASE_LIBS = -lcrypt -lxnet -lnsl -lsocket
 
# Base Compiler options for Sun SUNWspro compiler
#CC = /opt/SUNWspro/bin/cc
#BASECFLAGS = -fast
#BASELDFLAGS = -s
 
############################################################################
# Location of various include files and libraries.
############################################################################
 
# Location of c-client library.
CCLIENT_DIR=/usr/include/c-client
CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
CCLIENT_LIBS=-lc-client
 
# Electric fence (required if FENCE_ENABLE set)
FENCE_INCLUDE=
FENCE_LIBS=-lmcheck
 
# Zlib (required if GZIP_ENABLE set)
Z_INCLUDE =
Z_LIBS = -lz
 
# LDAP (required if LDAP_ENABLE set)
LDAP_INCLUDE =
LDAP_LIBS = -lldap
 
# Pam (required if CCLIENT_PAM_ENABLE set)
PAM_INCLUDE =
PAM_LIBS = -lpam
 
# Kerberos (required if CCLIENT_KERB_ENABLE set)
KERB_INCLUDE =
KERB_LIBS = -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
 
# SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
#
# Following suitable for Linux and FreeBSD which have SSL preinstalled
# (Header files from OpenSSL 0.9.7 want to include various Kerboros stuff)
#
SSL_INCLUDE=
SSL_LIBS=-lssl -lcrypto
OPENSSL=openssl
 
# Following definitions suitable for our Sun systems.
#SSL_BASE=/opt/local/ssl/current
#SSL_INCLUDE=-I ${SSL_BASE}/include
#SSL_LIBS=-L ${SSL_BASE}/lib -lssl -lcrypto
#OPENSSL=${SSL_BASE}/bin/openssl
 
# DB definitions (required if SESSION_CACHE_ENABLE set)
#
# Following suitable for Redhat Linux which has DB 3 preinstalled
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
 
############################################################################
 
# Install location of prayer configuration and support files. The initial
# config file runs prayer processes as user "prayer" and group "prayer".
# If you are using SSL, the certificate file must be readable by RW_USER or
# RW_GROUP. It is important that nothing else can read the certificate file.
 
# Build root (used by Redhat RPM system)
BROOT=$(CURDIR)/../debian/tmp
 
# Directory, User and group for read-write files: log files, sockets etc
VAR_PREFIX = /var/run/prayer
RW_USER = root
RW_GROUP = root
 
# Root Directory, User and group for read-only configuration files.
# Default configuration and permissions does not allow prayer user to
# update prayer configuration file.
 
PREFIX = /usr/share/prayer
RO_USER = root
RO_GROUP = root
 
# Access permissions for general objects (wrt above users and groups)
PUBLIC_EXEC = 0755
PUBLIC_DIR = 0755
PUBLIC_FILE = 0644
 
# Access permissions for private objects (wrt above users and groups)
PRIVATE_EXEC = 0750
PRIVATE_DIR = 0750
PRIVATE_FILE = 0640
 
# Location of configuration files and binaries
PRAYER_CONFIG_FILE = /etc/prayer/prayer.cf
BIN_DIR = /usr/sbin
ACCOUNTD_CONFIG_FILE = /etc/prayer/accountd.cf
/tags/1.2.3-2/debian/README.source
0,0 → 1,8
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build. For basic usage
information, see
 
/usr/share/doc/quilt/README.source
 
(after installing quilt).
/tags/1.2.3-2/debian/prayer.postinst
0,0 → 1,58
#!/bin/sh
# postinst script for prayer
#
# see: dh_installdeb(1)
 
set -e
 
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#
 
case "$1" in
configure)
adduser --quiet --system --no-create-home --home /var/run/prayer prayer
 
dpkg-statoverride --list /var/log/prayer >/dev/null 2>&1 \
|| dpkg-statoverride --update --add prayer adm 2750 /var/log/prayer
 
if dpkg --compare-versions "$2" lt "1.2.2.1-7" &&
dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1; then
dpkg-statoverride --remove /var/run/prayer
fi
 
# Add prayer user to the ssl-cert group on upgrades or fresh installs
if dpkg --compare-versions "$2" lt "1.2.2.1-1"; then
if getent group ssl-cert >/dev/null; then
adduser --quiet prayer ssl-cert
fi
fi
 
;;
 
abort-upgrade|abort-remove|abort-deconfigure)
 
;;
 
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
 
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
 
#DEBHELPER#
 
exit 0
 
 
/tags/1.2.3-2/debian/prayer.postrm
0,0 → 1,50
#!/bin/sh
# postrm script for prayer
#
# see: dh_installdeb(1)
 
set -e
 
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
 
 
case "$1" in
upgrade|abort-install|failed-upgrade|abort-upgrade)
;;
 
remove|disappear)
rm -rf /var/run/prayer
;;
 
purge)
rm -rf /var/log/prayer
if dpkg-statoverride --list /var/log/prayer >/dev/null 2>&1; then
dpkg-statoverride --remove /var/log/prayer
fi
if [ -x /usr/sbin/deluser ]; then
deluser --system --quiet prayer || true
fi
;;
 
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
 
esac
 
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
 
#DEBHELPER#
 
exit 0
/tags/1.2.3-2/debian/prayer.default
0,0 → 1,17
# Defaults for prayer initscript
# sourced by /etc/init.d/prayer
# installed at /etc/default/prayer by the maintainer scripts
 
# This is a POSIX shell fragment
 
# Change to one to enable prayer after editing /etc/prayer/prayer.cf
ENABLED=0
 
# Default values for var_prefix (also used for pid_dir) and
# prayer_user. These are set from the command line to make sure that
# prayer uses the expected values.
#VAR_PREFIX="/var/run/prayer"
#PRAYER_USER="prayer"
 
# Additional ptions. You probably won't need any.
DAEMON_OPTS=""
/tags/1.2.3-2/debian/prayer.dirs
0,0 → 1,3
var/log/prayer
etc/prayer/templates/xhtml_transitional
etc/prayer/templates/xhtml_strict
/tags/1.2.3-2/debian/prayer.init
0,0 → 1,99
#!/bin/sh
#
### BEGIN INIT INFO
# Provides: prayer
# Required-Start:
# Required-Stop:
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Prayer init script
# Description: Init script for prayer services
### END INIT INFO
 
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
FRONTEND_DAEMON=/usr/sbin/prayer
SESSION_DAEMON=/usr/sbin/prayer-session
VAR_PREFIX=/var/run/prayer
PRAYER_USER=prayer
DESC="webmail server"
 
test -x $FRONTEND_DAEMON -a -x $SESSION_DAEMON || exit 0
 
. /lib/lsb/init-functions
 
ENABLED=0
 
# Include prayer defaults if available
if [ -f /etc/default/prayer ] ; then
. /etc/default/prayer
fi
 
FRONTEND_PIDFILE="$VAR_PREFIX/prayer.pid"
SESSION_PIDFILE="$VAR_PREFIX/prayer-session.pid"
 
set +e
 
start() {
if [ "$ENABLED" = "0" ]; then
echo "Prayer is disabled. Please set ENABLED=1 in /etc/default/prayer"
echo "after adapting /etc/prayer/prayer.cf to your needs."
exit 0
fi
 
log_daemon_msg "Starting $DESC" "prayer"
start-stop-daemon --start --pidfile "$FRONTEND_PIDFILE" \
--exec "$FRONTEND_DAEMON" \
-- $DAEMON_OPTS --config-option "prayer_user=$PRAYER_USER" \
--config-option "var_prefix=$VAR_PREFIX" \
--config-option "pid_dir=$VAR_PREFIX"
log_end_msg $?
}
 
stop() {
log_daemon_msg "Stopping $DESC"
if [ -f "$SESSION_PIDFILE" ]; then
start-stop-daemon --stop --quiet --oknodo --pidfile "$SESSION_PIDFILE"
log_progress_msg "prayer-session"
fi
if [ -f "$FRONTEND_PIDFILE" ]; then
start-stop-daemon --stop --quiet --oknodo --pidfile "$FRONTEND_PIDFILE"
start-stop-daemon --stop --quiet --oknodo --exec "$FRONTEND_DAEMON"
log_progress_msg "prayer"
fi
rm -f "$FRONTEND_PIDFILE" "$SESSION_PIDFILE"
log_end_msg 0
}
 
case "$1" in
start)
# Create /var/run/prayer with prayer as owner in case /var/run is a tmpfs.
# If local admin
install -d -m 2750 -o "$PRAYER_USER" "$VAR_PREFIX"
start
;;
 
stop)
stop
;;
 
restart|force-reload)
#
# If the "reload" option is implemented, move the "force-reload"
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
stop
sleep 1
start
;;
*)
N=/etc/init.d/prayer
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
log_failure_msg "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
 
exit 0
/tags/1.2.3-2/debian/prayer-session.8
0,0 → 1,96
.\" -*- nroff -*-
.Dd 17 August 2008
.Os "The Prayer Webmail Interface"
.ds volume-operating-system
.Dt PRAYER-SESSION 8
.Sh NAME
.Nm prayer-session
.Nd Prayer user session backend daemon
.Sh SYNOPSIS
.Nm
.Oo Fl -config-file
.Ar file Oc
.Oo Oo Fl -config-option
.Ar name Ns = Ns Ar value Oc
.Ar ... Oc
.Op Fl -foreground
.Sh DESCRIPTION
.Nm
is the backend process in the Prayer Webmail system. A fresh
.Nm
backend is forked off whenever a user logs in.
.Pp
This process contains all of the permanent state associated with that login
session including one or more connections to a IMAP server and possibly
connections to accountd servers. prayer-session communicates with the user
using HTML over HTTP connections via the
.Xr prayer 8 proxy. Each login has a session ID that the front end processes
use to find the correct backend.
.Pp
Backend server processes move into a dormant state after a certain period
of inactivity, shutting down IMAP and accountd connections which can be
easily resuscitated when the session wakes up. After a long period of
inactivity, typically several hours the session process shuts down.
.Pp
.Nm
accepts the following command-line options:
.Bl -tag -width Ds
.It Fl -config-file Ar file
Reads configuration from
.Ar file
instead of the default
.Pa /etc/prayer/prayer.cf .
.It Fl -config-option Ar name Ns = Ns Ar value
Sets (overrides) the configuration option
.Ar name
to
.Ar value .
Any number of options can be specified in this manner.
.It Fl -foreground
Debug mode. Run a single process in the foreground.
.El
.
.Sh ENVIRONMENT
.
.Bl -tag -width Ds
.It Ev PRAYER_CONFIG_FILE
Can be set to specify the configuration file to use. The
.Fl -config-file
option takes precedence over this variable.
.It Ev PRAYER_HOSTNAME
Local hostname. Overrides the
.Cd hostname
setting in the configuration file as well as on the command line.
.El
.Sh FILES
.Bl -tag -width Ds
.It Pa /etc/prayer/prayer.cf
Default configuration file.
.It /usr/share/prayer/templates/
Location of standard templates (in the separate
.Em prayer-templates
package). The templates are compiled into
.Nm
for performance reasons, so the template files are actually not
used, but they are available for customization.
.It /etc/prayer/templates/
The Debian pre-configured
.Cd template_path .
As a Debian extension,
.Nm
looks here before falling back to the compiled template if
.Cd template_use_compiled No is Li false .
.El
.
.Sh SEE ALSO
.
.Xr prayer 8 ,
.Xr prayer.cf 5
.
.Sh AUTHORS
.
This manual page was put together by
.An "Magnus Holmgren" <holmgren@debian.org>
using documentation written by
.An "David Carter" <dpc22@cam.ac.uk> .
.\" .Sh BUGS
/tags/1.2.3-2/debian/rules
0,0 → 1,18
#!/usr/bin/make -f
# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
# This file is public domain.
 
# Add here any variable or target overrides you need
 
makebuilddir/prayer::
cp debian/Config .
 
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE)
DEB_MAKE_INSTALL_TARGET = install BROOT=$(CURDIR)/debian/tmp
DEB_INSTALL_CHANGELOGS_ALL = docs/DONE
DEB_DH_INSTALL_SOURCEDIR = debian/tmp
DEB_INSTALL_MANPAGES_prayer = "--language=C"
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 1.2.3-2/debian/prayer.manpages
===================================================================
--- 1.2.3-2/debian/prayer.manpages (nonexistent)
+++ 1.2.3-2/debian/prayer.manpages (revision 85)
@@ -0,0 +1,4 @@
+debian/prayer.8
+debian/prayer-session.8
+debian/prayer.cf.5
+debian/prayer-ssl-prune.8
Index: 1.2.3-2/debian/prayer.cf.5
===================================================================
--- 1.2.3-2/debian/prayer.cf.5 (nonexistent)
+++ 1.2.3-2/debian/prayer.cf.5 (revision 85)
@@ -0,0 +1,1015 @@
+.\" -*- nroff -*-
+.Dd 17 August 2008
+.Os "The Prayer Webmail Interface"
+.ds volume-operating-system
+.Dt PRAYER.CF 5
+.Sh NAME
+.Nm prayer.cf
+.Nd main Prayer configuration file
+.
+.Sh DESCRIPTION
+.
+.Pa prayer.cf
+is the configuration file of
+.Xr prayer 8
+and
+.Xr prayer-session 8 .
+.
+.Sh SYNTAX
+For the most part, prayer.cf consists of
+.Ar option No = Ar value
+pairs, but some configuration items are more complex. All values may
+be enclosed in double quotes, which are stripped. Quotes must be used
+if a value contains a
+.Ql #
+character. Otherwise, everything following it is treated as a comment.
+Any line can be folded using a
+.Ql \(rs
+character at the end of the line; any linear white space at the beginning
+of the next line is removed.
+.Pp
+Simple options can be of the following types:
+.Bl -tag
+.
+.It Vt string
+No particular restrictions.
+.It Vt path
+A file or directory name. The configuration parser expands occurences of a few macros
+in settings of this type. See
+.Cd prefix
+.No and Cd var_prefix
+below.
+.It Vt boolean
+The following forms are interpreted as
+.Sy true :
+.Ql true ,
+.Ql t ,
+and
+.Ql 1 .
+The following forms are interpreted as
+.Sy false :
+.Ql false ,
+.Ql nil ,
+.Ql 0 .
+Capitalisation does not matter.
+.
+.It Vt number
+An integer number (sequence of digits 0-9), optionally immediately followed by a single letter
+.Ql K ,
+causing the number to be multiplied by 1024, or
+.Ql M
+multiplying it by 1024 \(pc 1024.
+.
+.It Vt time
+An integer number (sequence of digits 0-9) of seconds, optionally immediately
+followed by a single case-insignificant letter
+.Ql s ,
+which has no effect,
+.Ql m ,
+causing the number to be multiplied by 60,
+.Ql h ,
+multiplying it by 60 \(pc 60, or
+.Ql d ,
+for a multiple of 24 \(pc 60 \(pc 60.
+.It Vt perm
+A file permission mode; an octal number of exactly four digits, where the first digit must be 0.
+.El
+.
+.Sh OPTIONS
+.
+.Bl -tag -width Ds
+.
+.It Cd prefix Vt ( string ) , Cd var_prefix Vt ( string )
+The values of these options can be referred to as
+.Li $prefix
+(or
+.Li ${prefix} ) ,
+and
+.Li $var_prefix
+(or
+.Li ${var_prefix} ) ,
+respectively, in settings of type
+.Vt path
+in the rest of the file.
+.Pp
+.Sy Default : No none. Need to be set only if referenced later.
+.
+.It Cd prayer_user Vt ( string ) , Cd prayer_uid Vt ( number )
+User name or ID to
+.Xr setuid 2
+to if started as root. Either, but not both, must be set and must not specify
+.Li uid 0 .
+.Sy Default :
+none.
+.
+.It Cd prayer_group Vt ( string ) , Cd prayer_gid Vt ( number )
+Group name or ID to
+.Xr setgid 2
+to if we start off as root. In addition, prayer calls
+.Xr initgroups 3
+if
+.Cd prayer_user
+is set.
+.Sy Default :
+none.
+.
+.It Cd prayer_background Vt ( boolean )
+Run prayer as background process. If true, prayer will return as soon
+as valid configuration is found.
+.Sy Default : Li true
+.
+.It Cd file_perms Vt ( perm )
+Create mode for new files.
+.Sy Default : Li 0640 No if Cd prayer_uid No or Cd prayer_user No is set, otherwise Li 0644 .
+.
+.It Cd directory_perms Vt ( perm )
+Create mode for new directories.
+.Sy Default : Li 0750 No if Cd prayer_uid No or Cd prayer_user No is set, otherwise Li 0755 .
+.
+.It Cd check_directory_perms Vt ( boolean )
+Check existing directories under
+.Li ${var_prefix} ?
+.El
+.
+.Ss Mail server settings
+.
+.Bl -tag -width Ds
+.It Cd imapd_server Vt ( string )
+Specifies the default IMAP server(s) using libc-client syntax:
+.Bd -literal -offset indent
+.Sm Ar host Oo : Ar port Oc Op / Ar flag Oo / Ar flag Oc Ar ...
+.Sm on
+.Ed
+.Pp
+Multiple server specifications can be listed, separated by commas. Common flags are:
+.Bl -tag -compact
+.It Li /ssl
+Use SSL-on-connect (on port 993 by default).
+.It Li /tls
+Force use of TLS (using STARTTLS on the normal IMAP port) to encrypt the
+session. Recommended if the server is remote, since otherwise a
+downgrade attack is possible.
+.It Li /notls
+Don't issue STARTTLS even if the server supports it. Recommended if
+the server is
+.Li localhost .
+.It Li /novalidate-cert
+Don't check the integrity of the server certificate.
+.El
+For the full list of flags, see naming.txt.gz in the current
+libc-client package.
+.
+.It Cd imapd_user_map Vt ( path )
+CDB lookup map overriding default imapd_server location. For information on CDB, see
+.Bl -bullet -compact
+.It
+http://cr.yp.to/cdb.html
+.It
+http://en.wikipedia.org/wiki/Constant_Data_Base
+.El
+.
+.It Cd prefs_folder_name Vt ( string )
+Name of Prayer user preferences folder on IMAP server.
+.
+.It Cd use_namespace ( Vt boolean )
+Use IMAP NAMESPACE command to find
+.Cd personal_hierarchy No and Cd hiersep .
+.Sy Default : Li true .
+.
+.It Cd personal_hierarchy ( Vt string )
+If not supplied by NAMESPACE.
+.Sy Default : Li """""" .
+.
+.It Cd hiersep ( Vt string )
+If not supplied by NAMESPACE.
+.Sy Default : Li """/""" .
+.
+.It Cd dualuse ( Vt boolean )
+Hint to Prayer that new mailboxes are dual use (i.e. can contain both
+mail and inferior mailboxes). Things will mostly work if dualuse set to
+.Li false No on a server which supports it, but people will be
+unable to create children of newly created mailboxes without
+refreshing the view.
+.Pp
+.Sy Default : Li false .
+.
+.It Cd sieved_server Vt ( string )
+Talk to Cyrus timsieved using MANAGESIEVE protocol. Syntax is similar to
+.Cd imapd_server ,
+except the only recognised flag is
+.Li /ssl .
+.
+.It Cd sieved_user_map Vt ( path )
+Can be used to provide individualised imapd_server settings in the form of a CDB file.
+.
+.It Cd sieved_timeout Vt ( time )
+Default timsieved timeout is 10 minutes
+.El
+.
+.Ss Mail domain configuration
+.
+.Bl -tag -width Ds
+.
+.It Cd local_domain
+Define a valid local domain, and optionally the valid local parts in that domain.
+This is a special directive that can appear multiple times and does not use an equals sign:
+.Bd -unfilled
+.Cd local_domain Ar domain Op Ar map
+.Ed
+.Pp
+.No Without Ar map , Cd local_domain
+simply defines a domain which will appear on the list visible to user
+preferences. With
+.Ar map ,
+it also defines a list a CDB map file which defines valid entries in
+that domain; used for personal name expansion and checking for valid
+addresses: The keys are the valid local parts and the values are the
+corresponding full names of the users.
+.Pp
+.Sy Default : No A single entry which corresponds to
+.Cd default_domain .
+.
+.It Cd return_path_domain Vt ( string )
+Domain used in the return address given to
+.Xr sendmail 8 .
+.Sy Default : No the default domain.
+.
+.It Cd filter_domain_pattern Vt ( string )
+A filter pattern which is equivalent to, or at least approximates the
+list of local domains.
+.Sy Default : No the default domain.
+.
+.It Cd hostname Vt ( string )
+Hostname is the canonical name for this particular system, used in
+session and icon URLs which are generated by Prayer. This is derived
+automatically using
+.Xr gethostname 2
+.No and Xr gethostbyname 3
+if no value is provided. However, there are situations, especially
+involving SSL certificates, where the default hostname may not be
+appropriate. The special value
+.Ql __UNDEFINED__
+here means the startup script or command line must provide a hostname
+using a
+.Fl -config-option
+override or via the environment variable
+.Ev PRAYER_HOSTNAME .
+This is just a safeguard for systems which use DNS round robining to
+distribute load across a number of machines.
+.
+.It Cd hostname_service Vt ( string )
+Host name common for all Prayer installations part of the same webmail
+service. (Only) useful for large installations using DNS round robin
+for load balancing (example: webmail.hermes.cam.ac.uk is an alias for
+webmail[123].hermes.cam.ac.uk). This setting is used for two things:
+The user is redirected to this hostname after logging out, and HTTP
+requests are sanity checked against it in addition to the canonical
+hostname.
+.Pp
+.Sy Default : No none
+.
+.It Cd fix_from_address ( Vt boolean )
+suppresses the From address option from the Preferences and Roles
+screens.
+.Sy Default : Li false .
+.
+.It Cd lookup_rpasswd ( Vt path )
+Path to a CDB file that maps arbitrary search keys to colon- or
+comma-separated lists of user names.
+.Sy Note : No Keys must be Em lowercase ;
+Prayer converts search strings to lowercase in order to provide
+case-insensitive lookup.
+.
+.It Cd lookup_rusername ( Vt path )
+Path to a second CDB file that maps arbitrary search keys to colon- or
+comma-separated lists of user names.
+.Pp
+If the user enters a valid and existing username according to
+.Xr getpwnam 3 , Prayer does not search these first two CDB files,
+but skips directly to the second stage of looking up user information.
+.
+.It Cd lookup_username ( Vt path )
+Path to a CDB file that maps usernames to records consisting of the user's
+.Dq registered name
+and his/her affiliation (department), separated by a vertical bar
+.Ql ( "|" ) .
+Additionally, if a second vertical bar follows, the account is
+regarded as cancelled.
+.Pp
+When presenting the search results, the usernames found are combined with the
+.Cd default_domain
+to form email addresses. It is not possible at this time to let users
+search for addresses in more than one domain using this facility.
+.
+.It Cd lookup_fullname ( Vt path )
+Path to a CDB file that maps usernames to
+.Dq display names ,
+possibly provided by the users themselves in some way. The display name
+of a user is used together with the email address in recipient fields
+.Pp
+Note that all four lookup options must be set to valid CDB files for
+the local lookup to work, but more than one option may conceivably
+point to the same file.
+.
+.It Cd ldap_server ( Vt string )
+Name or address of LDAP server.
+.
+.It Cd ldap_base_dn ( Vt string )
+Base DN to search. After binding anonymously, Prayer performs a
+one-level-scope search for entries with
+.Li surname No or Li mail No attributes containing the search string.
+The following attributes are fetched and presented:
+.Bl -bullet -compact
+.It
+.Li uid
+.It
+.Li displayName
+.It
+.Li cn Dq ( registered name )
+.It
+.Li ou Dq ( affiliation )
+.It
+.Li mail
+.It
+.Li telephoneNumber
+.El
+.
+.It Cd ldap_timeout ( Vt time )
+Search timeout.
+.Sy Default : Li 30s .
+.El
+.
+.Ss HTTP and other frontend settings
+.
+.Bl -tag -width Ds
+.
+.It Cd use_http_port , use_https_port
+Define a single HTTP[S] port to bind to. You can define an arbitary list
+of ports of both kinds by using a series of separate
+.Cd use_http_port No and Cd use_https_port
+directives, with one port on each line. Syntax:
+.Bd -literal -offset indent
+.Cd use_http_port Oo Ar interface : Oc Ns Ar port
+.Cd use_https_port Oo Ar interface : Oc Ns Ar port
+.Ed
+.Pp
+.Ar interface
+can be an IP (v4 or v6) address or a hostname. If provided, it is passed to
+.Xr getaddrinfo 3
+for resolution, and the first resulting address is used to bind to. Otherwise,
+.Xr prayer 8
+.No binds to Ar port No on all interfaces.
+.
+.It Cd ssl_default_port Vt ( number )
+Prayer will put a warning on the login page for HTTP connections if
+both HTTP and HTTPS sessions are available. This will provide a link
+to the SSL version of the service, defaulting to port 443 or failing
+that the first defined HTTPS port. ssl_default_port overrides the
+built in logic.
+.Pp
+Should be rarely required now that Prayer automatically derives an
+appropriate port if none is provided here.
+.
+.It Cd ssl_cert_file Vt ( path )
+Locatation of SSL certificate file (only used if SSL ports defined).
+Required if we are going to provide SSL services.
+.
+.It Cd ssl_privatekey_file Vt ( path )
+Location of SSL private key file (only used if SSL ports defined).
+Required if we are going to provide SSL services.
+.
+.It Cd ssl_rsakey_lifespan Vt ( time )
+Master server will regenerate shared RSA key at this interval.
+.Sy Default : Li 15m .
+.
+.It Cd ssl_rsakey_freshen Vt ( time )
+RSA key remains fresh in child process for this long after first actual use.
+.Sy Default : Li 15m .
+.
+.It Cd ssl_session_timeout Vt ( time )
+SSL session cache TTL.
+.Sy Default : Li 0 No (SSL session cache not used).
+.Xr prayer-ssl-prune 8 should be run periodically to purge any stale session
+data from the DBD database.
+.
+.It Cd egd_socket Vt ( path )
+Path to entropy gathering daemon socket. If provided, it will be used in place of
+or in addition to
+.Pa /dev/urandom
+.
+.It Cd contact_email Vt ( string )
+System administrator email address.
+.Sy This setting is currently not used.
+If you want to display support information to your users, customise the templates.
+.
+.It Cd fatal_dump_core Vt ( boolean )
+Dump core on
+.Fn fatal
+error.
+.Sy Default : No false.
+.
+.It Cd log_debug Vt ( boolean )
+Enable somewhat more verbose logging, mainly in relation to SSL.
+.Sy Default : No false.
+.
+.It Cd fix_client_ipaddr Vt ( boolean )
+Client must connect from consistent IP addresses. May be useful as
+a security measure in LAN environments. Painful for dialup users
+whose connections may drop out.
+.Sy Default : No false.
+.
+.It Cd gzip_allow_nets Vt ( string ) , Cd gzip_deny_nets Vt ( string )
+.Xr prayer-session 8
+gzip-compresses pages sent to clients if:
+.Bl -enum -compact
+.It
+gzip compression enabled at compile time,
+.It
+.Cd use_gzip No is set in user preferences,
+.It
+User agent is known to support Content-Encoding: gzip,
+.It
+User agent asks for Content-Encoding: gzip or x-gzip,
+.It
+IP address of client appears in
+.Cd gzip_allow_nets
+.Em or No IP address of client does Em not No appear in Cd gzip_deny_nets .
+.El
+.Pp
+The format of these options is a sequence of
+.Ar ipaddr Ns Op / Ns Ar masklen
+items, separated by colons
+.Em and No whitespace (to allow for IPv6 addresses to be parsed easily). If
+.Ar masklen No is omitted, the item is interpreted as a full host address.
+.
+.It Cd log_name_nets Vt ( string )
+A network list in the same format as
+.Cd gzip_allow_nets
+above. To avoid delay when a user logs in,
+.Xr prayer-session 8
+only performs a reverse lookup of the remote address if matches this list.
+.Sy Default : No empty; no reverse lookup are performed.
+.
+.It Cd limit_vm Vt ( number )
+Virtual memory limit imposed on each process to stop runaway process killing system. See
+.Xr setrlimit 2 .
+.Sy Default : No no limit.
+.
+.It Cd http_max_method_size Vt ( number )
+Prayer should in theory be able to cope with input of arbitrary
+size. In practice however, the incoming request has to be stored
+somewhere and without limits an attacker may exhaust available memory,
+causing a denial of service attack.
+.Pp
+This sets the maximum size of the initial line of an HTTP request.
+.Sy Default : No no limit.
+.
+.It Cd http_max_hdr_size Vt ( number )
+Maximum for headers associated with this request.
+.
+.It Cd http_max_body_size Vt ( number )
+Maximum for HTTP payload. This is the most significant one in normal use.
+.
+.It Cd draft_att_single_max ( Vt number )
+Maximum size of a single attachment when composing a mail.
+.Sy Default : Li 0 No (unlimited).
+.
+.It Cd draft_att_total_max ( Vt number )
+Maximum size of all attachments.
+.Sy Default : Li 0 No (unlimited).
+.
+.It Cd http_min_servers Vt ( number )
+Minimum number of preforked
+.Xr prayer 8 HTTP servers. The master process forks new slave processes
+whenever the number of idle slaves falls below this number, unless the
+total number of slaves would exceed
+.Cd http_max_servers .
+.Sy Default : Li 4.
+.
+.It Cd http_max_servers Vt ( number )
+Maximum number of preforked
+.Xr prayer 8 HTTP servers (active and idle). The master process does not,
+however, enforce any maximum number of
+.Em idle No slave processes; they have to terminate voluntarily by timing out
+or serving the maximum number of connections.
+.Sy Default : Li 64 .
+.
+.It Cd http_max_connections Vt ( number )
+Maximum number of connections that each frontend server will process.
+.Sy Default : Li 0 No (no limit).
+.
+.It Cd http_timeout_idle Vt ( time )
+Timeout for (dirty) spare server waiting for another HTTP connection.
+.Sy Default : Li 30s .
+.
+.It Cd http_timeout_icons Vt ( time )
+Timeout for HTTP connection that last served static content.
+.Sy Default : Li 10s .
+.
+.It Cd http_timeout_session Vt ( time )
+Timeout for HTTP connection that last served a session URL or has not served anything yet.
+.Sy Default : Li 60s .
+.
+.It Cd http_cookie_use_port Vt ( boolean )
+Present HTTP cookies to browser as
+.Dq Li username:port=value
+rather than
+.Dq Li username=value .
+Allows simultaneous login sessions from a single client browser.
+However can leave a trail of cookies behind. Probably don't want this
+in the long term, it's here for experimentation purposes only at the
+moment.
+.
+.It Cd icon_expire_timeout Vt ( time )
+The amount of time in the future to set the HTTP
+.Li Expires: No field for static content.
+.Sy Default : Li 7d .
+(In contrast sessions URLs expire immediately: Browsers really
+shouldn't be trying to cache this stuff, especially when it is coming
+in over HTTPS).
+.El
+.
+.Ss Session specific configuration
+.
+.Bl -tag -width Ds
+.
+.It Cd session_idle_time Vt ( time )
+Session switches to idle mode after this much time: connections to
+IMAP and accountd servers are shut down.
+.Sy Default : Li 0 No (idle mode disabled).
+.
+.It Cd session_timeout Vt ( time )
+Session terminates after this much idle time.
+.Ql 0
+means session never times out.
+.Sy Default : Li 4h .
+.
+.It Cd session_timeout_compose Vt ( time )
+Session terminates after this much idle time instead when the last command was
+.Ql compose
+.No or Ql sieve .
+It should probably not be set lower than
+.Cd session_timeout .
+.Sy Default : Li 0 No (always use the same timeout).
+.
+.It Cd stream_ping_interval Vt ( time )
+Ping INBOX, Other, and Draft streams at this interval.
+.Sy Default : Li 5m .
+.
+.It Cd stream_checkpoint Vt ( boolean )
+.No Use Li CHECKPOINT No instead of Li PING Li to \(lqping\(rq streams.
+.Sy Default : Li true .
+.
+.It Cd stream_misc_timeout Vt ( time )
+Shut down Postponed, Preferences and Transfer streams entirely
+after this much idle time, but only if idle mode doesn't beat us to it.
+.Sy Default : Li 0 No (disabled).
+.
+.It Cd log_ping_interval Vt ( time )
+.Xr stat 2 log files at this interval to see if target file has been
+renamed or removed.
+.Ql 0s
+means stat() log file every time something is logged.
+.Sy Default : Li 5m .
+.
+.It Cd db_ping_interval Vt ( time )
+Interval at which to re-read CDB files containing the local domain.
+.Sy Default : Li 30m .
+.El
+.
+.Ss Display specific configuration
+.
+.Bl -tag -width Ds
+.It Cd login_banner Vt ( string )
+Used in the
+.Li <title>
+and heading of the login page, unless
+.Cd login_prefix_path
+specifies a custom first HTML part.
+.Sy Default : Li """Webmail Service Login""" .
+.
+.It Cd login_service_name Vt ( string )
+Used in the
+.Li <title> No and elsewhere to refer to the webmail system
+.Em after No the user has logged in.
+.Sy Default : Li """Prayer""" .
+.
+.It Cd login_prefix_path Vt ( path )
+File to use as the part of the login page before the login
+form. Should include everything including DOCTYPE and <html> tag. If
+unset, Prayer constructs a fairly safe and boring login page
+consisting of the
+.Cd login_banner .
+on the background colour of the default main theme.
+.
+.It Cd motd_path Vt ( path )
+File to use as the part of the login page immediately following the login form.
+.
+.It Cd login_suffix_path Vt ( path )
+File to use as the last part of the login page. If unset, Prayer simply outputs
+.Dq Li </body></html> .
+.
+.It Cd ssl_encouraged ( Vt boolean )
+If the user connects over unencrypted HTTP, do not show the login form on the start
+.Pa ( / ) No page. A link to Pa /login , No where the form is still displayed, is still provided.
+.Sy Default : Li false . No Ignored if Cd ssl_redirect No or Cd ssl_required No is Li true .
+.
+.It Cd ssl_redirect ( Vt boolean )
+If the user connects over unencrypted HTTP, return a
+.Ql 302
+redirect to the default SSL port. Only the start
+.Pa ( / ) No page is redirected and it may be possible to switch between http and
+https after loggin in, subject to cookie rules.
+.Pp
+.Sy Default : Li false .
+.
+.It Cd ssl_required ( Vt boolean )
+Return a
+.Ql 403 Forbidden
+error if the user tries to access anything over unencrypted HTTP.
+.Cd ssl_redirect No still has effect, however.
+.
+.It Cd list_addr_maxlen Vt ( number )
+The maximum number of characters to show from addresses on the mailbox list screen.
+.Sy Default : Li 30 .
+.
+.It Cd list_subject_maxlen Vt ( number )
+The maximum number of characters to show from the subject on the mailbox list screen.
+.Sy Default : Li 30 .
+.
+.It Cd change_max_folders ( Vt number )
+The maximum number of folders allowed in the quick folder change
+dropdown list. If there would be too many folders, the quick list is
+disabled altogether. Only folders that are expanded in the folder view
+are included.
+.Pp
+.Sy Default : Li 20 .
+.
+.It Cd template_path ( Vt path )
+Path to uncompiled template sets (directories).
+.Sy Default : Li """../templates""" No (relative to
+.Cd tmp_dir ) .
+.
+.It Cd template_set ( Vt string )
+Template set to use.
+.Sy Default : Li """xhtml_strict""" .
+.
+.It Cd template_use_compiled ( Vt boolean )
+Use the compiled-in templates, ignoring
+.Cd template_path .
+.Sy Default : Li true .
+.Pp
+As a Debian extension,
+.Xr prayer-session 8
+will fall back to the compiled-in template version of any template
+that it cannot find in the template directory. This enables
+customization of some templates without having to compile all of them
+at run time, although attempting to open each template still incurs a
+certain penalty.
+.
+.It Cd theme
+Define themes and their colors.
+.Em Semi-deprecated ; No Colours set with this directive are only used by the
+.Li xhtml_transitional No template set. The
+.Li xhtml_strict No template set, as well as the login screen, use CSS instead.
+It is still necessary to tell Prayer which themes are available, however.
+.Pp
+Syntax:
+.Bd -literal -offset indent
+.Cd theme Ar name Li description Ar description
+.Cd theme Ar name element colour
+.Cd theme Ar name element colour
+\&...
+.Ed
+.Pp
+.Ar description No is the label shown in the theme dropdown lists on the
+General Preferences page.
+.Pp
+.Ar element No is one of
+.Li fgcolor , fgcolor_link , bgcolor , bgcolor_banner , bgcolor_row1 , bgcolor_row2 ,
+.Li bgcolor_status , bgcolor_status_none , fgcolor_quote1 , fgcolor_quote2 ,
+.Li fgcolor_quote3 , No and Li fgcolor_quote4 .
+The first three are not used by any standard template set, but are
+available. Please study the templates to understand how the rest are
+used.
+.Pp
+.Ar colour No is any valid HTML Vt %Color No value.
+Remember that strings containing hash marks need to be quoted.
+.It Cd theme_default_main ( Vt string )
+.No The Ar name No of the default theme.
+.
+.It Cd theme_default_main ( Vt string )
+.No The Ar name No of the default theme in help mode.
+.
+.It Cd use_ispell_language
+Ispell languages that we want to support, with some descriptive text
+for the preferences screen. Syntax:
+.Bd -literal -offset indent
+.Cd use_ispell_language Ar wordlist Ar description
+.Ed
+.Pp
+Example:
+.Bd -literal -offset indent
+.Li use_ispell_language british Qq British English
+.Ed
+.El
+.
+.Ss Paths etc.
+.
+.Bl -tag -width Ds
+.
+.It Cd aspell_path ( Vt path )
+Location of Aspell Binary (takes precedence over
+.Cd ispell_path ) .
+.
+.It Cd bin_dir ( Vt path )
+Location of Prayer binaries
+.Xr ( prayer 8 and
+.Xr prayer-session 8 ) .
+.Sy Default : No none. Sy Must be set.
+.
+.It Cd icon_dir ( Vt path )
+Location of icon files.
+.Sy Default : No none. Sy Must be set.
+.
+.It Cd ispell_path ( Vt path )
+Location of Ispell Binary (backwards compatibility only).
+.
+.It Cd log_dir ( Vt path )
+Location of log files.
+.Sy Default : No none. Sy Must be set.
+.
+.It Cd pid_dir ( Vt path )
+Location for PID files of prayer and prayer-session master processes.
+.Sy Default : No none. Sy Must be set.
+.
+.It Cd sendmail_path ( Vt path )
+Location of sendmail binary or drop in replacement such as Exim.
+.Sy Default : Pa /usr/lib/sendmail .
+.
+.It Cd socket_dir ( Vt path )
+Location for unix domain sockets which connect
+.Xr ( prayer 8 to
+.Xr prayer-session 8 ) .
+.
+.It Cd socket_split_dir ( Vt boolean )
+Split socket directory into 64 subdirs keyed on first letter of
+sessionID. It is possible to switch back and forth without moving
+sockets or killing sessions, since
+.Xr prayer 8 tries both variants. \&In effect, this setting merely controls where
+.Xr prayer-session 8 creates the socket files.
+.Sy Default : Li false .
+.
+.It Cd init_socket_name ( Vt string )
+Name of Unix domain socket (in
+.Cd socket_dir ) No used for initial handshake
+between prayer and prayer-session processes when a user logs in.
+.Sy Default : No none. Sy Must be set.
+.
+.It Cd ssl_session_dir ( Vt path )
+Location of the SSL session cache database.
+.Sy Default : No none. Sy Must be set , No even if the SSL session cache is disabled.
+.
+.It Cd static_dir ( Vt path )
+Location of other static files (CSS).
+.Sy Default : No none. If unset, Prayer will not serve CSS files.
+.
+.It Cd tmp_dir ( Vt path )
+As the directory both daemons
+.Xr chdir 2
+to at startup, it is where temporary files, such as attachments and
+folders in transist during upload and download operations, are
+written. Core files also end up here.
+.Sy Default : No none. Sy Must be set.
+.El
+.
+.Ss Defaults for user preferences
+.
+.Bl -tag -width Ds
+.
+.It Cd confirm_logout ( Vt boolean )
+Confirmation dialogue when user logs out.
+.Sy Default : Li true .
+.
+.It Cd confirm_expunge ( Vt boolean )
+Confirmation dialogue when user hits expunge.
+.Sy Default : Li false .
+.
+.It Cd confirm_rm ( Vt boolean )
+Confirmation dialogue when user deletes mail folder or directory.
+.Sy Default : Li true .
+.
+.It Cd default_domain Vt ( string )
+Default domain for outgoing mail. Defaults to
+.Cd hostname No setting.
+.
+.It Cd html_inline ( Vt boolean )
+Show text/html bodyparts inline. Content is scrubbed to remove
+dangerous tags; see documentation for more details.
+.Sy Default : Li true .
+.
+.It Cd html_inline_auto ( Vt boolean )
+Same as above for text/* bodyparts which start "<HTML>" (case-independent!)
+Does anyone other than spammers actually use this?
+.Sy Default : Li true .
+.
+.It Cd ispell_language ( Vt string )
+Language for ispell.
+.Sy Default : Li """british""" .
+.
+.It Cd msgs_per_page ( Vt number )
+Number of messages per screen on message list screen.
+.Sy Default : Li 12 .
+.
+.It Cd msgs_per_page_max ( Vt number )
+Maximum value that users are allowed to set
+.Cd msgs_per_page No to.
+.Sy Default : Li 50 .
+.
+.It Cd msgs_per_page_min ( Vt number )
+Minimum value that users are allowed to set
+.Cd msgs_per_page No to.
+.Sy Default : Li 4 .
+.
+.It Cd abook_per_page ( Vt number )
+Number of addressbook entries per page on address book list screen.
+.Sy Default : Li 12 .
+.
+.It Cd abook_per_page_max ( Vt number )
+Maximum value that users are allowed to set
+.Cd abook_per_page No to.
+.Sy Default : Li 50 .
+.
+.It Cd abook_per_page_min ( Vt number )
+Minimum value that users are allowed to set
+.Cd abook_per_page No to.
+.Sy Default : Li 4 .
+.
+.It Cd maildir ( Vt string )
+Mail directory in user's account.
+.Sy Default : Li """""" .
+Typically needed with uw-imap. Typically not needed with e.g. Dovecot or Courier.
+.
+.It Cd suppress_dotfiles ( Vt boolean )
+Supress dotfiles from directory listing.
+.Sy Default : Li true .
+.
+.It Cd postponed_folder ( Vt string )
+Name of the folder where messages to be sent later, a.k.a. drafts, are stored.
+.Sy Default : Li """postponed-msgs""" .
+.
+.It Cd sent_mail_folder ( Vt string )
+Name of folder for sent mail.
+.Sy Default : Li """sent-mail""" .
+.
+.It Cd small_cols ( Vt number )
+Width of small compose textarea in columns.
+.Sy Default : Li 80 .
+.
+.It Cd small_rows ( Vt number )
+Height of small compose textarea in lines.
+.Sy Default : Li 18 .
+.
+.It Cd large_cols ( Vt number )
+Width of large compose textarea in columns.
+.Sy Default : Li 80 .
+.
+.It Cd large_rows ( Vt number )
+Height of large compose textarea in lines.
+.Sy Default : Li 32 .
+.
+.It Cd sort_mode ( Vt string )
+Default Sort mode for mailbox list. One of
+.Li ARRIVAL , DATE , FROM , TO , CC , SIZE , SUBJECT , REFERENCES , ORDEREDSUBJECT .
+.Sy Default : Li ARRIVAL No is most efficient, and recommended.
+.
+.It Cd sort_reverse ( Vt boolean )
+Favour reverse sort rather than normal sort order?
+.Sy Default : Li false .
+.
+.It Cd abook_sort_mode ( Vt string )
+Default Sort mode for addressbook list. One of:
+.Li ORDERED , ALIAS , NAME , COMMENT , ADDRESS .
+.Sy Default : Li ORDERED .
+.
+.It Cd abook_sort_reverse ( Vt boolean )
+Favour reverse sort rather than normal sort order?
+.Sy Default : Li false .
+.
+.It Cd line_wrap_len ( Vt number )
+Wrap lines at this many characters.
+.Sy Default : Li 76 .
+.
+.It Cd line_wrap_advanced ( Vt boolean )
+Enable advanced line wrap options?
+.Sy Default : Li false .
+.
+.It Cd line_wrap_on_reply ( Vt boolean )
+Line wrap automatically on reply.
+.Sy Default : Li true .
+.
+.It Cd line_wrap_on_spell ( Vt boolean )
+Line wrap automatically on spell check.
+.Sy Default : Li true .
+.
+.It Cd line_wrap_on_send ( Vt boolean )
+Line wrap automatically on send.
+.Sy Default : Li true .
+.
+.It Cd preserve_mimetype ( Vt boolean )
+Send message Content-Type through to browser. If
+.Li false , No Content-Type is replaced with
+.Ql application/octet-stream
+which should force download to local disk, bypassing any automatic
+processing of bodyparts by the User-Agent. Unclear at the moment
+whether we need to do this, or whether this should be done selectively
+based on the User-Agent.
+.Sy Default : Li true .
+.
+.It Cd use_sent_mail ( Vt boolean )
+.No Make the Dq Save copy
+checkbox on the compose screen checked default.
+.Sy Default : Li true .
+.
+.It Cd use_mark_persist ( Vt boolean )
+Use persistent mark for aggregate operations.
+.Sy Default : Li false .
+.
+.It Cd use_search_zoom ( Vt boolean )
+Zoom automatically after sucessful search
+.Sy Default : Li true .
+.
+.It Cd use_agg_unmark ( Vt boolean )
+Unmark messages after sucessful aggregate operation.
+.Sy Default : Li true .
+.
+.It Cd use_icons ( Vt boolean )
+Use icons: may be overriden by value of User-Agent.
+.Sy Default : Li true .
+.
+.It Cd use_welcome ( Vt boolean )
+Enable welcome screen .
+.Sy Default : Li true .
+.
+.It Cd use_tail_banner ( Vt boolean )
+Duplicate banner icons (toolbar) at the bottom of the Message screen.
+.Sy Default : Li true .
+.El
+.
+.Ss Hidden preferences
+.
+The following options are internally handled as user preferences, but
+the Preferences screen no longer provides any means for changing them.
+.
+.Bl -tag -width Ds
+.It Cd use_cookie ( Vt boolean )
+Use HTTP cookie for Session-ID, if the browser supports cookies
+If disabled, or user rejects the cookie, then the session-ID is stored in the URL.
+.Sy Default : Li true .
+.
+.It Cd use_substitution ( Vt boolean )
+Use page substiution rather than HTTP redirects. Faster, but the URLs
+that are generated are less predictable. Page substitution and browser
+history mechanism don't coexist well at the moment (Prayer would need to
+cache final page value for each substiution event).
+.Pp
+.Sy Default : Li true .
+.
+.It Cd use_http_1_1 ( Vt boolean )
+Allow HTTP/1.1, if the browser supports it.
+.Sy Default : Li true .
+.
+.It Cd use_pipelining ( Vt boolean )
+Allow HTTP/1.1 pipelining, if the browser supports it.
+.Sy Default : Li true .
+.
+.It Cd use_embed_http ( Vt boolean )
+Allow HTTP links embedded in HTTPS responses, if the browser supports it.
+.Sy Default : Li true .
+.
+.It Cd use_persist ( Vt boolean )
+Allow persistent HTTP/1.1 and HTTP/1.0 persistent connections,
+if the browser supports them.
+.Sy Default : Li true .
+.
+.It Cd use_short ( Vt boolean )
+Allow short URLs, if the browser supports them.
+.Sy Default : Li true .
+.
+.It Cd use_gzip ( Vt boolean )
+Allow gzip compression, if the browser supports it.
+.Sy Default : Li true .
+.
+.El
+.
+.Sh SEE ALSO
+.
+.Xr prayer 8 ,
+.Xr prayer-session 8
+.
+.Sh AUTHORS
+.
+This manual page was put together by
+.An "Magnus Holmgren" <holmgren@debian.org>
+using documentation written by
+.An "David Carter" <dpc22@cam.ac.uk> .
Index: 1.2.3-2/debian/prayer-ssl-prune.8
===================================================================
--- 1.2.3-2/debian/prayer-ssl-prune.8 (nonexistent)
+++ 1.2.3-2/debian/prayer-ssl-prune.8 (revision 85)
@@ -0,0 +1,54 @@
+.\" -*- nroff -*-
+.Dd 17 August 2008
+.Os "The Prayer Webmail Interface"
+.ds volume-operating-system
+.Dt PRAYER-SSL-PRUNE 8
+.Sh NAME
+.Nm prayer-ssl-prune
+.Nd purge stale SSL session data
+.Sh SYNOPSIS
+.Nm
+.Oo Fl -config-file
+.Ar file Oc
+.Oo Oo Fl -config-option
+.Ar name Ns = Ns Ar value Oc
+.Ar ... Oc
+.
+.Sh DESCRIPTION
+.Nm
+should be run periodically (e.g. once a day) when using SSL session caching
+.Cd ( ssl_session_timeout No > 0 in
+.Pa prayer.cf ) .
+It removes old transaction logs and stale session data.
+It accepts the same configuration-overriding options as
+.Xr prayer 8 and
+.Xr prayer-session 8 .
+.
+.Sh ENVIRONMENT
+.
+.Bl -tag -width ".Ev PRAYER_CONFIG_FILE "
+.It Ev PRAYER_CONFIG_FILE
+Can be set to specify the configuration file to use.
+.El
+.
+.Sh FILES
+.
+.Bl -tag -compact
+.It Pa /etc/prayer/prayer.cf
+Default configuration file.
+.It Pa /var/run/prayer/ssl_scache/
+Default location of the SSL session cache database.
+.El
+.
+.Sh SEE ALSO
+.
+.Xr prayer 8 ,
+.Xr prayer.cf 5
+.
+.Sh AUTHORS
+.
+This manual page was put together by
+.An "Magnus Holmgren" <holmgren@debian.org>
+using documentation written by
+.An "David Carter" <dpc22@cam.ac.uk> .
+.\" .Sh BUGS
Index: 1.2.3-2/debian/prayer-accountd.init
===================================================================
--- 1.2.3-2/debian/prayer-accountd.init (nonexistent)
+++ 1.2.3-2/debian/prayer-accountd.init (revision 85)
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: prayer-accountd
+# Required-Start:
+# Required-Stop:
+# Should-Start: $local_fs
+# Should-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Prayer account helper daemon
+# Description: Lets users change passwords, manage filters and other things not supported by IMAP itself
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/prayer-accountd
+PIDFILE=/var/run/prayer-accountd.pid
+DESC="Prayer account helper server"
+
+test -x $DAEMON || exit 0
+
+egrep -iq "^[[:space:]]*accountd_port[[:space:]]*=[[:space:]]*[[:digit:]]+[[:space:]]*$" /etc/prayer/accountd.cf || exit 0
+
+. /lib/lsb/init-functions
+
+# Include prayer defaults if available
+if [ -f /etc/default/prayer-accountd ] ; then
+ . /etc/default/prayer-accountd
+fi
+
+set +e
+
+start() {
+ log_daemon_msg "Starting $DESC" "accountd"
+ start-stop-daemon --start --background --make-pidfile --pidfile $PIDFILE \
+ --exec $DAEMON -- $DAEMON_OPTS
+ log_end_msg $?
+}
+
+stop() {
+ log_daemon_msg "Stopping $DESC"
+ if [ -f "$PIDFILE" ]; then
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+ log_progress_msg "accountd"
+ fi
+ rm -f "$PIDFILE"
+ log_end_msg 0
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+
+ stop)
+ stop
+ ;;
+
+ restart|force-reload)
+ stop
+ sleep 1
+ start
+ ;;
+ *)
+ N=/etc/init.d/prayer-accountd
+ # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ log_failure_msg "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Index: 1.2.3-2/debian/prayer-templates.install
===================================================================
--- 1.2.3-2/debian/prayer-templates.install (nonexistent)
+++ 1.2.3-2/debian/prayer-templates.install (revision 85)
@@ -0,0 +1 @@
+usr/share/prayer/templates
Index: 1.2.3-2/debian/prayer.install
===================================================================
--- 1.2.3-2/debian/prayer.install (nonexistent)
+++ 1.2.3-2/debian/prayer.install (revision 85)
@@ -0,0 +1,6 @@
+usr/sbin/prayer
+usr/sbin/prayer-session
+usr/sbin/prayer-ssl-prune
+usr/share/prayer/icons
+usr/share/prayer/static
+etc/prayer/prayer.cf
Index: 1.2.3-2/debian/prayer.8
===================================================================
--- 1.2.3-2/debian/prayer.8 (nonexistent)
+++ 1.2.3-2/debian/prayer.8 (revision 85)
@@ -0,0 +1,93 @@
+.\" -*- nroff -*-
+.Dd 17 August 2008
+.Os "The Prayer Webmail Interface"
+.ds volume-operating-system
+.Dt PRAYER 8
+.Sh NAME
+.Nm prayer
+.Nd standalone IMAP-based webmail server
+.Sh SYNOPSIS
+.Nm
+.Oo Fl -config-file
+.Ar file Oc
+.Oo Oo Fl -config-option
+.Ar name Ns = Ns Ar value Oc
+.Ar ... Oc
+.Op Fl -foreground | -disable-prefork
+.Oo Fl -disable-session | -
+.Ar session-options Ar ... Oc
+.
+.Sh DESCRIPTION
+.Nm
+is the normal frontend daemon in the Prayer Webmail system. It is a
+simple HTTP server and proxy that serves icons and other static files,
+but firstly and foremostly forwards requests to the correct backend
+daemons based on session IDs passed either in cookies or as part of
+the URL.
+.Pp
+The master daemon normally preforks a number of child processes that
+each will serve a configurable number of requests. The total number of
+child processes is limited to prevent denial of service attacks.
+.Pp
+.Nm
+accepts the following command-line options:
+.Bl -tag -width indent
+.It Fl -config-file Ar file
+Reads configuration from
+.Ar file
+instead of the default.
+.It Fl -config-option Ar name Ns = Ns Ar value
+Sets (overrides) the configuration option
+.Ar name No to Ar value .
+Any number of options can be specified in this manner.
+.It Fl -foreground
+Debug mode. Run a single process in the foreground.
+.It Fl -disable-prefork
+Disable preforking. The master daemon will listen for connections
+on the configured ports and spawn child processes one at a time.
+.It Fl -disable-session
+Do not start the session server,
+.Xr prayer-session 8 .
+.It Fl -
+End of
+.Nm
+options; remaining options will be passed to
+.Xr prayer-session 8 .
+.El
+.
+.Sh ENVIRONMENT
+.
+.Bl -tag -width ".Ev PRAYER_CONFIG_FILE "
+.It Ev PRAYER_CONFIG_FILE
+Can be set to specify the configuration file to use.
+.It Ev PRAYER_HOSTNAME
+Local hostname. Overrides the
+.Cd hostname
+setting in the configuration file as well as on the command line.
+.El
+.
+.Sh FILES
+.
+.Bl -tag -compact
+.It Pa /etc/prayer/prayer.cf
+Default configuration file.
+.It Pa /usr/share/prayer/icons/
+Location of the standard icons used by the interface.
+.It Pa /usr/share/prayer/static/
+Directory containing other static files; currently only CSS files.
+.It Pa /var/run/prayer/sockets/
+Pre-configured location of sockets for frontend to backend communication.
+.El
+.
+.Sh SEE ALSO
+.
+.Xr prayer-session 8 ,
+.Xr prayer.cf 5
+.
+.Sh AUTHORS
+.
+This manual page was put together by
+.An -nosplit
+.An "Magnus Holmgren" <holmgren@debian.org>
+.No using documentation written by An "David Carter" <dpc22@cam.ac.uk> .
+.\" .Sh BUGS
Index: 1.2.3-2/debian/README.Debian
===================================================================
--- 1.2.3-2/debian/README.Debian (nonexistent)
+++ 1.2.3-2/debian/README.Debian (revision 85)
@@ -0,0 +1,103 @@
+prayer for Debian
+-----------------
+
+The Debian version of Prayer is built with SSL support with session
+cache using libdb4.6, gzip Content-Transfer-Encoding, LDAP, and System
+V mutex support. The previous version, which was only uloaded to the
+experimental distribution, was heavily patched to add UTF-8 and IPv6
+support among other things. All that has been incorporated and
+improved by upstream in 1.1.0. The remaining patches concern changes
+to the default configuration as detailed below, or fix bugs. You can
+always find information about patches in changelog.Debian.gz.
+
+To enable Prayer, you must edit /etc/default/prayer and change
+ENABLED=0 to ENABLED=1. But before you do that you should go through
+/etc/prayer/prayer.cf and adapt it to your needs. In particular, if
+you already run a web server on this machine you need to change
+use_http_port (and use_https_port) to something else.
+
+Debian-specific configuration defaults:
+
+ * Static files (templates, icons, CSS files) are installed in
+ /usr/share/prayer in accordance with policy. The prefix option
+ points there, while var_prefix, the location of pid files
+ (pid_dir), sockets (socket_dir), and the SSL session cache
+ (ssl_session_dir), is /var/run/prayer and subdirectories. Log
+ files are written to /var/log/prayer (log_dir) and /tmp is used to
+ temporarily store uploaded attachments (tmp_dir).
+
+ * Prayer by default runs as user prayer (created on install) and
+ group nogroup. The prayer user is added to the ssl-cert group on
+ installation, so that it can access keys in /etc/ssl/private.
+
+ * ssl_cert_file and ssl_privatekey_file point to the "snake oil"
+ certificate and key created by the ssl-cert package, so that you
+ only have to uncomment use_https_port to enable encryption. For a
+ production server you should of course install a real certificate.
+
+ * Support for SSL session caching is compiled in, but caching is
+ disabled by default, as it probably doesn't make that much a
+ difference on modern hardware. To enable it, uncomment the
+ ssl_session_timeout setting in prayer.cf. You should also arrange
+ for prayer-ssl-prune to be run periodically, for example by placing
+ a symlink to it in /etc/cron.hourly or /etc/cron.daily.
+
+ * The default IMAP folders for sent mail (sent_mail_folder) and
+ drafts (postponed_folder) are "Sent" and "Drafts", respectively,
+ the default for Mozilla Thunderbird and others (although many IMAP
+ clients unfortunately use localized folder names).
+
+ * socket_split_dir is off by default to reduce complexity when
+ testing. You will probably only need it if you have lots of
+ simultaneous users and a file system without directory indexes.
+
+Customizing templates:
+
+To use customized templates you must set template_use_compiled to
+FALSE in prayer.cf. Then copy the template (.t file) you wish to
+customize from /usr/share/prayer/templates to the corresponding
+location under /etc/prayer/templates and edit it there. Prayer will
+still use the compiled-in versions of the remaining templates, thanks
+to a small patch.
+
+Quirks:
+
+ * If your IMAP server supports STARTTLS, then Prayer (actually the
+ libc-client IMAP client library) will use it automatically. To
+ disable, append "/notls" to the IMAP server name(s) specified with
+ imapd_server. To force TLS, append "/tls". Make sure that the
+ server name you specify for imapd_server in prayer.cf matches the
+ Common Name in the SSL certificate; otherwise libc-client will
+ refuse to accept it. To disable that check, use "/novalidate-cert".
+ Other switches you can append are listed in the file naming.txt.gz
+ in the documentation directory of the C-client library.
+
+ * If your IMAP server is Dovecot (or any of a number of others,
+ probably), then you must change prefs_folder_name to something not
+ containing a dot. Unfortunately this means that the preference
+ folder will be fully visible.
+
+ * Prayer doesn't handle signals gracefully yet, which means that it
+ will leave SysV semaphores lying around when it is stopped or
+ restarted. You can use ipcs to find them and ipcrm to delete them.
+
+ * While Prayer does its best to remove potentially harmful tags from
+ HTML email, it doesn't try to convert it to XHTML. This means that
+ Prayer's output is conformant XHTML only when not viewing HTML
+ mail.
+
+ * Prayer deletes mail the IMAP way, which is by marking messages as
+ deleted and leaving them in their folders. Prayer always lists
+ deleted messages (with a special icon) and expunges (deletes
+ permanently) deleted messages only when explicitly requested.
+ Before that they can be undeleted at any time by "unmarking" them.
+
+ Most mail client software deletes mail by moving it to a "trash"
+ folder, which in reality means creating a copy in the trash folder
+ and marking the original deleted. Messages that are marked as
+ deleted are usually never listed, cannot be unmarked, and are often
+ automatically expunged. These two approaches are rather
+ incompatible, but some software can take either.
+
+ -- Magnus Holmgren <holmgren@debian.org>, Tue, 24 Jun 2008 00:11:04 +0200
+
Index: 1.2.3-2/debian/prayer.examples
===================================================================
--- 1.2.3-2/debian/prayer.examples (nonexistent)
+++ 1.2.3-2/debian/prayer.examples (revision 85)
@@ -0,0 +1,3 @@
+files/etc.hermes/login_prefix.html
+files/etc.hermes/login_suffix.html
+files/etc.hermes/motd.html
Index: 1.2.3-2/debian/copyright
===================================================================
--- 1.2.3-2/debian/copyright (nonexistent)
+++ 1.2.3-2/debian/copyright (revision 85)
@@ -0,0 +1,83 @@
+This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
+Tue, 24 Oct 2006 21:08:34 +0200.
+
+It was downloaded from ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer
+
+Upstream author/maintainer: David Carter <dpc22@cam.ac.uk> et al.
+
+The Debian packaging is © 2006-2008 Magnus Holmgren <holmgren@debian.org>
+and is licensed under the GPL.
+
+The original licence is as follows (from the file NOTICE in the upstream
+distribution); the GPL should be in /usr/share/common-licenses/GPL on a debian
+system.
+
+
+The Prayer Webmail Interface
+----------------------------
+
+Copyright (c) 2002 University of Cambridge
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+In addition, for the avoidance of any doubt, permission is granted to
+link this program with OpenSSL or any other library package.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+USA
+
+INCORPORATED CODE
+-----------------
+
+Code implementing the SSL session cache has been adapted from code used by
+the Cyrus IMAP server, which is distributed under the following copyright:
+
+/* Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any other legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
Index: 1.2.3-2/debian/prayer.docs
===================================================================
--- 1.2.3-2/debian/prayer.docs (nonexistent)
+++ 1.2.3-2/debian/prayer.docs (revision 85)
@@ -0,0 +1,11 @@
+docs/CMD_LINE
+docs/DESIGN
+docs/DONE-OLD
+docs/FEATURES
+docs/ICONLIST
+docs/LOGS
+docs/NOTICE
+docs/README
+docs/SECURITY
+docs/TODO
+docs/TEMPLATES
Index: 1.2.3-2/debian/prayer-accountd.lintian-overrides
===================================================================
--- 1.2.3-2/debian/prayer-accountd.lintian-overrides (nonexistent)
+++ 1.2.3-2/debian/prayer-accountd.lintian-overrides (revision 85)
@@ -0,0 +1 @@
+prayer-accountd: possible-gpl-code-linked-with-openssl
Index: 1.2.3-2/debian/prayer.lintian-overrides
===================================================================
--- 1.2.3-2/debian/prayer.lintian-overrides (nonexistent)
+++ 1.2.3-2/debian/prayer.lintian-overrides (revision 85)
@@ -0,0 +1 @@
+prayer: possible-gpl-code-linked-with-openssl
Index: 1.2.3-2/debian/compat
===================================================================
--- 1.2.3-2/debian/compat (nonexistent)
+++ 1.2.3-2/debian/compat (revision 85)
@@ -0,0 +1 @@
+5
Index: 1.2.3-2/debian/prayer-accountd.docs
===================================================================
--- 1.2.3-2/debian/prayer-accountd.docs (nonexistent)
+++ 1.2.3-2/debian/prayer-accountd.docs (revision 85)
@@ -0,0 +1,8 @@
+docs/ACCOUNTD
+docs/DESIGN
+docs/DONE-OLD
+docs/FEATURES
+docs/NOTICE
+docs/README
+docs/SECURITY
+docs/TODO
Index: 1.2.3-2/debian/prayer.logrotate
===================================================================
--- 1.2.3-2/debian/prayer.logrotate (nonexistent)
+++ 1.2.3-2/debian/prayer.logrotate (revision 85)
@@ -0,0 +1,8 @@
+/var/log/prayer/prayer /var/log/prayer/prayer_session /var/log/prayer/access_log /var/log/prayer/session_log {
+ rotate 28
+ daily
+ compress
+ delaycompress
+ missingok
+ notifempty
+}
Index: 1.2.3-2/debian/prayer-accountd.install
===================================================================
--- 1.2.3-2/debian/prayer-accountd.install (nonexistent)
+++ 1.2.3-2/debian/prayer-accountd.install (revision 85)
@@ -0,0 +1,2 @@
+usr/sbin/prayer-accountd
+etc/prayer/accountd.cf
Index: 1.2.3-2/debian/watch
===================================================================
--- 1.2.3-2/debian/watch (nonexistent)
+++ 1.2.3-2/debian/watch (revision 85)
@@ -0,0 +1,9 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-(.*)\.tar\.gz debian uupdate
Index: 1.2.3-2/debian
===================================================================
--- 1.2.3-2/debian (nonexistent)
+++ 1.2.3-2/debian (revision 85)
/1.2.3-2/debian
Property changes:
Added: mergeWithUpstream
## -0,0 +1 ##
+1
\ No newline at end of property
Index: 1.2.3-2
===================================================================
--- 1.2.3-2 (nonexistent)
+++ 1.2.3-2 (revision 85)
/1.2.3-2
Property changes:
Added: svn:mergeinfo
## -0,0 +0,3 ##
Merged /tags/1.2.2.1-1:r47-51
Merged /branches/lenny:r52-71
Merged /tags/1.2.2.1-7:r53-72