On torsdagen den 23 oktober 2008, Adeodato Simó wrote: > * Magnus Holmgren [Sun, 19 Oct 2008 23:47:08 +0200]: > > See > > http://svn.kibibyte.se/prayer/branches/lenny/debian/?op=log&rev=0&sc=0&is > >dir=1 (changesets 66 through 68) or > > svn co svn://svn.kibibyte.se/prayer/branches/lenny/ > > > > (plus the patch in http://bugs.debian.org/497016). > > If you could attach by mail a full/combined diff, including te one in > the bug, we'd be grateful. Sorry, I know, always debdiff or equivalent. See attached. -- Magnus Holmgren holmgren@debian.org Debian Developer
Index: debian/control
===================================================================
--- debian/control (revision 65)
+++ debian/control (arbetskopia)
@@ -14,8 +14,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, ssl-cert (>= 1.0.11),
logrotate
-Suggests: prayer-accountd, imap-server, aspell | ispell
-Description: Standalone IMAP-based webmail server
+Suggests: prayer-accountd, prayer-templates, imap-server, aspell | ispell
+Description: standalone IMAP-based webmail server
Prayer is yet another Webmail interface.
.
It is unusual in that it is a complete, standalone, HTTP server and proxy
@@ -29,6 +29,18 @@
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}
Index: debian/patches/makefile_install_config.patch
===================================================================
--- debian/patches/makefile_install_config.patch (revision 65)
+++ debian/patches/makefile_install_config.patch (arbetskopia)
@@ -141,13 +141,9 @@
# Name of Unix domain socket (in $socket_dir) used for initial handshake
# between prayer and prayer-session processes when a user logs in
-@@ -453,10 +438,10 @@ ssl_session_dir = "$var_prefix/ssl_s
+@@ -453,7 +438,7 @@ ssl_session_dir = "$var_prefix/ssl_s
+ tmp_dir = "$var_prefix/tmp"
- # 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"
Index: debian/patches/usernames_with_at.patch
===================================================================
--- debian/patches/usernames_with_at.patch (revision 0)
+++ debian/patches/usernames_with_at.patch (revision 0)
@@ -0,0 +1,53 @@
+--- a/session/draft.c
++++ b/session/draft.c
+@@ -1399,10 +1399,12 @@ char *draft_make_msg(struct draft *draft
+ if (draft->from_address && draft->from_address[0]) {
+ from_address = draft->from_address;
+ use_sender = T;
+- } else
+- from_address
+- =
++ } else if (strchr(session->username, '@')) {
++ from_address = pool_strdup(pool, session->username);
++ } else {
++ from_address =
+ pool_printf(pool, "%s@%s", session->username, default_domain);
++ }
+
+ if (draft->from_personal && draft->from_personal[0]) {
+ from_personal = draft->from_personal;
+@@ -1431,9 +1433,14 @@ char *draft_make_msg(struct draft *draft
+ NIL);
+ bputs(mb, "" CRLF);
+
+- if (use_sender)
+- bprintf(mb, "Sender: %s@%s" CRLF, session->username,
+- default_domain);
++ if (use_sender) {
++ if (strchr(session->username, '@')) {
++ bprintf(mb, "Sender: %s" CRLF, session->username);
++ } else {
++ bprintf(mb, "Sender: %s@%s" CRLF, session->username,
++ default_domain);
++ }
++ }
+
+ if (!(draft_make_abook_address(session, mb, "To", draft->to) &&
+ draft_make_abook_address(session, mb, "Cc", draft->cc) &&
+--- a/cmd/cmd_prefs.c
++++ b/cmd/cmd_prefs.c
+@@ -474,9 +474,12 @@ generate_compose1_form(struct session *s
+ template_vals_string(tvals, "from_address", prefs->from_address);
+
+ if (!(prefs->from_address && prefs->from_address[0])) {
+- char *s = pool_printf(request->pool, "%s@%s",
+- session->username, prefs->default_domain);
++ char *s = session->username;
+
++ if (!strchr(session->username, '@')) {
++ s = pool_printf(request->pool, "%s@%s",
++ session->username, prefs->default_domain);
++ }
+ template_vals_string(tvals, "default_from_address", s);
+ }
+
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 58)
+++ debian/patches/series (arbetskopia)
@@ -5,3 +5,4 @@
templates_fallback_to_compiled.patch
template_find_bug.patch
unlimit_login_username.patch
+usernames_with_at.patch
Index: debian/prayer.init
===================================================================
--- debian/prayer.init (revision 65)
+++ debian/prayer.init (arbetskopia)
@@ -19,7 +19,7 @@
SESSION_PIDFILE=/var/run/prayer/prayer-session.pid
DESC="webmail server"
-test -x $DAEMON || exit 0
+test -x $FRONTEND_DAEMON -a -x $SESSION_DAEMON || exit 0
. /lib/lsb/init-functions
Index: debian/changelog
===================================================================
--- debian/changelog (revision 65)
+++ debian/changelog (arbetskopia)
@@ -1,3 +1,17 @@
+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, 24 Oct 2008 00:10:20 +0200
+
prayer (1.2.2.1-5a) unstable; urgency=medium
* Prevent dh_installman from interpreting the cf in prayer.cf.5 as a
Index: debian/prayer-session.8
===================================================================
--- debian/prayer-session.8 (revision 65)
+++ debian/prayer-session.8 (arbetskopia)
@@ -67,7 +67,9 @@
.It Pa /etc/prayer/prayer.cf
Default configuration file.
.It /usr/share/prayer/templates/
-Location of standard templates. The templates are compiled into
+Location of standard templates (in the separate
+.Em prayer-templates
+package). The templates are compiled into
.Nm
for performance reasons, so the template files are actually not
used, but they are available for customization.
Index: debian/prayer-templates.install
===================================================================
--- debian/prayer-templates.install (revision 0)
+++ debian/prayer-templates.install (revision 67)
@@ -0,0 +1 @@
+usr/share/prayer/templates
Index: debian/prayer.install
===================================================================
--- debian/prayer.install (revision 65)
+++ debian/prayer.install (arbetskopia)
@@ -1,5 +1,6 @@
usr/sbin/prayer
usr/sbin/prayer-session
usr/sbin/prayer-ssl-prune
-usr/share/prayer
+usr/share/prayer/icons
+usr/share/prayer/static
etc/prayer/prayer.cf
Attachment:
signature.asc
Description: This is a digitally signed message part.