Fix rights of files generated by UCF. Closes: #671474.

diff --git a/debian/changelog b/debian/changelog
index f4b2add987133b3973f08e3b6c7f5b7816fcf767..91fb53ec9648f02bf455ffd77d475a6b9329af06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 roundcube (0.7.2-2) UNRELEASED; urgency=low
 
   * Rotate /var/log/roundcube/session. Closes: #671472.
+  * Fix rights of files generated by UCF. Closes: #671474.
 
  -- Vincent Bernat <bernat@debian.org>  Fri, 04 May 2012 18:58:34 +0200
 

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index f07f3d3cefee43000c2687fd9e913563ddbe4718..36457be2768b27da80f9444da29317c663452263 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -75,6 +75,7 @@ EOF
        CONFFILE=/etc/roundcube/main.inc.php
        touch $CONFFILE.ucftmp
        chmod 640 $CONFFILE.ucftmp
+       chown root:www-data $CONFFILE.ucftmp
 
        db_get roundcube/hosts || true
        hosts="$RET"
@@ -119,8 +120,9 @@ EOF
        done >> $CONFFILE.ucftmp
 
        ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
-       chown root:www-data $CONFFILE
-        rm -f $CONFFILE.ucftmp
+       chown root:www-data $CONFFILE
+       [ ! -f $CONFFILE.dpkg-dist ] || chown root:www-data $CONFFILE.dpkg-dist
+       rm -f $CONFFILE.ucftmp
        
        # Handle webserver reconfiguration/restart ; stolen from zabbix package
        db_get roundcube/reconfigure-webserver || true