/trunk/debian/prayer.cf.5 |
---|
File deleted |
/trunk/debian/prayer-ssl-prune.8 |
---|
File deleted |
/trunk/debian/prayer.manpages |
---|
File deleted |
/trunk/debian/prayer-templates.install |
---|
File deleted |
/trunk/debian/prayer.8 |
---|
File deleted |
/trunk/debian/prayer-session.8 |
---|
File deleted |
/trunk/debian/changelog |
---|
11,71 → 11,6 |
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Jul 2008 00:53:37 +0200 |
prayer (1.2.2.1-6) unstable; urgency=low |
* prayer.init: Correctly check for the presence of the executables. |
* Split out templates to a separate arch-indep package. |
* Change the default value of the tmp_dir option back to |
${var_prefix}/tmp (/var/run/prayer/tmp) because using /tmp may not be |
secure. |
* usernames_with_at.patch (new, from upstream CVS): If a username |
contains an @, it will be assumed to be a valid email address and be |
used as envelope sender address and default "From" address when |
sending mail (Closes: #497016). |
-- Magnus Holmgren <holmgren@debian.org> Fri, 31 Oct 2008 18:19:34 +0100 |
prayer (1.2.2.1-5a) unstable; urgency=medium |
* Prevent dh_installman from interpreting the cf in prayer.cf.5 as a |
language code. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 17 Aug 2008 19:24:10 +0200 |
prayer (1.2.2.1-4) unstable; urgency=medium |
* Urgency medium since fixing fairly serious bug(s). |
* debian/Config: Fix handling of CFLAGS, CPPFLAGS and LDFLAGS from the |
environment or command line, breaking a circular definition of |
LDFLAGS (FTBFS on Ubuntu; LP: #256220). |
* unlimit_login_username.patch (new): |
- servers/prayer_login.c: Remove 8 character username limit from login |
form (Closes: #494517). |
* prayer.init, prayer-accountd.init: Sleep 1 second between stop and |
start in restart. |
* Add manpages prayer(8), prayer-session(8), prayer.cf(5), and |
prayer-ssl-prune(8) (groff-mdoc format). Remove half-done Docbook |
versions from source package. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 17 Aug 2008 17:38:00 +0200 |
prayer (1.2.2.1-3) unstable; urgency=low |
* welcome_is_template.patch: |
- shared/config.c: Don't require that the help_dir option, which was |
removed from the default prayer.cf earlier, is defined |
(Closes: #493009). |
* makefile_install_config.patch: |
- shared/config.c: Likewise don't check for lock_dir (Closes: #494011). |
-- Magnus Holmgren <holmgren@debian.org> Wed, 06 Aug 2008 21:20:17 +0200 |
prayer (1.2.2.1-2) unstable; urgency=low |
* Acknowledge NMU, but change the build dependency to |
libc-client2007b-dev | libc-client2007-dev | libc-client-dev |
(>= 7:2007~), since we need at least that version. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 27 Jul 2008 20:52:18 +0200 |
prayer (1.2.2.1-1.1) unstable; urgency=low |
* Non-maintainer upload. |
* Build-depend on unversioned libc-client-dev to allow BinNMUs. |
Closes: bug#492285. |
-- Jonas Smedegaard <dr@jones.dk> Thu, 24 Jul 2008 23:42:33 +0200 |
prayer (1.2.2.1-1) unstable; urgency=low |
* New upstream release featuring XHTML templates and fixes to various |
/trunk/debian/patches/usernames_with_at.patch |
---|
File deleted |
/trunk/debian/patches/unlimit_login_username.patch |
---|
File deleted |
/trunk/debian/patches/series |
---|
1,5 → 1,3 |
makefile_install_config.patch |
templates_fallback_to_compiled.patch |
kfreebsd.patch |
unlimit_login_username.patch |
usernames_with_at.patch |
/trunk/debian/patches/makefile_install_config.patch |
---|
134,9 → 134,13 |
# Name of Unix domain socket (in $socket_dir) used for initial handshake |
# between prayer and prayer-session processes when a user logs in |
@@ -448,7 +433,7 @@ ssl_session_dir = "$var_prefix/ssl_s |
tmp_dir = "$var_prefix/tmp" |
@@ -445,10 +430,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" |
161,13 → 165,3 |
# Size of small and large compose windows |
small_cols = 80 |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -2144,7 +2144,6 @@ BOOL config_check(struct config * config |
TEST_STRING(config->socket_dir, "socket_dir"); |
TEST_STRING(config->init_socket_name, "init_socket_name"); |
TEST_STRING(config->ssl_session_dir, "ssl_session_dir"); |
- TEST_STRING(config->lock_dir, "lock_dir"); |
TEST_STRING(config->log_dir, "log_dir"); |
TEST_STRING(config->tmp_dir, "tmp_dir"); |
TEST_STRING(config->pid_dir, "pid_dir"); |
/trunk/debian/prayer.install |
---|
1,6 → 1,5 |
usr/sbin/prayer |
usr/sbin/prayer-session |
usr/sbin/prayer-ssl-prune |
usr/share/prayer/icons |
usr/share/prayer/static |
usr/share/prayer |
etc/prayer/prayer.cf |
/trunk/debian/control |
---|
3,8 → 3,8 |
Priority: optional |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Build-Depends: cdbs, debhelper (>= 5), quilt, |
libc-client2007b-dev | libc-client2007-dev | libc-client-dev (>= 7:2007~), |
libldap2-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb-dev, |
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 |
14,8 → 14,8 |
Architecture: any |
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, ssl-cert (>= 1.0.11), |
logrotate |
Suggests: prayer-accountd, prayer-templates, imap-server, aspell | ispell |
Description: standalone IMAP-based webmail server |
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 |
29,18 → 29,6 |
the IMAP server rather than in a SQL database. It does however implement a |
full range of features and user preference settings. |
Package: prayer-templates |
Architecture: all |
Recommends: prayer (>= 1.2.0) |
Replaces: prayer (<< 1.2.2.1-6) |
Description: templates for customizing Prayer Webmail |
This package contains, in source form, the templates for the HTML |
that Prayer outputs. |
. |
As all the templates are compiled into the session daemon, |
prayer-session, you only need to install this package if you need to |
customize one or more pages and you want something to start from. |
Package: prayer-accountd |
Architecture: any |
Depends: ${shlibs:Depends}, ${misc:Depends} |
/trunk/debian/Config |
---|
33,14 → 33,21 |
# Location of install program (GNU install or compatible required) |
INSTALL = install |
# Base Compiler options for GCC (use CFLAGS, CPPFLAGS and LDFLAGS if passed in) |
BASECFLAGS := $(CFLAGS) |
BASECFLAGS ?= -Wall -g -O2 |
BASECFLAGS += $(CPPFLAGS) |
# 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 |
BASELDFLAGS := $(LDFLAGS) |
BASELDFLAGS ?= -g |
# Minimal libraries needed by Linux |
BASE_LIBS = -lcrypt |
# FreeBSD needs some extra libraries: |
71,7 → 78,7 |
Z_LIBS = -lz |
# LDAP (required if LDAP_ENABLE set) |
LDAP_INCLUDE = |
LDAP_INCLUDE = -DLDAP_DEPRECATED |
LDAP_LIBS = -lldap |
# Pam (required if CCLIENT_PAM_ENABLE set) |
/trunk/debian/rules |
---|
15,4 → 15,3 |
DEB_MAKE_INSTALL_TARGET = install BROOT=$(CURDIR)/debian/tmp |
DEB_INSTALL_CHANGELOGS_ALL = docs/DONE |
DEB_DH_INSTALL_SOURCEDIR = debian/tmp |
DEB_INSTALL_MANPAGES_prayer = "--language=C" |
/trunk/debian/prayer-accountd.init |
---|
58,7 → 58,6 |
restart|force-reload) |
stop |
sleep 1 |
start |
;; |
*) |
/trunk/debian/prayer-session.8.dbk |
---|
0,0 → 1,158 |
<?xml version='1.0' encoding='ISO-8859-1'?> |
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ |
<!-- |
Process this file with an XSLT processor: `xsltproc \ |
-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ |
manpages/docbook.xslb manpage.dbk'. A manual page |
<package>.<section> will be generated. You may view the |
manual page with: nroff -man <package>.<section> | less'. A |
typical entry in a Makefile or Makefile.am is: |
DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ |
manpages/docbook.xsl |
XP=xsltproc -''-nonet |
manpage.1: manpage.dbk |
$(XP) $(DB2MAN) $< |
The xsltproc binary is found in the xsltproc package. The |
XSL files are in docbook-xsl. Please remember that if you |
create the nroff version in one of the debian/rules file |
targets (such as build), you will need to include xsltproc |
and docbook-xsl in your Build-Depends control field. |
--> |
<!-- Fill in your name for FIRSTNAME and SURNAME. --> |
<!ENTITY dhfirstname "<firstname>Magnus</firstname>"> |
<!ENTITY dhsurname "<surname>Holmgren</surname>"> |
<!-- Please adjust the date whenever revising the manpage. --> |
<!ENTITY dhdate "<date>oktober 24, 2006</date>"> |
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are |
allowed: see man(7), man(1). --> |
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> |
<!ENTITY dhemail "<email>magnus@kibibyte.se</email>"> |
<!ENTITY dhusername "Magnus Holmgren"> |
<!ENTITY dhucpackage "<refentrytitle>PRAYER</refentrytitle>"> |
<!ENTITY dhpackage "prayer-session"> |
<!ENTITY debian "<productname>Debian</productname>"> |
<!ENTITY gnu "<acronym>GNU</acronym>"> |
<!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> |
]> |
<refentry> |
<refentryinfo> |
<address> |
&dhemail; |
</address> |
<author> |
&dhfirstname; |
&dhsurname; |
</author> |
<copyright> |
<year>2006</year> |
<holder>&dhusername;</holder> |
</copyright> |
&dhdate; |
</refentryinfo> |
<refmeta> |
&dhucpackage; |
&dhsection; |
</refmeta> |
<refnamediv> |
<refname>&dhpackage;</refname> |
<refpurpose>a fast stand-alone webmail server</refpurpose> |
</refnamediv> |
<refsynopsisdiv> |
<cmdsynopsis> |
<command>&dhpackage;</command> |
<arg><option><replaceable>OPTION</replaceable></option></arg>...</cmdsynopsis> |
</refsynopsisdiv> |
<refsect1> |
<title>DESCRIPTION</title> |
<para>This manual page documents briefly the |
<command>&dhpackage;</command> command.</para> |
<para>This manual page was written for the &debian; distribution |
because the original program does not have a manual page.</para> |
<para><command>&dhpackage;</command> is a program that...</para> |
</refsect1> |
<refsect1> |
<title>OPTIONS</title> |
<variablelist> |
<varlistentry> |
<term> |
<option>--config-file <replaceable>filename</replaceable></option> |
</term> |
<listitem> |
<para>Define prayer config file (Overrides compilation default and PRAYER_CONFIG_FILE environment variable).</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--config-option <replaceable>option</replaceable>=<replaceable>value</replaceable></option> |
</term> |
<listitem> |
<para>Override single configuration option.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--foreground</option> |
</term> |
<listitem> |
<para>Run single threaded server in foreground.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--debug</option> |
</term> |
<listitem> |
<para>Enable debugging.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--help</option> |
</term> |
<listitem> |
<para>Show option summary.</para> |
</listitem> |
</varlistentry> |
</variablelist> |
</refsect1> |
<refsect1> |
<title>SEE ALSO</title> |
<para>prayer(8), prayer.cf(5).</para> |
</refsect1> |
<refsect1> |
<title>AUTHOR</title> |
<para>This manual page was written by &dhusername; &dhemail; for |
the &debian; system (but may be used by others). Permission is |
granted to copy, distribute and/or modify this document under |
the terms of the &gnu; General Public License, Version 2 any |
later version published by the Free Software Foundation. |
</para> |
<para> |
On Debian systems, the complete text of the GNU General Public |
License can be found in /usr/share/common-licenses/GPL. |
</para> |
</refsect1> |
</refentry> |
/trunk/debian/prayer.init |
---|
19,7 → 19,7 |
SESSION_PIDFILE=/var/run/prayer/prayer-session.pid |
DESC="webmail server" |
test -x $FRONTEND_DAEMON -a -x $SESSION_DAEMON || exit 0 |
test -x $DAEMON || exit 0 |
. /lib/lsb/init-functions |
76,7 → 76,6 |
# just the same as "restart". |
# |
stop |
sleep 1 |
start |
;; |
*) |
/trunk/debian/prayer.8.dbk |
---|
0,0 → 1,178 |
<?xml version='1.0' encoding='ISO-8859-1'?> |
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ |
<!-- |
Process this file with an XSLT processor: `xsltproc \ |
-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ |
manpages/docbook.xslb manpage.dbk'. A manual page |
<package>.<section> will be generated. You may view the |
manual page with: nroff -man <package>.<section> | less'. A |
typical entry in a Makefile or Makefile.am is: |
DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ |
manpages/docbook.xsl |
XP=xsltproc -''-nonet |
manpage.1: manpage.dbk |
$(XP) $(DB2MAN) $< |
The xsltproc binary is found in the xsltproc package. The |
XSL files are in docbook-xsl. Please remember that if you |
create the nroff version in one of the debian/rules file |
targets (such as build), you will need to include xsltproc |
and docbook-xsl in your Build-Depends control field. |
--> |
<!-- Fill in your name for FIRSTNAME and SURNAME. --> |
<!ENTITY dhfirstname "<firstname>Magnus</firstname>"> |
<!ENTITY dhsurname "<surname>Holmgren</surname>"> |
<!-- Please adjust the date whenever revising the manpage. --> |
<!ENTITY dhdate "<date>oktober 24, 2006</date>"> |
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are |
allowed: see man(7), man(1). --> |
<!ENTITY dhsection "<manvolnum>8</manvolnum>"> |
<!ENTITY dhemail "<email>magnus@kibibyte.se</email>"> |
<!ENTITY dhusername "Magnus Holmgren"> |
<!ENTITY dhucpackage "<refentrytitle>PRAYER</refentrytitle>"> |
<!ENTITY dhpackage "prayer"> |
<!ENTITY debian "<productname>Debian</productname>"> |
<!ENTITY gnu "<acronym>GNU</acronym>"> |
<!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> |
]> |
<refentry> |
<refentryinfo> |
<address> |
&dhemail; |
</address> |
<author> |
&dhfirstname; |
&dhsurname; |
</author> |
<copyright> |
<year>2006</year> |
<holder>&dhusername;</holder> |
</copyright> |
&dhdate; |
</refentryinfo> |
<refmeta> |
&dhucpackage; |
&dhsection; |
</refmeta> |
<refnamediv> |
<refname>&dhpackage;</refname> |
<refpurpose>a fast stand-alone webmail server</refpurpose> |
</refnamediv> |
<refsynopsisdiv> |
<cmdsynopsis> |
<command>&dhpackage;</command> |
<arg><option><replaceable>OPTION</replaceable></option></arg>... -- <arg><option><replaceable>PRAYER-SESSION-OPTION</replaceable></option></arg> ... |
</cmdsynopsis> |
</refsynopsisdiv> |
<refsect1> |
<title>DESCRIPTION</title> |
<para>This manual page documents briefly the |
<command>&dhpackage;</command> and <command>bar</command> |
commands.</para> |
<para>This manual page was written for the &debian; distribution |
because the original program does not have a manual page. |
Instead, it has documentation in the &gnu; |
<application>Info</application> format; see below.</para> |
<para><command>&dhpackage;</command> is a program that...</para> |
</refsect1> |
<refsect1> |
<title>OPTIONS</title> |
<variablelist> |
<varlistentry> |
<term> |
<option>--config-file <replaceable>filename</replaceable></option> |
</term> |
<listitem> |
<para>Define prayer config file (Overrides compilation default and PRAYER_CONFIG_FILE environment variable).</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--config-option <replaceable>option</replaceable>=<replaceable>value</replaceable></option> |
</term> |
<listitem> |
<para>Override single configuration option.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--foreground</option> |
</term> |
<listitem> |
<para>Run single threaded server in foreground.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--disable-prefork</option> |
</term> |
<listitem> |
<para>Run as simple fork()/exec() daemon.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--disable-session</option> |
</term> |
<listitem> |
<para>Don't start up prayer-session server.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--</option> |
</term> |
<listitem> |
<para>End of prayer options: remaining options will be passed to prayer-session server process.</para> |
</listitem> |
</varlistentry> |
<varlistentry> |
<term> |
<option>--help</option> |
</term> |
<listitem> |
<para>Show option summary.</para> |
</listitem> |
</varlistentry> |
</variablelist> |
</refsect1> |
<refsect1> |
<title>SEE ALSO</title> |
<para>prayer-session(8), prayer.cf(5).</para> |
</refsect1> |
<refsect1> |
<title>AUTHOR</title> |
<para>This manual page was written by &dhusername; &dhemail; for |
the &debian; system (but may be used by others). Permission is |
granted to copy, distribute and/or modify this document under |
the terms of the &gnu; General Public License, Version 2 any |
later version published by the Free Software Foundation. |
</para> |
<para> |
On Debian systems, the complete text of the GNU General Public |
License can be found in /usr/share/common-licenses/GPL. |
</para> |
</refsect1> |
</refentry> |
/trunk/. |
---|
Property changes: |
Deleted: svn:mergeinfo |
## -0,2 +0,0 ## |
Reverse-merged /tags/1.2.2.1-1:r47-51 |
Reverse-merged /branches/lenny:r52-70 |