diff -u courier-0.53.3/debian/changelog courier-0.53.3/debian/changelog --- courier-0.53.3/debian/changelog +++ courier-0.53.3/debian/changelog @@ -1,3 +1,25 @@ +courier (0.53.3-6ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - change MAILDIR to MAILDIRPATH in imap, imap/ssl, pop, and pop/ssl inits + (Fixes Malone Bug #86802) + - build-depend on libmysqlclient15-dev only + - build-depend on libgamin-dev instead of libfam-dev + - depend on postfix in preference to exim4 + - LSB init scripts + - create /var/run/courier where necessary + - common PAM configuration + - combined suggests for courier-imap-ssl into one line + - added build depends for po-debconf + - added debconf dependency for sqwebmail, courier-webadmin, courier-ssl, + courier-pop, courier-mta, courier-imap + - added LSB sections to all init scripts + - Grammar and prompt cleanup in debian/*.template + - build-dep debhelper >= 5.0.37 + - bump standards version to 3.7.2 + + -- Richard A. Johnson Mon, 21 May 2007 17:14:58 -0500 + courier (0.53.3-6) unstable; urgency=low * removed inclusion of Debconf library from courier-pcp postrm script @@ -5,6 +27,28 @@ -- Stefan Hornburg (Racke) Fri, 18 May 2007 09:45:29 +0200 +courier (0.53.3-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - change MAILDIR to MAILDIRPATH in imap, imap/ssl, pop, and pop/ssl inits + (Fixes Malone Bug #86802) + - build-depend on libmysqlclient15-dev only, + - build-depend on libgamin-dev instead of libfam-dev, + - depend on postfix in preference to exim4, + - LSB init scripts, + - create /var/run/courier where necessary, + - common PAM configuration + - combined suggests for courier-imap-ssl into one line + - added build depends for po-debconf + - added debconf dependency for sqwebmail, courier-webadmin, courier-ssl, + courier-pop, courier-mta, courier-imap + - added LSB sections to all init scripts + - Grammar and prompt cleanup in debian/*.template + - build-dep debhelper >= 5.0.37 + - Bump standards version to 3.7.2 + + -- Scott Kitterman Fri, 22 Feb 2007 08:44:23 -0500 + courier (0.53.3-5) unstable; urgency=high * update-alternatives requires path of the alternative on removal @@ -14,6 +58,26 @@ -- Stefan Hornburg (Racke) Tue, 13 Feb 2007 08:18:47 +0100 +courier (0.53.3-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - build-depend on libmysqlclient15-dev only, + - build-depend on libgamin-dev instead of libfam-dev, + - depend on postfix in preference to exim4, + - LSB init scripts, + - create /var/run/courier where necessary, + - common PAM configuration + - combined suggests for courier-imap-ssl into one line + - added build depends for po-debconf + - added debconf dependency for sqwebmail, courier-webadmin, courier-ssl, + courier-pop, courier-mta, courier-imap + - added LSB sections to all init scripts + - Grammar and prompt cleanup in debian/*.template + - build-dep debhelper >= 5.0.37 + - Bump standards version to 3.7.2 + + -- Scott Kitterman Sun, 04 Feb 2007 01:46:12 -0500 + courier (0.53.3-4) unstable; urgency=medium * updated Portuguese translation of Debconf templates (Closes: #409422, @@ -21,6 +85,27 @@ -- Stefan Hornburg (Racke) Sat, 3 Feb 2007 17:32:52 +0100 +courier (0.53.3-3ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - build-depend on libmysqlclient15-dev only, + - build-depend on libgamin-dev instead of libfam-dev, + - depend on postfix in preference to exim4, + - LSB init scripts, + - create /var/run/courier where necessary, + - common PAM configuration + * New changes with this merge: + - combined reccomends for courier-imap-ssl into one line + - added build depends for po-debconf + - added debconf dependency for sqwebmail, courier-webadmin, courier-ssl, + courier-pop, courier-mta, courier-imap + - added LSB sections to all init scripts + - Grammar and prompt cleanup in debian/*.template + - build-dep debhelper >= 5.0.37 + - Bump standards version to 3.7.2 + + -- Scott Kitterman Mon, 29 Jan 2007 23:35:55 -0500 + courier (0.53.3-3) unstable; urgency=medium * added Galician translation of Debconf templates (Closes: #408125, @@ -30,6 +115,21 @@ -- Stefan Hornburg (Racke) Fri, 26 Jan 2007 17:10:39 +0100 +courier (0.53.3-2ubuntu1) feisty; urgency=low + + * Re-sync with Debian: Retain the following changes: + * courier (0.53.2-3ubuntu1) edgy; urgency=low + * Merge from debian unstable, remaining changes: + - build-depend on libmysqlclient15-dev only, + - build-depend on libgamin-dev instead of libfam-dev, + - depend on postfix in preference to exim4, + - LSB init scripts, + - create /var/run/courier where necessary, + - common PAM configuration + -- Scott James Remnant Tue, 11 Jul 2006 20:48:22 +0100 + + -- Barry deFreese Wed, 20 Dec 2006 21:00:06 -0500 + courier (0.53.3-2) unstable; urgency=medium * change courier-faxmail dependency from groff-base to groff @@ -177,6 +277,72 @@ -- Stefan Hornburg (Racke) Mon, 30 May 2005 13:20:07 +0200 +courier (0.47-13ubuntu5) dapper; urgency=low + + * Correct permissions of /var/run/courier/authdaemon + + -- Scott James Remnant Wed, 19 Apr 2006 14:11:57 +0100 + +courier (0.47-13ubuntu4) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 12:47:35 +1000 + +courier (0.47-13ubuntu3) dapper; urgency=low + + * Build against libmysqlclient15. + + -- Martin Pitt Thu, 2 Feb 2006 16:51:20 +0000 + +courier (0.47-13ubuntu2) dapper; urgency=low + + * make initscripts create /var/run/courier if they don't exist yet. Dapper + runs /var/run on tempfs. (Malone #28552) + + -- Reinhard Tartler Wed, 25 Jan 2006 15:08:13 +0000 + +courier (0.47-13ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Readd debconf-2.0 alternative to debconf (>= 0.50) in courier-base + Depends. + + -- Tollef Fog Heen Fri, 25 Nov 2005 10:46:38 +0100 + +courier (0.47-13) unstable; urgency=low + + * transition to new PostgreSQL architecture (Closes: #339006, thanks to + Martin Pitt for the report and the patch) + * use libmysqlclient14-dev as alternative dependency to + libmysqlclient-dev + + -- Stefan Hornburg (Racke) Tue, 15 Nov 2005 11:33:41 +0100 + +courier (0.47-12) unstable; urgency=low + + * restoring call to pam_acct_mgmt (Closes: #211920, thanks to Patrick + Cheong Shu Yang for the report and David + H�deman for the patch) + + -- Stefan Hornburg (Racke) Thu, 27 Oct 2005 23:35:25 +0200 + +courier (0.47-12ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Change mysql client build dependency to libmysqlclient14-dev to focus on + MySQL 4.1 in Dapper and get rid of the older ones. + + -- Martin Pitt Mon, 14 Nov 2005 13:58:15 +0100 + +courier (0.47-12) unstable; urgency=low + + * restoring call to pam_acct_mgmt (Closes: #211920, thanks to Patrick + Cheong Shu Yang for the report and David + H�deman for the patch) + + -- Stefan Hornburg (Racke) Thu, 27 Oct 2005 23:35:25 +0200 + courier (0.47-11) unstable; urgency=low * init script for courier-imap checks for executable binary first @@ -241,7 +407,7 @@ report) -- Stefan Hornburg (Racke) Tue, 26 Jul 2005 11:07:51 +0200 - + courier (0.47-4) unstable; urgency=low * more logcheck fixes: @@ -260,6 +426,63 @@ -- Stefan Hornburg (Racke) Wed, 26 Jan 2005 23:04:19 +0100 +courier (0.47-3ubuntu7) breezy; urgency=low + + * Fix CAN number in previous upload. (Brown paperbag...) + + -- Martin Pitt Tue, 11 Oct 2005 10:04:47 +0200 + +courier (0.47-3ubuntu6) breezy; urgency=low + + * SECURITY UPDATE: Multiple XSS vulnerabilities in sqwebmail. + * webmail/html.c, webmail/folder.c: Apply upstream patch to fix cross site + scripting [CAN-2005-2724]. Taken from Debian security update. + * webmail/html.c: Filter out certain MSIE-only scripting constructs to fix + more cross site scripting bugs [CAN-2005-2769, CAN-2005-2820]. Patch taken + from Debian security update. + + -- Martin Pitt Tue, 11 Oct 2005 09:05:06 +0200 + +courier (0.47-3ubuntu5) breezy; urgency=low + + * SECURITY UPDATE: Fix Denial of Service. + * rfc1035/spf.c: + - Fix checking of DNS lookup return value to prevent free()ing unallocated + memory, and thus a crash. + - CAN-2005-2151 + + -- Martin Pitt Fri, 26 Aug 2005 12:39:48 +0200 + +courier (0.47-3ubuntu4) breezy; urgency=low + + * Make the pam configuration just include the + common-{auth,account,session} rather than hardcoding pam_unix. + (Ubuntu #11621) + + -- Tollef Fog Heen Thu, 18 Aug 2005 09:55:01 +0200 + +courier (0.47-3ubuntu3) breezy; urgency=low + + * Transition to new PostgreSQL architecture. + * debian/control: Changed build dependency postgresql-dev to libpq-dev. + * debian/rules: Use pg_config to determine include directory. + + -- Martin Pitt Mon, 6 Jun 2005 13:23:16 +0200 + +courier (0.47-3ubuntu2) breezy; urgency=low + + * Depend: postfix | mail-transport-agent + + -- LaMont Jones Mon, 2 May 2005 19:23:45 -0600 + +courier (0.47-3ubuntu1) hoary; urgency=low + + * Nathaniel McCallum + - debian/*.init: pretty initscripts + - debian/control: version depends on lsb-base + + -- Thom May Mon, 29 Nov 2004 12:09:34 +0000 + courier (0.47-3) unstable; urgency=medium * fix stupid typo in courier-pop init script (Closes: #276774, thanks to diff -u courier-0.53.3/debian/control courier-0.53.3/debian/control --- courier-0.53.3/debian/control +++ courier-0.53.3/debian/control @@ -1,10 +1,11 @@ Source: courier Section: mail Priority: optional -Maintainer: Stefan Hornburg (Racke) -Standards-Version: 3.5.6.0 -Build-Depends: libmysqlclient-dev | libmysqlclient15-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, libperl-dev, zlib1g-dev, libpcre3-dev, debhelper (>= 4.1.16), mime-support, libldap-dev, procps, libsasl2-dev | libsasl-dev, expect, groff-base, gs | gs-aladdin, mgetty-fax, netpbm, libfam-dev, libssl-dev, openssl (>= 0.9.6), libpq-dev | postgresql-dev, automake1.8, libtool, courier-authlib-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Stefan Hornburg (Racke) +Build-Depends: libmysqlclient15-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, libperl-dev, zlib1g-dev, libpcre3-dev, debhelper (>= 5.0.37), mime-support, libldap-dev, procps, libsasl2-dev | libsasl-dev, expect, groff-base, gs | gs-aladdin, mgetty-fax, netpbm, libgamin-dev, libssl-dev, openssl (>= 0.9.6), libpq-dev, automake1.8, libtool, courier-authlib-dev, po-debconf Build-Conflicts: automake1.4 +Standards-Version: 3.7.2 Package: courier-base Architecture: any @@ -23,7 +24,7 @@ Package: courier-maildrop Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), exim4 | mail-transport-agent +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), postfix | mail-transport-agent Suggests: courier-doc Replaces: maildrop Conflicts: maildrop @@ -56,7 +57,7 @@ Package: courier-mta Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}) +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), lsb-base (>= 1.3.9ubuntu3), debconf Conflicts: courier-faxmail (<= 0.42.2-6), mail-transport-agent Provides: mail-transport-agent Replaces: mail-transport-agent @@ -82,7 +83,7 @@ Package: courier-webadmin Architecture: any -Depends: courier-base (>= ${RELUP}), apache | httpd +Depends: courier-base (>= ${RELUP}), apache | httpd, debconf Suggests: courier-doc Description: Courier Mail Server - Web-based administration frontend The web-based administration and configuration tool for the Courier @@ -93,7 +94,7 @@ Package: sqwebmail Architecture: any -Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}), ispell, iamerican | ispell-dictionary, apache | httpd, cron, expect, courier-maildrop (>= ${RELUP}) +Depends: ${shlibs:Depends}, postfix | mail-transport-agent, courier-base (>= ${RELUP}), ispell, iamerican | ispell-dictionary, apache | httpd, cron, expect, courier-maildrop (>= ${RELUP}), lsb-base (>= 1.3-9ubuntu3), debconf Suggests: courier-doc, gnupg, courier-pcp Description: Courier Mail Server - Webmail server This package contains the SqWebMail webmail server, which @@ -101,7 +102,7 @@ Package: courier-pcp Architecture: any -Depends: ${shlibs:Depends}, sqwebmail +Depends: ${shlibs:Depends}, sqwebmail, lsb-base (>= 1.3-9ubuntu3) Suggests: courier-doc Description: Courier Mail Server - PCP server This package contains the PCP (Personal Calendaring Protocol) server @@ -109,7 +110,7 @@ Package: courier-pop Architecture: any -Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}) +Depends: ${shlibs:Depends}, postfix | mail-transport-agent, courier-base (>= ${RELUP}), debconf Provides: pop3-server Conflicts: pop3-server Replaces: pop3-server @@ -121,7 +122,7 @@ Package: courier-imap Architecture: any -Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}) +Depends: ${shlibs:Depends}, postfix | mail-transport-agent, courier-base (>= ${RELUP}), lsb-base (>= 1.3-9ubuntu3), debconf Suggests: courier-doc, imap-client, courier-imap-ssl Provides: imap-server Conflicts: imap-server @@ -134,7 +135,7 @@ Package: courier-ldap Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authlib-ldap +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authlib-ldap, lsb-base (>= 1.3-9ubuntu3) Suggests: courier-doc Replaces: courier-imap-authldap Conflicts: courier-imap-authldap @@ -151,7 +152,7 @@ Package: courier-ssl Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), openssl +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), openssl, debconf Description: Courier Mail Server - SSL/TLS Support The Courier Mail Server employs the SSL/TLS wrapper application couriertls instead of equipping the different applications with @@ -160,7 +161,7 @@ Package: courier-mta-ssl Architecture: any -Depends: courier-mta, courier-ssl (>= ${RELUP}) +Depends: courier-mta, courier-ssl (>= ${RELUP}), lsb-base (>= 1.3-9ubuntu3) Suggests: courier-doc Priority: extra Description: Courier Mail Server - ESMTP over SSL @@ -169,7 +170,7 @@ Package: courier-pop-ssl Architecture: any -Depends: courier-pop, courier-ssl (>= ${RELUP}) +Depends: courier-pop, courier-ssl (>= ${RELUP}), lsb-base (>= 1.3-9ubuntu3), openssl Suggests: courier-doc Description: Courier Mail Server - POP3 over SSL POP3 over SSL is handled by the regular POP3 daemon from courier-pop @@ -177,9 +178,8 @@ Package: courier-imap-ssl Architecture: any -Depends: courier-imap (>= 1.3.7-3), courier-ssl (>= ${RELUP}), openssl -Suggests: courier-doc -Suggests: imap-client +Depends: courier-imap (>= 1.3.7-3), courier-ssl (>= ${RELUP}), openssl, lsb-base (>= 1.3-9ubuntu3) +Suggests: courier-doc, imap-client Priority: extra Description: Courier Mail Server - IMAP over SSL IMAP over SSL is handled by the regular IMAP daemon from courier-imap diff -u courier-0.53.3/debian/courier-base.templates courier-0.53.3/debian/courier-base.templates --- courier-0.53.3/debian/courier-base.templates +++ courier-0.53.3/debian/courier-base.templates @@ -8,7 +8,7 @@ a base package (courier-authlib) and one for each authentication method (courier-authlib-userdb, -mysql, -postgresql, -ldap, -pipe). Unfortunately it wasn't possible to setup the dependencies in order to allow a seamless - upgrade. Please install the package for your authentication method manually. + upgrade. Please install the package for authentication method manually. Template: courier-base/webadmin-configmode Type: boolean @@ -23,13 +23,13 @@ relies on configuration directories instead of configuration files. - If you agree, any directories needed for the web-based + If agreed, any directories needed for the web-based administration tool will be created unless there is already a plain file in place. Template: courier-base/maildir Type: string Default: Maildir -_Description: Path to user's Maildir directory +_Description: Path to user's Maildir directory: This is a relative path name from each user's home directory to the Maildir directory where the Courier servers store and access the - user's email. Please refer to the maildir(5) manual page if you are + user's email. Please refer to the maildir(5) manual page for those unfamiliar with the mail storage format used by Courier. diff -u courier-0.53.3/debian/courier-imap-ssl.init courier-0.53.3/debian/courier-imap-ssl.init --- courier-0.53.3/debian/courier-imap-ssl.init +++ courier-0.53.3/debian/courier-imap-ssl.init @@ -1,11 +1,23 @@ #! /bin/bash -e - +### BEGIN INIT INFO +# Provides: courier-imap-ssl +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-imap -ssl +# Description: courier-imap is an IMAP Mail Delivery Agent with SSL. +### END INIT INFO prefix="/usr" exec_prefix=${prefix} sysconfdir="/etc/courier" bindir="${exec_prefix}/bin" sbindir="${exec_prefix}/sbin" libexecdir="${prefix}/lib/courier" +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" TCPD=${sbindir}/couriertcpd DAEMONPROG=${sbindir}/imapd DAEMON=imapd-ssl @@ -16,17 +28,30 @@ exit 0 fi +. /lib/lsb/init-functions + +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + +if [ ! -d ${calendar_dir} ]; then + mkdir -p ${calendar_dir} + chown daemon:daemon ${calendar_dir} +fi + + if ! [ -x $TCPD ]; then - echo "ERR: $TCPD missing" + log_failure_msg "ERR: $TCPD missing" exit 1 fi if ! [ -f ${sysconfdir}/imapd ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi if ! [ -f ${sysconfdir}/imapd-ssl ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi @@ -34,15 +59,15 @@ if [ -f /etc/default/courier ]; then . /etc/default/courier fi -if [ -z "$MAILDIR" ]; then - MAILDIR=Maildir +if [ -z "$MAILDIRPATH" ]; then + MAILDIRPATH=Maildir fi . ${sysconfdir}/imapd . ${sysconfdir}/imapd-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -54,7 +79,7 @@ case "$1" in start) if [ "$START" = "yes" ]; then - echo -n "Starting $PROGRAM:" + log_begin_msg "Starting $PROGRAM..." umask $IMAP_UMASK ulimit -v $IMAP_ULIMITD @@ -72,21 +97,21 @@ $TCPDOPTS \ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/imaplogin \ - ${bindir}/imapd $MAILDIR" - echo " $DAEMON." + ${bindir}/imapd $MAILDIRPATH" + log_end_msg 0 fi ;; stop) - echo -n "Stopping $PROGRAM:" - /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop - echo " $DAEMON." + log_begin_msg "Stopping $PROGRAM..." + /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-imap.init courier-0.53.3/debian/courier-imap.init --- courier-0.53.3/debian/courier-imap.init +++ courier-0.53.3/debian/courier-imap.init @@ -1,5 +1,15 @@ #! /bin/bash -e - +### BEGIN INIT INFO +# Provides: courier-imap +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-imap +# Description: courier-imap is an IMAP Mail Delivery Agent. +### END INIT INFO prefix="/usr" exec_prefix=${prefix} sysconfdir="/etc/courier" @@ -7,22 +17,37 @@ sbindir="${exec_prefix}/sbin" libexecdir="${prefix}/lib/courier" TCPD="${sbindir}/couriertcpd" +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" DAEMON="imapd" PROGRAM="Courier IMAP server" SSLCONFIG= +. /lib/lsb/init-functions + # first of all check if daemon is available if ! [ -x "${bindir}/imapd" ]; then exit 0 fi +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + +if [ ! -d ${calendar_dir} ]; then + mkdir -p ${calendar_dir} + chown daemon:daemon ${calendar_dir} +fi + + if ! [ -x $TCPD ]; then - echo "ERR: $TCPD missing" + log_failure_msg "ERR: $TCPD missing" exit 1 fi if ! [ -f ${sysconfdir}/$DAEMON ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi @@ -30,8 +55,8 @@ if [ -f /etc/default/courier ]; then . /etc/default/courier fi -if [ -z "$MAILDIR" ]; then - MAILDIR=Maildir +if [ -z "$MAILDIRPATH" ]; then + MAILDIRPATH=Maildir fi if [ -f "${sysconfdir}/imapd-ssl" ]; then @@ -48,7 +73,7 @@ case "$1" in start) if [ "$START" = "yes" ]; then - echo -n "Starting $PROGRAM:" + log_begin_msg "Starting $PROGRAM..." umask $IMAP_UMASK ulimit -v $IMAP_ULIMITD @@ -64,21 +89,21 @@ -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \ $TCPDOPTS \ $PORT ${libexecdir}/courier/imaplogin \ - ${bindir}/imapd $MAILDIR" - echo " $DAEMON." + ${bindir}/imapd $MAILDIRPATH" + log_end_msg 0 fi ;; stop) - echo -n "Stopping $PROGRAM:" - /usr/sbin/courierlogger -pid=$PIDFILE -stop - echo " $DAEMON." + log_begin_msg "Stopping $PROGRAM..." + /usr/sbin/courierlogger -pid=$PIDFILE -stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-imap.pam courier-0.53.3/debian/courier-imap.pam --- courier-0.53.3/debian/courier-imap.pam +++ courier-0.53.3/debian/courier-imap.pam @@ -1,4 +1,5 @@ -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so +#%PAM-1.0 + +@include common-auth +@include common-account +@include common-session diff -u courier-0.53.3/debian/courier-ldap.init courier-0.53.3/debian/courier-ldap.init --- courier-0.53.3/debian/courier-ldap.init +++ courier-0.53.3/debian/courier-ldap.init @@ -17,6 +17,17 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA. +### BEGIN INIT INFO +# Provides: courier-ldap +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-ldap +# Description: courier-ldap is the Courier LDAP alias daemon. +### END INIT INFO CONFFILE=/etc/courier/ldapaliasrc DAEMON=/usr/sbin/courierldapaliasd @@ -30,26 +41,28 @@ exit 0 fi +. /lib/lsb/init-functions + case "$1" in start) # Start Courier LDAP alias daemon - echo -n "Starting Courier LDAP alias daemon: " - $DAEMON start - echo "done." + log_begin_msg "Starting Courier LDAP alias daemon..." + $DAEMON start || log_end_msg 1 + log_end_msg 0 ;; stop) # Stop Courier LDAP alias daemon - echo -n "Stopping Courier LDAP alias daemon: " - $DAEMON stop - echo "done." + log_begin_msg "Stopping Courier LDAP alias daemon..." + $DAEMON stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) - echo -n "Restarting Courier LDAP alias daemon: " - $DAEMON restart - echo "done." + log_begin_msg "Restarting Courier LDAP alias daemon..." + $DAEMON restart || log_end_msg 1 + log_end_msg 0 ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-mta-ssl.init courier-0.53.3/debian/courier-mta-ssl.init --- courier-0.53.3/debian/courier-mta-ssl.init +++ courier-0.53.3/debian/courier-mta-ssl.init @@ -1,5 +1,15 @@ #! /bin/sh -e - +### BEGIN INIT INFO +# Provides: courier-mta mail-transport-agent +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-mta Mail Transport Agent +# Description: courier-mta is a Mail Transport agent +### END INIT INFO sysconfdir="/etc/courier" sbindir="/usr/sbin" TCPD=${sbindir}/couriertcpd @@ -30,23 +40,25 @@ . ${sysconfdir}/esmtpd . ${sysconfdir}/esmtpd-ssl +. /lib/lsb/init-functions + case "$1" in start) - echo -n "Starting Courier SMTP/SSL server:" - ${sbindir}/esmtpd-ssl start - echo " done." + log_begin_msg "Starting Courier SMTP/SSL server..." + ${sbindir}/esmtpd-ssl start || log_end_msg 1 + log_end_msg 0 ;; stop) - echo -n "Stopping Courier SMTP/SSL server:" - ${sbindir}/esmtpd-ssl stop - echo " done." + log_begin_msg "Stopping Courier SMTP/SSL server..." + ${sbindir}/esmtpd-ssl stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-mta.init courier-0.53.3/debian/courier-mta.init --- courier-0.53.3/debian/courier-mta.init +++ courier-0.53.3/debian/courier-mta.init @@ -1,16 +1,34 @@ #! /bin/sh -e - +### BEGIN INIT INFO +# Provides: courier-mta mail-transport-agent +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-mta Mail Transport Agent +# Description: courier-mta is a Mail Transport agent +### END INIT INFO prefix="/usr" exec_prefix=${prefix} sysconfdir="/etc/courier" sbindir="${exec_prefix}/sbin" libexecdir="${prefix}/lib/courier" +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" DAEMON=${sbindir}/esmtpd test -f $DAEMON || exit 0 test -f "$sysconfdir/esmtpd" || exit 0 test -f "$sysconfdir/esmtpd-msa" || exit 0 +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + + # Check if SMTP server should be started . ${sysconfdir}/esmtpd START_MTA=no @@ -28,82 +46,84 @@ exit 0 fi +. /lib/lsb/init-functions + case "$1" in start) cd / - echo -n "Starting Courier mail server:" - ${sbindir}/courier start - echo " done." - - echo -n "Starting Courier mail filter:" - ${sbindir}/courierfilter start - echo " done." + log_begin_msg "Starting Courier mail server..." + ${sbindir}/courier start || log_end_msg 1 + log_end_msg 0 + + log_begin_msg "Starting Courier mail filter..." + ${sbindir}/courierfilter start || log_end_msg 1 + log_end_msg 0 if [ "$START_MTA" = "yes" ]; then - echo -n "Starting Courier SMTP server:" - ${sbindir}/esmtpd start - echo " done." + log_begin_msg "Starting Courier SMTP server..." + ${sbindir}/esmtpd start || log_end_msg 1 + log_end_msg 0 fi if [ "$START_MSA" = "yes" ]; then - echo -n "Starting Courier SMTP MSA server:" - ${sbindir}/esmtpd-msa start - echo " done." + log_begin_msg "Starting Courier SMTP MSA server..." + ${sbindir}/esmtpd-msa start || log_end_msg 1 + log_end_msg 0 fi ;; stop) cd / if [ "$START_MSA" = "yes" ]; then - echo -n "Stopping Courier SMTP MSA server:" - ${sbindir}/esmtpd-msa stop - echo " done." + log_begin_msg "Stopping Courier SMTP MSA server..." + ${sbindir}/esmtpd-msa stop || log_end_msg 1 + log_end_msg 0 fi if [ "$START_MTA" = "yes" ]; then - echo -n "Stopping Courier SMTP server:" - ${sbindir}/esmtpd stop - echo " done." + log_begin_msg "Stopping Courier SMTP server..." + ${sbindir}/esmtpd stop || log_end_msg 1 + log_end_msg 0 fi - echo -n "Stopping Courier mail filter:" - ${sbindir}/courierfilter stop - echo " done." - - echo -n "Stopping Courier mail server:" - ${sbindir}/courier stop - echo " done." + log_begin_msg "Stopping Courier mail filter..." + ${sbindir}/courierfilter stop || log_end_msg 1 + log_end_msg 0 + + log_begin_msg "Stopping Courier mail server..." + ${sbindir}/courier stop || log_end_msg 1 + log_end_msg 0 ;; reload | force-reload) cd / if [ "$START_MSA" = "yes" ]; then - echo -n "Restarting Courier SMTP MSA server:" - ${sbindir}/esmtpd-msa restart - echo " done." + log_begin_msg "Restarting Courier SMTP MSA server..." + ${sbindir}/esmtpd-msa restart || log_end_msg 1 + log_end_msg 0 fi if [ "$START_MTA" = "yes" ]; then - echo -n "Restarting Courier SMTP server:" - ${sbindir}/esmtpd restart - echo " done." + log_begin_msg "Restarting Courier SMTP server..." + ${sbindir}/esmtpd restart || log_end_msg 1 + log_end_msg 0 fi - echo -n "Restarting Courier mail filter:" - ${sbindir}/courierfilter restart - echo " done." - - echo -n "Restarting Courier mail server:" - ${sbindir}/courier restart - echo " done." + log_begin_msg "Restarting Courier mail filter..." + ${sbindir}/courierfilter restart || log_end_msg 1 + log_end_msg 0 + + log_begin_msg "Restarting Courier mail server..." + ${sbindir}/courier restart || log_end_msg 1 + log_end_msg 0 ;; restart) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-mta.pam courier-0.53.3/debian/courier-mta.pam --- courier-0.53.3/debian/courier-mta.pam +++ courier-0.53.3/debian/courier-mta.pam @@ -1,4 +1,5 @@ -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so +#%PAM-1.0 + +@include common-auth +@include common-account +@include common-session diff -u courier-0.53.3/debian/courier-pcp.init courier-0.53.3/debian/courier-pcp.init --- courier-0.53.3/debian/courier-pcp.init +++ courier-0.53.3/debian/courier-pcp.init @@ -21,6 +21,17 @@ # and stop the PCP daemon. This is now handled by the # SqWebMail daemon automatically. +### BEGIN INIT INFO +# Provides: courier-pcp +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: +# Default-Stop: +# Short-Description: courier-pcp +# Description: courier-pcp Personal Calendaring Protocol server +### END INIT INFO case "$1" in start) ;; diff -u courier-0.53.3/debian/courier-mta.templates courier-0.53.3/debian/courier-mta.templates --- courier-0.53.3/debian/courier-mta.templates +++ courier-0.53.3/debian/courier-mta.templates @@ -1,12 +1,12 @@ Template: courier-mta/defaultdomain Type: string -_Description: Default domain +_Description: Default domain: Please specify a valid email domain. Most header rewriting functions will append this domain to all email addresses which do not specify a domain, e.g. emails from accounts on this machine. Template: courier-mta/dsnfrom Type: string -_Description: "From" Header for Delivery Notifications +_Description: "From" Header for Delivery Notifications: Please specify a valid value for the "From" Header for mail delivery notifications. Otherwise these cannot be sent. diff -u courier-0.53.3/debian/courier-pop-ssl.init courier-0.53.3/debian/courier-pop-ssl.init --- courier-0.53.3/debian/courier-pop-ssl.init +++ courier-0.53.3/debian/courier-pop-ssl.init @@ -1,4 +1,15 @@ #! /bin/sh -e +### BEGIN INIT INFO +# Provides: courier-pop-ssl +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-pop-ssl +# Description: courier-pop-ssl is an POP3 Mail Delivery Agent with SSL support. +### END INIT INFO prefix="/usr" exec_prefix=${prefix} @@ -6,6 +17,8 @@ sbindir="${exec_prefix}/sbin" bindir="${exec_prefix}/bin" libexecdir="${prefix}/lib/courier" +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" TCPD=${sbindir}/couriertcpd DAEMONPROG=${sbindir}/pop3d DAEMON=pop3d-ssl @@ -13,17 +26,30 @@ test -f $DAEMONPROG || exit 0 +. /lib/lsb/init-functions + +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + +if [ ! -d ${calendar_dir} ]; then + mkdir -p ${calendar_dir} + chown daemon:daemon ${calendar_dir} +fi + + if ! [ -x $TCPD ]; then - echo "ERR: $TCPD missing" + log_failure_msg "ERR: $TCPD missing" exit 1 fi if ! [ -f ${sysconfdir}/pop3d ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi if ! [ -f ${sysconfdir}/pop3d-ssl ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi @@ -31,15 +57,15 @@ if [ -f /etc/default/courier ]; then . /etc/default/courier fi -if [ -z "$MAILDIR" ]; then - MAILDIR=Maildir +if [ -z "$MAILDIRPATH" ]; then + MAILDIRPATH=Maildir fi . ${sysconfdir}/pop3d . ${sysconfdir}/pop3d-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -54,7 +80,7 @@ case "$1" in start) - echo -n "Starting $PROGRAM:" + log_begin_msg "Starting $PROGRAM..." /usr/bin/env - PATH="$PATH" SHELL="$SHELL" \ /bin/sh -c " . ${sysconfdir}/pop3d ; \ @@ -71,20 +97,20 @@ $TCPDOPTS \ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/courierpop3login \ - ${libexecdir}/courier/courierpop3d $MAILDIR" - echo " $DAEMON." + ${libexecdir}/courier/courierpop3d $MAILDIRPATH" + log_end_msg 0 ;; stop) - echo -n "Stopping $PROGRAM:" - /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop - echo " $DAEMON." + log_begin_msg "Stopping $PROGRAM..." + /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/courier-pop.init courier-0.53.3/debian/courier-pop.init --- courier-0.53.3/debian/courier-pop.init +++ courier-0.53.3/debian/courier-pop.init @@ -1,10 +1,23 @@ #! /bin/sh -e +### BEGIN INIT INFO +# Provides: courier-pop +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: courier-pop +# Description: courier-pop is an POP3 Mail Delivery Agent. +### END INIT INFO prefix="/usr" exec_prefix=${prefix} sysconfdir="/etc/courier" sbindir="${exec_prefix}/sbin" libexecdir="${prefix}/lib/courier" +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" TCPD="${sbindir}/couriertcpd" DAEMON=${sbindir}/pop3d PROGRAM="Courier POP3 server" @@ -13,13 +26,27 @@ test -f $DAEMON || exit 0 +. /lib/lsb/init-functions + +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + +if [ ! -d ${calendar_dir} ]; then + mkdir -p ${calendar_dir} + chown daemon:daemon ${calendar_dir} +fi + + + if ! [ -x $TCPD ]; then - echo "ERR: $TCPD missing" + log_failure_msg "ERR: $TCPD missing" exit 1 fi if ! [ -f ${sysconfdir}/pop3d ]; then - echo "ERR: config file missing" + log_failure_msg "ERR: config file missing" exit 1 fi @@ -27,8 +54,8 @@ if [ -f /etc/default/courier ]; then . /etc/default/courier fi -if [ -z "$MAILDIR" ]; then - MAILDIR=Maildir +if [ -z "$MAILDIRPATH" ]; then + MAILDIRPATH=Maildir fi if [ -f "${sysconfdir}/pop3d-ssl" ]; then @@ -45,7 +72,7 @@ case "$1" in start) if [ "$START" = "yes" ]; then - echo -n "Starting $PROGRAM:" + log_begin_msg "Starting $PROGRAM..." /usr/bin/env - /bin/sh -c " set -a; \ . ${sysconfdir}/pop3d; \ @@ -56,21 +83,21 @@ -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \ $TCPDOPTS -address=$ADDRESS $PORT \ ${libexecdir}/courier/courierpop3login $AUTHMODULELIST \ - ${libexecdir}/courier/courierpop3d $MAILDIR" - echo " $PROG." + ${libexecdir}/courier/courierpop3d $MAILDIRPATH" + log_end_msg 0 fi ;; stop) - echo -n "Stopping $PROGRAM:" - $TCPD -pid=$PIDFILE -stop - echo " $PROG." + log_begin_msg "Stopping $PROGRAM..." + $TCPD -pid=$PIDFILE -stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 exit 1 ;; esac diff -u courier-0.53.3/debian/courier-pop.pam courier-0.53.3/debian/courier-pop.pam --- courier-0.53.3/debian/courier-pop.pam +++ courier-0.53.3/debian/courier-pop.pam @@ -1,4 +1,5 @@ -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so +#%PAM-1.0 + +@include common-auth +@include common-account +@include common-session diff -u courier-0.53.3/debian/courier-webadmin.templates courier-0.53.3/debian/courier-webadmin.templates --- courier-0.53.3/debian/courier-webadmin.templates +++ courier-0.53.3/debian/courier-webadmin.templates @@ -4,18 +4,18 @@ _Description: Activate CGI Program ? - To allow courier-webadmin to work out of the box, we need to copy the CGI - program from /usr/lib/courier/courier/webmail/webadmin to + To allow courier-webadmin to work out of the box, the CGI program + must be copied from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/courierwebadmin and set the SUID bit. . There are two reasons why this is not done by default during the installation. First it has serious security implications, because courierwebadmin runs as root. Second it is not guaranteed to work - depending on your web server software and its configuration. + depending on the web server software and its configuration. . - If you agree here and your web server setup is compliant with - the Debian policy, you can access the administration frontend + If agreed and the web server setup is compliant with + the Debian policy, administration frontend can be accessed through http://localhost/cgi-bin/courierwebadmin. Template: courier-webadmin/password Type: password -_Description: Password for the Courier Administration +_Description: Password for the Courier Administration: To access the Courier administration a password is needed. diff -u courier-0.53.3/debian/sqwebmail.init courier-0.53.3/debian/sqwebmail.init --- courier-0.53.3/debian/sqwebmail.init +++ courier-0.53.3/debian/sqwebmail.init @@ -17,32 +17,59 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA. +### BEGIN INIT INFO +# Provides: sqwebmail +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: sqwebmail +# Description: sqwebmail is the Courier webmail/calendaring server. +### END INIT INFO + DAEMON=/usr/sbin/webmaild +run_dir="/var/run/courier" +calendar_dir="/var/run/courier/calendar" + # stop if the sqwebmail package has been removed if ! [ -x $DAEMON ]; then exit 0 fi +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + +if [ ! -d ${calendar_dir} ]; then + mkdir -p ${calendar_dir} + chown daemon:daemon ${calendar_dir} +fi + +. /lib/lsb/init-functions + case "$1" in start) # Start webmail daemon - echo -n "Starting Courier webmail daemon: " - $DAEMON start - echo "done." + log_begin_msg "Starting Courier webmail daemon..." + $DAEMON start || log_end_msg 1 + log_end_msg 0 ;; stop) # Stop webmail daemon - echo -n "Stopping Courier webmail daemon: " - $DAEMON stop - echo "done." + log_begin_msg "Stopping Courier webmail daemon..." + $DAEMON stop || log_end_msg 1 + log_end_msg 0 ;; restart | reload | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.53.3/debian/sqwebmail.pam courier-0.53.3/debian/sqwebmail.pam --- courier-0.53.3/debian/sqwebmail.pam +++ courier-0.53.3/debian/sqwebmail.pam @@ -1,4 +1,5 @@ -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so +#%PAM-1.0 +@include common-auth +@include common-account +@include common-session diff -u courier-0.53.3/debian/sqwebmail.templates courier-0.53.3/debian/sqwebmail.templates --- courier-0.53.3/debian/sqwebmail.templates +++ courier-0.53.3/debian/sqwebmail.templates @@ -2,15 +2,15 @@ Type: select _Choices: local, net, disabled Default: local -_Description: Enable Calendaring ? - Please specify if you would like to enable calendaring in local mode +_Description: Enable Calendaring: + Please specify if calendaring should be enabled in: local mode (choose local), groupware mode (choose net) or not at all (choose - disabled). To actually using the groupware mode, you need to install the + disabled). To actually use the groupware mode, install the courier-pcp package. . Local mode requires very little overhead compared to not using calendaring at all, but groupware mode requires a substantial additional amount of - server resources. If you select the groupware mode, a separate daemon + server resources. If groupware mode is selected, a separate daemon process will be run. . For more information, please refer to /usr/share/doc/sqwebmail/PCP.html. @@ -19,15 +19,15 @@ Type: select Choices: ${DICTS} Default: default -_Description: Ispell Dictionary - SqWebMail allows you to spellcheck your emails. Please select an +_Description: Ispell Dictionary: + SqWebMail allows spellchecking of emails. Please select an appropriate dictionary for ispell. Template: sqwebmail/install-www Type: select _Choices: symlink, copy, custom Default: symlink -_Description: How to you want to install the HTML documents and images for sqwebmail ? +_Description: How do you want to install the HTML documents and images for sqwebmail: The choices are to create a symbolic link /var/www/sqwebmail, copy all files from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For security reasons the second option is recommended. However, if @@ -39,6 +39,6 @@ - purged except you choose custom. + purged unless you choose custom. Template: sqwebmail/install-www-backup Type: string -Description: Here we record the value of install-www before configuration - This is just a dummy. You doesn't need to translate it. +Description: Record the value of install-www before configuration + This is just a dummy. You do not need to translate it. diff -u courier-0.53.3/debian/courier-imap.templates courier-0.53.3/debian/courier-imap.templates --- courier-0.53.3/debian/courier-imap.templates +++ courier-0.53.3/debian/courier-imap.templates @@ -5,6 +5,6 @@ - On your system are courier-imap configuration files within /etc. + The current system has courier-imap configuration files within /etc. From now on all configuration files related to Courier are located within - /etc/courier. If you like, we move the configuration files to the new - location. However, we cannot guarantee that they will work as before. + /etc/courier. If preferred, move the configuration files to the new + location. However, no guarantee can be made that they will work as before. Please refer to the Courier documentation and tell the maintainer about - your experiences with the conversion. + experiences with the conversion.