From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Wed, 28 Aug 2013 14:39:48 +0000 (+0200)
Subject: izmjene za wheezy i dovecot2
X-Git-Tag: debian/1%2.0_cn0^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=refs%2Fheads%2Fwheezy;p=dovecot-cn.git

izmjene za wheezy i dovecot2
---

diff --git a/debian/changelog b/debian/changelog
index 9ea24e0..499b01d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dovecot-cn (1:2.0~cn0) stable; urgency=medium
 
   * Prva verzija za wheezy
+  * Ispravke za Lintian
+  * Izmjene za postinst zbog Dovecot 2
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 28 Aug 2013 16:22:34 +0200
 
diff --git a/debian/postinst b/debian/postinst
index 5a13ee8..b3892be 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,75 +6,38 @@
 # Load CARNet Tools
 . /usr/share/carnet-tools/functions.sh
 
-cp_check_and_sed '^protocols' \
-                 's/protocols.*$/protocols = imap imaps pop3 pop3s/g' \
-		 /etc/dovecot/dovecot.conf || true
-
 cp_check_and_sed '#disable_plaintext_auth' \
                  's/#disable_plaintext_auth/disable_plaintext_auth/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-auth.conf || true
 
 cp_check_and_sed 'disable_plaintext_auth.*yes' \
                  's/disable_plaintext_auth.*$/disable_plaintext_auth = no/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-auth.conf || true
 
 cp_check_and_sed '#imap_client_workarounds' \
                  's/#imap_client_workarounds/imap_client_workarounds/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/20-imap.conf || true
 
 cp_check_and_sed '#pop3_client_workarounds' \
                  's/#pop3_client_workarounds/pop3_client_workarounds/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/20-pop3.conf || true
 
 cp_check_and_sed 'imap_client_workarounds' \
-                 's/imap_client_workarounds.*$/imap_client_workarounds = outlook-idle tb-extra-mailbox-sep netscape-eoh delay-newmail/g' \
-		 /etc/dovecot/dovecot.conf || true
+                 's/imap_client_workarounds.*$/imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags/g' \
+		 /etc/dovecot/conf.d/20-imap.conf || true
 
 cp_check_and_sed 'pop3_client_workarounds' \
                  's/pop3_client_workarounds.*$/pop3_client_workarounds = outlook-no-nuls oe-ns-eoh/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-cp_check_and_sed 'pop3_uidl_format' \
-                 's/pop3_uidl_format.*$/pop3_uidl_format = %v.%u/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-cp_check_and_sed '#quota = maildir' \
-                 's/#quota = maildir/quota = fs/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-# dodano zbog backward compatibility (etch->lenny)
-cp_check_and_sed '^mail_extra_groups' \
-                 's/^mail_extra_groups/mail_privileged_group/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/20-pop3.conf || true
 
 cp_check_and_sed '#ssl_cipher_list' \
                  's/#ssl_cipher_list.*/ssl_cipher_list = ALL:!aNULL:!eNULL:!ADH!LOW:!MEDIUM:!EXP:!SSLv2:HIGH/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-# ovo je potrebno postaviti u verziji 1.2
-cp_check_and_sed '#mail_location' \
-                 's|#mail_location.*|mail_location=mbox:~/mail:INBOX=/var/mail/%u|g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-ssl.conf || true
 
 # trazio zelja
 cp_check_and_sed '#ssl =' \
 		 's/^#ssl =/ssl =/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-if grep -q "^ssl_disable .*no" /etc/dovecot/dovecot.conf; then
-  cp_check_and_sed '^ssl =' \
-                   's/^ssl =.*/ssl = yes/g' \
-		   /etc/dovecot/dovecot.conf || true
-elif grep -q "^ssl_disable .*yes" /etc/dovecot/dovecot.conf; then
-  cp_check_and_sed '^ssl =' \
-                   's/^ssl =.*/ssl = no/g' \
-		   /etc/dovecot/dovecot.conf || true
-fi
-
-cp_check_and_sed '^ssl_disable' \
-                 's/^ssl_disable/#ssl_disable/g' \
-		 /etc/dovecot/dovecot.conf || true
-
+		 /etc/dovecot/conf.d/10-ssl.conf || true
 
 # restart 
 if [ -x /usr/sbin/invoke-rc.d ]; then