Update to 2.8.3:

2007/02/11: version 2.8.3 = tag release-2-8-3
5734: Update camlzip to version 1.03 (thx to orbit for reporting)
5735: BT: Fix make_torrents to sort dictionary entries alphabetically
      Bittornado did not read MLDonkey-made torrents (amadeo)
5737: MinGW: Work-around missing Unix.fstat
- fixes failed removal of torrent files from torrents/[incoming|downloads]

2007/02/06
5719: Unix2: Fix copying files > 1GB (1073741823 bytes),
      bug was introduced by patch 5589 after release of 2.8.2

2007/02/04
5724: http_client: Retry GET request if HEAD request returns http error 400
5723: HTML: print tracker errors in html table at 'vd <num>' (Schlumpf)
5722: HTML: use Printf2.html_mods_cntr () for table row classes (Schlumpf)
5720: Swarmer: block choice algorithm 2 from patch 5141 is new default
- remove swarming_block_selection_algorithm = 1
  because it finishes chunks too slowly
- remove swarming_block_selection_algorithm = 3 from TripleM
  because it uses too much CPU power.
- remove option swarming_block_selection_algorithm, hard-coded default is now 2
- remove option block_switching, hard-coded default is now true

2007/01/30
5717: Optimize function print_command_result

2007/01/28
5715: Improve porttest (Schlumpf)
- use 'porttest' command to start the network porttest the first time,
  after this to see the results
- new command 'force_porttest' to force an new porttest
- improve html porttest output and make it also available in telnet
5716: EDK: Do not send share list to servers with state Connecting
5713: HTML: show messages link in vd clickable (Schlumpf)

2007/01/25
5712: Multiuser: New verbosity "com" to log commands by non-admin users
5711: Multiuser: Block commands preferred, bs, bp, port for non-admin users
5642: Swarmer: swarming_block_selection_algorithm = 3 (TripleM)
- this new algorithm select always the rarest choice, if average availability
  is below 5, or one choice_availability is below average availability
- added a hashtable to store blockmaps of uploaders for a given swarmer
- long term memory usage has to be observed
5710: Swarmer: Fix chunk propagation (pango)

2007/01/21
5693: "voo changed" prints changed options only, useful for support (Schlumpf)
5698: EDK: fix display of porttest result images (Schlumpf)
5699: Multiuser: Fix wrong file path (user_commit_dir) in notification mail
5695: Command "set": better error text if option does not exist
5694: Fix small typo in buildinfo

2007/01/17
5673: New core start parameter: -useradd "user pass", needed for Debian package
5678: New options for command force_web_infos: kind/URL (thx to Schlumpf)

2007/01/15
5691: EDK: Recognize compatibleclient 60: IMPmule (imp-project.net)
5689: EDK: Log downloading file name when client disconnects
5684: GUI: Fix build of mlprogress (Alt linux)
5677: Options: New concept of option types, fix non-admin Sancho http preview

2007/01/11
5665: EDK: Support compressed upload, implement file read cache (TripleM)
new options:
- ED2K_upload_compression to enable compressed upload, default true
- ED2K_upload_compression_threshold, default 2000 bytes
  Size difference in bytes between one zone (180 kBytes) and its compressed
  counterpart, which has to occure, to send compressed parts instead of plain.
- ED2K_upload_compression_level, Zlib compression level, default 9
- ED2K_upload_compression_table_size, default 20
5669: HTML: Add HTML headers to prohibit browser-side caching (Schlumpf)
5671: Configure: Fix question whether to compile lablgtk, same as patch 5401
5675: Updated Mozilla protocol handler to version 1.10

2007/01/08
5666: New option upload_complete_chunks (TripleM)
- default false, if true, each client is allowed to complete only one chunk,
  independent, if it is empty or partial. this setting overrides
  upload_full_chunks and dynamic_upload_lifetime, but is, as a failsafe,
  limited by upload_lifetime (should be set reasonable high)
5664: EDK: Avoid uploading data more than due
      to eMules rotating block requests (pango)
5596: EDK: New option upload_full_chunks (thx to TripleM)
- If the new option upload_full_chunks is set to true, each client is
  allowed to receive one chunk, this setting overrides upload_lifetime.
  Well, not exactly one chunk. eMule has this code in opcode.h:
    #define SESSIONMAXTRANS (PARTSIZE+20*1024) //
    "Try to send complete chunks" always sends this amount of data
  MLdonkey now does the same, if upload_full_chunks is true and client A got
  9728000+20*1024 bytes during the current session its upload slot will be
  revoked unless pending slots are empty.
5619: EDK: Print network specific infos in command "vc <num>",
      remove unneeded fields from client structures
5627: commonHasher: fix wrong arg types from several functions (Schlumpf)
5626: MinGW: fix missing declarations and wrong pointer
      initialization in stubs_c.c (Schlumpf)

2007/01/06
5599: EDK: Support for files >4GB (TripleM, pango)
- this patch does not include >4GB support for Kademlia
5660: Swarming: Enable wrongly disabled select block memoization (pango)
5659: GD: Fix wrong months display (skeeve)

