Subversion Repositories prayer-err

Compare Revisions

Ignore whitespace Rev HEAD → Rev 1

/tags/1.0.18-1/debian/changelog
File deleted
/tags/1.0.18-1/debian/patches/hasnochildren_means_noinferiors.patch
File deleted
/tags/1.0.18-1/debian/patches/ipv6.patch
File deleted
/tags/1.0.18-1/debian/patches/utf8.patch
File deleted
/tags/1.0.18-1/debian/patches/session_unix_bugs.patch
File deleted
/tags/1.0.18-1/debian/patches/includes.patch
File deleted
/tags/1.0.18-1/debian/patches/sighandling.patch
File deleted
/tags/1.0.18-1/debian/patches/makefile_install_config.patch
File deleted
/tags/1.0.18-1/debian/patches/session_server_bugs.patch
File deleted
/tags/1.0.18-1/debian/patches/pidfiles_extension.patch
File deleted
/tags/1.0.18-1/debian/patches/series
File deleted
/tags/1.0.18-1/debian/prayer-accountd.docs
File deleted
/tags/1.0.18-1/debian/prayer-session.8.dbk
File deleted
/tags/1.0.18-1/debian/prayer.docs
File deleted
/tags/1.0.18-1/debian/rules
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.0.18-1/debian/prayer-accountd.dirs
===================================================================
--- 1.0.18-1/debian/prayer-accountd.dirs (revision 37)
+++ 1.0.18-1/debian/prayer-accountd.dirs (nonexistent)
@@ -1 +0,0 @@
-/var/run/prayer
Index: 1.0.18-1/debian/prayer.logrotate
===================================================================
--- 1.0.18-1/debian/prayer.logrotate (revision 37)
+++ 1.0.18-1/debian/prayer.logrotate (nonexistent)
@@ -1,8 +0,0 @@
-/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.0.18-1/debian/prayer-accountd.init
===================================================================
--- 1.0.18-1/debian/prayer-accountd.init (revision 37)
+++ 1.0.18-1/debian/prayer-accountd.init (nonexistent)
@@ -1,71 +0,0 @@
-#!/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: 1.0.18-1/debian/prayer.dirs
===================================================================
--- 1.0.18-1/debian/prayer.dirs (revision 37)
+++ 1.0.18-1/debian/prayer.dirs (nonexistent)
@@ -1,2 +0,0 @@
-var/run/prayer
-var/log/prayer
Index: 1.0.18-1/debian/prayer.init
===================================================================
--- 1.0.18-1/debian/prayer.init (revision 37)
+++ 1.0.18-1/debian/prayer.init (nonexistent)
@@ -1,89 +0,0 @@
-#!/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: 1.0.18-1/debian/prayer-accountd.install
===================================================================
--- 1.0.18-1/debian/prayer-accountd.install (revision 37)
+++ 1.0.18-1/debian/prayer-accountd.install (nonexistent)
@@ -1,2 +0,0 @@
-usr/sbin/prayer-accountd
-etc/prayer/accountd.cf
Index: 1.0.18-1/debian/Config
===================================================================
--- 1.0.18-1/debian/Config (revision 37)
+++ 1.0.18-1/debian/Config (nonexistent)
@@ -1,160 +0,0 @@
-# $Cambridge: hermes/src/prayer/defaults/Config,v 1.5 2006/04/05 12:35:35 fanf2 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
-DIRECT_ENABLE = false # Experimental. Leave this switched off...
-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 = true # 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.
-#BASECFLAGS = -Wall -g
-#BASELDFLAGS = -g
-BASECFLAGS = -Wall -g -O2
-BASELDFLAGS = -g -O2
-BASE_LIBS = -lcrypt
-
-# Base Compiler options for Sun SUNWspro compiler
-#CC = /opt/SUNWspro/bin/cc
-#BASECFLAGS = -fast
-#BASELDFLAGS = -s
-#BASE_LIBS = -lcrypt -lxnet
-
-############################################################################
-# Location of various include files and libraries.
-############################################################################
-
-# Location of c-client library.
-#
-# Following works if we have a vanilla c-client installation at same level
-# as the prayer installation. Relies on a symbolic link ./prayer/c-client
-# which points to ../../imap/c-client. This just reduces the amount of
-# noise output on each line when building the package.
-#
-CCLIENT_DIR=/usr/include/c-client
-CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
-CCLIENT_LIBS=-lc-client
-
-#
-# Following works with the mail/cclient port from FreeBSD
-#
-#CCLIENT_INCLUDE = -I/usr/local/include/c-client
-#CCLIENT_LIBS = -L/usr/local/lib -lc-client4
-#
-# Complication:
-# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
-#
-#CCLIENT_SSL_ENABLE = true
-#CCLIENT_KERB_ENABLE = true
-
-############################################################################
-
-# 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/lib/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
Index: 1.0.18-1/debian/watch
===================================================================
--- 1.0.18-1/debian/watch (revision 37)
+++ 1.0.18-1/debian/watch (nonexistent)
@@ -1,9 +0,0 @@
-# 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.0.18-1/debian/prayer.8.dbk
===================================================================
--- 1.0.18-1/debian/prayer.8.dbk (revision 37)
+++ 1.0.18-1/debian/prayer.8.dbk (nonexistent)
@@ -1,178 +0,0 @@
-<?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: 1.0.18-1/debian/prayer.install
===================================================================
--- 1.0.18-1/debian/prayer.install (revision 37)
+++ 1.0.18-1/debian/prayer.install (nonexistent)
@@ -1,10 +0,0 @@
-usr/sbin/prayer
-usr/sbin/prayer-session
-usr/sbin/prayer-chroot
-usr/sbin/prayer-db-prune
-usr/sbin/prayer-sem-prune
-usr/sbin/prayer-ssl-prune
-usr/share/prayer
-etc/prayer/prayer.cf
-etc/prayer/motd.html
-etc/prayer/welcome.html
Index: 1.0.18-1/debian/copyright
===================================================================
--- 1.0.18-1/debian/copyright (revision 37)
+++ 1.0.18-1/debian/copyright (nonexistent)
@@ -1,83 +0,0 @@
-This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
-Tue, 24 Oct 2006 21:08:34 +0200.
-
-It was downloaded from http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
-
-Upstream author/maintainer: David Carter <dpc22@cam.ac.uk> et al.
-
-The Debian packaging is (C) 2006, Magnus Holmgren <magnus@kibibyte.se>
-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.0.18-1/debian/README.Debian
===================================================================
--- 1.0.18-1/debian/README.Debian (revision 37)
+++ 1.0.18-1/debian/README.Debian (nonexistent)
@@ -1,51 +0,0 @@
-prayer for Debian
------------------
-
-The Debian version of Prayer is built with SSL support with session
-cache using libdb4.3, gzip Content-Transfer-Encoding, LDAP, and System
-V mutex support. Some bigger and some smaller changes have been made:
-
- * As the upstream web page explains, "Prayer was designed to work
- with the Washington IMAP server, which has the most problems
- associated with transient IMAP connections. Consequently, the user
- interface distinguishes between mailboxes and directories: this will
- not work well with servers which provide dual use mail folders."
- A simple patch from Jonathan McDowell at least makes leaf folders
- be treated as folders.
-
- * This packaging adds IPv6 support. However, prayer-session uses
- libc-client to connect to the IMAP server, and IPv6 support can only
- be achieved there by building with the version of libc-client
- currently in experimental.
-
- * This packaging adds international character support, including
- encoding and decoding of modified-UTF-7-encoded folder
- names. However, the folder filter still works on the UTF-7 level,
- meaning, for example, that a "-" will match any folder with an
- encoded character in it, since "-" is the shift-out character that
- ends every base64-encoded sequence in UTF-7.
-
- Where it was hardwired to ISO-8859-1 it has been re-wired to UTF-8,
- but I may have missed some spots and ISO-8859-1 is still the hardcoded
- fallback character set.
-
- * The decoding of RFC2047 encoded words has been relaxed, accommodating
- to some common encoding errors: spaces are accepted in the encoded
- text, as are overlong encoded words.
-
-
-Quirks:
-
- * If your IMAP server supports STARTTLS, then Prayer (actually the
- libc-client IMAP client library) will use it automatically and it
- can't be turned off. 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.
-
- * If your IMAP server is Dovecot, then you must change
- prefs_folder_name to something not containing a dot. Unfortunately
- this means that the preference folder will be fully visible.
-
- -- Magnus Holmgren <magnus@kibibyte.se>, Wed, 15 Nov 2006 14:51:00 +0100
-
-Tag: interface::web, made-of::lang:c, made-of::data:html mail::imap, mail::user-agent, protocol::imap, protocol::ssl, protocol::http, role::sw:server, use::viewing, works-with::mail, web::application
Index: 1.0.18-1/debian/control
===================================================================
--- 1.0.18-1/debian/control (revision 37)
+++ 1.0.18-1/debian/control (nonexistent)
@@ -1,48 +0,0 @@
-Source: prayer
-Section: mail
-Priority: optional
-Maintainer: Magnus Holmgren <magnus@kibibyte.se>
-Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt, libc-client-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb4.3-dev | libdb-dev, libldap2-dev
-Standards-Version: 3.7.2
-
-Package: prayer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-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.
Index: 1.0.18-1/debian/compat
===================================================================
--- 1.0.18-1/debian/compat (revision 37)
+++ 1.0.18-1/debian/compat (nonexistent)
@@ -1 +0,0 @@
-5
Index: 1.0.18-1/debian/prayer.postinst
===================================================================
--- 1.0.18-1/debian/prayer.postinst (revision 37)
+++ 1.0.18-1/debian/prayer.postinst (nonexistent)
@@ -1,46 +0,0 @@
-#!/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 --ingroup nogroup --no-create-home \
- --disabled-password --disabled-login prayer
- chown prayer:root /var/run/prayer
- chown prayer:adm /var/log/prayer
- chmod 2750 /var/run/prayer /var/log/prayer
- ;;
-
- 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
-
-
Index: 1.0.18-1/debian/prayer.postrm
===================================================================
--- 1.0.18-1/debian/prayer.postrm (revision 37)
+++ 1.0.18-1/debian/prayer.postrm (nonexistent)
@@ -1,43 +0,0 @@
-#!/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
- purge)
- deluser --system --quiet prayer || true
- rm -rf /var/log/prayer
- find /var/run/prayer/ \( -type s -o -name ssl_scache \) -exec rm {} +
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- ;;
-
- *)
- 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
Index: 1.0.18-1/debian/prayer.default
===================================================================
--- 1.0.18-1/debian/prayer.default (revision 37)
+++ 1.0.18-1/debian/prayer.default (nonexistent)
@@ -1,11 +0,0 @@
-# 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: 1.0.18-1/debian
===================================================================
--- 1.0.18-1/debian (revision 37)
+++ 1.0.18-1/debian (nonexistent)
/1.0.18-1/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property
Index: 1.1.0-1/debian/README.Debian
===================================================================
--- 1.1.0-1/debian/README.Debian (revision 37)
+++ 1.1.0-1/debian/README.Debian (nonexistent)
@@ -1,31 +0,0 @@
-prayer for Debian
------------------
-
-The Debian version of Prayer is built with SSL support with session
-cache using libdb4.3, 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 default configuration regarding directory structure, and minor
-cosmetic changes to the folder list.
-
-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.
-
- -- Magnus Holmgren <holmgren@debian.org>, Tue, 13 May 2008 22:27:11 +0200
-
Index: 1.1.0-1/debian/control
===================================================================
--- 1.1.0-1/debian/control (revision 37)
+++ 1.1.0-1/debian/control (nonexistent)
@@ -1,52 +0,0 @@
-Source: prayer
-Section: mail
-Priority: optional
-Maintainer: Magnus Holmgren <holmgren@debian.org>
-Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt,
- libc-client2007-dev, libldap2-dev,
- zlib1g-dev, libssl-dev (>= 0.9.6), libdb4.3-dev | libdb-dev,
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk
-Vcs-Browser: http://svn.kibibyte.se/prayer
-
-Package: prayer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-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.
Index: 1.1.0-1/debian/compat
===================================================================
--- 1.1.0-1/debian/compat (revision 37)
+++ 1.1.0-1/debian/compat (nonexistent)
@@ -1 +0,0 @@
-5
Index: 1.1.0-1/debian/prayer.postinst
===================================================================
--- 1.1.0-1/debian/prayer.postinst (revision 37)
+++ 1.1.0-1/debian/prayer.postinst (nonexistent)
@@ -1,45 +0,0 @@
-#!/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 prayer
- chown prayer:root /var/run/prayer
- chown prayer:adm /var/log/prayer
- chmod 2750 /var/run/prayer /var/log/prayer
- ;;
-
- 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
-
-
Index: 1.1.0-1/debian/prayer.postrm
===================================================================
--- 1.1.0-1/debian/prayer.postrm (revision 37)
+++ 1.1.0-1/debian/prayer.postrm (nonexistent)
@@ -1,43 +0,0 @@
-#!/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
- purge)
- deluser --system --quiet prayer || true
- rm -rf /var/log/prayer
- find /var/run/prayer/ \( -type s -o -name ssl_scache \) -exec rm {} +
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- ;;
-
- *)
- 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
Index: 1.1.0-1/debian/prayer.default
===================================================================
--- 1.1.0-1/debian/prayer.default (revision 37)
+++ 1.1.0-1/debian/prayer.default (nonexistent)
@@ -1,11 +0,0 @@
-# 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: 1.1.0-1/debian/changelog
===================================================================
--- 1.1.0-1/debian/changelog (revision 37)
+++ 1.1.0-1/debian/changelog (nonexistent)
@@ -1,25 +0,0 @@
-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
Index: 1.1.0-1/debian/patches/includes.patch
===================================================================
--- 1.1.0-1/debian/patches/includes.patch (revision 37)
+++ 1.1.0-1/debian/patches/includes.patch (nonexistent)
@@ -1,22 +0,0 @@
---- prayer-1.1.0.orig/prayer/prayer_session.h
-+++ prayer-1.1.0/prayer/prayer_session.h
-@@ -27,7 +27,7 @@
-
- extern int errno; /* just in case */
-
--#include "c-client.h"
-+#include <c-client.h>
-
- #define PRAYER_FULL_HDRS
- #include "prayer_shared.h"
---- prayer-1.1.0.orig/prayer/cdb.c
-+++ prayer-1.1.0/prayer/cdb.c
-@@ -63,7 +63,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
--#include "mail.h"
-+#include "common.h"
- #include "cdb.h"
-
- #define CDB_HASH_SPLIT 256 /* num pieces the hash table is split into */
Index: 1.1.0-1/debian/patches/sighandling.patch
===================================================================
--- 1.1.0-1/debian/patches/sighandling.patch (revision 37)
+++ 1.1.0-1/debian/patches/sighandling.patch (nonexistent)
@@ -1,75 +0,0 @@
-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, ...);
Index: 1.1.0-1/debian/patches/makefile_install_config.patch
===================================================================
--- 1.1.0-1/debian/patches/makefile_install_config.patch (revision 37)
+++ 1.1.0-1/debian/patches/makefile_install_config.patch (nonexistent)
@@ -1,251 +0,0 @@
---- prayer-1.1.0.orig/files/etc/prayer-accountd.cf
-+++ prayer-1.1.0/files/etc/prayer-accountd.cf
-@@ -8,6 +8,8 @@
- # Default accountd.cf file suitable for RedHat Linux only.
- # See distribution for some sample files for FreeBSD and Solaris
-
-+accountd_port = 145
-+
- msforward_name = ".MSforward"
- forward_name = ".forward"
- aliases_name = "vacation.aliases"
---- prayer-1.1.0.orig/files/Makefile
-+++ prayer-1.1.0/files/Makefile
-@@ -53,41 +53,44 @@ distclean:
- install-cert:
- if [ -f certs/prayer.pem ]; then \
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
-- -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
-+ -m $(PRIVATE_FILE) certs/prayer.pem ${DESTDIR}${PREFIX}/certs; \
- fi
-
- install-config: etc/prayer.cf
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
-+ etc/prayer.cf ${DESTDIR}${PRAYER_CONFIG_FILE}
-
- install-aconfig:
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
-+ etc/prayer-accountd.cf ${DESTDIR}${ACCOUNTD_CONFIG_FILE}
-
- install-motd:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/motd.html ${BROOT}${PREFIX}/etc
-+ etc/motd.html ${DESTDIR}/etc/prayer
-
- install-welcome:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/welcome.html ${BROOT}${PREFIX}/etc
-+ etc/welcome.html ${DESTDIR}/etc/prayer
-
- install:
-- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
-+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}${PREFIX}
-+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}/etc/prayer
-+
-+ PREFIX=$(DESTDIR)$(PREFIX) VAR_PREFIX=$(DESTDIR)$(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) \
-+ BIN_DIR=$(DESTDIR)$(BIN_DIR) INSTALL=$(INSTALL) \
- ./install.sh
-- if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-- 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 $(DESTDIR)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-+ if [ ! -f $(DESTDIR)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
-+ if [ ! -f $(DESTDIR)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
-+ if [ ! -f $(DESTDIR)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
-+ if [ ! -f $(DESTDIR)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
-
- redhat-install-init.d:
- install -D -o root -g root -m 755 \
-- ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
-+ ./init.d/prayer $(DESTDIR)/etc/rc.d/init.d/prayer
- #chkconfig prayer --level 2345 on
---- prayer-1.1.0.orig/files/install.sh
-+++ prayer-1.1.0/files/install.sh
-@@ -4,77 +4,6 @@
-
- PATH=/bin:/sbin/:/usr/bin:/usr/sbin
-
--error=0
--
--if [ "x$PREFIX" = "x" ]; then
-- echo 'PREFIX not defined'
-- error=1
--fi
--
--if [ "x$VAR_PREFIX" = "x" ]; then
-- echo 'VAR_PREFIX not defined'
-- error=1
--fi
--
--if [ "x$RO_USER" = "x" ]; then
-- echo 'RO_USER not defined'
-- error=1
--fi
--
--if [ "x$RO_GROUP" = "x" ]; then
-- echo 'RO_GROUP not defined'
-- error=1
--fi
--
--if [ "x$RW_USER" = "x" ]; then
-- echo 'RW_USER not defined'
-- error=1
--fi
--
--if [ "x$RW_GROUP" = "x" ]; then
-- echo 'RW_GROUP not defined'
-- error=1
--fi
--
--if [ "x$PUBLIC_DIR" = "x" ]; then
-- echo 'PUBLIC_DIR not defined'
-- error=1
--fi
--
--if [ "x$PRIVATE_DIR" = "x" ]; then
-- echo 'PRIVATE_DIR not defined'
-- error=1
--fi
--
--if [ "x$BIN_DIR" = "x" ]; then
-- echo 'BIN_DIR not defined'
-- error=1
--fi
--
--if [ $error != 0 ]; then
-- exit 1
--fi
--
--if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
-- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
--fi
--
--if [ ! -d ${PREFIX} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
--fi
--
--if [ ! -d ${PREFIX}/etc ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
--fi
--
--if [ ! -d ${PREFIX}/certs ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
--fi
--
--if [ ! -d ${BIN_DIR} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
--fi
--
- for i in help icons
- do
- if [ -d "${PREFIX}/${i}" ]; then
---- prayer-1.1.0.orig/files/etc/prayer.cf.SRC
-+++ prayer-1.1.0/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.
-@@ -428,14 +428,14 @@ 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"
-+lock_dir = "/var/lock"
-
- # $socket_dir is location for unix domain sockets which connect frontend
- # to backend in proxy mode of operation.
--socket_dir = "$var_prefix/sockets"
-+socket_dir = "/var/run/prayer"
-
- # Split socket directory into 64 subdirs keyed on first letter of sessionID
- # Code provides compatibility in both directions: can switch back and forward
-@@ -446,14 +446,14 @@ socket_split_dir = TRUE
- init_socket_name = init
-
- # $ssl_session_dir is location for SSL session cache
--ssl_session_dir = "$var_prefix/ssl_scache"
-+ssl_session_dir = "/var/run/prayer/ssl_scache"
-
- # 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/run/prayer"
-
- # Interface to Hermes finger database
- #lookup_rpasswd = "/data/finger/rpasswd.cdb"
-@@ -614,7 +614,7 @@ sent_mail_folder = "sent-mail"
- # default_domain = "<valid mail domain>"
-
- # Language for ispell.
--ispell_language = "british"
-+ispell_language = "american"
-
- # Size of small and large compose windows
- small_cols = 80
---- prayer-1.1.0.orig/prayer/Makefile
-+++ prayer-1.1.0/prayer/Makefile
-@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
- SESSION_LIBS += $(KERB_LIBS)
- endif
-
--CFLAGS = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
--LDFLAGS = $(BASELDFLAGS)
-+CFLAGS = $(BASECFLAGS)
-+override CFLAGS += $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-+LDFLAGS = $(BASELDFLAGS) -Wl,--as-needed
-
- SHARED_OBJS = \
- pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
-@@ -175,21 +176,21 @@ clean:
-
- install: all
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
-- $(BROOT)$(BIN_DIR)
-+ $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer $(BROOT)$(BIN_DIR)
-+ prayer $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-chroot $(BROOT)$(BIN_DIR)
-+ prayer-chroot $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-session $(BROOT)$(BIN_DIR)
-+ prayer-session $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-ssl-prune $(BROOT)$(BIN_DIR)
-+ prayer-ssl-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-sem-prune $(BROOT)$(BIN_DIR)
-+ prayer-sem-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-db-prune $(BROOT)$(BIN_DIR)
-+ prayer-db-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-cyclog $(BROOT)$(BIN_DIR)
-+ prayer-cyclog $(DESTDIR)$(BIN_DIR)
-
- prayer: $(PRAYER_OBJS) prayer_main.o
- $(CC) $(LDFLAGS) -o prayer $(PRAYER_OBJS) prayer_main.o $(PRAYER_LIBS)
Index: 1.1.0-1/debian/patches/series
===================================================================
--- 1.1.0-1/debian/patches/series (revision 37)
+++ 1.1.0-1/debian/patches/series (nonexistent)
@@ -1,3 +0,0 @@
-folder_list_cosmetics.patch
-includes.patch
-makefile_install_config.patch
Index: 1.1.0-1/debian/patches/folder_list_cosmetics.patch
===================================================================
--- 1.1.0-1/debian/patches/folder_list_cosmetics.patch (revision 37)
+++ 1.1.0-1/debian/patches/folder_list_cosmetics.patch (nonexistent)
@@ -1,30 +0,0 @@
---- a/prayer/cmd_folders.c
-+++ b/prayer/cmd_folders.c
-@@ -45,10 +45,10 @@ generate_folder_line(struct session *ses
- html_session_bprintf(session, b, "<a href=\"", "\">",
- "folders/toggle/%s", name);
- if (fi->expanded)
-- html_icon(session, b, "down.gif", "[Collapse]");
-+ html_icon(session, b, "down.gif", "[-]&nbsp;");
- else
-- html_icon(session, b, "right.gif", "[Expand]");
-- bputs(b, "</a>&nbsp;");
-+ html_icon(session, b, "right.gif", "[+]&nbsp;");
-+ bputs(b, "</a>");
- } else
- html_icon(session, b, "blank.gif", "&nbsp;&nbsp;&nbsp;&nbsp;");
-
---- a/prayer/cmd_favourites.c
-+++ b/prayer/cmd_favourites.c
-@@ -77,9 +77,9 @@ generate_folder_line(struct session *ses
- html_session_bprintf(session, b, "<a href=\"", "\">",
- "favourites/toggle/%s", name);
- if (fi->expanded)
-- html_icon(session, b, "down.gif", "[Collapse]");
-+ html_icon(session, b, "down.gif", "[-]&nbsp;");
- else
-- html_icon(session, b, "right.gif", "[Expand]");
-+ html_icon(session, b, "right.gif", "[+]&nbsp;");
- bputs(b, "</a>");
- } else
- html_icon(session, b, "blank.gif", "&nbsp;&nbsp;&nbsp;&nbsp;");
Index: 1.1.0-1/debian/prayer-accountd.docs
===================================================================
--- 1.1.0-1/debian/prayer-accountd.docs (revision 37)
+++ 1.1.0-1/debian/prayer-accountd.docs (nonexistent)
@@ -1,8 +0,0 @@
-docs/ACCOUNTD
-docs/DESIGN
-docs/DONE-OLD
-docs/FEATURES
-docs/NOTICE
-docs/README
-docs/SECURITY
-docs/TODO
Index: 1.1.0-1/debian/prayer-session.8.dbk
===================================================================
--- 1.1.0-1/debian/prayer-session.8.dbk (revision 37)
+++ 1.1.0-1/debian/prayer-session.8.dbk (nonexistent)
@@ -1,158 +0,0 @@
-<?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: 1.1.0-1/debian/prayer.docs
===================================================================
--- 1.1.0-1/debian/prayer.docs (revision 37)
+++ 1.1.0-1/debian/prayer.docs (nonexistent)
@@ -1,11 +0,0 @@
-docs/CMD_LINE
-docs/DESIGN
-docs/DONE-OLD
-docs/FEATURES
-docs/ICONLIST
-docs/LOGS
-docs/NOTICE
-docs/README
-docs/SECURITY
-docs/TODO
-docs/URL_OPTIONS
Index: 1.1.0-1/debian/rules
===================================================================
--- 1.1.0-1/debian/rules (revision 37)
+++ 1.1.0-1/debian/rules (nonexistent)
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
-
-DEB_AUTO_CLEANUP_RCS := yes
-
-# 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 DESTDIR=$(CURDIR)/debian/tmp
-DEB_INSTALL_CHANGELOGS_ALL = docs/DONE
-DEB_INSTALL_DOCS_ALL = -XCVS
-DEB_DH_INSTALL_ARGS = -XCVS
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-
-clean::
- rm -f Config
/1.1.0-1/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.1.0-1/debian/prayer-accountd.dirs
===================================================================
--- 1.1.0-1/debian/prayer-accountd.dirs (revision 37)
+++ 1.1.0-1/debian/prayer-accountd.dirs (nonexistent)
@@ -1 +0,0 @@
-/var/run/prayer
Index: 1.1.0-1/debian/prayer.logrotate
===================================================================
--- 1.1.0-1/debian/prayer.logrotate (revision 37)
+++ 1.1.0-1/debian/prayer.logrotate (nonexistent)
@@ -1,8 +0,0 @@
-/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.1.0-1/debian/prayer-accountd.init
===================================================================
--- 1.1.0-1/debian/prayer-accountd.init (revision 37)
+++ 1.1.0-1/debian/prayer-accountd.init (nonexistent)
@@ -1,71 +0,0 @@
-#!/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: 1.1.0-1/debian/prayer.dirs
===================================================================
--- 1.1.0-1/debian/prayer.dirs (revision 37)
+++ 1.1.0-1/debian/prayer.dirs (nonexistent)
@@ -1,2 +0,0 @@
-var/run/prayer
-var/log/prayer
Index: 1.1.0-1/debian/prayer.init
===================================================================
--- 1.1.0-1/debian/prayer.init (revision 37)
+++ 1.1.0-1/debian/prayer.init (nonexistent)
@@ -1,89 +0,0 @@
-#!/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: 1.1.0-1/debian/prayer-accountd.install
===================================================================
--- 1.1.0-1/debian/prayer-accountd.install (revision 37)
+++ 1.1.0-1/debian/prayer-accountd.install (nonexistent)
@@ -1,2 +0,0 @@
-usr/sbin/prayer-accountd
-etc/prayer/accountd.cf
Index: 1.1.0-1/debian/Config
===================================================================
--- 1.1.0-1/debian/Config (revision 37)
+++ 1.1.0-1/debian/Config (nonexistent)
@@ -1,160 +0,0 @@
-# $Cambridge: hermes/src/prayer/defaults/Config,v 1.5 2006/04/05 12:35:35 fanf2 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
-DIRECT_ENABLE = false # Experimental. Leave this switched off...
-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 = true # 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.
-#BASECFLAGS = -Wall -g
-#BASELDFLAGS = -g
-BASECFLAGS = -Wall -g -O2
-BASELDFLAGS = -g -O2
-BASE_LIBS = -lcrypt
-
-# Base Compiler options for Sun SUNWspro compiler
-#CC = /opt/SUNWspro/bin/cc
-#BASECFLAGS = -fast
-#BASELDFLAGS = -s
-#BASE_LIBS = -lcrypt -lxnet
-
-############################################################################
-# Location of various include files and libraries.
-############################################################################
-
-# Location of c-client library.
-#
-# Following works if we have a vanilla c-client installation at same level
-# as the prayer installation. Relies on a symbolic link ./prayer/c-client
-# which points to ../../imap/c-client. This just reduces the amount of
-# noise output on each line when building the package.
-#
-CCLIENT_DIR=/usr/include/c-client
-CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
-CCLIENT_LIBS=-lc-client
-
-#
-# Following works with the mail/cclient port from FreeBSD
-#
-#CCLIENT_INCLUDE = -I/usr/local/include/c-client
-#CCLIENT_LIBS = -L/usr/local/lib -lc-client4
-#
-# Complication:
-# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
-#
-#CCLIENT_SSL_ENABLE = true
-#CCLIENT_KERB_ENABLE = true
-
-############################################################################
-
-# 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/lib/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
Index: 1.1.0-1/debian/watch
===================================================================
--- 1.1.0-1/debian/watch (revision 37)
+++ 1.1.0-1/debian/watch (nonexistent)
@@ -1,9 +0,0 @@
-# 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.1.0-1/debian/prayer.8.dbk
===================================================================
--- 1.1.0-1/debian/prayer.8.dbk (revision 37)
+++ 1.1.0-1/debian/prayer.8.dbk (nonexistent)
@@ -1,178 +0,0 @@
-<?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: 1.1.0-1/debian/prayer.install
===================================================================
--- 1.1.0-1/debian/prayer.install (revision 37)
+++ 1.1.0-1/debian/prayer.install (nonexistent)
@@ -1,10 +0,0 @@
-usr/sbin/prayer
-usr/sbin/prayer-session
-usr/sbin/prayer-chroot
-usr/sbin/prayer-db-prune
-usr/sbin/prayer-sem-prune
-usr/sbin/prayer-ssl-prune
-usr/share/prayer
-etc/prayer/prayer.cf
-etc/prayer/motd.html
-etc/prayer/welcome.html
Index: 1.1.0-1/debian/copyright
===================================================================
--- 1.1.0-1/debian/copyright (revision 37)
+++ 1.1.0-1/debian/copyright (nonexistent)
@@ -1,83 +0,0 @@
-This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
-Tue, 24 Oct 2006 21:08:34 +0200.
-
-It was downloaded from http://www-uxsup.csx.cam.ac.uk/~dpc22/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.1.0-1/debian
===================================================================
--- 1.1.0-1/debian (revision 37)
+++ 1.1.0-1/debian (nonexistent)
/1.1.0-1/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property
Index: 1.1.0-2/debian/README.Debian
===================================================================
--- 1.1.0-2/debian/README.Debian (revision 37)
+++ 1.1.0-2/debian/README.Debian (nonexistent)
@@ -1,31 +0,0 @@
-prayer for Debian
------------------
-
-The Debian version of Prayer is built with SSL support with session
-cache using libdb4.3, 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 default configuration regarding directory structure, and minor
-cosmetic changes to the folder list.
-
-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.
-
- -- Magnus Holmgren <holmgren@debian.org>, Tue, 13 May 2008 22:27:11 +0200
-
Index: 1.1.0-2/debian/control
===================================================================
--- 1.1.0-2/debian/control (revision 37)
+++ 1.1.0-2/debian/control (nonexistent)
@@ -1,52 +0,0 @@
-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), libdb4.3-dev | libdb-dev,
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk
-Vcs-Browser: http://svn.kibibyte.se/prayer
-
-Package: prayer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-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.
Index: 1.1.0-2/debian/prayer-accountd.postinst
===================================================================
--- 1.1.0-2/debian/prayer-accountd.postinst (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.postinst (nonexistent)
@@ -1,44 +0,0 @@
-#!/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)
- dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1 \
- || dpkg-statoverride --update --add prayer root 2750 /var/run/prayer
-
- ;;
-
- 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
-
-
Index: 1.1.0-2/debian/compat
===================================================================
--- 1.1.0-2/debian/compat (revision 37)
+++ 1.1.0-2/debian/compat (nonexistent)
@@ -1 +0,0 @@
-5
Index: 1.1.0-2/debian/prayer-accountd.postrm
===================================================================
--- 1.1.0-2/debian/prayer-accountd.postrm (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.postrm (nonexistent)
@@ -1,41 +0,0 @@
-#!/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
- purge)
- [ -e /var/run/prayer/ ] || dpkg-statoverride --remove /var/run/prayer
- ;;
-
- remove|disappear|upgrade|abort-install|failed-upgrade|abort-upgrade)
-
- ;;
-
- *)
- 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
Index: 1.1.0-2/debian/prayer.postinst
===================================================================
--- 1.1.0-2/debian/prayer.postinst (revision 37)
+++ 1.1.0-2/debian/prayer.postinst (nonexistent)
@@ -1,49 +0,0 @@
-#!/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 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
-
- ;;
-
- 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
-
-
Index: 1.1.0-2/debian/prayer.default
===================================================================
--- 1.1.0-2/debian/prayer.default (revision 37)
+++ 1.1.0-2/debian/prayer.default (nonexistent)
@@ -1,11 +0,0 @@
-# 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: 1.1.0-2/debian/prayer.postrm
===================================================================
--- 1.1.0-2/debian/prayer.postrm (revision 37)
+++ 1.1.0-2/debian/prayer.postrm (nonexistent)
@@ -1,49 +0,0 @@
-#!/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
- purge)
- deluser --system --quiet prayer || true
- rm -rf /var/log/prayer
- dpkg-statoverride --remove /var/log/prayer
- [ -e /var/run/prayer/ ] || dpkg-statoverride --remove /var/run/prayer
- ;;
-
- remove|disappear)
- find /var/run/prayer/ -mindepth 1 \( -type s -o -name ssl_scache -o -empty \) -delete
-
- ;;
-
- upgrade|abort-install|failed-upgrade|abort-upgrade)
-
- ;;
-
- *)
- 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
Index: 1.1.0-2/debian/patches/includes.patch
===================================================================
--- 1.1.0-2/debian/patches/includes.patch (revision 37)
+++ 1.1.0-2/debian/patches/includes.patch (nonexistent)
@@ -1,22 +0,0 @@
---- prayer-1.1.0.orig/prayer/prayer_session.h
-+++ prayer-1.1.0/prayer/prayer_session.h
-@@ -27,7 +27,7 @@
-
- extern int errno; /* just in case */
-
--#include "c-client.h"
-+#include <c-client.h>
-
- #define PRAYER_FULL_HDRS
- #include "prayer_shared.h"
---- prayer-1.1.0.orig/prayer/cdb.c
-+++ prayer-1.1.0/prayer/cdb.c
-@@ -63,7 +63,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
--#include "mail.h"
-+#include "common.h"
- #include "cdb.h"
-
- #define CDB_HASH_SPLIT 256 /* num pieces the hash table is split into */
Index: 1.1.0-2/debian/patches/sighandling.patch
===================================================================
--- 1.1.0-2/debian/patches/sighandling.patch (revision 37)
+++ 1.1.0-2/debian/patches/sighandling.patch (nonexistent)
@@ -1,75 +0,0 @@
-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, ...);
Index: 1.1.0-2/debian/patches/makefile_install_config.patch
===================================================================
--- 1.1.0-2/debian/patches/makefile_install_config.patch (revision 37)
+++ 1.1.0-2/debian/patches/makefile_install_config.patch (nonexistent)
@@ -1,253 +0,0 @@
---- 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
-@@ -53,41 +53,44 @@ distclean:
- install-cert:
- if [ -f certs/prayer.pem ]; then \
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
-- -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
-+ -m $(PRIVATE_FILE) certs/prayer.pem ${DESTDIR}${PREFIX}/certs; \
- fi
-
- install-config: etc/prayer.cf
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
-+ etc/prayer.cf ${DESTDIR}${PRAYER_CONFIG_FILE}
-
- install-aconfig:
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
-+ etc/prayer-accountd.cf ${DESTDIR}${ACCOUNTD_CONFIG_FILE}
-
- install-motd:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/motd.html ${BROOT}${PREFIX}/etc
-+ etc/motd.html ${DESTDIR}/etc/prayer
-
- install-welcome:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/welcome.html ${BROOT}${PREFIX}/etc
-+ etc/welcome.html ${DESTDIR}/etc/prayer
-
- install:
-- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
-+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}${PREFIX}
-+ ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${DESTDIR}/etc/prayer
-+
-+ PREFIX=$(DESTDIR)$(PREFIX) VAR_PREFIX=$(DESTDIR)$(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) \
-+ BIN_DIR=$(DESTDIR)$(BIN_DIR) INSTALL=$(INSTALL) \
- ./install.sh
-- if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-- 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 $(DESTDIR)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-+ if [ ! -f $(DESTDIR)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
-+ if [ ! -f $(DESTDIR)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
-+ if [ ! -f $(DESTDIR)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
-+ if [ ! -f $(DESTDIR)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
-
- redhat-install-init.d:
- install -D -o root -g root -m 755 \
-- ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
-+ ./init.d/prayer $(DESTDIR)/etc/rc.d/init.d/prayer
- #chkconfig prayer --level 2345 on
---- a/files/install.sh
-+++ b/files/install.sh
-@@ -4,77 +4,6 @@
-
- PATH=/bin:/sbin/:/usr/bin:/usr/sbin
-
--error=0
--
--if [ "x$PREFIX" = "x" ]; then
-- echo 'PREFIX not defined'
-- error=1
--fi
--
--if [ "x$VAR_PREFIX" = "x" ]; then
-- echo 'VAR_PREFIX not defined'
-- error=1
--fi
--
--if [ "x$RO_USER" = "x" ]; then
-- echo 'RO_USER not defined'
-- error=1
--fi
--
--if [ "x$RO_GROUP" = "x" ]; then
-- echo 'RO_GROUP not defined'
-- error=1
--fi
--
--if [ "x$RW_USER" = "x" ]; then
-- echo 'RW_USER not defined'
-- error=1
--fi
--
--if [ "x$RW_GROUP" = "x" ]; then
-- echo 'RW_GROUP not defined'
-- error=1
--fi
--
--if [ "x$PUBLIC_DIR" = "x" ]; then
-- echo 'PUBLIC_DIR not defined'
-- error=1
--fi
--
--if [ "x$PRIVATE_DIR" = "x" ]; then
-- echo 'PRIVATE_DIR not defined'
-- error=1
--fi
--
--if [ "x$BIN_DIR" = "x" ]; then
-- echo 'BIN_DIR not defined'
-- error=1
--fi
--
--if [ $error != 0 ]; then
-- exit 1
--fi
--
--if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
-- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
--fi
--
--if [ ! -d ${PREFIX} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
--fi
--
--if [ ! -d ${PREFIX}/etc ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
--fi
--
--if [ ! -d ${PREFIX}/certs ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
--fi
--
--if [ ! -d ${BIN_DIR} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
--fi
--
- for i in help icons
- do
- if [ -d "${PREFIX}/${i}" ]; then
---- 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.
-@@ -428,14 +428,14 @@ 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"
-+lock_dir = "/var/lock"
-
- # $socket_dir is location for unix domain sockets which connect frontend
- # to backend in proxy mode of operation.
--socket_dir = "$var_prefix/sockets"
-+socket_dir = "/var/run/prayer"
-
- # Split socket directory into 64 subdirs keyed on first letter of sessionID
- # Code provides compatibility in both directions: can switch back and forward
-@@ -446,14 +446,14 @@ socket_split_dir = TRUE
- init_socket_name = init
-
- # $ssl_session_dir is location for SSL session cache
--ssl_session_dir = "$var_prefix/ssl_scache"
-+ssl_session_dir = "/var/run/prayer/ssl_scache"
-
- # 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/run/prayer"
-
- # Interface to Hermes finger database
- #lookup_rpasswd = "/data/finger/rpasswd.cdb"
-@@ -614,7 +614,7 @@ sent_mail_folder = "sent-mail"
- # 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/prayer/Makefile
-+++ b/prayer/Makefile
-@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
- SESSION_LIBS += $(KERB_LIBS)
- endif
-
--CFLAGS = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
--LDFLAGS = $(BASELDFLAGS)
-+CFLAGS =
-+override CFLAGS += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-+LDFLAGS = $(BASELDFLAGS) -Wl,--as-needed
-
- SHARED_OBJS = \
- pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
-@@ -175,21 +176,21 @@ clean:
-
- install: all
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
-- $(BROOT)$(BIN_DIR)
-+ $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer $(BROOT)$(BIN_DIR)
-+ prayer $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-chroot $(BROOT)$(BIN_DIR)
-+ prayer-chroot $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-session $(BROOT)$(BIN_DIR)
-+ prayer-session $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-ssl-prune $(BROOT)$(BIN_DIR)
-+ prayer-ssl-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-sem-prune $(BROOT)$(BIN_DIR)
-+ prayer-sem-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-db-prune $(BROOT)$(BIN_DIR)
-+ prayer-db-prune $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-- prayer-cyclog $(BROOT)$(BIN_DIR)
-+ prayer-cyclog $(DESTDIR)$(BIN_DIR)
-
- prayer: $(PRAYER_OBJS) prayer_main.o
- $(CC) $(LDFLAGS) -o prayer $(PRAYER_OBJS) prayer_main.o $(PRAYER_LIBS)
Index: 1.1.0-2/debian/patches/series
===================================================================
--- 1.1.0-2/debian/patches/series (revision 37)
+++ 1.1.0-2/debian/patches/series (nonexistent)
@@ -1,3 +0,0 @@
-folder_list_cosmetics.patch
-includes.patch
-makefile_install_config.patch
Index: 1.1.0-2/debian/patches/folder_list_cosmetics.patch
===================================================================
--- 1.1.0-2/debian/patches/folder_list_cosmetics.patch (revision 37)
+++ 1.1.0-2/debian/patches/folder_list_cosmetics.patch (nonexistent)
@@ -1,30 +0,0 @@
---- a/prayer/cmd_folders.c
-+++ b/prayer/cmd_folders.c
-@@ -45,10 +45,10 @@ generate_folder_line(struct session *ses
- html_session_bprintf(session, b, "<a href=\"", "\">",
- "folders/toggle/%s", name);
- if (fi->expanded)
-- html_icon(session, b, "down.gif", "[Collapse]");
-+ html_icon(session, b, "down.gif", "[-]&nbsp;");
- else
-- html_icon(session, b, "right.gif", "[Expand]");
-- bputs(b, "</a>&nbsp;");
-+ html_icon(session, b, "right.gif", "[+]&nbsp;");
-+ bputs(b, "</a>");
- } else
- html_icon(session, b, "blank.gif", "&nbsp;&nbsp;&nbsp;&nbsp;");
-
---- a/prayer/cmd_favourites.c
-+++ b/prayer/cmd_favourites.c
-@@ -77,9 +77,9 @@ generate_folder_line(struct session *ses
- html_session_bprintf(session, b, "<a href=\"", "\">",
- "favourites/toggle/%s", name);
- if (fi->expanded)
-- html_icon(session, b, "down.gif", "[Collapse]");
-+ html_icon(session, b, "down.gif", "[-]&nbsp;");
- else
-- html_icon(session, b, "right.gif", "[Expand]");
-+ html_icon(session, b, "right.gif", "[+]&nbsp;");
- bputs(b, "</a>");
- } else
- html_icon(session, b, "blank.gif", "&nbsp;&nbsp;&nbsp;&nbsp;");
Index: 1.1.0-2/debian/prayer-accountd.docs
===================================================================
--- 1.1.0-2/debian/prayer-accountd.docs (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.docs (nonexistent)
@@ -1,8 +0,0 @@
-docs/ACCOUNTD
-docs/DESIGN
-docs/DONE-OLD
-docs/FEATURES
-docs/NOTICE
-docs/README
-docs/SECURITY
-docs/TODO
Index: 1.1.0-2/debian/changelog
===================================================================
--- 1.1.0-2/debian/changelog (revision 37)
+++ 1.1.0-2/debian/changelog (nonexistent)
@@ -1,45 +0,0 @@
-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
Index: 1.1.0-2/debian/prayer-session.8.dbk
===================================================================
--- 1.1.0-2/debian/prayer-session.8.dbk (revision 37)
+++ 1.1.0-2/debian/prayer-session.8.dbk (nonexistent)
@@ -1,158 +0,0 @@
-<?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: 1.1.0-2/debian/prayer.docs
===================================================================
--- 1.1.0-2/debian/prayer.docs (revision 37)
+++ 1.1.0-2/debian/prayer.docs (nonexistent)
@@ -1,11 +0,0 @@
-docs/CMD_LINE
-docs/DESIGN
-docs/DONE-OLD
-docs/FEATURES
-docs/ICONLIST
-docs/LOGS
-docs/NOTICE
-docs/README
-docs/SECURITY
-docs/TODO
-docs/URL_OPTIONS
Index: 1.1.0-2/debian/rules
===================================================================
--- 1.1.0-2/debian/rules (revision 37)
+++ 1.1.0-2/debian/rules (nonexistent)
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
-
-DEB_AUTO_CLEANUP_RCS := yes
-
-# 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 DESTDIR=$(CURDIR)/debian/tmp
-DEB_INSTALL_CHANGELOGS_ALL = docs/DONE
-DEB_INSTALL_DOCS_ALL = -XCVS
-DEB_DH_INSTALL_ARGS = -XCVS
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-
-clean::
- rm -f Config
/1.1.0-2/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.1.0-2/debian/prayer-accountd.lintian-overrides
===================================================================
--- 1.1.0-2/debian/prayer-accountd.lintian-overrides (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-prayer-accountd: possible-gpl-code-linked-with-openssl
Index: 1.1.0-2/debian/prayer.lintian-overrides
===================================================================
--- 1.1.0-2/debian/prayer.lintian-overrides (revision 37)
+++ 1.1.0-2/debian/prayer.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-prayer: possible-gpl-code-linked-with-openssl
Index: 1.1.0-2/debian/prayer-accountd.dirs
===================================================================
--- 1.1.0-2/debian/prayer-accountd.dirs (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.dirs (nonexistent)
@@ -1 +0,0 @@
-/var/run/prayer
Index: 1.1.0-2/debian/prayer.logrotate
===================================================================
--- 1.1.0-2/debian/prayer.logrotate (revision 37)
+++ 1.1.0-2/debian/prayer.logrotate (nonexistent)
@@ -1,8 +0,0 @@
-/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.1.0-2/debian/prayer-accountd.init
===================================================================
--- 1.1.0-2/debian/prayer-accountd.init (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.init (nonexistent)
@@ -1,71 +0,0 @@
-#!/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: 1.1.0-2/debian/prayer.dirs
===================================================================
--- 1.1.0-2/debian/prayer.dirs (revision 37)
+++ 1.1.0-2/debian/prayer.dirs (nonexistent)
@@ -1,2 +0,0 @@
-var/run/prayer
-var/log/prayer
Index: 1.1.0-2/debian/prayer.init
===================================================================
--- 1.1.0-2/debian/prayer.init (revision 37)
+++ 1.1.0-2/debian/prayer.init (nonexistent)
@@ -1,89 +0,0 @@
-#!/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: 1.1.0-2/debian/prayer-accountd.install
===================================================================
--- 1.1.0-2/debian/prayer-accountd.install (revision 37)
+++ 1.1.0-2/debian/prayer-accountd.install (nonexistent)
@@ -1,2 +0,0 @@
-usr/sbin/prayer-accountd
-etc/prayer/accountd.cf
Index: 1.1.0-2/debian/Config
===================================================================
--- 1.1.0-2/debian/Config (revision 37)
+++ 1.1.0-2/debian/Config (nonexistent)
@@ -1,160 +0,0 @@
-# $Cambridge: hermes/src/prayer/defaults/Config,v 1.5 2006/04/05 12:35:35 fanf2 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
-DIRECT_ENABLE = false # Experimental. Leave this switched off...
-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 = true # 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.
-#BASECFLAGS = -Wall -g
-#BASELDFLAGS = -g
-CFLAGS = -Wall -g -O2
-LDFLAGS = -g -O2
-BASE_LIBS = -lcrypt
-
-# Base Compiler options for Sun SUNWspro compiler
-#CC = /opt/SUNWspro/bin/cc
-#BASECFLAGS = -fast
-#BASELDFLAGS = -s
-#BASE_LIBS = -lcrypt -lxnet
-
-############################################################################
-# Location of various include files and libraries.
-############################################################################
-
-# Location of c-client library.
-#
-# Following works if we have a vanilla c-client installation at same level
-# as the prayer installation. Relies on a symbolic link ./prayer/c-client
-# which points to ../../imap/c-client. This just reduces the amount of
-# noise output on each line when building the package.
-#
-CCLIENT_DIR=/usr/include/c-client
-CCLIENT_INCLUDE=-I$(CCLIENT_DIR)
-CCLIENT_LIBS=-lc-client
-
-#
-# Following works with the mail/cclient port from FreeBSD
-#
-#CCLIENT_INCLUDE = -I/usr/local/include/c-client
-#CCLIENT_LIBS = -L/usr/local/lib -lc-client4
-#
-# Complication:
-# The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
-#
-#CCLIENT_SSL_ENABLE = true
-#CCLIENT_KERB_ENABLE = true
-
-############################################################################
-
-# 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/lib/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
Index: 1.1.0-2/debian/watch
===================================================================
--- 1.1.0-2/debian/watch (revision 37)
+++ 1.1.0-2/debian/watch (nonexistent)
@@ -1,9 +0,0 @@
-# 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.1.0-2/debian/prayer.8.dbk
===================================================================
--- 1.1.0-2/debian/prayer.8.dbk (revision 37)
+++ 1.1.0-2/debian/prayer.8.dbk (nonexistent)
@@ -1,178 +0,0 @@
-<?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: 1.1.0-2/debian/prayer.install
===================================================================
--- 1.1.0-2/debian/prayer.install (revision 37)
+++ 1.1.0-2/debian/prayer.install (nonexistent)
@@ -1,10 +0,0 @@
-usr/sbin/prayer
-usr/sbin/prayer-session
-usr/sbin/prayer-chroot
-usr/sbin/prayer-db-prune
-usr/sbin/prayer-sem-prune
-usr/sbin/prayer-ssl-prune
-usr/share/prayer
-etc/prayer/prayer.cf
-etc/prayer/motd.html
-etc/prayer/welcome.html
Index: 1.1.0-2/debian/copyright
===================================================================
--- 1.1.0-2/debian/copyright (revision 37)
+++ 1.1.0-2/debian/copyright (nonexistent)
@@ -1,83 +0,0 @@
-This package was debianized by Magnus Holmgren <magnus@kibibyte.se> on
-Tue, 24 Oct 2006 21:08:34 +0200.
-
-It was downloaded from http://www-uxsup.csx.cam.ac.uk/~dpc22/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.1.0-2/debian
===================================================================
--- 1.1.0-2/debian (revision 37)
+++ 1.1.0-2/debian (nonexistent)
/1.1.0-2/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property
Index: 1.2.0-1/debian/prayer.lintian-overrides
===================================================================
--- 1.2.0-1/debian/prayer.lintian-overrides (revision 37)
+++ 1.2.0-1/debian/prayer.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-prayer: possible-gpl-code-linked-with-openssl
Index: 1.2.0-1/debian/prayer.logrotate
===================================================================
--- 1.2.0-1/debian/prayer.logrotate (revision 37)
+++ 1.2.0-1/debian/prayer.logrotate (nonexistent)
@@ -1,8 +0,0 @@
-/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.0-1/debian/prayer-accountd.init
===================================================================
--- 1.2.0-1/debian/prayer-accountd.init (revision 37)
+++ 1.2.0-1/debian/prayer-accountd.init (nonexistent)
@@ -1,71 +0,0 @@
-#!/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: 1.2.0-1/debian/prayer.dirs
===================================================================
--- 1.2.0-1/debian/prayer.dirs (revision 37)
+++ 1.2.0-1/debian/prayer.dirs (nonexistent)
@@ -1,2 +0,0 @@
-var/run/prayer
-var/log/prayer
Index: 1.2.0-1/debian/prayer.init
===================================================================
--- 1.2.0-1/debian/prayer.init (revision 37)
+++ 1.2.0-1/debian/prayer.init (nonexistent)
@@ -1,89 +0,0 @@
-#!/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: 1.2.0-1/debian/prayer-accountd.install
===================================================================
--- 1.2.0-1/debian/prayer-accountd.install (revision 37)
+++ 1.2.0-1/debian/prayer-accountd.install (nonexistent)
@@ -1,2 +0,0 @@
-usr/sbin/prayer-accountd
-etc/prayer/accountd.cf
Index: 1.2.0-1/debian/Config
===================================================================
--- 1.2.0-1/debian/Config (revision 37)
+++ 1.2.0-1/debian/Config (nonexistent)
@@ -1,153 +0,0 @@
-# $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
Index: 1.2.0-1/debian/watch
===================================================================
--- 1.2.0-1/debian/watch (revision 37)
+++ 1.2.0-1/debian/watch (nonexistent)
@@ -1,9 +0,0 @@
-# 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.0-1/debian/prayer.8.dbk
===================================================================
--- 1.2.0-1/debian/prayer.8.dbk (revision 37)
+++ 1.2.0-1/debian/prayer.8.dbk (nonexistent)
@@ -1,178 +0,0 @@
-<?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: 1.2.0-1/debian/prayer.install
===================================================================
--- 1.2.0-1/debian/prayer.install (revision 37)
+++ 1.2.0-1/debian/prayer.install (nonexistent)
@@ -1,10 +0,0 @@
-usr/sbin/prayer
-usr/sbin/prayer-session
-usr/sbin/prayer-chroot
-usr/sbin/prayer-db-prune
-usr/sbin/prayer-sem-prune
-usr/sbin/prayer-ssl-prune
-usr/share/prayer
-etc/prayer/prayer.cf
-etc/prayer/motd.html
-etc/prayer/welcome.html
Index: 1.2.0-1/debian/copyright
===================================================================
--- 1.2.0-1/debian/copyright (revision 37)
+++ 1.2.0-1/debian/copyright (nonexistent)
@@ -1,83 +0,0 @@
-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.0-1/debian/README.Debian
===================================================================
--- 1.2.0-1/debian/README.Debian (revision 37)
+++ 1.2.0-1/debian/README.Debian (nonexistent)
@@ -1,31 +0,0 @@
-prayer for Debian
------------------
-
-The Debian version of Prayer is built with SSL support with session
-cache using libdb4.3, 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 default configuration regarding directory structure, and minor
-cosmetic changes to the folder list.
-
-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.
-
- -- Magnus Holmgren <holmgren@debian.org>, Tue, 13 May 2008 22:27:11 +0200
-
Index: 1.2.0-1/debian/control
===================================================================
--- 1.2.0-1/debian/control (revision 37)
+++ 1.2.0-1/debian/control (nonexistent)
@@ -1,53 +0,0 @@
-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
-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.
Index: 1.2.0-1/debian/compat
===================================================================
--- 1.2.0-1/debian/compat (revision 37)
+++ 1.2.0-1/debian/compat (nonexistent)
@@ -1 +0,0 @@
-5
Index: 1.2.0-1/debian/prayer.postinst
===================================================================
--- 1.2.0-1/debian/prayer.postinst (revision 37)
+++ 1.2.0-1/debian/prayer.postinst (nonexistent)
@@ -1,49 +0,0 @@
-#!/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
-
- ;;
-
- 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
-
-
Index: 1.2.0-1/debian/prayer.postrm
===================================================================
--- 1.2.0-1/debian/prayer.postrm (revision 37)
+++ 1.2.0-1/debian/prayer.postrm (nonexistent)
@@ -1,53 +0,0 @@
-#!/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
Index: 1.2.0-1/debian/prayer.default
===================================================================
--- 1.2.0-1/debian/prayer.default (revision 37)
+++ 1.2.0-1/debian/prayer.default (nonexistent)
@@ -1,11 +0,0 @@
-# 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: 1.2.0-1/debian/patches/sighandling.patch
===================================================================
--- 1.2.0-1/debian/patches/sighandling.patch (revision 37)
+++ 1.2.0-1/debian/patches/sighandling.patch (nonexistent)
@@ -1,75 +0,0 @@
-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, ...);
Index: 1.2.0-1/debian/patches/accountd_makefile_typo.patch
===================================================================
--- 1.2.0-1/debian/patches/accountd_makefile_typo.patch (revision 37)
+++ 1.2.0-1/debian/patches/accountd_makefile_typo.patch (nonexistent)
@@ -1,11 +0,0 @@
---- a/accountd/Makefile
-+++ b/accountd/Makefile
-@@ -60,7 +60,7 @@ accountd.o: accountd.c *.h Makefile
- $(CC) $(CFLAGS) -c \
- -DACCOUNTD_CONFIG_FILE=\"$(ACCOUNTD_CONFIG_FILE)\" $<
-
--authenicate.o: authenicate.c *.h Makefile
-+authenticate.o: authenticate.c *.h Makefile
- $(CC) $(CFLAGS) -c $(ACCOUNTD_PAM_DEFS) $<
-
- clean:
Index: 1.2.0-1/debian/patches/makefile_install_config.patch
===================================================================
--- 1.2.0-1/debian/patches/makefile_install_config.patch (revision 37)
+++ 1.2.0-1/debian/patches/makefile_install_config.patch (nonexistent)
@@ -1,186 +0,0 @@
---- 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,29 @@ 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:
-+ ${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
-+
- 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) \
-+ BIN_DIR=$(BROOT)$(BIN_DIR) INSTALL=$(INSTALL) \
- ./install.sh
-- if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-+# if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
- 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/install.sh
-+++ b/files/install.sh
-@@ -4,77 +4,6 @@
-
- PATH=/bin:/sbin/:/usr/bin:/usr/sbin
-
--error=0
--
--if [ "x$PREFIX" = "x" ]; then
-- echo 'PREFIX not defined'
-- error=1
--fi
--
--if [ "x$VAR_PREFIX" = "x" ]; then
-- echo 'VAR_PREFIX not defined'
-- error=1
--fi
--
--if [ "x$RO_USER" = "x" ]; then
-- echo 'RO_USER not defined'
-- error=1
--fi
--
--if [ "x$RO_GROUP" = "x" ]; then
-- echo 'RO_GROUP not defined'
-- error=1
--fi
--
--if [ "x$RW_USER" = "x" ]; then
-- echo 'RW_USER not defined'
-- error=1
--fi
--
--if [ "x$RW_GROUP" = "x" ]; then
-- echo 'RW_GROUP not defined'
-- error=1
--fi
--
--if [ "x$PUBLIC_DIR" = "x" ]; then
-- echo 'PUBLIC_DIR not defined'
-- error=1
--fi
--
--if [ "x$PRIVATE_DIR" = "x" ]; then
-- echo 'PRIVATE_DIR not defined'
-- error=1
--fi
--
--if [ "x$BIN_DIR" = "x" ]; then
-- echo 'BIN_DIR not defined'
-- error=1
--fi
--
--if [ $error != 0 ]; then
-- exit 1
--fi
--
--if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
-- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
--fi
--
--if [ ! -d ${PREFIX} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
--fi
--
--if [ ! -d ${PREFIX}/etc ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
--fi
--
--if [ ! -d ${PREFIX}/certs ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
--fi
--
--if [ ! -d ${BIN_DIR} ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
--fi
--
- for i in icons
- do
- if [ -d "${PREFIX}/${i}" ]; then
---- 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.
-@@ -428,10 +428,10 @@ 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"
-+lock_dir = "/var/lock"
-
- # $socket_dir is location for unix domain sockets which connect frontend
- # to backend in proxy mode of operation.
-@@ -439,7 +439,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
-@@ -450,10 +450,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"
-@@ -621,7 +621,7 @@ sent_mail_folder = "sent-mail"
- # default_domain = "<valid mail domain>"
-
- # Language for ispell.
--ispell_language = "british"
-+ispell_language = "american"
-
- # Size of small and large compose windows
- small_cols = 80
Index: 1.2.0-1/debian/patches/series
===================================================================
--- 1.2.0-1/debian/patches/series (revision 37)
+++ 1.2.0-1/debian/patches/series (nonexistent)
@@ -1,3 +0,0 @@
-makefile_install_config.patch
-repair_ssl_session_db_on_version_mismatch.patch
-accountd_makefile_typo.patch
Index: 1.2.0-1/debian/patches/repair_ssl_session_db_on_version_mismatch.patch
===================================================================
--- 1.2.0-1/debian/patches/repair_ssl_session_db_on_version_mismatch.patch (revision 37)
+++ 1.2.0-1/debian/patches/repair_ssl_session_db_on_version_mismatch.patch (nonexistent)
@@ -1,20 +0,0 @@
---- a/lib/mydb_db3.c
-+++ b/lib/mydb_db3.c
-@@ -208,7 +208,7 @@ static int init(const char *dbdir, int m
- if (!(r = myinit(dbdir, myflags)))
- return(0);
-
-- if (r != ENOENT) {
-+ if (r != ENOENT && r != DB_VERSION_MISMATCH) {
- 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;
Index: 1.2.0-1/debian/prayer-accountd.docs
===================================================================
--- 1.2.0-1/debian/prayer-accountd.docs (revision 37)
+++ 1.2.0-1/debian/prayer-accountd.docs (nonexistent)
@@ -1,8 +0,0 @@
-docs/ACCOUNTD
-docs/DESIGN
-docs/DONE-OLD
-docs/FEATURES
-docs/NOTICE
-docs/README
-docs/SECURITY
-docs/TODO
Index: 1.2.0-1/debian/changelog
===================================================================
--- 1.2.0-1/debian/changelog (revision 37)
+++ 1.2.0-1/debian/changelog (nonexistent)
@@ -1,76 +0,0 @@
-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
Index: 1.2.0-1/debian/prayer-session.8.dbk
===================================================================
--- 1.2.0-1/debian/prayer-session.8.dbk (revision 37)
+++ 1.2.0-1/debian/prayer-session.8.dbk (nonexistent)
@@ -1,158 +0,0 @@
-<?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: 1.2.0-1/debian/prayer.docs
===================================================================
--- 1.2.0-1/debian/prayer.docs (revision 37)
+++ 1.2.0-1/debian/prayer.docs (nonexistent)
@@ -1,11 +0,0 @@
-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.0-1/debian/rules
===================================================================
--- 1.2.0-1/debian/rules (revision 37)
+++ 1.2.0-1/debian/rules (nonexistent)
@@ -1,17 +0,0 @@
-#!/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
/1.2.0-1/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.2.0-1/debian/prayer-accountd.lintian-overrides
===================================================================
--- 1.2.0-1/debian/prayer-accountd.lintian-overrides (revision 37)
+++ 1.2.0-1/debian/prayer-accountd.lintian-overrides (nonexistent)
@@ -1 +0,0 @@
-prayer-accountd: possible-gpl-code-linked-with-openssl
Index: 1.2.0-1/debian
===================================================================
--- 1.2.0-1/debian (revision 37)
+++ 1.2.0-1/debian (nonexistent)
/1.2.0-1/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property