[Pkg-ocaml-maint-commits] r3270 - in /trunk/packages/mldonkey/trunk/debian: changelog patches/00list patches/newdns.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Oct 24 21:34:53 2006
New Revision: 3270

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3270
Log:
Fix the DNS resolution problem with www.mldonkey.net.

Added:
    trunk/packages/mldonkey/trunk/debian/patches/newdns.dpatch   (with props)
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/patches/00list

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3270&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Tue Oct 24 21:34:53 2006
@@ -1,5 +1,7 @@
-mldonkey (2.8.1-2) UNRELEASED; urgency=low
-
+mldonkey (2.8.1-2) unstable; urgency=low
+
+  * Added newdns.dpatch to fix the DNS resolution problem with
+    www.mldonkey.net, closes: #395068.
   * Creating mldonkey group as system group, closes: #389455.
   * Flushing after password prompt in mldonkey_command, closes: #391729.
   * Patched mldonkey_server to be able to run mldonkey even when HOME is not
@@ -9,7 +11,7 @@
   * Fixed a typo in mldonkey_server (thanks Géraud Meyer), closes: #392617.
   * Change address of Sylvain Le Gall to gildor at debian.org.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 12 Oct 2006 21:10:55 +0000
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Oct 2006 21:29:32 +0000
 
 mldonkey (2.8.1-1) unstable; urgency=low
 

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list?rev=3270&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list Tue Oct 24 21:34:53 2006
@@ -1,1 +1,2 @@
 01_see
+newdns

Added: trunk/packages/mldonkey/trunk/debian/patches/newdns.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/newdns.dpatch?rev=3270&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/newdns.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/newdns.dpatch Tue Oct 24 21:34:53 2006
@@ -1,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## newdns.dpatch by spiralvoice <spiralvoice at hotmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix DNS test, test other domains besides www.mldonkey.net.
+
+ at DPATCH@
+diff -urNad mldonkey-2.8.1~/src/daemon/driver/driverMain.ml mldonkey-2.8.1/src/daemon/driver/driverMain.ml
+--- mldonkey-2.8.1~/src/daemon/driver/driverMain.ml	2006-09-05 14:15:19.000000000 +0000
++++ mldonkey-2.8.1/src/daemon/driver/driverMain.ml	2006-10-24 21:28:21.000000000 +0000
+@@ -341,15 +341,18 @@
+       CommonGlobals.exit_properly 71
+     end;
+ 
+-  (
+-    let hostname = "www.mldonkey.net" in
++  (ignore (List.exists (fun hostname ->
+     try
+       ignore(Ip.from_name hostname);
+-      DriverInteractive.dns_works := true
++      DriverInteractive.dns_works := true;
++      true
+     with e ->
+-        lprintf (_b "\nDNS resolution does not work! Looking up %s failed with %s.")
+-           hostname (Printexc2.to_string e);
+-	lprintf "
++      lprintf_nl (_b "DNS lookup %s failed with %s.")
++	hostname (Printexc2.to_string e);
++      false
++    ) [ "www.mldonkey.org"; "mldonkey.sf.net"; "www.mldonkey.net"; "www.google.com"]);
++
++    if not !DriverInteractive.dns_works then lprintf "
+ The core therefore is unable to get eDonkey serverlists and loading
+ .torrent files via dllink from websites is also impossible.
+ If you are using MLDonkey in a chroot environment you should

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