[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.3-2-5-gcf252f2

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8be438e9364c1b1e0087d0fd47a808ea43d8ad95
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 26 06:30:54 2010 +0200

    Recursively chown /var/{log,lib}/mldonkey (Closes: #593091).

diff --git a/debian/changelog b/debian/changelog
index 0c55bff..6aa7e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 mldonkey (3.0.3-3) unstable; urgency=low
 
   * Do not erase existing configuration on upgrades (Closes: #601332, #522900).
+  * Recursively chown /var/{log,run}/mldonkey (Closes: #593091).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Mon, 25 Oct 2010 12:42:28 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 26 Oct 2010 06:29:33 +0200
 
 mldonkey (3.0.3-2) unstable; urgency=low
 
diff --git a/debian/mldonkey-server.init b/debian/mldonkey-server.init
index 83f0c87..c5f8901 100644
--- a/debian/mldonkey-server.init
+++ b/debian/mldonkey-server.init
@@ -69,6 +69,9 @@ if [ -f "/etc/default/locale" ]; then
   export LANG
 fi
 
+if [ -n "$MLDONKEY_UMASK" ]; then
+    umask $MLDONKEY_UMASK
+fi
 # /var/run might be on tempfs, see #354701.
 if [ ! -d /var/run/mldonkey ]; then
     mkdir -m 755 /var/run/mldonkey
@@ -77,8 +80,8 @@ if [ ! -d /var/log/mldonkey ]; then
     mkdir -m 755 /var/log/mldonkey
 fi
 if [ -n "$MLDONKEY_USER" ] && [ -n "$MLDONKEY_GROUP" ]; then
-    chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
-    chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/log/mldonkey
+    chown -R $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
+    chown -R $MLDONKEY_USER:$MLDONKEY_GROUP /var/log/mldonkey
 fi
 
 WRAPPER_OPTIONS="--iosched idle"
diff --git a/debian/mldonkey-server.postinst b/debian/mldonkey-server.postinst
index 21ed66e..e35ee5f 100644
--- a/debian/mldonkey-server.postinst
+++ b/debian/mldonkey-server.postinst
@@ -124,7 +124,7 @@ EOF
         if ! dpkg-statoverride --list "$file" >/dev/null; then
             # BUG: cf dpkg-statoverride above
             if [ -e "$file" ]; then
-                chown $run_as_user:$mldonkey_group $file
+                chown -R $run_as_user:$mldonkey_group $file
                 $DEBUG && echo "done."
             else
                 $DEBUG && echo "$file doesn't exist."

-- 
mldonkey packaging