2006/12/08
5617: New option share_scan_interval
- how often (in minutes) should MLDonkey scan all shared directories
  for new/removed files, default one minute
- on slow machines raise the interval to a higher value to reduce CPU load
- to force a re-scan of shared directories use command "reshare"

2006/12/06
5613: Another longhelp cleanup (anhi)
5615: EDK: Parse more fields from server.met files

2006/12/04
5612: EDK: OP_HELLO tag 0x75, print os_info in logfile

2006/12/03
5602: HTML: Display share status in upstats
5609: New field type Field_KNOWN, EDK: recognize more HELLO/EmuleInfo tags
5610: CommonSources: Cleanups and reformatting the code (pango)

2006/12/02
5608: Multiuser, chgrp: Prevent change of file_group to None
      if the user is not file_owner
5607: Multiuser, chown: Change file_group to user_default_group
      if the new user is not member of file_group
5606: Introduce display of session transfer values
- new columns for session up-/download
- send session values to GUIs

2006/12/01
5605: HTML: Fix search list display when html_checkbox_search_file_list = true

2006/11/29
5598: Remove use of deprecated sort module, remove unused sort2.ml* (pango)
5589: New option create_file_mode,
      rename create_dir_mask to create_dir_mode (pango)
5595: EDK: Fully parse emule_miscoptions1/2
5594: EDK: If update_server_list_client true, add yet unknown server
      of lowid clients

6 files changed, 8 insertions, 147 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 71f1283dd04..b317f3a69f2 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.43 2007/01/13 18:41:32 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/02/16 06:42:33 wiz Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		1
 
 RCD_SCRIPTS=		mldonkey
 
 BUILD_DEFS+=		MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
