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,17 @@ +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 + - combined reccomends for courier-imap-ssl into one line + - added build depends for po-debconf + + -- Scott Kitterman Sat, 27 Jan 2007 00:55:55 -0500 + courier (0.53.3-3) unstable; urgency=medium * added Galician translation of Debconf templates (Closes: #408125, @@ -7,6 +21,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 @@ -154,6 +183,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 @@ -218,7 +313,7 @@ report) -- Stefan Hornburg (Racke) Tue, 26 Jul 2005 11:07:51 +0200 - + courier (0.47-4) unstable; urgency=low * more logcheck fixes: @@ -237,6 +332,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 @@ -3,7 +3,7 @@ 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 +Build-Depends: 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, libgamin-dev, libssl-dev, openssl (>= 0.9.6), libpq-dev, automake1.8, libtool, courier-authlib-dev, po-debconf Build-Conflicts: automake1.4 Package: courier-base @@ -23,7 +23,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 +56,7 @@ Package: courier-mta Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}) +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), lsb-base (>= 1.3.9ubuntu3) Conflicts: courier-faxmail (<= 0.42.2-6), mail-transport-agent Provides: mail-transport-agent Replaces: mail-transport-agent @@ -93,7 +93,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) Suggests: courier-doc, gnupg, courier-pcp Description: Courier Mail Server - Webmail server This package contains the SqWebMail webmail server, which @@ -101,7 +101,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 +109,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}) Provides: pop3-server Conflicts: pop3-server Replaces: pop3-server @@ -121,7 +121,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) Suggests: courier-doc, imap-client, courier-imap-ssl Provides: imap-server Conflicts: imap-server @@ -134,7 +134,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 @@ -160,7 +160,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 +169,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 +177,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-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 @@ -6,6 +6,8 @@ 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 +18,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 @@ -42,7 +57,7 @@ . ${sysconfdir}/imapd-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -54,7 +69,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 @@ -73,20 +88,20 @@ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/imaplogin \ ${bindir}/imapd $MAILDIR" - echo " $DAEMON." + 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 @@ -7,22 +7,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 @@ -48,7 +63,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 @@ -65,20 +80,20 @@ $TCPDOPTS \ $PORT ${libexecdir}/courier/imaplogin \ ${bindir}/imapd $MAILDIR" - echo " $DAEMON." + 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 @@ -30,26 +30,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 @@ -30,23 +30,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 @@ -5,12 +5,20 @@ 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 +36,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-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 @@ -6,6 +6,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 +15,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 @@ -39,7 +54,7 @@ . ${sysconfdir}/pop3d-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -54,7 +69,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 ; \ @@ -72,19 +87,19 @@ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/courierpop3login \ ${libexecdir}/courier/courierpop3d $MAILDIR" - echo " $DAEMON." + 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 @@ -5,6 +5,8 @@ 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 +15,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 @@ -45,7 +61,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; \ @@ -57,20 +73,20 @@ $TCPDOPTS -address=$ADDRESS $PORT \ ${libexecdir}/courier/courierpop3login $AUTHMODULELIST \ ${libexecdir}/courier/courierpop3d $MAILDIR" - echo " $PROG." + 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/sqwebmail.init courier-0.53.3/debian/sqwebmail.init --- courier-0.53.3/debian/sqwebmail.init +++ courier-0.53.3/debian/sqwebmail.init @@ -19,30 +19,45 @@ 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/po/ja.po courier-0.53.3/debian/po/ja.po --- courier-0.53.3/debian/po/ja.po +++ courier-0.53.3/debian/po/ja.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: courier 0.44.2-3\n" "Report-Msgid-Bugs-To: racke@linuxia.de\n" -"POT-Creation-Date: 2006-10-13 12:06+0000\n" +"POT-Creation-Date: 2007-01-26 16:53+0000\n" "PO-Revision-Date: 2006-10-08 02:05+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" diff -u courier-0.53.3/debian/po/fr.po courier-0.53.3/debian/po/fr.po --- courier-0.53.3/debian/po/fr.po +++ courier-0.53.3/debian/po/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: racke@linuxia.de\n" -"POT-Creation-Date: 2006-10-13 12:06+0000\n" +"POT-Creation-Date: 2007-01-26 16:53+0000\n" "PO-Revision-Date: 2006-10-19 09:30+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff -u courier-0.53.3/debian/po/de.po courier-0.53.3/debian/po/de.po --- courier-0.53.3/debian/po/de.po +++ courier-0.53.3/debian/po/de.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Courier 0.53.3-2\n" "Report-Msgid-Bugs-To: racke@linuxia.de\n" -"POT-Creation-Date: 2006-11-02 10:47+0000\n" +"POT-Creation-Date: 2007-01-26 16:53+0000\n" "PO-Revision-Date: 2007-01-10 17:12+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: German \n" @@ -45,16 +45,16 @@ "possible to setup the dependencies in order to allow a seamless upgrade. " "Please install the package for your authentication method manually." msgstr "" -"Seit Courier 0.48 sind die Authentifizierungsmodule, die vorher Teil " -"von Courier waren, in eine separate Bibliothek ausgelagert. Alle " -"Courier-Applikationen nutzen jetzt die gleiche Infrastruktur zur " -"Authentifzierung, die »Courier Authentication Library«. Die Pakete dieser " -"Bibliothek bestehen aus einem Basispaket (courier-authlib) und je einem " -"Paket für jede Authentifizierungsmethode (courier-authlib-userdb, -mysql, " -"-postgresql, -ldap, -pipe). Unglücklicherweise war es nicht möglich, die " +"Seit Courier 0.48 sind die Authentifizierungsmodule, die vorher Teil von " +"Courier waren, in eine separate Bibliothek ausgelagert. Alle Courier-" +"Applikationen nutzen jetzt die gleiche Infrastruktur zur Authentifzierung, " +"die »Courier Authentication Library«. Die Pakete dieser Bibliothek bestehen " +"aus einem Basispaket (courier-authlib) und je einem Paket für jede " +"Authentifizierungsmethode (courier-authlib-userdb, -mysql, -postgresql, -" +"ldap, -pipe). Unglücklicherweise war es nicht möglich, die " "Paketabhängigkeiten so einzurichten, dass eine nahtlose Aktualisierung " -"möglich wäre. Bitte installieren Sie das zu Ihrer " -"Authentifizierungsmethode passende Paket von Hand." +"möglich wäre. Bitte installieren Sie das zu Ihrer Authentifizierungsmethode " +"passende Paket von Hand." #. Type: boolean #. Description @@ -130,11 +130,11 @@ msgstr "" "Konfigurationsdateien für courier-imap wurden im Verzeichnis /etc gefunden. " "Ab jetzt werden alle Konfigurationsdateien, die mit Courier im Zusammenhang " -"stehen, unter /etc/courier aufbewahrt. Wenn Sie es wünschen, werden die alten " -"Konfigurationsdateien in das neue Verzeichnis verschoben. Es kann jedoch " -"nicht garantiert werden, dass sie wie vorher funktionieren. Bitte informieren " -"Sie sich in der Courier-Dokumentation und teilen dem Maintainer dieses " -"Paketes ihre Erfahrungen mit der Umstellung mit." +"stehen, unter /etc/courier aufbewahrt. Wenn Sie es wünschen, werden die " +"alten Konfigurationsdateien in das neue Verzeichnis verschoben. Es kann " +"jedoch nicht garantiert werden, dass sie wie vorher funktionieren. Bitte " +"informieren Sie sich in der Courier-Dokumentation und teilen dem Maintainer " +"dieses Paketes ihre Erfahrungen mit der Umstellung mit." #. Type: string #. Description @@ -195,8 +195,8 @@ "nicht bereits ein Zertifikat vorhanden ist. Für den Produktionsbetrieb muß " "das X.509-Zertifikat von einer anerkannten Zertifizierungsstelle signiert " "werden, damit das Zertifikat von Mailprogrammen akzeptiert wird. Das " -"Zertifikat wird standardmäßig in /etc/courier/pop3d.pem bzw. " -"/etc/courier/imapd.pem abgelegt." +"Zertifikat wird standardmäßig in /etc/courier/pop3d.pem bzw. /etc/courier/" +"imapd.pem abgelegt." #. Type: boolean #. Description @@ -278,9 +278,10 @@ "package." msgstr "" "Bitte wählen Sie, ob Sie die Kalenderfunktion im Lokal-Modus (wählen Sie " -"»Lokal«), im Groupware-Modus (wählen Sie »Netzwerkweit«) oder überhaupt nicht " -"aktivieren möchten (wählen Sie »Deaktiviert«). Um den Groupware-Modus letztendlich " -"verwenden zu können, müssen Sie noch das Paket courier-pcp installieren." +"»Lokal«), im Groupware-Modus (wählen Sie »Netzwerkweit«) oder überhaupt " +"nicht aktivieren möchten (wählen Sie »Deaktiviert«). Um den Groupware-Modus " +"letztendlich verwenden zu können, müssen Sie noch das Paket courier-pcp " +"installieren." #. Type: select #. Description @@ -349,9 +350,9 @@ "das Kopieren aller Dateien von /usr/share/sqwebmail nach /var/www/sqwebmail " "oder /var/www unverändert zu lassen. Aus Sicherheitsgründen ist die zweite " "Möglichkeit zu bevorzugen. Wenn jedoch bereits FollowSymLinks oder " -"SymLinksIfOwnerMatch in der Apache-Konfiguration aktiviert ist, kann auch die " -"erste Option gewählt werden. Bei Auswahl von »Benutzerdefiniert« ist manuell " -"für die korrekte Konfiguration des Webservers zu sorgen." +"SymLinksIfOwnerMatch in der Apache-Konfiguration aktiviert ist, kann auch " +"die erste Option gewählt werden. Bei Auswahl von »Benutzerdefiniert« ist " +"manuell für die korrekte Konfiguration des Webservers zu sorgen." #. Type: select #. Description only in patch2: unchanged: --- courier-0.53.3.orig/courier_0.53.2-3ubuntu1.patch +++ courier-0.53.3/courier_0.53.2-3ubuntu1.patch @@ -0,0 +1,941 @@ +diff -pruN 0.53.2-3/debian/changelog 0.53.2-3ubuntu1/debian/changelog +--- 0.53.2-3/debian/changelog 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/changelog 2006-07-11 23:15:06.000000000 +0100 +@@ -1,3 +1,15 @@ ++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 ++ + courier (0.53.2-3) unstable; urgency=low + + * runtime directory /var/lib/courier/track added to courier-mta package +@@ -114,6 +126,72 @@ courier (0.50.0-0.1) experimental; urgen + + -- 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ärdeman 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ärdeman 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 +@@ -178,7 +256,7 @@ courier (0.47-5) unstable; urgency=high + report) + + -- Stefan Hornburg (Racke) Tue, 26 Jul 2005 11:07:51 +0200 +- ++ + courier (0.47-4) unstable; urgency=low + + * more logcheck fixes: +@@ -197,6 +275,63 @@ courier (0.47-4) unstable; urgency=low + + -- 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 +@@ -1154,4 +1289,3 @@ courier (0.29.1-1) unstable; urgency=low + + -- Stefan Hornburg Wed, 22 Nov 2000 02:31:47 +0100 + +- +diff -pruN 0.53.2-3/debian/control 0.53.2-3ubuntu1/debian/control +--- 0.53.2-3/debian/control 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/control 2006-07-11 23:15:06.000000000 +0100 +@@ -3,7 +3,7 @@ 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 ++Build-Depends: 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, libgamin-dev, libssl-dev, openssl (>= 0.9.6), libpq-dev, automake1.8, libtool, courier-authlib-dev + Build-Conflicts: automake1.4 + + Package: courier-base +@@ -23,7 +23,7 @@ Description: Courier Mail Server - Base + + 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 +56,7 @@ Description: Courier Mail Server - Maili + + Package: courier-mta + Architecture: any +-Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}) ++Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), lsb-base (>= 1.3.9ubuntu3) + Conflicts: courier-faxmail (<= 0.42.2-6), mail-transport-agent + Provides: mail-transport-agent + Replaces: mail-transport-agent +@@ -93,7 +93,7 @@ Description: Courier Mail Server - Web-b + + 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) + Suggests: courier-doc, gnupg, courier-pcp + Description: Courier Mail Server - Webmail server + This package contains the SqWebMail webmail server, which +@@ -101,7 +101,7 @@ Description: Courier Mail Server - Webma + + 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 +109,7 @@ Description: Courier Mail Server - PCP s + + 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}) + Provides: pop3-server + Conflicts: pop3-server + Replaces: pop3-server +@@ -121,7 +121,7 @@ Description: Courier Mail Server - POP3 + + 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) + Suggests: courier-doc, imap-client, courier-imap-ssl + Provides: imap-server + Conflicts: imap-server +@@ -134,7 +134,7 @@ Description: Courier Mail Server - IMAP + + 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 +@@ -160,7 +160,7 @@ Description: Courier Mail Server - SSL/T + + 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 +169,7 @@ Description: Courier Mail Server - ESMTP + + 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,7 +177,7 @@ Description: Courier Mail Server - POP3 + + Package: courier-imap-ssl + Architecture: any +-Depends: courier-imap (>= 1.3.7-3), courier-ssl (>= ${RELUP}), openssl ++Depends: courier-imap (>= 1.3.7-3), courier-ssl (>= ${RELUP}), openssl, lsb-base (>= 1.3-9ubuntu3) + Suggests: courier-doc + Suggests: imap-client + Priority: extra +diff -pruN 0.53.2-3/debian/courier-imap.init 0.53.2-3ubuntu1/debian/courier-imap.init +--- 0.53.2-3/debian/courier-imap.init 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-imap.init 2006-07-11 23:15:06.000000000 +0100 +@@ -7,22 +7,37 @@ bindir="${exec_prefix}/bin" + 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 + +@@ -48,7 +63,7 @@ esac + case "$1" in + start) + if [ "$START" = "yes" ]; then +- echo -n "Starting $PROGRAM:" ++ log_begin_msg "Starting $PROGRAM..." + + umask $IMAP_UMASK + ulimit -v $IMAP_ULIMITD +@@ -65,20 +80,20 @@ start) + $TCPDOPTS \ + $PORT ${libexecdir}/courier/imaplogin \ + ${bindir}/imapd $MAILDIR" +- echo " $DAEMON." ++ 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 -pruN 0.53.2-3/debian/courier-imap.pam 0.53.2-3ubuntu1/debian/courier-imap.pam +--- 0.53.2-3/debian/courier-imap.pam 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-imap.pam 2006-07-11 23:15:06.000000000 +0100 +@@ -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 -pruN 0.53.2-3/debian/courier-imap-ssl.init 0.53.2-3ubuntu1/debian/courier-imap-ssl.init +--- 0.53.2-3/debian/courier-imap-ssl.init 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-imap-ssl.init 2006-07-11 23:15:06.000000000 +0100 +@@ -6,6 +6,8 @@ sysconfdir="/etc/courier" + 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}/imapd + DAEMON=imapd-ssl +@@ -13,17 +15,30 @@ PROGRAM="Courier IMAP-SSL server" + + 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}/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 + +@@ -39,7 +54,7 @@ fi + . ${sysconfdir}/imapd-ssl + + if ! [ -x $COURIERTLS ]; then +- echo "ERR: $COURIERTLS missing" ++ log_failure_msg "ERR: $COURIERTLS missing" + exit 1 + fi + +@@ -54,8 +69,9 @@ fi + + case "$1" in + start) +- echo -n "Starting $PROGRAM:" ++ log_begin_msg "Starting $PROGRAM..." + umask $IMAP_UMASK ++ + ulimit -d $IMAP_ULIMITD + /usr/bin/env - /bin/sh -c " . ${sysconfdir}/imapd ; \ + . ${sysconfdir}/imapd-ssl ; \ +@@ -72,19 +88,19 @@ start) + $SSLPORT $COURIERTLS -server -tcpd \ + ${libexecdir}/courier/imaplogin \ + ${bindir}/imapd $MAILDIR" +- echo " $DAEMON." ++ 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 -pruN 0.53.2-3/debian/courier-ldap.init 0.53.2-3ubuntu1/debian/courier-ldap.init +--- 0.53.2-3/debian/courier-ldap.init 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-ldap.init 2006-07-11 23:15:06.000000000 +0100 +@@ -30,26 +30,28 @@ if ! [ -f $CONFFILE ]; then + 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 PCP 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 -pruN 0.53.2-3/debian/courier-mta.init 0.53.2-3ubuntu1/debian/courier-mta.init +--- 0.53.2-3/debian/courier-mta.init 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-mta.init 2006-07-11 23:15:06.000000000 +0100 +@@ -5,12 +5,20 @@ 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 +36,84 @@ if [ "$START_MTA" = "no" ] && [ $START_M + 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 -pruN 0.53.2-3/debian/courier-mta.pam 0.53.2-3ubuntu1/debian/courier-mta.pam +--- 0.53.2-3/debian/courier-mta.pam 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-mta.pam 2006-07-11 23:15:06.000000000 +0100 +@@ -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 -pruN 0.53.2-3/debian/courier-mta-ssl.init 0.53.2-3ubuntu1/debian/courier-mta-ssl.init +--- 0.53.2-3/debian/courier-mta-ssl.init 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-mta-ssl.init 2006-07-11 23:15:06.000000000 +0100 +@@ -30,23 +30,25 @@ fi + . ${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 -pruN 0.53.2-3/debian/courier-pop.init 0.53.2-3ubuntu1/debian/courier-pop.init +--- 0.53.2-3/debian/courier-pop.init 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-pop.init 2006-07-11 23:15:06.000000000 +0100 +@@ -5,6 +5,8 @@ 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 +15,27 @@ SSLCONFIG= + + 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 + +@@ -45,7 +61,7 @@ esac + 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; \ +@@ -57,20 +73,20 @@ start) + $TCPDOPTS -address=$ADDRESS $PORT \ + ${libexecdir}/courier/courierpop3login $AUTHMODULELIST \ + ${libexecdir}/courier/courierpop3d $MAILDIR" +- echo " $PROG." ++ 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 -pruN 0.53.2-3/debian/courier-pop.pam 0.53.2-3ubuntu1/debian/courier-pop.pam +--- 0.53.2-3/debian/courier-pop.pam 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-pop.pam 2006-07-11 23:15:06.000000000 +0100 +@@ -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 -pruN 0.53.2-3/debian/courier-pop-ssl.init 0.53.2-3ubuntu1/debian/courier-pop-ssl.init +--- 0.53.2-3/debian/courier-pop-ssl.init 2006-07-11 23:19:04.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/courier-pop-ssl.init 2006-07-11 23:15:06.000000000 +0100 +@@ -6,6 +6,8 @@ sysconfdir="/etc/courier" + 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 +15,30 @@ PROGRAM="Courier POP3-SSL server" + + 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 + +@@ -39,7 +54,7 @@ fi + . ${sysconfdir}/pop3d-ssl + + if ! [ -x $COURIERTLS ]; then +- echo "ERR: $COURIERTLS missing" ++ log_failure_msg "ERR: $COURIERTLS missing" + exit 1 + fi + +@@ -54,7 +69,7 @@ fi + + 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 ; \ +@@ -72,19 +87,19 @@ start) + $SSLPORT $COURIERTLS -server -tcpd \ + ${libexecdir}/courier/courierpop3login \ + ${libexecdir}/courier/courierpop3d $MAILDIR" +- echo " $DAEMON." ++ 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 -pruN 0.53.2-3/debian/sqwebmail.init 0.53.2-3ubuntu1/debian/sqwebmail.init +--- 0.53.2-3/debian/sqwebmail.init 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/sqwebmail.init 2006-07-11 23:15:06.000000000 +0100 +@@ -19,30 +19,45 @@ + + 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 -pruN 0.53.2-3/debian/sqwebmail.pam 0.53.2-3ubuntu1/debian/sqwebmail.pam +--- 0.53.2-3/debian/sqwebmail.pam 2006-07-11 23:19:05.000000000 +0100 ++++ 0.53.2-3ubuntu1/debian/sqwebmail.pam 2006-07-11 23:15:06.000000000 +0100 +@@ -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