diff -Nru dovecot-1.2.12/debian/changelog dovecot-1.2.12/debian/changelog --- dovecot-1.2.12/debian/changelog 2010-07-08 09:13:47.000000000 -0400 +++ dovecot-1.2.12/debian/changelog 2010-07-08 13:21:16.000000000 -0400 @@ -1,3 +1,10 @@ +dovecot (1:1.2.12-1ubuntu3) maverick; urgency=low + + * debian/dovecot-common.dovecot.upstart, debian/rules: + Convert init script to upstart. + + -- Chuck Short Thu, 08 Jul 2010 13:19:33 -0400 + dovecot (1:1.2.12-1ubuntu2) maverick; urgency=low * debian/rules, debian/source_dovecot.py: Add apport hook. diff -Nru dovecot-1.2.12/debian/control dovecot-1.2.12/debian/control --- dovecot-1.2.12/debian/control 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/control 2010-07-08 13:33:03.000000000 -0400 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Dovecot Maintainers Uploaders: Jaldhar H. Vyas , Fabio Tranchitella , Joel Johnson , Marco Nenciarini -Build-Depends: debhelper (>= 5.0.0), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev, hardening-wrapper +Build-Depends: debhelper (>= 7.3.15ubuntu3), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev, hardening-wrapper Build-Conflicts: linux-kernel-headers (<= 2.5.999-test7-bk-17) Standards-Version: 3.8.4 Homepage: http://dovecot.org/ diff -Nru dovecot-1.2.12/debian/dovecot-common.dirs dovecot-1.2.12/debian/dovecot-common.dirs --- dovecot-1.2.12/debian/dovecot-common.dirs 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-common.dirs 2010-07-08 13:48:13.000000000 -0400 @@ -7,3 +7,4 @@ usr/share/doc/dovecot-common etc/dovecot/conf.d etc/dovecot/auth.d +etc/init diff -Nru dovecot-1.2.12/debian/dovecot-common.dovecot.upstart dovecot-1.2.12/debian/dovecot-common.dovecot.upstart --- dovecot-1.2.12/debian/dovecot-common.dovecot.upstart 1969-12-31 19:00:00.000000000 -0500 +++ dovecot-1.2.12/debian/dovecot-common.dovecot.upstart 2010-07-08 13:21:37.000000000 -0400 @@ -0,0 +1,18 @@ +# dovecot - pop3/imap mail server +# +# Dovecot is a mail server whose major goals are security and extreme reliability. + +description "dovecot - pop3/imap mail server" + +start on started rc-sysinit +stop on runlevel [!2345] + +expect fork + +pre-start script + test -x /usr/sbin/dovecot || { stop ; exit 0; } + test -r /etc/dovecot/dovecot.conf || { stop ; exit 0; } +end script + + +exec /usr/sbin/dovecot -c /etc/dovecot/dovecot.conf diff -Nru dovecot-1.2.12/debian/dovecot-imapd.postinst dovecot-1.2.12/debian/dovecot-imapd.postinst --- dovecot-1.2.12/debian/dovecot-imapd.postinst 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-imapd.postinst 2010-07-08 13:22:40.000000000 -0400 @@ -8,12 +8,4 @@ /etc/dovecot/dovecot.conf fi -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d dovecot restart - else - /etc/init.d/dovecot restart - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/dovecot-imapd.postrm dovecot-1.2.12/debian/dovecot-imapd.postrm --- dovecot-1.2.12/debian/dovecot-imapd.postrm 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-imapd.postrm 2010-07-08 13:22:51.000000000 -0400 @@ -8,13 +8,4 @@ /etc/dovecot/dovecot.conf fi -# Restart dovecot because we've updated the configuration file. -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ] ; then - invoke-rc.d dovecot start - else - /etc/init.d/dovecot start - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/dovecot-imapd.prerm dovecot-1.2.12/debian/dovecot-imapd.prerm --- dovecot-1.2.12/debian/dovecot-imapd.prerm 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-imapd.prerm 2010-07-08 13:25:01.000000000 -0400 @@ -1,12 +1,3 @@ #!/bin/sh set -e - -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ] ; then - invoke-rc.d dovecot stop - else - /etc/init.d/dovecot stop - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/dovecot-pop3d.postinst dovecot-1.2.12/debian/dovecot-pop3d.postinst --- dovecot-1.2.12/debian/dovecot-pop3d.postinst 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-pop3d.postinst 2010-07-08 13:23:12.000000000 -0400 @@ -8,12 +8,4 @@ /etc/dovecot/dovecot.conf fi -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d dovecot restart - else - /etc/init.d/dovecot restart - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/dovecot-pop3d.postrm dovecot-1.2.12/debian/dovecot-pop3d.postrm --- dovecot-1.2.12/debian/dovecot-pop3d.postrm 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-pop3d.postrm 2010-07-08 13:23:26.000000000 -0400 @@ -8,13 +8,4 @@ /etc/dovecot/dovecot.conf fi -# Restart dovecot because we've updated the configuration file. -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ] ; then - invoke-rc.d dovecot start - else - /etc/init.d/dovecot start - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/dovecot-pop3d.prerm dovecot-1.2.12/debian/dovecot-pop3d.prerm --- dovecot-1.2.12/debian/dovecot-pop3d.prerm 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/dovecot-pop3d.prerm 2010-07-08 13:24:24.000000000 -0400 @@ -1,12 +1,4 @@ #!/bin/sh set -e -if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ] ; then - invoke-rc.d dovecot stop - else - /etc/init.d/dovecot stop - fi -fi - #DEBHELPER# diff -Nru dovecot-1.2.12/debian/mail-stack-delivery.postinst dovecot-1.2.12/debian/mail-stack-delivery.postinst --- dovecot-1.2.12/debian/mail-stack-delivery.postinst 2010-06-29 09:29:09.000000000 -0400 +++ dovecot-1.2.12/debian/mail-stack-delivery.postinst 2010-07-08 13:25:43.000000000 -0400 @@ -64,13 +64,6 @@ echo "finish mail-stack-delivery installation." echo "" fi - if [ -x "/etc/init.d/dovecot" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d dovecot restart - else - service dovecot restart - fi - fi if [ -x "/etc/init.d/postfix" ]; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d postfix restart diff -Nru dovecot-1.2.12/debian/patches/debian-changes-1:1.2.12-1ubuntu1 dovecot-1.2.12/debian/patches/debian-changes-1:1.2.12-1ubuntu1 --- dovecot-1.2.12/debian/patches/debian-changes-1:1.2.12-1ubuntu1 2010-06-29 09:29:14.000000000 -0400 +++ dovecot-1.2.12/debian/patches/debian-changes-1:1.2.12-1ubuntu1 1969-12-31 19:00:00.000000000 -0500 @@ -1,62 +0,0 @@ -Description: Upstream changes introduced in version 1:1.2.12-1ubuntu1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - dovecot (1:1.2.12-1ubuntu1) maverick; urgency=low - . - * Merge from Debian Unstable, remaining changes: - + Add mail-stack-delivery as per server-maverick-mail-integration spec: - - Update debian/rules - - Convert existing package to a dummy package and add new binary in debian/control - - Update maintainer scripts. - - Move previously installed backups and config files to new package name - space in preinst - - Add new debian/mail-stack-delivery.prerm to handle downgrades - - Rename debian/dovecot-postfix.* to debian/mail-stack-delivery.* - + Use Snakeoil SSL certificates by default. - - debian/control: Depend on ssl-cert. - - debian/patches/ssl-cert-snakeoil.dpatch: Change default SSL cert paths to snakeoil. - - debian/dovecot-common.postinst: Relax grep for SSL_* a bit. - + Add autopkgtest to debian/tests/*. - + Add ufw integration: - - Created debian/dovecot-common.ufw.profile. - - debian/rules: install profile. - - debian/control: suggest ufw. - + debian/{control,rules}: enable PIE hardening. - + debian/control: Update Vcs-* headers. - + Add SMTP-AUTH support for Outlook (login auth mechanism) - + debian/dovecot-common.dirs: Added usr/share/doc/dovecot-common - + debian/patches/fix-dovecot-config-parser.patch: Fix ordering of external config - files. (LP: #597818) - . - The person named in the Author field signed this changelog entry. -Author: Chuck Short -Bug-Ubuntu: https://bugs.launchpad.net/bugs/597818 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- dovecot-1.2.12.orig/src/lib-storage/index/mbox/mbox-storage.c -+++ dovecot-1.2.12/src/lib-storage/index/mbox/mbox-storage.c -@@ -310,10 +310,6 @@ mbox_get_list_settings(struct mailbox_li - it's root dir if we've already chroot()ed, otherwise - either ~/mail or ~/Mail */ - list_set->root_dir = get_root_dir(storage); -- if (list_set->root_dir == NULL) { -- *error_r = "Autodetection failed"; -- return -1; -- } - } else { - if (debug) - i_info("mbox: data=%s", data); diff -Nru dovecot-1.2.12/debian/patches/series dovecot-1.2.12/debian/patches/series --- dovecot-1.2.12/debian/patches/series 2010-06-29 09:29:14.000000000 -0400 +++ dovecot-1.2.12/debian/patches/series 2010-07-08 13:19:09.000000000 -0400 @@ -8,4 +8,3 @@ dovecot-ssl.patch dovecot-mboxlocking.patch fix-dovecot-config-parser.patch -debian-changes-1:1.2.12-1ubuntu1 diff -Nru dovecot-1.2.12/debian/rules dovecot-1.2.12/debian/rules --- dovecot-1.2.12/debian/rules 2010-07-08 09:36:20.000000000 -0400 +++ dovecot-1.2.12/debian/rules 2010-07-08 13:49:19.000000000 -0400 @@ -91,6 +91,7 @@ install -o root -g root -m 0644 $(CURDIR)/doc/dovecot-sql-example.conf $(CURDIR)/debian/dovecot-common/usr/share/dovecot/dovecot-sql.conf install -D -m 0755 -o root -g root $(CURDIR)/debian/maildirmake.dovecot $(CURDIR)/debian/dovecot-common/usr/bin/maildirmake.dovecot install -m644 debian/dovecot-common.ufw.profile debian/dovecot-common/etc/ufw/applications.d/dovecot-common + install -m644 debian/dovecot-common.dovecot.upstart debian/dovecot-common/etc/init/dovecot.conf install -m 0755 -o root -g root $(CURDIR)/debian/expire-tool.sh $(CURDIR)/debian/dovecot-common/usr/lib/dovecot/expire-tool.sh cp $(SIEVE_DIR)/ChangeLog $(CURDIR)/debian/dovecot-common/usr/share/doc/dovecot-common/sieve.ChangeLog cp $(SIEVE_DIR)/README $(CURDIR)/debian/dovecot-common/usr/share/doc/dovecot-common/sieve.README @@ -137,7 +138,6 @@ dh_installexamples -a dh_installpam -a mv $(CURDIR)/debian/dovecot-common/etc/pam.d/dovecot-common $(CURDIR)/debian/dovecot-common/etc/pam.d/dovecot - dh_installinit -pdovecot-common --init-script=dovecot -u"start 24 2 3 4 5 . stop 76 1 ." dh_installcron -p dovecot-common --name=dovecot dh_installman -a dh_installman -p dovecot-common debian/maildirmake.dovecot.1 debian/dovecot.1 debian/dovecot.8 debian/dovecotpw.1