+BUILD_DEFS+=		VARBASE
 
 OWN_DIRS_PERMS=		${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
 OWN_DIRS_PERMS+=	${VARBASE}/log/mldonkey \
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 79303df5850..df3e563a0b0 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.22 2006/12/05 11:05:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2007/02/16 06:42:33 wiz Exp $
 #
 
-DISTNAME=	mldonkey-2.8.2
+DISTNAME=	mldonkey-2.8.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 105a890eba2..344a510bb88 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.34 2007/01/13 18:41:32 wiz Exp $
+$NetBSD: distinfo,v 1.35 2007/02/16 06:42:33 wiz Exp $
 
-SHA1 (mldonkey-2.8.2.tar.bz2) = 510fad86b4c83b54a7e8836cec3a3f30d67aed8a
-RMD160 (mldonkey-2.8.2.tar.bz2) = ce95184805ac8f4c690e37c75d418b5f7e265f92
-Size (mldonkey-2.8.2.tar.bz2) = 2652074 bytes
-SHA1 (patch-aa) = 80045d742084ed024ddff515fee79a520c666c67
-SHA1 (patch-ab) = 0d0b0bd6b4c699ff0dbe69f07106b3a235223e67
-SHA1 (patch-ac) = 82b523066574f94ae238eaa7ba95e4823c41a49f
+SHA1 (mldonkey-2.8.3.tar.bz2) = 6b824a657b08a2fcc030cf2b4f81af8cb181e500
+RMD160 (mldonkey-2.8.3.tar.bz2) = 4dc9547584c2bcf4de93a2eee420528e6d7b7814
+Size (mldonkey-2.8.3.tar.bz2) = 2659818 bytes
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
deleted file mode 100644
index 323e6fcd9fe..00000000000
--- a/net/mldonkey/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2007/01/13 18:41:32 wiz Exp $
-
---- src/networks/donkey/donkeyClient.ml.orig	2006-11-26 16:36:29.000000000 +0000
-+++ src/networks/donkey/donkeyClient.ml
-@@ -442,15 +442,17 @@ let client_wants_file c md4 =
-   
- let new_chunk up begin_pos end_pos =
-   if begin_pos <> end_pos then
--    let pair = (begin_pos, end_pos) in
--    (match up.up_chunks with
--        [] ->
-+    let chunk = (begin_pos, end_pos) in
-+    (* the zone requested is already "in the pipe" *)
-+    if not (List.mem chunk up.up_flying_chunks) then
-+      match up.up_chunks with
-+      | [] ->
-           up.up_pos <- begin_pos;
-           up.up_end_chunk <- end_pos;
--          up.up_chunks <- [pair];
--      | chunks ->
--          if not (List.mem pair chunks) then
--            up.up_chunks <- chunks @ [pair])
-+          up.up_chunks <- [chunk];
-+      | up_chunks ->
-+          if not (List.mem chunk up_chunks) then
-+            up.up_chunks <- up_chunks @ [chunk]
-   
- let identify_client_brand c =
-   if c.client_brand = Brand_unknown then
-@@ -2039,13 +2041,21 @@ end else *)
-         set_rtimeout sock !!upload_timeout;
-         
-         let up, waiting = match c.client_upload with
--            Some ({ up_file = f } as up) when f == file ->  up, up.up_waiting
-+          | Some ({ up_file = f } as up) when f == file ->
-+	      (* zones are received in the order they're sent, so we
-+		 know that the oldest of the zones "in fly" must have
-+		 been received when this QueryBlockReq was sent *)
-+	      (match up.up_flying_chunks with
-+	       | [] -> () 
-+	       | _ :: q -> up.up_flying_chunks <- q);
-+	      up, up.up_waiting
-           | Some old_up ->
-               {
-                 up_file = file;
-                 up_pos = Int64.zero;
-                 up_end_chunk = Int64.zero;
-                 up_chunks = [];
-+		up_flying_chunks = [];
-                 up_waiting = old_up.up_waiting;
-               }, old_up.up_waiting
-           | _ ->
-@@ -2054,6 +2064,7 @@ end else *)
-                 up_pos = Int64.zero;
-                 up_end_chunk = Int64.zero;
-                 up_chunks = [];
-+		up_flying_chunks = [];
-                 up_waiting = false;
-               }, false
-         in
-@@ -2141,12 +2152,12 @@ make 1500 connections/10 minutes.  *)
- let init_client sock c =
-   set_handler sock WRITE_DONE (fun s ->
-       match c.client_upload with
--        None -> ()
--      | Some up ->
-+      | Some ({ up_chunks = _ :: _ } as up) ->
-           if not up.up_waiting && !CommonUploads.has_upload = 0 then begin
-               up.up_waiting <- true;
-               CommonUploads.ready_for_upload (as_client c)
-             end
-+      | _ -> ()
-   );
- (*
-   set_handler sock (BASIC_EVENT RTIMEOUT) (fun s ->
diff --git a/net/mldonkey/patches/patch-ab b/net/mldonkey/patches/patch-ab
deleted file mode 100644
index 828931b6289..00000000000
--- a/net/mldonkey/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/01/13 18:41:32 wiz Exp $
-
---- src/networks/donkey/donkeyFiles.ml.orig	2006-11-21 22:34:33.000000000 +0000
-+++ src/networks/donkey/donkeyFiles.ml
-@@ -123,7 +123,7 @@ module NewUpload = struct
- (*      lprintf "send_client_block\n"; *)
-       if per_client > 0 && CommonUploads.can_write_len sock max_msg_size then
-         match c.client_upload with
--        | Some ({ up_chunks = _ :: chunks } as up)  ->
-+        | Some ({ up_chunks = current_chunk :: chunks } as up)  ->
-             if up.up_file.file_shared = None then begin
- (* Is there a message to warn that a file is not shared anymore ? *)
-                 c.client_upload <- None;
-@@ -134,16 +134,17 @@ module NewUpload = struct
-             if max_len <= msg_block_size_int then
- (* last block from chunk *)
-               begin
-+                send_small_block c sock up.up_file up.up_pos max_len;
-                 if !verbose_upload then
-                     lprintf_nl "End of chunk (%d) %Ld %s" max_len up.up_end_chunk (file_best_name up.up_file);
--                send_small_block c sock up.up_file up.up_pos max_len;
-+		up.up_flying_chunks <- up.up_flying_chunks @ [current_chunk];
-                 up.up_chunks <- chunks;
-                 let per_client = per_client - max_len in
-                 match chunks with
--                  [] -> 
-+		| [] -> 
-                     if !verbose_upload then
--                        lprintf_nl "NO CHUNKS";
--                    c.client_upload <- None;
-+                        lprintf_nl "NO MORE CHUNKS";
-+		    up.up_waiting <- false;
-                 | (begin_pos, end_pos) :: _ ->
-                     up.up_pos <- begin_pos;
-                     up.up_end_chunk <- end_pos;
-@@ -168,10 +169,10 @@ module NewUpload = struct
-           let size = min max_msg_size size in
-           send_client_block c sock size;
-            (match c.client_upload with
--              None -> ()
--            | Some up ->
-+            | Some ({ up_chunks = _ :: _ }) ->
-                 if !CommonUploads.has_upload = 0 then
-                   CommonUploads.ready_for_upload (as_client c)
-+	    | _ -> ()
-           )
-       )
-     let _ =
diff --git a/net/mldonkey/patches/patch-ac b/net/mldonkey/patches/patch-ac
deleted file mode 100644
index a739f2f310b..00000000000
--- a/net/mldonkey/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/01/13 18:41:32 wiz Exp $
-
---- src/networks/donkey/donkeyTypes.ml.orig	2006-11-26 16:36:29.000000000 +0000
-+++ src/networks/donkey/donkeyTypes.ml
-@@ -602,6 +602,8 @@ and upload_info = {
-     mutable up_pos : int64;
-     mutable up_end_chunk : int64;
-     mutable up_chunks : (int64 * int64) list;
-+    (* zones sent but not yet received by other peer, oldest first *)
-+    mutable up_flying_chunks : (int64 * int64) list; 
-     mutable up_waiting : bool;
-   }
-