[Pkg-ocaml-maint-commits] r2956 - in /trunk/packages/mldonkey/trunk/debian: changelog mldonkey-server.config mldonkey-server.init patches/00list.arm patches/arm_dynamic_loop_delay.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Wed Jul 19 10:27:01 2006
New Revision: 2956

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2956
Log:
Fix #378603 and #370107.

Added:
    trunk/packages/mldonkey/trunk/debian/patches/00list.arm
    trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch   (with props)
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.init

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2956&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Wed Jul 19 10:27:01 2006
@@ -1,3 +1,12 @@
+mldonkey (2.7.7-5) UNRELEASED; urgency=low
+
+  * chown /var/run/mldonkey only if both variables MLDONKEY_USER and
+    MLDONKEY_GROUP are set, closes: #378603.
+  * Added arm_dynamic_loop_delay.dpatch on arm only to avoid a freeze of
+    mldonkey, closes: #370107.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 19 Jul 2006 10:08:09 +0000
+
 mldonkey (2.7.7-4) unstable; urgency=low
 
   * Import patch from Ubuntu (thanks Reinhard Tartler) to handle systems where

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.config?rev=2956&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.config (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.config Wed Jul 19 10:27:01 2006
@@ -10,7 +10,8 @@
 CONFIGFILE=/etc/default/mldonkey-server
 if [ -e $CONFIGFILE ]; then
   MLDONKEY_DIR=
-  MLDONKEY_GROUP=
+  MLDONKEY_GROUP=mldonkey
+  MLDONKEY_USER=mldonkey
   MLDONKEY_UMASK=0022
   MAX_ALIVE=
   LAUNCH_AT_STARTUP=

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.init?rev=2956&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Wed Jul 19 10:27:01 2006
@@ -26,16 +26,13 @@
 
 . $CONFIG
 
-if [ -z "$MLDONKEY_USER" ] || [ -z "$MLDONKEY_GROUP" ]; then
-	echo Please set both variables "MLDONKEY_USER" and "MLDONKEY_GROUP" in /etc/default/mldonkey-server
-	exit 1
-fi
-
 # /var/run is on tempfs now!
 if [ ! -d /var/run/mldonkey ]; then
-	mkdir -m 755 /var/run/mldonkey
+    mkdir -m 755 /var/run/mldonkey
 fi
-chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
+if [ -n "$MLDONKEY_USER" ] && [ -n "$MLDONKEY_GROUP" ]; then
+    chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
+fi
 
 WRAPPER_OPTIONS=""
 

Added: trunk/packages/mldonkey/trunk/debian/patches/00list.arm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list.arm?rev=2956&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list.arm (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list.arm Wed Jul 19 10:27:01 2006
@@ -1,0 +1,1 @@
+arm_dynamic_loop_delay

Added: trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch?rev=2956&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch Wed Jul 19 10:27:01 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_dynamic_loop_delay.dpatch by spiralvoice <spiralvoice at hotmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid a freeze of mldonkey on arm (cf. #370107).
+
+ at DPATCH@
+diff -urNad mldonkey-2.7.7~/src/utils/net/basicSocket.ml mldonkey-2.7.7/src/utils/net/basicSocket.ml
+--- mldonkey-2.7.7~/src/utils/net/basicSocket.ml	2006-05-17 08:52:44.000000000 +0000
++++ mldonkey-2.7.7/src/utils/net/basicSocket.ml	2006-07-19 10:13:15.000000000 +0000
+@@ -519,7 +519,7 @@
+       let time = 
+  	let new_time = update_time () in
+  	let dynamic_loop_delay =  !loop_time +. !loop_delay -. new_time in
+-        if dynamic_loop_delay > 0. then begin
++        if dynamic_loop_delay > 0.01 then begin
+  	  (try select [] dynamic_loop_delay;  with _ -> ());
+  	  update_time ()
+  	end else new_time in

Propchange: trunk/packages/mldonkey/trunk/debian/patches/arm_dynamic_loop_delay.dpatch
------------------------------------------------------------------------------
    svn:executable = *