Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 51 → Rev 52

/branches/lenny/debian/patches/template_find_bug.patch
0,0 → 1,28
--- a/lib/template.c
+++ b/lib/template.c
@@ -199,10 +199,11 @@ template_find(char *set, char *name, str
unsigned long first, last, middle;
int rc;
- while (strcmp(tmi->name, set) != 0)
+ while (strcmp(tmi->name, set) != 0) {
tmi++;
- if (!tmi->name)
- return(NIL);
+ if (!tmi->name)
+ return(NIL);
+ }
tm = tmi->template_map;
count = *(tmi->count);
--- a/shared/config.c
+++ b/shared/config.c
@@ -168,7 +168,7 @@ struct config *config_create(void)
config->fatal_dump_core = NIL;
config->template_path = "../templates";
- config->template_set = "html4";
+ config->template_set = "xhtml_strict";
config->template_use_compiled = T;
config->prayer_user = NIL;
/branches/lenny/debian/patches/series
0,0 → 1,6
repair_ssl_session_db_on_version_mismatch.patch
makefile_install_config.patch
remove_old_db_logfiles_from_prayer-ssl-prune.patch
welcome_is_template.patch
templates_fallback_to_compiled.patch
template_find_bug.patch
/branches/lenny/debian/patches/remove_old_db_logfiles_from_prayer-ssl-prune.patch
0,0 → 1,34
--- a/lib/mydb_db3.c
+++ b/lib/mydb_db3.c
@@ -289,9 +289,6 @@ static int myarchive(const char **fnames
const char **fname;
char dstname[1024], *dp;
- strcpy(dstname, dirname);
- dp = dstname + strlen(dstname);
-
/* Get the list of log files to remove. */
r = log_archive(dbenv, &list, DB_ARCH_ABS, NULL);
if (r) {
@@ -312,6 +309,11 @@ static int myarchive(const char **fnames
free (begin);
}
+ if (!dirname) return 0;
+
+ strcpy(dstname, dirname);
+ dp = dstname + strlen(dstname);
+
/* Get the list of database files to archive. */
/* XXX Should we do this, or just use the list given to us? */
r = log_archive(dbenv, &list, DB_ARCH_ABS | DB_ARCH_DATA, NULL);
--- a/lib/ssl.c
+++ b/lib/ssl.c
@@ -837,6 +837,7 @@ int ssl_prune_sessions(struct ssl_config
log_debug("tls_prune: purged %d out of %d entries",
prock.deletions, prock.count);
+ DB->archive(NULL, NULL);
DB->done();
return (0);
/branches/lenny/debian/patches/makefile_install_config.patch
0,0 → 1,174
--- 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,26 +65,21 @@ 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-welcome:
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- etc/welcome.html ${BROOT}${PREFIX}/etc
+ etc/welcome.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)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
+ if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
+ if [ ! -f $(BROOT)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; 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.
@@ -271,11 +271,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
@@ -283,26 +283,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
@@ -387,13 +375,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/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
@@ -431,10 +419,7 @@ 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"
# $socket_dir is location for unix domain sockets which connect frontend
# to backend in proxy mode of operation.
@@ -442,7 +427,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
@@ -453,10 +438,10 @@ ssl_session_dir = "$var_prefix/ssl_s
# Location for temporary files e.g; attachments and folders in transist
# during upload and download operation. Core files also end up here
-tmp_dir = "$var_prefix/tmp"
+tmp_dir = "/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"
@@ -617,14 +602,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
/branches/lenny/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
@@ -452,7 +452,7 @@ pid_dir = "$var_prefix"
######################################################################
# Template stuff
-template_path = "__PREFIX__/templates"
+template_path = "/etc/prayer/templates"
template_set = "xhtml_strict"
template_use_compiled = TRUE
/branches/lenny/debian/patches/repair_ssl_session_db_on_version_mismatch.patch
0,0 → 1,24
--- a/lib/mydb_db3.c
+++ b/lib/mydb_db3.c
@@ -208,7 +208,11 @@ static int init(const char *dbdir, int m
if (!(r = myinit(dbdir, myflags)))
return(0);
- if (r != ENOENT) {
+ if (r != ENOENT
+#ifdef DB_VERSION_MISMATCH
+ && r != DB_VERSION_MISMATCH
+#endif
+ ) {
log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r));
return MYDB_IOERROR;
}
@@ -217,7 +217,7 @@ static int init(const char *dbdir, int m
/* DPC 24/03/2002. DB_CREATE leaks 12 MBytes into dbenv.
* Workaround: close down dbenv, reopen after backing files created */
- r = myinit(dbdir, myflags|MYDB_CREATE);
+ r = myinit(dbdir, myflags|MYDB_CREATE|MYDB_RECOVER);
if (r) {
log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r));
return MYDB_IOERROR;
/branches/lenny/debian/patches/welcome_is_template.patch
0,0 → 1,31
--- a/cmd/cmd_welcome.c
+++ b/cmd/cmd_welcome.c
@@ -74,12 +74,7 @@ void cmd_welcome(struct session *session
unsigned long msgno;
if ((request->method != POST) && (prefs->use_welcome)) {
- if (config->welcome_path &&
- (string = read_welcome(request->pool, config->welcome_path)))
- generate_welcome_page(session, string);
- else
- session_redirect(session, request, "list");
-
+ generate_welcome_page(session, NULL);
return;
}
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -402,12 +402,6 @@ ssl_required = FALSE
# Session banner (local HTML inserted into each page of login session)
#session_banner_path = "$prefix/etc/session_banner.html"
-# Welcome text displayed when user first logs in
-welcome_path = "$prefix/etc/welcome.html"
-
-# Location of help files
-help_dir = "$prefix/help"
-
# Location of icon files
icon_dir = "$prefix/icons"
/branches/lenny/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, ...);
/branches/lenny/debian/changelog
0,0 → 1,127
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
/branches/lenny/debian/prayer.install
0,0 → 1,5
usr/sbin/prayer
usr/sbin/prayer-session
usr/sbin/prayer-ssl-prune
usr/share/prayer
etc/prayer/prayer.cf
/branches/lenny/debian/README.Debian
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
 
/branches/lenny/debian/control
0,0 → 1,54
Source: prayer
Section: mail
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt,
libc-client2007-dev, libldap2-dev,
zlib1g-dev, libssl-dev (>= 0.9.6), libdb-dev,
Standards-Version: 3.7.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
Suggests: prayer-accountd, 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-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.
/branches/lenny/debian/prayer.dirs
0,0 → 1,4
var/run/prayer
var/log/prayer
etc/prayer/templates/xhtml_transitional
etc/prayer/templates/xhtml_strict
/branches/lenny/debian/prayer.examples
0,0 → 1,3
files/etc.hermes/login_prefix.html
files/etc.hermes/login_suffix.html
files/etc.hermes/motd.html
/branches/lenny/debian/prayer.postinst
0,0 → 1,56
#!/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/run/prayer >/dev/null 2>&1 \
|| dpkg-statoverride --update --add prayer root 2750 /var/run/prayer
 
dpkg-statoverride --list /var/log/prayer >/dev/null 2>&1 \
|| dpkg-statoverride --update --add prayer adm 2750 /var/log/prayer
 
# 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
 
 
/branches/lenny/debian/Config
0,0 → 1,153
# $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 CPPFLAGS and LDFLAGS if passed in)
ifdef CPPFLAGS
BASECFLAGS = $(CPPFLAGS)
else
BASECFLAGS = -Wall -g -O2
endif
ifdef INCLUDES
BASECFLAGS += $(INCLUDES)
endif
ifdef LDFLAGS
BASELDFLAGS = $(LDFLAGS)
else
BASELDFLAGS = -g
endif
 
# Minimal libraries needed by Linux
BASE_LIBS = -lcrypt
# 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 = -DLDAP_DEPRECATED
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
/branches/lenny/debian/copyright
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.
*/
 
/branches/lenny/debian/prayer.docs
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
/branches/lenny/debian/prayer.postrm
0,0 → 1,53
#!/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 dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1; then
dpkg-statoverride --remove /var/run/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
/branches/lenny/debian/rules
0,0 → 1,17
#!/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
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: lenny/debian/prayer-accountd.init
===================================================================
--- lenny/debian/prayer-accountd.init (nonexistent)
+++ lenny/debian/prayer-accountd.init (revision 52)
@@ -0,0 +1,71 @@
+#!/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
+ 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: lenny/debian/prayer-accountd.lintian-overrides
===================================================================
--- lenny/debian/prayer-accountd.lintian-overrides (nonexistent)
+++ lenny/debian/prayer-accountd.lintian-overrides (revision 52)
@@ -0,0 +1 @@
+prayer-accountd: possible-gpl-code-linked-with-openssl
Index: lenny/debian/prayer.lintian-overrides
===================================================================
--- lenny/debian/prayer.lintian-overrides (nonexistent)
+++ lenny/debian/prayer.lintian-overrides (revision 52)
@@ -0,0 +1 @@
+prayer: possible-gpl-code-linked-with-openssl
Index: lenny/debian/compat
===================================================================
--- lenny/debian/compat (nonexistent)
+++ lenny/debian/compat (revision 52)
@@ -0,0 +1 @@
+5
Index: lenny/debian/prayer.default
===================================================================
--- lenny/debian/prayer.default (nonexistent)
+++ lenny/debian/prayer.default (revision 52)
@@ -0,0 +1,11 @@
+# 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
+
+# Options. You probably won't need any.
+DAEMON_OPTS=""
Index: lenny/debian/prayer-accountd.docs
===================================================================
--- lenny/debian/prayer-accountd.docs (nonexistent)
+++ lenny/debian/prayer-accountd.docs (revision 52)
@@ -0,0 +1,8 @@
+docs/ACCOUNTD
+docs/DESIGN
+docs/DONE-OLD
+docs/FEATURES
+docs/NOTICE
+docs/README
+docs/SECURITY
+docs/TODO
Index: lenny/debian/prayer-session.8.dbk
===================================================================
--- lenny/debian/prayer-session.8.dbk (nonexistent)
+++ lenny/debian/prayer-session.8.dbk (revision 52)
@@ -0,0 +1,158 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xslb manpage.dbk'. A manual page
+<package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+ $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The
+XSL files are in docbook-xsl. Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Magnus</firstname>">
+ <!ENTITY dhsurname "<surname>Holmgren</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>oktober 24, 2006</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>8</manvolnum>">
+ <!ENTITY dhemail "<email>magnus@kibibyte.se</email>">
+ <!ENTITY dhusername "Magnus Holmgren">
+ <!ENTITY dhucpackage "<refentrytitle>PRAYER</refentrytitle>">
+ <!ENTITY dhpackage "prayer-session">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>a fast stand-alone webmail server</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option><replaceable>OPTION</replaceable></option></arg>...</cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.</para>
+
+ <para><command>&dhpackage;</command> is a program that...</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>--config-file <replaceable>filename</replaceable></option>
+ </term>
+ <listitem>
+ <para>Define prayer config file (Overrides compilation default and PRAYER_CONFIG_FILE environment variable).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--config-option <replaceable>option</replaceable>=<replaceable>value</replaceable></option>
+ </term>
+ <listitem>
+ <para>Override single configuration option.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--foreground</option>
+ </term>
+ <listitem>
+ <para>Run single threaded server in foreground.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--debug</option>
+ </term>
+ <listitem>
+ <para>Enable debugging.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>Show option summary.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>prayer(8), prayer.cf(5).</para>
+
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2 any
+ later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
Index: lenny/debian/prayer.logrotate
===================================================================
--- lenny/debian/prayer.logrotate (nonexistent)
+++ lenny/debian/prayer.logrotate (revision 52)
@@ -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: lenny/debian/prayer.init
===================================================================
--- lenny/debian/prayer.init (nonexistent)
+++ lenny/debian/prayer.init (revision 52)
@@ -0,0 +1,89 @@
+#!/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
+FRONTEND_PIDFILE=/var/run/prayer/prayer.pid
+SESSION_PIDFILE=/var/run/prayer/prayer-session.pid
+DESC="webmail server"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+ENABLED=0
+
+# Include prayer defaults if available
+if [ -f /etc/default/prayer ] ; then
+ . /etc/default/prayer
+fi
+
+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
+ 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)
+ 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
+ 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
Index: lenny/debian/prayer-accountd.install
===================================================================
--- lenny/debian/prayer-accountd.install (nonexistent)
+++ lenny/debian/prayer-accountd.install (revision 52)
@@ -0,0 +1,2 @@
+usr/sbin/prayer-accountd
+etc/prayer/accountd.cf
Index: lenny/debian/watch
===================================================================
--- lenny/debian/watch (nonexistent)
+++ lenny/debian/watch (revision 52)
@@ -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: lenny/debian/prayer.8.dbk
===================================================================
--- lenny/debian/prayer.8.dbk (nonexistent)
+++ lenny/debian/prayer.8.dbk (revision 52)
@@ -0,0 +1,178 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xslb manpage.dbk'. A manual page
+<package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+ $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The
+XSL files are in docbook-xsl. Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Magnus</firstname>">
+ <!ENTITY dhsurname "<surname>Holmgren</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>oktober 24, 2006</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>8</manvolnum>">
+ <!ENTITY dhemail "<email>magnus@kibibyte.se</email>">
+ <!ENTITY dhusername "Magnus Holmgren">
+ <!ENTITY dhucpackage "<refentrytitle>PRAYER</refentrytitle>">
+ <!ENTITY dhpackage "prayer">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>a fast stand-alone webmail server</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option><replaceable>OPTION</replaceable></option></arg>... -- <arg><option><replaceable>PRAYER-SESSION-OPTION</replaceable></option></arg> ...
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> and <command>bar</command>
+ commands.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in the &gnu;
+ <application>Info</application> format; see below.</para>
+
+ <para><command>&dhpackage;</command> is a program that...</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>--config-file <replaceable>filename</replaceable></option>
+ </term>
+ <listitem>
+ <para>Define prayer config file (Overrides compilation default and PRAYER_CONFIG_FILE environment variable).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--config-option <replaceable>option</replaceable>=<replaceable>value</replaceable></option>
+ </term>
+ <listitem>
+ <para>Override single configuration option.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--foreground</option>
+ </term>
+ <listitem>
+ <para>Run single threaded server in foreground.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--disable-prefork</option>
+ </term>
+ <listitem>
+ <para>Run as simple fork()/exec() daemon.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--disable-session</option>
+ </term>
+ <listitem>
+ <para>Don't start up prayer-session server.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--</option>
+ </term>
+ <listitem>
+ <para>End of prayer options: remaining options will be passed to prayer-session server process.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>Show option summary.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>prayer-session(8), prayer.cf(5).</para>
+
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2 any
+ later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
Index: lenny/debian
===================================================================
--- lenny/debian (nonexistent)
+++ lenny/debian (revision 52)
/lenny/debian
Property changes:
Added: mergeWithUpstream
## -0,0 +1 ##
+1
\ No newline at end of property