diff -u courier-0.60.0/debian/courier-mlm.init courier-0.60.0/debian/courier-mlm.init --- courier-0.60.0/debian/courier-mlm.init +++ courier-0.60.0/debian/courier-mlm.init @@ -78,7 +78,7 @@ $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|force-reload}" exit 2 ;; esac diff -u courier-0.60.0/debian/courier-imap-ssl.init courier-0.60.0/debian/courier-imap-ssl.init --- courier-0.60.0/debian/courier-imap-ssl.init +++ courier-0.60.0/debian/courier-imap-ssl.init @@ -6,14 +6,16 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# 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 @@ -24,20 +26,37 @@ 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 +# read/set defaults +if [ -f /etc/default/courier ]; then + . /etc/default/courier +fi # ensure that maildirpath is set if [ -z "$MAILDIRPATH" ]; then MAILDIRPATH=Maildir @@ -47,7 +66,7 @@ . ${sysconfdir}/imapd-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -59,7 +78,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 @@ -78,20 +97,20 @@ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/imaplogin \ ${bindir}/imapd $MAILDIRPATH" - 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 | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-imap.init courier-0.60.0/debian/courier-imap.init --- courier-0.60.0/debian/courier-imap.init +++ courier-0.60.0/debian/courier-imap.init @@ -6,8 +6,8 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Description: courier-imap is an IMAP Mail Delivery Agent. ### END INIT INFO - prefix="/usr" exec_prefix=${prefix} sysconfdir="/etc/courier" @@ -15,25 +15,44 @@ 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 +# read/set defaults +if [ -f /etc/default/courier ]; then + . /etc/default/courier +fi # ensure that maildirpath is set if [ -z "$MAILDIRPATH" ]; then MAILDIRPATH=Maildir @@ -53,7 +72,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 @@ -70,20 +89,20 @@ $TCPDOPTS \ $PORT ${libexecdir}/courier/imaplogin \ ${bindir}/imapd $MAILDIRPATH" - 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 | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-pop-ssl.init courier-0.60.0/debian/courier-pop-ssl.init --- courier-0.60.0/debian/courier-pop-ssl.init +++ courier-0.60.0/debian/courier-pop-ssl.init @@ -6,6 +6,7 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Description: courier-pop-ssl is an POP3 Mail Delivery Agent with SSL support. ### END INIT INFO prefix="/usr" @@ -14,6 +15,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 @@ -21,20 +24,37 @@ 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 +# read/set defaults +if [ -f /etc/default/courier ]; then + . /etc/default/courier +fi # ensure that maildirpath is set if [ -z "$MAILDIRPATH" ]; then MAILDIRPATH=Maildir @@ -44,7 +64,7 @@ . ${sysconfdir}/pop3d-ssl if ! [ -x $COURIERTLS ]; then - echo "ERR: $COURIERTLS missing" + log_failure_msg "ERR: $COURIERTLS missing" exit 1 fi @@ -59,7 +79,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 ; \ @@ -77,19 +97,19 @@ $SSLPORT $COURIERTLS -server -tcpd \ ${libexecdir}/courier/courierpop3login \ ${libexecdir}/courier/courierpop3d $MAILDIRPATH" - 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 | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-mta-ssl.postinst courier-0.60.0/debian/courier-mta-ssl.postinst --- courier-0.60.0/debian/courier-mta-ssl.postinst +++ courier-0.60.0/debian/courier-mta-ssl.postinst @@ -21,6 +21,9 @@ . /usr/share/debconf/confmodule if [ "$1" = "configure" ]; then + + test -d /etc/courier || mkdir /etc/courier + if [ ! -f /etc/courier/esmtpd.pem ]; then /usr/sbin/mkesmtpdcert chown daemon /etc/courier/esmtpd.pem diff -u courier-0.60.0/debian/courier-mta.postinst courier-0.60.0/debian/courier-mta.postinst --- courier-0.60.0/debian/courier-mta.postinst +++ courier-0.60.0/debian/courier-mta.postinst @@ -24,6 +24,10 @@ . /usr/share/debconf/confmodule if [ "$1" = "configure" ]; then + + # Make sure we actually have courier's directory. + test -d /etc/courier || mkdir /etc/courier + # write default domain file db_get courier-mta/defaultdomain echo $RET > /etc/courier/defaultdomain @@ -53,7 +57,6 @@ echo $RET > /etc/courier/dsnfrom - # Update Alternatives update-alternatives --install /usr/bin/lockmail lockmail /usr/bin/lockmail.courier 5 \ --slave /usr/share/man/man1/lockmail.1.gz lockmail.1.gz /usr/share/man/man1/lockmail.courier.1.gz diff -u courier-0.60.0/debian/courier-pop.init courier-0.60.0/debian/courier-pop.init --- courier-0.60.0/debian/courier-pop.init +++ courier-0.60.0/debian/courier-pop.init @@ -6,6 +6,7 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Description: courier-pop is an POP3 Mail Delivery Agent. ### END INIT INFO prefix="/usr" @@ -13,6 +14,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" @@ -21,16 +24,34 @@ 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 +# read/set defaults +if [ -f /etc/default/courier ]; then + . /etc/default/courier +fi # ensure that maildirpath is set if [ -z "$MAILDIRPATH" ]; then MAILDIRPATH=Maildir @@ -50,7 +71,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; \ @@ -63,20 +84,20 @@ $TCPDOPTS -address=$ADDRESS $PORT \ ${libexecdir}/courier/courierpop3login $AUTHMODULELIST \ ${libexecdir}/courier/courierpop3d $MAILDIRPATH" - 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 | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 exit 1 ;; esac diff -u courier-0.60.0/debian/courier-mta.init courier-0.60.0/debian/courier-mta.init --- courier-0.60.0/debian/courier-mta.init +++ courier-0.60.0/debian/courier-mta.init @@ -1,24 +1,32 @@ #! /bin/sh -e ### BEGIN INIT INFO # Short-Description: Courier SMTP server -# Provides: courier-mta +# Provides: courier-mta mail-transport-agent # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# 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 @@ -36,82 +44,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 ;; 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|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-pop-ssl.postinst courier-0.60.0/debian/courier-pop-ssl.postinst --- courier-0.60.0/debian/courier-pop-ssl.postinst +++ courier-0.60.0/debian/courier-pop-ssl.postinst @@ -21,6 +21,9 @@ . /usr/share/debconf/confmodule if [ "$1" = "configure" ]; then + + test -d /etc/courier || mkdir /etc/courier + if [ ! -f /etc/courier/pop3d.pem ]; then /usr/sbin/mkpop3dcert fi diff -u courier-0.60.0/debian/courier-mta-ssl.init courier-0.60.0/debian/courier-mta-ssl.init --- courier-0.60.0/debian/courier-mta-ssl.init +++ courier-0.60.0/debian/courier-mta-ssl.init @@ -1,20 +1,26 @@ #! /bin/sh -e ### BEGIN INIT INFO -# Short-Description: Courier SMTP server -# Provides: courier-mta-ssl +# Provides: courier-mta mail-transport-agent # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # 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" +run_dir="/var/run/courier" TCPD=${sbindir}/couriertcpd DAEMONPROG=${sbindir}/esmtpd-ssl test -f $DAEMONPROG || exit 0 +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +fi + # check for couriertcpd if ! [ -x $TCPD ]; then exit 0 @@ -38,23 +44,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 | force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-pcp.init courier-0.60.0/debian/courier-pcp.init --- courier-0.60.0/debian/courier-pcp.init +++ courier-0.60.0/debian/courier-pcp.init @@ -6,6 +6,7 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Description: courier-pcp Personal Calendaring Protocol server ### END INIT INFO # # Copyright 2002,2004,2008 by Stefan Hornburg (Racke) diff -u courier-0.60.0/debian/control courier-0.60.0/debian/control --- courier-0.60.0/debian/control +++ courier-0.60.0/debian/control @@ -1,9 +1,10 @@ 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, automake, libtool, courier-authlib-dev (>= 0.61.0) +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Stefan Hornburg (Racke) +Standards-Version: 3.8.0 +Build-Depends: libmysqlclient15-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, libperl-dev, zlib1g-dev, libpcre3-dev, debhelper (>= 5.0.37), mime-support, libldap2-dev, procps, libsasl2-dev, expect, groff-base, gs | gs-aladdin, mgetty-fax, netpbm, libgamin-dev, libssl-dev, openssl (>= 0.9.6), libpq-dev, automake, libtool, courier-authlib-dev (>= 0.61.0), po-debconf Build-Conflicts: automake1.4 Package: courier-base @@ -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 @@ -63,7 +64,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 @@ -99,7 +100,7 @@ Package: courier-webadmin Architecture: any -Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), apache | httpd +Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), apache2 | httpd, debconf Suggests: courier-doc Description: Courier mail server - web-based administration frontend The Courier mail transfer agent (MTA) is an integrated mail/groupware @@ -115,7 +116,7 @@ Package: sqwebmail Architecture: any -Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}), ispell, iamerican | ispell-dictionary, apache2 | httpd-cgi, cron, expect, courier-maildrop (>= ${RELUP}) +Depends: ${shlibs:Depends}, postfix | mail-transport-agent, courier-base (>= ${RELUP}), ispell, iamerican | ispell-dictionary, apache2 | httpd, cron, expect, courier-maildrop (>= ${RELUP}), lsb-base (>= 1.3.9ubuntu3), debconf Suggests: courier-doc, gnupg, courier-pcp Description: Courier mail server - webmail server The Courier mail transfer agent (MTA) is an integrated mail/groupware @@ -128,7 +129,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 The Courier mail transfer agent (MTA) is an integrated mail/groupware @@ -141,7 +142,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 @@ -158,7 +159,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 @@ -176,7 +177,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 @@ -202,7 +203,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 transfer agent (MTA) is an integrated mail/groupware server based on open commodity protocols, such as ESMTP, IMAP, POP3, LDAP, @@ -216,7 +217,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 @@ -230,7 +231,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 The Courier mail transfer agent (MTA) is an integrated mail/groupware @@ -243,7 +244,7 @@ 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, imap-client Priority: extra Description: Courier mail server - IMAP over SSL diff -u courier-0.60.0/debian/changelog courier-0.60.0/debian/changelog --- courier-0.60.0/debian/changelog +++ courier-0.60.0/debian/changelog @@ -1,3 +1,39 @@ +courier (0.60.0-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - - debian/watch - Added + - debian/control: + - Bumped Standards-Version to 3.7.3 + - Changed Build-Depend libgamin-dev instead libfam-dev + - Updated Build-Depend to debhelper >= 5.0.37 + - Updated Build-Depend to libldap2-dev instead libldap-dev + - Dropped Build-Depend libmysqlclient-dev + - Added Build-Depend po-debconf + - Changed Depends to apache2 instead apache + - Changed Depends to postfix instead exim4 + - Added Depends debconf to courier-mta, sqwebmail, courier-imap, + courier-webadmin, courier-pop, courier-ssl + - Added Depends lsb-base to courier-mta, sqwebmail, courier-imap, + courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl, + courier-imap-ssl + - Added Depends openssl to courier-pop-ssl + - debian/courier-imap.init, debian/courier-imap-ssl.init, + debian/courier-ldap.init, debian/courier-mta.init, + debian/courier-mta-ssl.init, debian/courier-pcp.init, + debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init: + - Added LSB sections + - Fixed MAILDIR var to MAILDIRPATH + - debian/sqwebmail.pam: + - Added common-session + - debian/control: + - Changed maintainer to MOTU + - debian/*.init: use log_success_msg instead of echo + - If /etc/courier for some reason does not exist, some of the + postinst scripts could die horribly. Make sure that it does. + - Required-Start and Required-Stop lsb fields similar to Debian version. + + -- Nicolas Valcárcel Mon, 04 Aug 2008 09:59:32 -0400 + courier (0.60.0-1) unstable; urgency=low * New upstream release, removing IEFT license from internet draft file (Closes: #482048) @@ -9,6 +45,43 @@ -- Stefan Hornburg (Racke) Thu, 17 Jul 2008 12:01:59 +0200 +courier (0.59.0-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. (LP: #226093, #230016, #209449) Remaining + Ubuntu changes: + - debian/watch - Added + - debian/control: + - Bumped Standards-Version to 3.7.3 + - Changed Build-Depend libgamin-dev instead libfam-dev + - Updated Build-Depend to debhelper >= 5.0.37 + - Updated Build-Depend to libldap2-dev instead libldap-dev + - Dropped Build-Depend libmysqlclient-dev + - Added Build-Depend po-debconf + - Changed Depends to apache2 instead apache + - Changed Depends to postfix instead exim4 + - Added Depends debconf to courier-mta, sqwebmail, courier-imap, + courier-webadmin, courier-pop, courier-ssl + - Added Depends lsb-base to courier-mta, sqwebmail, courier-imap, + courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl, + courier-imap-ssl + - Added Depends openssl to courier-pop-ssl + - debian/courier-imap.init, debian/courier-imap-ssl.init, + debian/courier-ldap.init, debian/courier-mta.init, + debian/courier-mta-ssl.init, debian/courier-pcp.init, + debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init: + - Added LSB sections + - Fixed MAILDIR var to MAILDIRPATH + - debian/sqwebmail.pam: + - Added common-session + - debian/control: + - Changed maintainer to MOTU + - debian/*.init: use log_success_msg instead of echo + - If /etc/courier for some reason does not exist, some of the + postinst scripts could die horribly. Make sure that it does. + - Required-Start and Required-Stop lsb fields similar to Debian version. + + -- Stefan Ebner Fri, 20 Jun 2008 14:50:50 -0400 + courier (0.59.0-3) unstable; urgency=high * Applied upstream patch removing IETF license from internet draft files @@ -69,6 +142,55 @@ -- Stefan Hornburg (Racke) Thu, 3 Apr 2008 18:25:47 +0200 +courier (0.58.0.20080127-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #188746) + * Automatically merged by DaD: + - debian/watch - Added + - debian/compat - Added + - debian/control: + - Bumped Standards-Version to 3.7.3 + - Changed Build-Depend libgamin-dev instead libfam-dev + - Updated Build-Depend to debhelper >= 5.0.37 + - Updated Build-Depend to libldap2-dev instead libldap-dev + - Updated Build-Depend to apache2 instead apache + - Dropped Build-Depend libmysqlclient-dev + - Added Build-Depend po-debconf + - Changed Depends to postfix instead exim4 + - Added Depends debconf to courier-mta, sqwebmail, courier-imap, + courier-webadmin, courier-pop, courier-ssl + - Added Depends lsb-base to courier-mta, sqwebmail, courier-imap, + courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl, + courier-imap-ssl + - Added Depends openssl to courier-pop-ssl + - debian/courier-imap.templates - Added + - debian/courier-base.templates, debian/courier-webadmin.templates, + debian/sqwebmail.templates: + - Grammar and prompt cleanup + - debian/courier-imap.init, debian/courier-imap-ssl.init, + debian/courier-ldap.init, debian/courier-mta.init, + debian/courier-mta-ssl.init, debian/courier-pcp.init, + debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init: + - Added LSB sections + - Fixed MAILDIR var to MAILDIRPATH + - debian/rules: + - Dropped DH_COMPAT + - Fixed shared/index to drop warnings + - debian/sqwebmail.pam: + - Added common-session + - debian/srcmgr: + - Fixed to remove recursive + * Remaining Ubuntu manual changes: + - debian/control: + - Changed maintainer to MOTU + - debian/*.init: use log_success_msg instead of echo + - If /etc/courier for some reason does not exist, some of the + postinst scripts could die horribly. Make sure that it does. + - Required-Start and Required-Stop lsb fields similar to Debian version. + - Removed trailing whitespace everywhere. + + -- Morten Kjeldgaard Sun, 03 Feb 2008 22:04:13 +0100 + courier (0.58.0.20080127-1) unstable; urgency=low * new upstream release (development snapshot) @@ -97,6 +219,58 @@ -- Stefan Hornburg (Racke) Thu, 31 Jan 2008 20:25:05 +0100 +courier (0.58.0-1ubuntu2) hardy; urgency=low + + * No-change rebuild against libldap-2.4-2. + + -- Steve Langasek Tue, 05 Feb 2008 22:59:20 -0800 + +courier (0.58.0-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/watch - Added + - debian/compat - Added + - debian/control: + - Changed maintainer to MOTU + - Bumped Standards-Version to 3.7.3 + - Changed Build-Depend libgamin-dev instead libfam-dev + - Updated Build-Depend to debhelper >= 5.0.37 + - Updated Build-Depend to libldap2-dev instead libldap-dev + - Updated Build-Depend to apache2 instead apache + - Dropped Build-Depend libmysqlclient-dev + - Added Build-Depend po-debconf + - Changed Depends to postfix instead exim4 + - Added Depends debconf to courier-mta, sqwebmail, courier-imap, + courier-webadmin, courier-pop, courier-ssl + - Added Depends lsb-base to courier-mta, sqwebmail, courier-imap, + courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl, + courier-imap-ssl + - Added Depends openssl to courier-pop-ssl + - debian/courier-imap.templates - Added + - debian/courier-base.templates, debian/courier-webadmin.templates, + debian/sqwebmail.templates: + - Grammar and prompt cleanup + - debian/courier-imap.init, debian/courier-imap-ssl.init, + debian/courier-ldap.init, debian/courier-mta.init, + debian/courier-mta-ssl.init, debian/courier-pcp.init, + debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init: + - Added LSB sections + - Fixed MAILDIR var to MAILDIRPATH + - debian/po/cs.po, debian/po/es.po, debian/po/fr.po, + debian/po/gl.po, debian/po/ja.po, debian/po/nl.po, debian/po/pt.po, + debian/po/pt_BR.po, debian/po/ru.po, debian/po/sv.po, debian/po/tr.po, + debian/po/vi.po, debian/po/templates.pot: + - Fixed + - debian/rules: + - Dropped DH_COMPAT + - Fixed shared/index to drop warnings + - debian/sqwebmail.pam: + - Added common-session + - debian/srcmgr: + - Fixed to remove recursive + + -- Scott Kitterman Tue, 15 Jan 2008 14:58:21 -0500 + courier (0.58.0-1) unstable; urgency=low * new upstream release @@ -126,6 +300,56 @@ -- Stefan Hornburg (Racke) Wed, 5 Dec 2007 11:07:13 +0100 +courier (0.57.0-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + * debian/watch: + Added + * debian/compat: + Added + * debian/control: + Added Original-Maitainer + Fixed Maintainer to MOTU + Fixed Standards-Version to 3.7.2 + Fixed Build-Depend libgamin-dev instead libfam-dev + Updated Build-Depend to debhelper >= 5.0.37 + Updated Build-Depend to libldap2-dev instead libldap-dev + Updated Build-Depend to apache2 instead apache + Dropped Build-Depend libmysqlclient-dev + Added Build-Depend po-debconf + Fixed Depends to postfix instead exim4 + Added Depends debconf to courier-mta, sqwebmail, courier-imap, + courier-webadmin, courier-pop, courier-ssl + Added Depends lsb-base to courier-mta, sqwebmail, courier-imap, + courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl, courier-imap-ssl + Added Depends openssl to courier-pop-ssl + * debian/courier-imap.templates: + - Added + * debian/courier-base.templates, debian/courier-webadmin.templates, + debian/sqwebmail.templates: + - Grammar and prompt cleanup + * debian/courier-imap.init, debian/courier-imap-ssl.init, + debian/courier-ldap.init, debian/courier-mta.init, + debian/courier-mta-ssl.init, debian/courier-pcp.init, + debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init: + - Added LSB sections + - Fixed MAILDIR var to MAILDIRPATH + * debian/po/cs.po, debian/po/cs.po, debian/po/es.po, debian/po/fr.po, + debian/po/gl.po, debian/po/ja.po, debian/po/nl.po, debian/po/pt.po, + debian/po/pt_BR.po, debian/po/ru.po, debian/po/sv.po, debian/po/tr.po, + debian/po/vi.po, debian/po/templates.pot: + - Fixed + * debian/rules: + - Dropped DH_COMPAT + - Fixed shared/index to drop warnings + - Fixed clean rule to check Makefile + * debian/sqwebmail.pam: + - Added common-session + * debian/srcmgr: + - Fixed to remove recursive + + -- Fernando Ribeiro Tue, 23 Oct 2007 23:05:18 -0300 + courier (0.57.0-1) unstable; urgency=low * new upstream release, now under GPL version 3 @@ -140,6 +364,32 @@ -- Stefan Hornburg (Racke) Sun, 30 Sep 2007 22:20:55 +0200 +courier (0.56.0-2ubuntu2) gutsy; urgency=low + + * Add SSLv23_method() to tcpd/libcouriertls.c to support combined SSL v2/v3 + (LP: #150067) - Change backported from Courier 0.57 + + -- Scott Kitterman Sun, 07 Oct 2007 00:23:12 -0400 + +courier (0.56.0-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - change MAILDIR to MAILDIRPATH in imap, imap/ssl, pop, and pop/ssl inits + - build-depend on libmysqlclient15-dev only + - build-depend on libgamin-dev instead of libfam-dev + - depend on postfix in preference to exim4 + - create /var/run/courier and change ownership where necessary + - 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 + - Add debian/compat and set to 5 + + -- Scott Kitterman Mon, 17 Sep 2007 12:39:26 -0400 + courier (0.56.0-2) unstable; urgency=low * updated NEWS.Debian entry (Closes: #442061, thanks to Steve Greenland @@ -181,13 +431,57 @@ -- Stefan Hornburg (Racke) Tue, 11 Sep 2007 20:23:06 -0400 +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 (Closes: #416732, thanks to Michael Ablassmeier ) -- 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 @@ -197,6 +491,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, @@ -204,6 +518,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, @@ -213,6 +548,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 @@ -360,6 +710,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 @@ -424,7 +840,7 @@ report) -- Stefan Hornburg (Racke) Tue, 26 Jul 2005 11:07:51 +0200 - + courier (0.47-4) unstable; urgency=low * more logcheck fixes: @@ -443,6 +859,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.60.0/debian/courier-ldap.init courier-0.60.0/debian/courier-ldap.init --- courier-0.60.0/debian/courier-ldap.init +++ courier-0.60.0/debian/courier-ldap.init @@ -6,6 +6,7 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Description: courier-ldap is the Courier LDAP alias daemon. ### END INIT INFO # # Copyright 2002,2006,2008 by Stefan Hornburg (Racke) @@ -27,6 +28,7 @@ CONFFILE=/etc/courier/ldapaliasrc DAEMON=/usr/sbin/courierldapaliasd +run_dir="/var/run/courier" # stop if the courier-ldap package has been removed if ! [ -x $DAEMON ]; then @@ -38,26 +40,33 @@ exit 0 fi +if [ ! -d ${run_dir} ]; then + mkdir -p ${run_dir} + chown daemon:daemon ${run_dir} +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 | force-reload) - echo -n "Restarting Courier LDAP alias daemon: " - $DAEMON restart - echo "done." +restart | reload | force-reload) + log_begin_msg "Restarting Courier LDAP alias daemon..." + $DAEMON restart || log_end_msg 1 + log_end_msg 0 ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff -u courier-0.60.0/debian/courier-imap-ssl.postinst courier-0.60.0/debian/courier-imap-ssl.postinst --- courier-0.60.0/debian/courier-imap-ssl.postinst +++ courier-0.60.0/debian/courier-imap-ssl.postinst @@ -21,6 +21,9 @@ . /usr/share/debconf/confmodule if [ "$1" = "configure" ]; then + + test -d /etc/courier || mkdir /etc/courier + if [ ! -f /etc/courier/imapd.pem ]; then /usr/sbin/mkimapdcert fi diff -u courier-0.60.0/debian/po/cs.po courier-0.60.0/debian/po/cs.po --- courier-0.60.0/debian/po/cs.po +++ courier-0.60.0/debian/po/cs.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: courier 0.53.2-3\n" "Report-Msgid-Bugs-To: courier@packages.debian.org\n" -"POT-Creation-Date: 2008-07-17 11:20+0000\n" +"POT-Creation-Date: 2008-06-04 11:59+0000\n" "PO-Revision-Date: 2006-10-06 21:01+0200\n" "Last-Translator: Martin Sin \n" "Language-Team: Czech \n" diff -u courier-0.60.0/debian/po/pt_BR.po courier-0.60.0/debian/po/pt_BR.po --- courier-0.60.0/debian/po/pt_BR.po +++ courier-0.60.0/debian/po/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: courier\n" "Report-Msgid-Bugs-To: courier@packages.debian.org\n" -"POT-Creation-Date: 2008-07-17 11:20+0000\n" +"POT-Creation-Date: 2008-06-04 11:59+0000\n" "PO-Revision-Date: 2007-04-21 17:33-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" diff -u courier-0.60.0/debian/po/sv.po courier-0.60.0/debian/po/sv.po --- courier-0.60.0/debian/po/sv.po +++ courier-0.60.0/debian/po/sv.po @@ -22,23 +22,23 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +# | msgid "Create directories for web-based administration ?" #. Type: boolean #. Description #: ../courier-base.templates:2001 #, fuzzy -#| msgid "Create directories for web-based administration ?" msgid "Create directories for web-based administration?" msgstr "Skapa mappar för webbaserad administration?" +# | msgid "" +# | "Courier uses several configuration files which are located in /etc/" +# | "courier. Some configuration files can be replaced by a subdirectory where " +# | "all files insides this directory are concatenated and considered to be a " +# | "single, consolidated, configuration file." #. Type: boolean #. Description #: ../courier-base.templates:2001 #, fuzzy -#| msgid "" -#| "Courier uses several configuration files which are located in /etc/" -#| "courier. Some configuration files can be replaced by a subdirectory where " -#| "all files insides this directory are concatenated and considered to be a " -#| "single, consolidated, configuration file." msgid "" "Courier uses several configuration files in /etc/courier. Some of these " "files can be replaced by a subdirectory whose contents are concatenated and " @@ -63,23 +63,23 @@ "administrationsverktyget att skapas om det inte redan finns en fil på samma " "plats." +# | msgid "Path to user's Maildir directory" #. Type: string #. Description #: ../courier-base.templates:3001 #, fuzzy -#| msgid "Path to user's Maildir directory" msgid "Path to Maildir directory:" msgstr "Sökväg till användarnas Maildir-mapp" +# | msgid "" +# | "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 unfamiliar " +# | "with the mail storage format used by Courier." #. Type: string #. Description #: ../courier-base.templates:3001 #, fuzzy -#| msgid "" -#| "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 unfamiliar " -#| "with the mail storage format used by Courier." msgid "" "Please give the relative path name from each user's home directory to the " "Maildir directory where the Courier servers store and access the user's " @@ -106,22 +106,22 @@ "default/courier is therefore obsolete and will be not recognized." msgstr "" +# | msgid "Default domain" #. Type: string #. Description #: ../courier-mta.templates:2001 #, fuzzy -#| msgid "Default domain" msgid "Default domain:" msgstr "Standarddomän" +# | msgid "" +# | "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." #. Type: string #. Description #: ../courier-mta.templates:2001 #, fuzzy -#| msgid "" -#| "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." msgid "" "Please specify a valid email domain. Most header rewriting functions will " "append this domain to all email addresses which do not specify a domain, " @@ -132,21 +132,21 @@ "inte har en domän specificerad, till exempel e-post från konton på denna " "maskin." +# | msgid "\"From\" Header for Delivery Notifications" #. Type: string #. Description #: ../courier-mta.templates:3001 #, fuzzy -#| msgid "\"From\" Header for Delivery Notifications" msgid "\"From\" header for delivery notifications:" msgstr "\"From\"-huvud för leveransbesked" +# | msgid "" +# | "Please specify a valid value for the \"From\" Header for mail delivery " +# | "notifications. Otherwise these cannot be send." #. Type: string #. Description #: ../courier-mta.templates:3001 #, fuzzy -#| msgid "" -#| "Please specify a valid value for the \"From\" Header for mail delivery " -#| "notifications. Otherwise these cannot be send." msgid "" "Please specify a valid value for the \"From\" header for mail delivery " "notifications. These notifications cannot be sent without that setting." @@ -160,18 +160,18 @@ msgid "SSL certificate required" msgstr "SSL-certfikat krävs" +# | msgid "" +# | "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " +# | "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " +# | "X.509 certificate will be generated if necessary. For production use the " +# | "X.509 certificate must be signed by a recognized certificate authority, " +# | "in order for mail clients to accept the certificate. The default " +# | "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" +# | "courier/imapd.pem." #. Type: note #. Description #: ../courier-ssl.templates:2001 #, fuzzy -#| msgid "" -#| "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " -#| "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " -#| "X.509 certificate will be generated if necessary. For production use the " -#| "X.509 certificate must be signed by a recognized certificate authority, " -#| "in order for mail clients to accept the certificate. The default " -#| "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" -#| "courier/imapd.pem." msgid "" "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " "the installation of courier-pop-ssl or courier-imap-ssl, a self-signed X.509 " @@ -185,18 +185,18 @@ "Standardplatsen för detta certifikat är /etc/courier/pop3d.pem respektive /" "etc/courier/imapd.pem." +# | msgid "" +# | "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " +# | "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " +# | "X.509 certificate will be generated if necessary. For production use the " +# | "X.509 certificate must be signed by a recognized certificate authority, " +# | "in order for mail clients to accept the certificate. The default " +# | "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" +# | "courier/imapd.pem." #. Type: note #. Description #: ../courier-ssl.templates:2001 #, fuzzy -#| msgid "" -#| "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " -#| "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " -#| "X.509 certificate will be generated if necessary. For production use the " -#| "X.509 certificate must be signed by a recognized certificate authority, " -#| "in order for mail clients to accept the certificate. The default " -#| "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" -#| "courier/imapd.pem." msgid "" "For production use, the X.509 certificate must be signed by a recognized " "certificate authority, in order for mail clients to accept the certificate. " @@ -211,22 +211,22 @@ "Standardplatsen för detta certifikat är /etc/courier/pop3d.pem respektive /" "etc/courier/imapd.pem." +# | msgid "Activate CGI Program ?" #. Type: boolean #. Description #: ../courier-webadmin.templates:2001 #, fuzzy -#| msgid "Activate CGI Program ?" msgid "Activate CGI program?" msgstr "Aktivera CGI-programmet ?" +# | msgid "" +# | "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 /usr/lib/cgi-" +# | "bin/courierwebadmin and set the SUID bit." #. Type: boolean #. Description #: ../courier-webadmin.templates:2001 #, fuzzy -#| msgid "" -#| "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 /usr/lib/cgi-" -#| "bin/courierwebadmin and set the SUID bit." msgid "" "To allow courier-webadmin to work out of the box, the CGI program /usr/lib/" "courier/courier/webmail/webadmin needs to be installed as /usr/lib/cgi-bin/" @@ -236,15 +236,15 @@ "programmet från /usr/lib/courier/courier/webmail/webadmin till /usr/lib/cgi-" "bin/courierwebadmin och sätta SUID-biten." +# | msgid "" +# | "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." #. Type: boolean #. Description #: ../courier-webadmin.templates:2001 #, fuzzy -#| msgid "" -#| "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." msgid "" "This may have serious security implications, because courierwebadmin runs as " "root. Moreover, that solution is not guaranteed to work, depending on the " @@ -255,14 +255,14 @@ "courierwebadmin kör som root. För det andra är det inte garanterat att " "fungera beroende på din webserverprogramvara och dess konfiguration." +# | msgid "" +# | "If you agree here and your web server setup is compliant with the Debian " +# | "policy, you can access the administration frontend through http://" +# | "localhost/cgi-bin/courierwebadmin." #. Type: boolean #. Description #: ../courier-webadmin.templates:2001 #, fuzzy -#| msgid "" -#| "If you agree here and your web server setup is compliant with the Debian " -#| "policy, you can access the administration frontend through http://" -#| "localhost/cgi-bin/courierwebadmin." msgid "" "If you choose this option and the web server setup is policy-compliant, you " "can access the administration frontend through http://localhost/cgi-bin/" @@ -272,11 +272,11 @@ "kan du få tillgång till administrationsgränssnittet genom att gå till http://" "localhost/cgi-bin/courierwebadmin." +# | msgid "Password for the Courier Administration" #. Type: password #. Description #: ../courier-webadmin.templates:3001 #, fuzzy -#| msgid "Password for the Courier Administration" msgid "Password for Courier administration:" msgstr "Lösenord för administration av Courier" @@ -306,23 +306,23 @@ msgid "disabled" msgstr "" +# | msgid "Enable Calendaring ?" #. Type: select #. Description #: ../sqwebmail.templates:2002 #, fuzzy -#| msgid "Enable Calendaring ?" msgid "Calendaring mode:" msgstr "Aktivera kalender?" +# | msgid "" +# | "Please specify if you would like to enable calendaring 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 " +# | "courier-pcp package." #. Type: select #. Description #: ../sqwebmail.templates:2002 #, fuzzy -#| msgid "" -#| "Please specify if you would like to enable calendaring 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 " -#| "courier-pcp package." msgid "" "Please specify if you would like to enable calendaring in 'local' mode, " "enable groupware or 'net' mode or disable it. The courier-pcp package is " @@ -332,15 +332,15 @@ "groupwareläget (välj nätverk) eller inte alls (välj avstängd). För att " "faktiskt använda groupwareläget behöver du installera paketet courier-pcp." +# | msgid "" +# | "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 process will be run." #. Type: select #. Description #: ../sqwebmail.templates:2002 #, fuzzy -#| msgid "" -#| "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 process will be run." msgid "" "Local mode adds very little overhead over a disabled calendaring mode. On " "the other hand, groupware mode is less resources-friendly and requires a " @@ -357,11 +357,11 @@ "For more information, please refer to /usr/share/doc/sqwebmail/PCP.html." msgstr "För mer information, se /usr/share/doc/sqwebmail/PCP.html." +# | msgid "Ispell Dictionary" #. Type: select #. Description #: ../sqwebmail.templates:3001 #, fuzzy -#| msgid "Ispell Dictionary" msgid "Ispell dictionary:" msgstr "Ispell uppslagsverk" @@ -406,13 +406,13 @@ "manual actions to configure the web server." msgstr "" +# | msgid "" +# | "Please note that /var/www/sqwebmail will be removed if this package is " +# | "purged except you choose custom." #. Type: select #. Description #: ../sqwebmail.templates:4002 #, fuzzy -#| msgid "" -#| "Please note that /var/www/sqwebmail will be removed if this package is " -#| "purged except you choose custom." msgid "" "Please note that /var/www/sqwebmail will be removed if this package is " "purged unless the 'custom' option is chosen." diff -u courier-0.60.0/debian/po/es.po courier-0.60.0/debian/po/es.po --- courier-0.60.0/debian/po/es.po +++ courier-0.60.0/debian/po/es.po @@ -115,18 +115,18 @@ msgid "SSL certificate required" msgstr "Se necesita un certificado SSL" +# | msgid "" +# | "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " +# | "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " +# | "X.509 certificate will be generated if necessary. For production use the " +# | "X.509 certificate must be signed by a recognized certificate authority, " +# | "in order for mail clients to accept the certificate. The default " +# | "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" +# | "courier/imapd.pem." #. Type: note #. Description #: ../courier-ssl.templates:2001 #, fuzzy -#| msgid "" -#| "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " -#| "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " -#| "X.509 certificate will be generated if necessary. For production use the " -#| "X.509 certificate must be signed by a recognized certificate authority, " -#| "in order for mail clients to accept the certificate. The default " -#| "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" -#| "courier/imapd.pem." msgid "" "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " "the installation of courier-pop-ssl or courier-imap-ssl, a self-signed X.509 " @@ -140,18 +140,18 @@ "Las ubicaciones predeterminadas para este certificado son /etc/courier/pop3d." "pem y /etc/courier/imapd.pem respectivamente." +# | msgid "" +# | "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " +# | "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " +# | "X.509 certificate will be generated if necessary. For production use the " +# | "X.509 certificate must be signed by a recognized certificate authority, " +# | "in order for mail clients to accept the certificate. The default " +# | "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" +# | "courier/imapd.pem." #. Type: note #. Description #: ../courier-ssl.templates:2001 #, fuzzy -#| msgid "" -#| "POP and IMAP over SSL requires a valid, signed, X.509 certificate. During " -#| "the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed " -#| "X.509 certificate will be generated if necessary. For production use the " -#| "X.509 certificate must be signed by a recognized certificate authority, " -#| "in order for mail clients to accept the certificate. The default " -#| "locations for this certificate is /etc/courier/pop3d.pem resp. /etc/" -#| "courier/imapd.pem." msgid "" "For production use, the X.509 certificate must be signed by a recognized " "certificate authority, in order for mail clients to accept the certificate. " @@ -262,11 +262,11 @@ "For more information, please refer to /usr/share/doc/sqwebmail/PCP.html." msgstr "" +# | msgid "Ispell Dictionary" #. Type: select #. Description #: ../sqwebmail.templates:3001 #, fuzzy -#| msgid "Ispell Dictionary" msgid "Ispell dictionary:" msgstr "Diccionario ispell" @@ -311,13 +311,13 @@ "manual actions to configure the web server." msgstr "" +# | msgid "" +# | "Please note that /var/www/sqwebmail will be removed if this package is " +# | "purged except you choose custom." #. Type: select #. Description #: ../sqwebmail.templates:4002 #, fuzzy -#| msgid "" -#| "Please note that /var/www/sqwebmail will be removed if this package is " -#| "purged except you choose custom." msgid "" "Please note that /var/www/sqwebmail will be removed if this package is " "purged unless the 'custom' option is chosen." only in patch2: unchanged: --- courier-0.60.0.orig/debian/watch +++ courier-0.60.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://sf.net/courier/courier-([\d\.]+)\.tar\.bz2 debian uupdate