-
--- 3.1.5-3.1/src/utils/bitstring/bitstring.ml.in 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/bitstring.ml.in 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: bitstring.ml.in,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*)
open Printf
-
src/networks/fasttrack/fasttrackProto.ml
-
--- 3.1.5-3.1/distrib/ChangeLog 2014-03-22 11:09:35.000000000 +0000
+++ 3.1.6-0ubuntu1/distrib/ChangeLog 2017-01-23 01:54:46.000000000 +0000
@@ -14,6 +14,9 @@ http://mldonkey.sourceforge.net/Windows#
ChangeLog
=========
+2017/01/22: ygrek
+Changes after 3.1.5 are in CHANGES file in the project root directory
+
2014/03/22: version 3.1.5 = tag release-3-1-5
8415: Revert patch #8328 to fix GTK2 gui's compilation (ygrek)
-
--- 3.1.5-3.1/src/networks/fasttrack/fst_crypt.h 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fst_crypt.h 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ *
+ * Copyright (C) 2003 giFT-FastTrack project
+ * http://developer.berlios.de/projects/gift-fasttrack
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef _CRYPT_H_
+#define _CRYPT_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*****************************************************************************/
+
+typedef struct
+{
+ int pos;
+ unsigned int wrapcount;
+ unsigned int add_to_lookup;
+ unsigned int enc_type;
+ unsigned char pad[63];
+ unsigned char lookup[256];
+ unsigned int pad16[20];
+ unsigned int seed;
+} FSTCipher;
+
+/*****************************************************************************/
+
+/* allocate and init cipher */
+FSTCipher *fst_cipher_create();
+
+/* free cipher */
+void fst_cipher_free (FSTCipher *cipher);
+
+/* initialize cipher state */
+/* returns FALSE if enc_type is not supported, TRUE otherwise */
+int fst_cipher_init (FSTCipher *cipher, unsigned int seed, unsigned int enc_type);
+
+/* encrypt / decrypt a byte of data with cipher */
+unsigned char fst_cipher_clock (FSTCipher *cipher);
+
+/* encrypt / decrypt a block of data with cipher */
+void fst_cipher_crypt (FSTCipher *cipher, unsigned char *data, int len);
+
+/*****************************************************************************/
+
+/* returns encrypted or decrypted enc_type */
+unsigned int fst_cipher_mangle_enc_type (unsigned int seed, unsigned int enc_type);
+
+/*****************************************************************************/
+
+#endif
-
--- 3.1.5-3.1/src/networks/bittorrent/bTTorrent.ml 2011-01-23 15:20:26.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTTorrent.ml 2017-01-23 01:54:46.000000000 +0000
@@ -416,7 +416,7 @@ let make_torrent announce filename comme
Unix32.flush_fd t;
let length = Unix32.getsize64 t in
let npieces = 1+ Int64.to_int ((length -- one) // chunk_size) in
- let pieces = Array.create npieces Sha1.null in
+ let pieces = Array.make npieces Sha1.null in
for i = 0 to npieces - 1 do
let begin_pos = chunk_size *.. i in
-
--- 3.1.5-3.1/src/networks/bittorrent/bTGlobals.ml 2012-07-27 17:46:38.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTGlobals.ml 2017-01-23 01:54:46.000000000 +0000
@@ -165,8 +165,8 @@ let bt_upload_counter = ref Int64.zero
let log_prefix = "[BT]"
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
+let lprintf_nl ?exn fmt =
+ lprintf_nl2 ?exn log_prefix fmt
let lprintf_n fmt =
lprintf2 log_prefix fmt
-
--- 3.1.5-3.1/.pc/0001-Use-usr-bin-see-as-default-previewer.patch/src/daemon/common/commonOptions.ml 2013-07-07 11:07:13.000000000 +0000
+++ 3.1.6-0ubuntu1/.pc/0001-Use-usr-bin-see-as-default-previewer.patch/src/daemon/common/commonOptions.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1046,7 +1046,7 @@ let web_infos = define_option current_se
web_infos = [
(\"server.met\", 0, \"http://www.gruk.org/server.met.gz\");
(\"hublist\", 0, \"http://dchublist.com/hublist.xml.bz2\");
- (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/level1.gz\");
+ (\"guarding.p2p\", 96, \"http://upd.emule-security.org/ipfilter.zip\");
(\"ocl\", 24, \"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\");
(\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\");
(\"geoip.dat\", 168, \"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz\");
@@ -1055,7 +1055,7 @@ let web_infos = define_option current_se
(list_option (tuple3_option (string_option, int_option, string_option)))
[
("guarding.p2p", 96,
- "http://www.bluetack.co.uk/config/level1.gz");
+ "http://upd.emule-security.org/ipfilter.zip");
("server.met", 0,
"http://www.gruk.org/server.met.gz");
("geoip.dat", 0,
@@ -1670,7 +1670,7 @@ let max_displayed_results = define_exper
let options_version = define_expert_option current_section ["options_version"]
~internal: true
"(internal option)"
- int_option 22
+ int_option 23
let max_comments_per_file = define_expert_option current_section ["max_comments_per_file"]
"Maximum number of comments per file"
@@ -2274,4 +2274,9 @@ let rec update_options () =
enable_overnet =:= false;
update 22
+ | 22 ->
+ web_infos_remove "http://www.bluetack.co.uk/config/level1.gz";
+ web_infos_add "guarding.p2p" 0 "http://upd.emule-security.org/ipfilter.zip";
+ update 23
+
| _ -> ()
-
--- 3.1.5-3.1/src/networks/donkey/donkeyTypes.ml 2010-10-23 18:25:14.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyTypes.ml 2017-01-23 01:54:46.000000000 +0000
@@ -26,8 +26,8 @@ open Printf2
let log_prefix = "[EDK]"
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
+let lprintf_nl ?exn fmt =
+ lprintf_nl2 ?exn log_prefix fmt
let lprintf_n fmt =
lprintf2 log_prefix fmt
-
--- 3.1.5-3.1/src/gtk2/gui/guiCom.ml 2007-11-03 22:04:51.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/guiCom.ml 2017-01-23 01:54:46.000000000 +0000
@@ -44,9 +44,9 @@ let when_disconnected (gui : gui) =
gui.clear ()
-let to_gui_protocol_used = Array.create (to_gui_last_opcode+1)
+let to_gui_protocol_used = Array.make (to_gui_last_opcode+1)
GuiProto.best_gui_version
-let from_gui_protocol_used = Array.create
+let from_gui_protocol_used = Array.make
(from_gui_last_opcode+1)
GuiProto.best_gui_version
-
src/daemon/driver/driverCommands.ml
--- 3.1.5-3.1/src/daemon/driver/driverCommands.ml 2014-03-22 11:04:27.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/driver/driverCommands.ml 2017-01-23 01:54:46.000000000 +0000
@@ -2970,20 +2970,39 @@ let _ =
(* *)
(*************************************************************************)
-let _ =
+(* TODO richer condition language *)
+let parse_filter args =
+ match args with
+ | ["where";"priority";(">"|"<"|">="|"<="|"="|"<>" as op);n] ->
+ let n = int_of_string n in
+ let op = match op with
+ | ">" -> (>)
+ | "<" -> (<)
+ | ">=" -> (>=)
+ | "<=" -> (<=)
+ | "=" -> (=)
+ | "<>" -> (<>)
+ | _ -> assert false
+ in
+ `Filter (fun file -> op (file_priority file) n)
+ | ["all"] -> `All
+ | l -> `Files (List.map int_of_string l)
+
+let filter_files args k =
+ match parse_filter args with
+ | `All -> List.iter k !!files
+ | `Filter filter -> List.iter (fun file -> if filter file then k file) !!files
+ | `Files l -> List.iter begin fun num ->
+ match try Some (file_find num) with _ -> None with
+ | None -> ()
+ | Some file -> k file
+ end l
+
+let () =
let resume_alias s = s, Arg_multiple (fun args o ->
- if args = ["all"] && user2_is_admin o.conn_user.ui_user then
- List.iter (fun file ->
- file_resume file (admin_user ())
- ) !!files
- else
- List.iter (fun num ->
- let num = int_of_string num in
- List.iter (fun file ->
- if (as_file_impl file).impl_file_num = num then
- file_resume file o.conn_user.ui_user
- ) !!files) args; ""
- ), "<num|all> :\t\t\tresume a paused download (use arg 'all' for all files)"
+ filter_files args (fun file -> file_resume file o.conn_user.ui_user);
+ ""
+ ), "<nums|all|where filter> :\t\t\tresume a paused download (use arg 'all' for all files)"
in
register_commands "Driver/Downloads"
[
@@ -2994,24 +3013,20 @@ let _ =
p :: files ->
let absolute, p = if String2.check_prefix p "=" then
true, int_of_string (String2.after p 1)
- else false, int_of_string p in
- List.iter (fun arg ->
- try
- let file = file_find (int_of_string arg) in
- let priority = if absolute then p
- else (file_priority file) + p in
- let priority = if priority < -100 then -100 else
- if priority > 100 then 100 else priority in
- set_file_priority file priority;
- Printf.bprintf buf "Setting priority of %s to %d\n"
- (file_best_name file) (file_priority file);
- with _ -> failwith (Printf.sprintf "No file number %s" arg)
- ) files;
+ else false, int_of_string p
+ in
+ filter_files files begin fun file ->
+ let priority = if absolute then p else file_priority file + p in
+ let priority = max (-100) (min 100 priority) in
+ set_file_priority file priority;
+ Printf.bprintf buf "Setting priority of %s to %d\n"
+ (file_best_name file) (file_priority file)
+ end;
force_download_quotas ();
_s "done"
| [] -> "Bad number of args"
- ), "<priority> <files numbers> :\tchange file priorities";
+ ), "<priority> <nums|all|where filter> :\tchange file priorities";
"download_order", Arg_two (fun num v o ->
try
@@ -3141,23 +3156,9 @@ let _ =
), "<num|all> :\t\t\tverify chunks of file <num> (use 'all' for all files)";
"pause", Arg_multiple (fun args o ->
- let filter =
- match args with (* TODO richer condition language *)
- | ["where";"priority";(">"|"<" as op);n] ->
- let n = int_of_string n in
- let op = if op = ">" then (>) else (<) in
- (fun file -> op (file_priority file) n)
- | ["all"] -> (fun _ -> true)
- | l ->
- let l = List.map int_of_string l in
- (fun file -> List.mem (file_num file) l)
- in
- List.iter begin fun file ->
- if filter file then
- file_pause file o.conn_user.ui_user
- end !!files;
+ filter_files args (fun file -> file_pause file o.conn_user.ui_user);
""
- ), "<num|all|where priority < prio> :\t\t\tpause a download (use arg 'all' for all files)";
+ ), "<nums|all|where priority < prio> :\t\t\tpause a download (use arg 'all' for all files)";
resume_alias "resume";
resume_alias "unpause";
@@ -3255,7 +3256,7 @@ let _ =
let num = int_of_string arg in
try
let file = file_find num in
- set_file_best_name file new_name "" 0;
+ set_file_best_name file new_name 0;
Printf.sprintf (_b "Download %d renamed to %s") num (file_best_name file)
with e -> Printf.sprintf (_b "No file number %d, error %s") num (Printexc2.to_string e)
), "<num> \"<new name>\" :\t\tchange name of download <num> to <new name>";
-
--- 3.1.5-3.1/src/gtk2/gui/guiNetHtmlScanner.mll 2005-10-31 18:34:02.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/guiNetHtmlScanner.mll 2017-01-23 01:54:46.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: guiNetHtmlScanner.mll,v 1.1 2005/10/31 18:34:02 spiralvoice Exp $
+(* $Id$
* ----------------------------------------------------------------------
*
*)
@@ -135,7 +135,7 @@ and scan_element = parse
(* ======================================================================
* History:
*
- * $Log: guiNetHtmlScanner.mll,v $
+ * $Log$
* Revision 1.1 2005/10/31 18:34:02 spiralvoice
* patch #4583
*
-
--- 3.1.5-3.1/src/gtk2/gui/guiNetHtml.mli 2005-10-31 18:34:02.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/guiNetHtml.mli 2017-01-23 01:54:46.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: guiNetHtml.mli,v 1.1 2005/10/31 18:34:02 spiralvoice Exp $
+(* $Id$
* ----------------------------------------------------------------------
*
*)
-
--- 3.1.5-3.1/src/gtk2/gui/graphTypes.ml 2006-08-16 19:10:34.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/graphTypes.ml 2017-01-23 01:54:46.000000000 +0000
@@ -156,7 +156,7 @@ module GStack = struct
if q.gstack_empty
then [||]
else begin
- let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue q.gstack_outpos)) in
+ let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue q.gstack_outpos)) in
for i = q.gstack_outpos to q.gstack_inpos - 1 do
Array.unsafe_set r (i - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue i))
done;
@@ -167,7 +167,7 @@ module GStack = struct
if q.gstack_empty
then [||]
else begin
- let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in
+ let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in
for i = q.gstack_inpos - 1 downto q.gstack_outpos do
Array.unsafe_set r (i - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue i))
done;
@@ -178,7 +178,7 @@ module GStack = struct
if q.gstack_empty
then [||]
else begin
- let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue q.gstack_outpos)) in
+ let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue q.gstack_outpos)) in
for i = q.gstack_outpos to q.gstack_inpos - 1 do
Array.unsafe_set r (i - q.gstack_outpos) (f (i - q.gstack_outpos) (Array.unsafe_get q.gstack_queue i))
done;
@@ -189,7 +189,7 @@ module GStack = struct
if q.gstack_empty
then [||]
else begin
- let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in
+ let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in
for i = q.gstack_inpos - 1 downto q.gstack_outpos do
Array.unsafe_set r (i - q.gstack_outpos) (f (i - q.gstack_outpos) (Array.unsafe_get q.gstack_queue i))
done;
-
--- 3.1.5-3.1/src/networks/soulseek/slskProtocol.ml 2005-09-06 11:25:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/soulseek/slskProtocol.ml 2017-01-23 01:54:46.000000000 +0000
@@ -321,8 +321,8 @@ module S2C = struct
(*
let nrooms = get_int s 0 in
- let room_names = Array.create nrooms "" in
- let room_nusers = Array.create nrooms 0 in
+ let room_names = Array.make nrooms "" in
+ let room_nusers = Array.make nrooms 0 in
let rec iter_names nleft pos =
if nleft = 0 then pos else
let name, pos = get_string s pos in
-
--- 3.1.5-3.1/src/networks/donkey/donkeyClient.ml 2010-10-24 12:04:24.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyClient.ml 2017-01-23 01:54:46.000000000 +0000
@@ -46,19 +46,14 @@ open TcpBufferedSocket
open DonkeyOptions
open CommonOptions
open DonkeyComplexOptions
+open DonkeyThieves
open DonkeyGlobals
open DonkeyStats
-open DonkeyTypes
+open DonkeyTypes
open DonkeyReliability
-open DonkeyThieves
module VB = VerificationBitmap
-let log_prefix = "[EDK]"
-
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
-
module Udp = DonkeyProtoUdp
(* Lifetime of a socket after sending interesting messages *)
@@ -289,8 +284,7 @@ let disconnect_client c reason =
c.client_file_queue <- [];
c.client_session_downloaded <- 0L;
- with e -> lprintf_nl "Exception %s in disconnect_client"
- (Printexc2.to_string e));
+ with exn -> lprintf_nl ~exn "disconnect_client");
set_client_disconnected c reason;
DonkeySources.source_disconnected c.client_source
@@ -1325,9 +1319,8 @@ let client_to_client for_files c t sock
c.client_all_files <- Some !list;
client_must_update c
- with e ->
- lprintf_nl "Exception in ViewFilesReply %s"
- (Printexc2.to_string e);
+ with exn ->
+ lprintf_nl ~exn "ViewFilesReply"
end;
| M.AvailableSlotReq _ ->
@@ -1511,13 +1504,12 @@ other one for unlimited sockets. *)
try
let file = find_file t.Q.md4 in
received_client_bitmap c file t.Q.chunks
- with e ->
+ with exn ->
client_send c (M.NoSuchFileReq t.Q.md4);
- if !verbose then lprintf_nl
- "QueryChunksReply: Client (%s) asked for file_md4 %s, Exception %s"
+ if !verbose then lprintf_nl ~exn
+ "QueryChunksReply: Client (%s) asked for file_md4 %s"
(full_client_identifier c)
(Md4.to_string t.Q.md4)
- (Printexc2.to_string e)
end
| M.QueryChunkMd4ReplyReq t ->
@@ -1783,9 +1775,8 @@ is checked for the file.
if !verbose_unexpected_messages then
lprintf_nl "donkeyClient: QueryFileReq: Client %s queried unpublished file %s"
(full_client_identifier c) (Md4.to_string md4)
- | e ->
- lprintf_nl "Exception %s in QueryFileReq"
- (Printexc.to_string e)
+ | exn ->
+ lprintf_nl ~exn "QueryFileReq"
end
| M.EmuleSignatureReq t ->
@@ -2509,11 +2500,11 @@ can be increased by AvailableSlotReq, Bl
(Ip.to_string ip) port;
set_client_disconnected c (Closed_connect_failed);
DonkeySources.source_disconnected c.client_source
- | e ->
- lprintf_nl "Exception %s in client connection to IP %s:%d"
- (Printexc2.to_string e) (Ip.to_string ip) port;
+ | exn ->
+ lprintf_nl ~exn "client connection to IP %s:%d"
+ (Ip.to_string ip) port;
(* connection_failed c.client_connection_control; *)
- set_client_disconnected c (Closed_for_exception e);
+ set_client_disconnected c (Closed_for_exception exn);
DonkeySources.source_disconnected c.client_source
)
in
@@ -2628,12 +2619,10 @@ let client_connection_handler overnet t
(DonkeyProtoCom.client_handler2 c (read_first_message overnet is_connecting_server cc)
(client_to_client []));
- with e -> lprintf_nl "Exception %s in init_connection"
- (Printexc2.to_string e);
+ with exn -> lprintf_nl ~exn "init_connection"
);
- with e ->
- lprintf_nl "Exception %s in client_connection_handler"
- (Printexc2.to_string e);
+ with exn ->
+ lprintf_nl ~exn "client_connection_handler";
Unix.close s)
end
else
@@ -2689,9 +2678,9 @@ let _ =
M.QueryChunksReq file.file_md4);
ignore (DonkeySources.add_request c.client_source
file.file_sources (last_time ()))
- with e ->
+ with exn ->
if !verbose then
- lprintf_nl "query_source: exception %s" (Printexc2.to_string e)
+ lprintf_nl ~exn "query_source"
);
DonkeySources.functions.DonkeySources.function_connect <-
@@ -2707,9 +2696,9 @@ let _ =
if Ip.reachable server_ip then
query_id server_ip server_port id;
- with e ->
+ with exn ->
if !verbose then begin
- lprintf_nl "connect_source: exception %s" (Printexc2.to_string e);
+ lprintf_nl "connect_source"
end
);
@@ -2743,9 +2732,9 @@ a FIFO from where they are removed after
with
| Not_found -> ()
- | e ->
+ | exn ->
if !verbose then
- lprintf_nl "add_location: exception %s" (Printexc2.to_string e)
+ lprintf_nl ~exn "add_location"
);
DonkeySources.functions.DonkeySources.function_remove_location <- (fun
@@ -2758,8 +2747,8 @@ a FIFO from where they are removed after
with
| Not_found -> ()
- | e ->
+ | exn ->
if !verbose then
- lprintf_nl "remove_location for file_md4 %s: exception %s"
- file_uid (Printexc2.to_string e)
+ lprintf_nl ~exn "remove_location for file_md4 %s"
+ file_uid
)
-
--- 3.1.5-3.1/config/Makefile.in 2012-07-01 17:47:41.000000000 +0000
+++ 3.1.6-0ubuntu1/config/Makefile.in 2017-01-23 01:54:46.000000000 +0000
@@ -148,9 +148,9 @@ CDK_SRCS += $(CDK)/zlib.ml $(CDK)/zip.m
CDK_SRCS += $(LIB)/autoconf.ml
-CDK_SRCS+= $(LIB)/fifo.ml $(CDK)/arg2.ml $(LIB)/syslog.ml $(CDK)/printf2.ml \
- $(CDK)/heap.ml \
- $(CDK)/printexc2.ml $(CDK)/genlex2.ml \
+CDK_SRCS+= $(LIB)/fifo.ml $(CDK)/arg2.ml $(LIB)/syslog.ml \
+ $(CDK)/printexc2.ml $(CDK)/printf2.ml \
+ $(CDK)/heap.ml $(CDK)/genlex2.ml \
$(CDK)/filepath.ml $(CDK)/string2.ml \
$(CDK)/filename2.ml $(CDK)/array2.ml $(CDK)/hashtbl2.ml \
$(CDK)/unix2.ml $(CDK)/file.ml \
-
--- 3.1.5-3.1/src/utils/bitstring/bitstring_c.c 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/bitstring_c.c 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: bitstring_c.c,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*/
/* This file contains hand-coded, optimized C implementations of
-
--- 3.1.5-3.1/src/gtk/gpattern/gpattern.ml 2004-03-07 09:34:25.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/gpattern/gpattern.ml 2017-01-23 01:54:46.000000000 +0000
@@ -318,9 +318,9 @@ class virtual ['a] filtered_plist
method private add_hidden_item i =
if nitems = Array.length items then begin
let nis = nitems * 2 + 8 in
- let is = Array.create nis i in
+ let is = Array.make nis i in
Array.blit items 0 is 0 nitems;
- contents <- Array.create nis dummy_line;
+ contents <- Array.make nis dummy_line;
items <- is
end else begin
items.(nitems) <- i;
@@ -604,11 +604,11 @@ class virtual ['a] filtered_ptree
) l;
let length = Array.length !array_of_children in
let new_nitems = nitems + length in
- let new_items = Array.create new_nitems {data = i.data; children = []} in
+ let new_items = Array.make new_nitems {data = i.data; children = []} in
Array.blit items 0 new_items 0 (row + 1);
Array.blit !array_of_children 0 new_items (row + 1) length;
Array.blit items (row + 1) new_items (row + length + 1) (nitems - row - 1);
- let new_contents = Array.create new_nitems dummy_line in
+ let new_contents = Array.make new_nitems dummy_line in
Array.blit contents 0 new_contents 0 (row + 1);
Array.blit contents row new_contents (row + length + 1) (nitems - row - 1);
nitems <- new_nitems;
@@ -631,10 +631,10 @@ class virtual ['a] filtered_ptree
let (row, _) = self#find (get_key i) in
let length = List.assoc (get_key i) is_expanded in
let new_nitems = nitems - length in
- let new_items = Array.create new_nitems {data = i.data; children = []} in
+ let new_items = Array.make new_nitems {data = i.data; children = []} in
Array.blit items 0 new_items 0 (row + 1);
Array.blit items (row + length + 1) new_items (row + 1) (nitems - row - length - 1);
- let new_contents = Array.create new_nitems dummy_line in
+ let new_contents = Array.make new_nitems dummy_line in
Array.blit contents 0 new_contents 0 (row + 1);
Array.blit contents (row + length + 1) new_contents (row + 1) (nitems - row - length - 1);
nitems <- new_nitems;
@@ -822,9 +822,9 @@ class virtual ['a] filtered_ptree
method private add_hidden_item i =
if nitems = Array.length items then begin
let nis = nitems * 2 + 8 in
- let is = Array.create nis i in
+ let is = Array.make nis i in
Array.blit items 0 is 0 nitems;
- contents <- Array.create nis dummy_line;
+ contents <- Array.make nis dummy_line;
items <- is
end else begin
items.(nitems) <- i;
-
--- 3.1.5-3.1/src/daemon/common/commonInteractive.ml 2014-03-10 16:51:45.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonInteractive.ml 2017-01-23 01:54:46.000000000 +0000
@@ -135,7 +135,7 @@ let send_dirfull_warning dir full line1
let file_committed_name incoming_dir file =
(try Unix2.safe_mkdir incoming_dir with _ -> ());
- let fs = Unix32.filesystem incoming_dir in
+ let fs = Unix32.filesystem_type incoming_dir in
let namemax =
match Unix32.fnamelen incoming_dir with
| None -> 0
@@ -157,7 +157,7 @@ let file_committed_name incoming_dir fil
in
iter 1
else new_name in
- set_file_best_name file (file_best_name file) fs namemax;
+ set_file_best_name file (file_best_name file) ~fs namemax;
Filename.concat incoming_dir new_name
let script_for_file file incoming new_name =
-
--- 3.1.5-3.1/src/networks/bittorrent/bTUdpTracker.mlp 2014-02-23 18:11:38.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTUdpTracker.mlp 2017-01-23 01:54:46.000000000 +0000
@@ -22,7 +22,7 @@ let connect_response s exp_txn =
| { 0l : 32 ; txn : 32 ; conn_id : 64 } ->
if txn = exp_txn then conn_id else fail "error connect_response txn %ld expected %ld" txn exp_txn
| { :error_response } -> fail "error connect_response txn %ld : %s" txn msg
- | { } -> fail "error connect_response : %s" (AnyEndian.dump_hex_s s)
+ | { } -> fail "error connect_response (expected txn %ld) : %s" exp_txn (AnyEndian.dump_hex_s s)
(** announce *)
let announce_request conn txn ~info_hash ~peer_id (downloaded,left,uploaded) event ?(ip=0l) ?(key=0l) ~numwant port =
@@ -56,4 +56,4 @@ let announce_response s exp_txn =
else
fail "error announce_response txn %ld expected %ld" txn exp_txn
| { :error_response } -> fail "error announce_response txn %ld : %s" txn msg
- | { } -> fail "error announce_response : %s" (AnyEndian.dump_hex_s s)
+ | { } -> fail "error announce_response (expected txn %ld) : %s" exp_txn (AnyEndian.dump_hex_s s)
-
--- 3.1.5-3.1/src/daemon/driver/driverInterface.ml 2011-01-23 15:20:26.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/driver/driverInterface.ml 2017-01-23 01:54:46.000000000 +0000
@@ -533,9 +533,9 @@ let gui_reader (gui: gui_record) t _ =
| GuiProtocol version ->
let version = min GuiProto.best_gui_version version in
- gui.gui_proto_to_gui_version <- Array.create
+ gui.gui_proto_to_gui_version <- Array.make
(to_gui_last_opcode + 1) version;
- gui.gui_proto_from_gui_version <- Array.create
+ gui.gui_proto_from_gui_version <- Array.make
(from_gui_last_opcode + 1) version;
if not !verbose_no_login then lprintf_nl "GUI protocol %d" version
@@ -831,7 +831,7 @@ let gui_reader (gui: gui_record) t _ =
| P.SaveFile (num, name) ->
let file = file_find num in
- set_file_best_name file name "" 0;
+ set_file_best_name file name 0;
(match file_state file with
FileDownloaded ->
file_save_as file name;
@@ -888,7 +888,7 @@ let gui_reader (gui: gui_record) t _ =
| P.RenameFile (num, new_name) ->
let file = file_find num in
- set_file_best_name file new_name "" 0;
+ set_file_best_name file new_name 0;
addevent gui.gui_events.gui_files num true
| P.ConnectFriend num
@@ -1159,8 +1159,8 @@ let new_gui gui_send gui_auth sock gui_t
gui_sock = sock;
gui_search_nums = [];
gui_events = gui_events ();
- gui_proto_to_gui_version = Array.create (to_gui_last_opcode+1) 0;
- gui_proto_from_gui_version = Array.create (from_gui_last_opcode+1) 0;
+ gui_proto_to_gui_version = Array.make (to_gui_last_opcode+1) 0;
+ gui_proto_from_gui_version = Array.make (from_gui_last_opcode+1) 0;
gui_num = !gui_counter;
gui_auth = gui_auth;
gui_poll = false;
-
--- 3.1.5-3.1/src/utils/bitstring/bitstring_persistent.mli 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/bitstring_persistent.mli 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: bitstring_persistent.mli,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*)
(**
-
--- 3.1.5-3.1/src/networks/fileTP/fileTPGlobals.ml 2011-10-25 17:33:22.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fileTP/fileTPGlobals.ml 2017-01-23 01:54:46.000000000 +0000
@@ -43,8 +43,8 @@ open FileTPOptions
let log_prefix = "[FileTP]"
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
+let lprintf_nl ?exn fmt =
+ lprintf_nl2 ?exn log_prefix fmt
let lprintf_n fmt =
lprintf2 log_prefix fmt
-
src/networks/fasttrack/enc_type_1.c
-
--- 3.1.5-3.1/config/configure 2014-03-22 11:12:25.000000000 +0000
+++ 3.1.6-0ubuntu1/config/configure 2017-01-23 02:15:14.000000000 +0000
@@ -722,6 +722,7 @@ RANLIB
CUT
STAT
SVNVERSION
+GIT
GREP
SED
host_os
@@ -759,6 +760,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -864,6 +866,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1116,6 +1119,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1253,7 +1265,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1406,6 +1418,7 @@ Fine tuning of the installation director
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2379,7 +2392,7 @@ cd config
MAJOR_VERSION=3
MINOR_VERSION=1
-SUB_VERSION=5 # range 0-7 due to eMule limitations
+SUB_VERSION=6 # range 0-7 due to eMule limitations
# ********** **********
# ********** check for C compiler **********
@@ -3674,6 +3687,65 @@ ARCH=$arch
# ********** Parse checkout date (CVS) or revision (SVN) if available **********
# ********** **********
+if test -d ../.git; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking git revision" >&5
+$as_echo "$as_me: checking git revision" >&6;}
+ # Extract the first word of "git", so it can be a program name with args.
+set dummy git; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$GIT"; then
+ ac_cv_prog_GIT="$GIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GIT="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+GIT=$ac_cv_prog_GIT
+if test -n "$GIT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
+$as_echo "$GIT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ SUB_VERSION3="git"
+ if test "$ac_cv_prog_GIT" = "yes"; then
+ GIT_BRANCH=`git symbolic-ref -q --short HEAD`
+ GIT_COMMIT=`git describe --always --tags`
+ case "$GIT_BRANCH" in
+ ""|"master")
+ SCM_VERSION="${GIT_COMMIT}"
+ ;;
+ *)
+ SCM_VERSION="${GIT_COMMIT}-${GIT_BRANCH}"
+ ;;
+ esac
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: cannot determine git revision" >&5
+$as_echo "$as_me: cannot determine git revision" >&6;}
+ SCM_VERSION=""
+ fi
+fi
+
if test -d .svn; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SVN revision" >&5
$as_echo "$as_me: checking SVN revision" >&6;}
@@ -3717,7 +3789,8 @@ fi
if test "$ac_cv_prog_SVNVERSION" = "svnversion"; then
SUB_VERSION3="SVN"
SCM_VERSION=`svnversion -n .`
- else { $as_echo "$as_me:${as_lineno-$LINENO}: cannot checking SVN revision... no SVNVERSION" >&5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: cannot checking SVN revision... no SVNVERSION" >&5
$as_echo "$as_me: cannot checking SVN revision... no SVNVERSION" >&6;}
SCM_VERSION="cannot find out SVN revision (no SVNVERSION)"
fi
@@ -5523,7 +5596,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -5569,7 +5642,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -5593,7 +5666,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -5638,7 +5711,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -5662,7 +5735,7 @@ rm -f core conftest.err conftest.$ac_obj
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
-
--- 3.1.5-3.1/src/networks/fileTP/fileTPHTTP.ml 2011-07-16 08:59:27.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fileTP/fileTPHTTP.ml 2017-01-23 01:54:46.000000000 +0000
@@ -46,14 +46,6 @@ open FileTPProtocol
open FileTPClients
-let log_prefix = "[FileTP]"
-
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
-
-let lprintf_n fmt =
- lprintf2 log_prefix fmt
-
(*************************************************************************)
(* *)
(* MAIN *)
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackClients.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackClients.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,4 @@
+#where "gnutella_" = "fasttrack_"
+#where "_gnutella" = "_fasttrack"
+#where "Gnutella" = "Fasttrack"
+#include "src/networks/gnutella/gnutellaClients.ml"
-
--- 3.1.5-3.1/src/daemon/driver/driverInteractive.ml 2013-07-07 10:58:32.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/driver/driverInteractive.ml 2017-01-23 01:54:46.000000000 +0000
@@ -364,7 +364,7 @@ let print_table_text buf alignments titl
if len > !max_cols then max_cols := len
) lines;
let ncols = !max_cols in
- let cols = Array.create ncols 0 in
+ let cols = Array.make ncols 0 in
List.iter (fun line ->
let len = Array.length line in
for i = 0 to len-1 do
@@ -377,7 +377,7 @@ let print_table_text buf alignments titl
Buffer.add_string buf col_sep;
) titles;
Buffer.add_char buf '\n';
- let aligns = Array.create ncols Align_Center in
+ let aligns = Array.make ncols Align_Center in
Array.iteri (fun i al -> aligns.(i) <- al) alignments;
List.iter (fun line ->
let len = Array.length line in
-
--- 3.1.5-3.1/src/daemon/common/commonFile.ml 2011-10-25 17:33:21.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonFile.ml 2017-01-23 01:54:46.000000000 +0000
@@ -323,7 +323,7 @@ let file_best_name (file : file) =
let file = as_file_impl file in
file.impl_file_best_name
-let set_file_best_name file name fs namemax =
+let set_file_best_name file name ?(fs=`Unknown) namemax =
let file = as_file_impl file in
let old_name = file.impl_file_best_name in
let real_name = Filename2.filesystem_compliant name fs namemax in
@@ -1265,13 +1265,13 @@ let impl_file_info impl =
T.file_release = impl.impl_file_release;
}
-let lprintf_file_nl file fmt =
- lprintf_nl2 ("[" ^ (file_network file).network_shortname ^
+let lprintf_file_nl ?exn file fmt =
+ lprintf_nl2 ?exn ("[" ^ (file_network file).network_shortname ^
"] [file_num " ^ (string_of_int (file_num file)) ^ "]" ^
"[temp " ^ (file_disk_name file) ^ "]") fmt
let concat_file dir filename =
- let fs = Unix32.filesystem dir in
+ let fs = Unix32.filesystem_type dir in
let namemax =
match Unix32.fnamelen dir with
| None -> 0
-
--- 3.1.5-3.1/src/utils/cdk/arg2.ml 2007-02-19 21:35:48.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/cdk/arg2.ml 2017-01-23 01:54:46.000000000 +0000
@@ -11,7 +11,7 @@
(* *)
(***********************************************************************)
-(* $Id: arg2.ml,v 1.6 2007/02/19 21:35:48 spiralvoice Exp $ *)
+(* $Id$ *)
type spec =
| Unit of (unit -> unit) (* Call the function with unit argument *)
-
--- 3.1.5-3.1/src/networks/fasttrack/fst_crypt_ml.c 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fst_crypt_ml.c 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,180 @@
+/* Copyright 2001, 2002 b8_bavard, b8_fee_carabine, INRIA */
+/*
+ This file is part of mldonkey.
+
+ mldonkey is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ mldonkey is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with mldonkey; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "fst_crypt.h"
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "caml/mlvalues.h"
+#include "caml/fail.h"
+
+#if defined(__MINGW32__)
+typedef unsigned int uint;
+#include <winsock.h>
+#else
+#include <netinet/in.h>
+#endif
+/************************************************************************/
+
+
+/* Functions for MLdonkey */
+
+
+/************************************************************************/
+
+value ml_create_cipher(value unit)
+{
+ return (value) fst_cipher_create();
+}
+
+value ml_apply_cipher(value cipher_v, value s_v, value pos_v, value len_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ char *s = String_val(s_v);
+ int pos = Int_val(pos_v);
+ int len = Int_val(len_v);
+
+/* printf("Apply cipher %X on %d [from %d]\n", cipher, len, pos); */
+
+ fst_cipher_crypt(cipher, s+pos, len);
+
+ return Val_unit;
+}
+
+value ml_init_cipher(value cipher_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ fst_cipher_init(cipher, cipher->seed, cipher->enc_type);
+
+ return Val_unit;
+}
+
+value ml_set_cipher(value cipher_v, value seed_v, value encode_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ unsigned int seed = Int32_val(seed_v);
+ unsigned int encode = Int_val(encode_v);
+
+/* printf("ml_set_cipher %X seed:%X enc_type: %X\n", cipher, seed, encode); */
+
+ cipher->enc_type = encode;
+ cipher->seed = seed;
+
+ return Val_unit;
+}
+
+value ml_cipher_packet_get(value s_v, value pos_v, value in_cipher_v)
+{
+ FSTCipher* in_cipher = (FSTCipher*) in_cipher_v;
+ char *s = String_val(s_v);
+ int pos = Int_val(pos_v);
+ unsigned int seed;
+ unsigned int enc_type;
+
+/*
+ printf("ml_cipher_packet_get IN:%X OUT:%X pos %d\n", in_cipher, out_cipher, pos);
+
+ printf("out seed:%X enc_type: %X\n", out_cipher->seed, out_cipher->enc_type);
+*/
+
+ seed = htonl (((unsigned int*)(s+pos))[0]);
+ enc_type = htonl (((unsigned int*)(s+pos+4))[0]);
+ enc_type = fst_cipher_mangle_enc_type (seed, enc_type);
+
+ in_cipher->seed = seed;
+ in_cipher->enc_type = enc_type;
+/* printf("in seed:%X enc_type: %X\n", seed, out_cipher->enc_type); */
+
+/* if(enc_type > 0x29) failwith ("ERROR: unsupported encryption"); */
+
+ return Val_unit;
+}
+
+value ml_xor_ciphers(value out_cipher_v, value in_cipher_v){
+ FSTCipher* in_cipher = (FSTCipher*) in_cipher_v;
+ FSTCipher* out_cipher = (FSTCipher*) out_cipher_v;
+
+ out_cipher->seed ^= in_cipher->seed; /* xor send cipher with received seed */
+
+ /* the correct behaviour here is to use the enc_type the supernode sent
+ * us for out_cipher too.
+ */
+ out_cipher->enc_type = in_cipher->enc_type;
+
+ return Val_unit;
+}
+
+value ml_xor_ciphers2(value out_cipher_v, value in_cipher_v){
+ FSTCipher* in_cipher = (FSTCipher*) in_cipher_v;
+ FSTCipher* out_cipher = (FSTCipher*) out_cipher_v;
+ unsigned int seed = out_cipher->seed;
+
+ out_cipher->seed ^= in_cipher->seed; /* xor send cipher with received seed */
+ in_cipher->seed ^= seed;
+ fst_cipher_init(out_cipher, out_cipher->seed, out_cipher->enc_type);
+
+ return Val_unit;
+}
+
+
+value ml_cipher_packet_set(value cipher_v, value s_v, value pos_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ char *s = String_val(s_v);
+ int pos = Int_val(pos_v);
+
+ ((unsigned int*)(s+pos))[0] = htonl(cipher->seed);
+ ((unsigned int*)(s+pos+4))[0] = htonl(
+ fst_cipher_mangle_enc_type(cipher->seed, cipher->enc_type));
+
+ return Val_unit;
+}
+
+value ml_cipher_enc_type(value cipher_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+
+ return Val_int(cipher->enc_type);
+}
+
+value ml_cipher_packet_set_xored(value cipher_v, value s_v, value pos_v, value xor_cipher_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ FSTCipher* xor_cipher = (FSTCipher*) xor_cipher_v;
+ char *s = String_val(s_v);
+ int pos = Int_val(pos_v);
+ unsigned int seed = cipher->seed;
+
+ seed ^= xor_cipher->seed;
+ ((unsigned int*)(s+pos))[0] = htonl(seed);
+ ((unsigned int*)(s+pos+4))[0] = htonl(
+ fst_cipher_mangle_enc_type(cipher->seed, cipher->enc_type));
+
+ return Val_unit;
+}
+
+
+value ml_cipher_free(value cipher_v)
+{
+ FSTCipher* cipher = (FSTCipher*) cipher_v;
+ fst_cipher_free(cipher);
+
+ return Val_unit;
+}
-
src/networks/fasttrack/enc_type_2.c
-
--- 3.1.5-3.1/debian/control 2015-10-14 08:04:53.000000000 +0000
+++ 3.1.6-0ubuntu1/debian/control 2017-06-30 13:52:16.000000000 +0000
@@ -1,7 +1,8 @@
Source: mldonkey
Section: net
Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
Uploaders:
Samuel Mimram <smimram@debian.org>,
Mehdi Dogguy <mehdi@debian.org>
-
--- 3.1.5-3.1/src/networks/donkey/donkeyGlobals.ml 2011-10-25 17:33:21.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyGlobals.ml 2017-01-23 01:54:46.000000000 +0000
@@ -44,8 +44,8 @@ open CommonOptions
let log_prefix = "[EDK]"
-let lprintf_nl fmt =
- lprintf_nl2 log_prefix fmt
+let lprintf_nl ?exn fmt =
+ lprintf_nl2 ?exn log_prefix fmt
(*************************************************************
@@ -324,7 +324,7 @@ let update_best_name file =
match impl.impl_file_probable_name with
None -> ()
| Some best_name ->
- set_file_best_name file best_name "" 0
+ set_file_best_name file best_name 0
with Not_found -> ()
let new_file file_diskname file_state md4 file_size filename writable user group =
@@ -781,7 +781,6 @@ let set_client_name c name md4 =
c.client_md4 <- md4;
end
-exception ClientFound of client
let find_client_by_name name =
try
H.iter (fun c ->
-
--- 3.1.5-3.1/src/config/unix/os_stubs_c.c 2010-07-16 13:56:35.000000000 +0000
+++ 3.1.6-0ubuntu1/src/config/unix/os_stubs_c.c 2017-01-23 01:54:46.000000000 +0000
@@ -66,7 +66,7 @@ ssize_t os_read(OS_FD fd, char *buf, siz
void os_ftruncate(OS_FD fd, OFF_T len, /* bool */ int sparse)
{
- int64 cursize;
+ int64_t cursize;
if(!fd) failwith("ftruncate32: file is closed");
cursize = os_getfdsize(fd);
@@ -109,7 +109,7 @@ int os_getdtablesize()
*******************************************************************/
-int64 os_getfdsize(OS_FD fd)
+int64_t os_getfdsize(OS_FD fd)
{
struct stat buf;
@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd)
*******************************************************************/
-int64 os_getfilesize(char *path)
+int64_t os_getfilesize(char *path)
{
struct stat buf;
-
--- 3.1.5-3.1/src/daemon/common/commonUploads.ml 2010-07-16 13:57:39.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonUploads.ml 2017-01-23 01:54:46.000000000 +0000
@@ -399,7 +399,7 @@ let flatten_tiger_array array =
let unflatten_tiger_array s =
let len = String.length s / TigerTree.length in
- let array = Array.create len TigerTree.null in
+ let array = Array.make len TigerTree.null in
for i = 0 to len - 1 do
array.(i) <- TigerTree.direct_of_string
(String.sub s (i * TigerTree.length) TigerTree.length)
@@ -409,7 +409,7 @@ let unflatten_tiger_array s =
let make_tiger_tree array =
let len = Array.length array in
let pos, list = tiger_pos2 len in
- let s = Array.create (pos + len) TigerTree.null in
+ let s = Array.make (pos + len) TigerTree.null in
for i = 0 to len - 1 do
s.(pos+i) <- array.(i)
done;
-
--- 3.1.5-3.1/src/daemon/common/commonGlobals.ml 2013-07-07 11:04:11.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonGlobals.ml 2017-01-23 01:54:46.000000000 +0000
@@ -592,7 +592,7 @@ let update_upload_history () =
done
let update_h_download_history () =
- if (!history_h_step = history_size * history_step) or ( (Fifo.length download_history) <= (!history_size_for_h_graph+1)) then
+ if (!history_h_step = history_size * history_step) || ( (Fifo.length download_history) <= (!history_size_for_h_graph+1)) then
Fifo.put download_h_history ((List.fold_left (+) 0 (Fifo.to_list download_history)) / ((Fifo.length download_history)))
else
Fifo.put download_h_history ((List.fold_left (+) 0
@@ -606,7 +606,7 @@ let update_h_download_history () =
let update_h_upload_history () =
(* Fifo.put upload_h_history ((Fifo.length upload_history) / 720); *)
- if (!history_h_step = history_size * history_step) or ((Fifo.length upload_history) <= (!history_size_for_h_graph+1)) then
+ if (!history_h_step = history_size * history_step) || ((Fifo.length upload_history) <= (!history_size_for_h_graph+1)) then
Fifo.put upload_h_history ((List.fold_left (+) 0 (Fifo.to_list upload_history)) / ((Fifo.length upload_history)))
else
Fifo.put upload_h_history ((List.fold_left (+) 0
-
--- 3.1.5-3.1/src/config/mingw/os_stubs_c.c 2010-07-16 13:56:35.000000000 +0000
+++ 3.1.6-0ubuntu1/src/config/mingw/os_stubs_c.c 2017-01-23 01:54:46.000000000 +0000
@@ -110,13 +110,13 @@ int os_getdtablesize()
*******************************************************************/
-int64 os_getfdsize(OS_FD fd)
+int64_t os_getfdsize(OS_FD fd)
{
long len_high;
- int64 ret;
+ int64_t ret;
ret = GetFileSize(fd, &len_high);
- return ((int64) len_high << 32 | ret);
+ return ((int64_t) len_high << 32 | ret);
}
/*******************************************************************
@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd)
*******************************************************************/
-int64 os_getfilesize(char *path)
+int64_t os_getfilesize(char *path)
{
OS_FD fd = CreateFile(path, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
@@ -137,7 +137,7 @@ int64 os_getfilesize(char *path)
if (fd != INVALID_HANDLE_VALUE){
ret = GetFileSize(fd, &len_high);
CloseHandle(fd);
- return ((int64) len_high << 32 | ret);
+ return ((int64_t) len_high << 32 | ret);
} else {
long err = GetLastError();
if (err != NO_ERROR) {
-
--- 3.1.5-3.1/docs/uri.txt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/docs/uri.txt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1 @@
+Get that document here: http://www.faqs.org/rfcs/rfc2396.html
\ No newline at end of file
-
--- 3.1.5-3.1/src/networks/gnutella/gnutellaClients.ml 2007-05-26 23:21:49.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/gnutella/gnutellaClients.ml 2017-01-23 01:54:46.000000000 +0000
@@ -231,7 +231,7 @@ save it on disk in the next version. *)
lprintf "[TTR] ttr loaded\n";
let ttr = Buffer.contents buf in
let tiger_pos = CommonUploads.tiger_pos nblocks in
- let array = Array.create nblocks TigerTree.null in
+ let array = Array.make nblocks TigerTree.null in
for i = 0 to nblocks - 1 do
array.(i) <- TigerTree.direct_of_string
(String.sub ttr ((tiger_pos + i) * 24) 24)
-
--- 3.1.5-3.1/src/networks/fileTP/fileTPFTP.ml 2013-07-07 11:00:53.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fileTP/fileTPFTP.ml 2017-01-23 01:54:46.000000000 +0000
@@ -103,8 +103,8 @@ end_pos !counter_pos b.len to_read;
if new_downloaded = file_size file then
download_finished file;
- with e ->
- lprintf_nl "Exception %s in CommonSwarming.received" (Printexc2.to_string e)
+ with exn ->
+ lprintf_nl ~exn "CommonSwarming.received"
end;
c.client_failed_attempts <- 0;
c.client_reconnect <- true;
@@ -260,8 +260,8 @@ let ftp_send_range_request c (x,y) sock
| _ ->
lprintf_nl "Cannot read ip address [%s]\n" line;
close sock Closed_by_user)
- with e ->
- lprintf_nl "Error %s in reader" (Printexc.to_string e);
+ with exn ->
+ lprintf_nl ~exn "reader";
close sock Closed_by_user)
| "350 " ->
let reqs = [Printf.sprintf "RETR %s" (snd (get_path_components file))] in
-
src/networks/fasttrack/fasttrackHandler.ml
-
--- 3.1.5-3.1/src/networks/bittorrent/bTComplexOptions.ml 2011-01-23 15:20:26.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTComplexOptions.ml 2017-01-23 01:54:46.000000000 +0000
@@ -314,12 +314,33 @@ let save _ =
let guptime () = !!guptime - !diff_time
-let _ =
+let rec update_options () =
+ let update v =
+ lprintf_nl "Updating options to version %i" v;
+ options_version =:= v;
+ update_options ()
+ in
+
+ match !!options_version with
+ | 0 ->
+ let present = ref false in
+ (* drop obsolete addresses, add new *)
+ dht_bootstrap_nodes =:= List.filter (function
+ | "router.utorrent.com", 6881 -> false
+ | "router.transmission.com", 6881 -> false
+ | "router.bittorrent.com", 8991 -> present := true; true
+ | _ -> true) !!dht_bootstrap_nodes;
+ if not !present then
+ dht_bootstrap_nodes =:= ("router.bittorrent.com", 8991) :: !!dht_bootstrap_nodes;
+ update 1
+ | _ -> ()
+
+let () =
network.op_network_file_of_option <- value_to_file;
file_ops.op_file_to_option <- file_to_value;
(* Shut up message "Network.save/load_complex_options not implemented by BitTorrent" *)
network.op_network_load_complex_options <- load;
network.op_network_save_complex_options <- save;
- network.op_network_update_options <- (fun _ -> ());
+ network.op_network_update_options <- update_options;
network.op_network_save_sources <- (fun _ -> ())
-
--- 3.1.5-3.1/src/gtk/gui/gui_com.ml 2005-04-13 21:52:25.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/gui/gui_com.ml 2017-01-23 01:54:46.000000000 +0000
@@ -41,9 +41,9 @@ let when_disconnected gui =
G.clear ()
-let to_gui_protocol_used = Array.create (to_gui_last_opcode+1)
+let to_gui_protocol_used = Array.make (to_gui_last_opcode+1)
GuiProto.best_gui_version
-let from_gui_protocol_used = Array.create
+let from_gui_protocol_used = Array.make
(from_gui_last_opcode+1)
GuiProto.best_gui_version
-
--- 3.1.5-3.1/ChangeLog 2002-05-18 07:53:04.000000000 +0000
+++ 3.1.6-0ubuntu1/ChangeLog 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-See the distrib/ChangeLog file.
-
-See also the distrib/TODO file :)
-
--- 3.1.5-3.1/src/networks/gnutella2/g2Proto.ml 2007-06-17 02:08:16.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/gnutella2/g2Proto.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1088,7 +1088,7 @@ let parse_udp_packet ip port buf =
if nCount > 1 then begin
let my_part = (get_uint8 buf 6)-1 in
(* lprintf "part %d on %d\n" my_part nCount; *)
- let needed = Array.create nCount None in
+ let needed = Array.make nCount None in
Fifo.iter (fun (p_ip, p_port, nSeq, nPart, nFlags, data) ->
if p_port = port && nSeq = nSequence
&& p_ip = ip then needed.(nPart) <- Some data
@@ -1505,7 +1505,7 @@ let create_qrt_table2 words table_size =
if !verbose then
lprintf "table_length %d\n" table_length;
- let array = Array.create table_length 0 in
+ let array = Array.make table_length 0 in
List.iter (fun w ->
let pos = bloom_hash w table_size in
let pos = Int64.to_int pos in
-
--- 3.1.5-3.1/src/daemon/common/commonBlocking.ml 2009-02-24 18:35:46.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonBlocking.ml 2017-01-23 01:54:46.000000000 +0000
@@ -29,7 +29,7 @@ let ip_blocking_list = ref Ip_set.bl_emp
let web_ip_blocking_list = ref Ip_set.bl_empty
let country_blocking_block = ref false
let country_blocking_list =
- Array.create (Array.length Geoip.country_code_array) false
+ Array.make (Array.length Geoip.country_code_array) false
(* Keep a copy of valid values from !!ip_blocking_countries to
check if geoip_hit needs really to compute the country code.
-
.pc/0004-Fix-compilation-with-OCaml-4.02.patch/src/utils/net/terminal.ml
-
--- 3.1.5-3.1/.pc/applied-patches 2017-07-03 19:12:09.021390275 +0000
+++ 3.1.6-0ubuntu1/.pc/applied-patches 2017-07-03 19:12:08.009362595 +0000
@@ -1,4 +1,3 @@
0001-Use-usr-bin-see-as-default-previewer.patch
0002-Remove-bashisms.patch
0003-Fix-tiger-tree-corruption.patch
-0004-Fix-compilation-with-OCaml-4.02.patch
-
--- 3.1.5-3.1/src/networks/bittorrent/bTClients.ml 2014-02-23 18:13:22.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTClients.ml 2017-01-23 01:54:46.000000000 +0000
@@ -134,7 +134,7 @@ let talk_to_udp_tracker host port args f
let set_reader f =
set_reader socket begin fun _ ->
try f () with exn ->
- lprintf_nl "udpt interact exn %s" (Printexc2.to_string exn);
+ lprintf_nl ~exn "udpt interact with %s" host;
close socket (Closed_for_exception exn)
end
in
@@ -202,7 +202,7 @@ let talk_to_udp_tracker host port args f
Ip.async_ip host (fun ip ->
(* lprintf_nl "udpt resolved %s to ip %s" host (Ip.to_string ip); *)
if not (Ip.equal Ip.localhost ip) then
- try interact ip with exn -> lprintf_nl "udpt interact exn %s" (Printexc2.to_string exn)
+ try interact ip with exn -> lprintf_nl ~exn "udpt interact with %s" host
else if !verbose_msg_servers then
lprintf_nl "udpt ignoring tracker %s (resolves to localhost)" host)
(fun () ->
@@ -210,7 +210,7 @@ let talk_to_udp_tracker host port args f
lprintf_nl "udpt failed to resolve %s" host)
with
exn ->
- lprintf_nl "udpt start exn %s" (Printexc2.to_string exn)
+ lprintf_nl ~exn "udpt start"
end (* include *)
@@ -768,10 +768,10 @@ let rec client_parse_header counter cc i
if !verbose_unexpected_messages then
lprintf_nl "Client %s:%d requested a file that is not shared [%s]"
(Ip.to_string ip) port (Sha1.to_hexa file_id)
- | e ->
- lprintf_nl "Exception %s in client_parse_header" (Printexc2.to_string e);
- close sock (Closed_for_exception e);
- raise e
+ | exn ->
+ lprintf_nl ~exn "client_parse_header";
+ close sock (Closed_for_exception exn);
+ raise exn
(** Update the bitmap of a client. Unclear if it is still useful.
@@ -1537,10 +1537,9 @@ let connect_client c =
set_bt_sock sock !verbose_msg_clients
(BTHeader (client_parse_header !counter (ref ((Some c), c.client_country_code)) true))
end
- with e ->
- lprintf_nl "Exception %s while connecting to client"
- (Printexc2.to_string e);
- disconnect_client c (Closed_for_exception e)
+ with exn ->
+ lprintf_nl ~exn "connecting to client";
+ disconnect_client c (Closed_for_exception exn)
);
(*Since this is a pending connection put ConnectionWaiting
in client_sock
@@ -1628,10 +1627,9 @@ let listen () =
) in
listen_sock := Some s;
()
- with e ->
+ with exn ->
if !verbose_connect then
- lprintf_nl "Exception %s while init bittorrent server"
- (Printexc2.to_string e)
+ lprintf_nl ~exn "init bittorrent server"
(** This function send keepalive messages to all connected clients
@@ -1672,9 +1670,9 @@ let resume_clients file =
else
print_control c.client_connection_control
with _ -> ())
- with e ->
+ with exn ->
if !verbose_connect then
- lprintf_file_nl (as_file file) "Exception %s in resume_clients" (Printexc2.to_string e)
+ lprintf_file_nl ~exn (as_file file) "resume_clients"
) file.file_clients
let () =
@@ -1929,9 +1927,9 @@ let rec iter_upload sock c =
(* lprintf "sending piece\n"; *)
send_client c (Piece (num, pos, upload_buffer, 0, len));
iter_upload sock c
- with e ->
+ with exn ->
if !verbose then
- lprintf_nl "Exception %s in iter_upload" (Printexc2.to_string e)
+ lprintf_nl ~exn "iter_upload"
end else
begin
(* lprintf "client is waiting for another piece\n"; *)
-
--- 3.1.5-3.1/src/daemon/common/commonSources.ml 2010-11-01 17:09:28.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonSources.ml 2017-01-23 01:54:46.000000000 +0000
@@ -115,7 +115,7 @@ let queue_name = [|
let nqueues = Array.length queue_name
-let queue_period = Array.create nqueues 600
+let queue_period = Array.make nqueues 600
let () =
queue_period.(new_sources_queue) <- 0;
@@ -527,10 +527,10 @@ module Make(M:
let list_sum = List.fold_left (+) 0 in
- let nsources_per_queue = Array.create nqueues 0 in
- let nready_per_queue = Array.create nqueues 0 in
- let nindirect_per_queue = Array.create nqueues 0 in
- let ninvalid_per_queue = Array.create nqueues 0 in
+ let nsources_per_queue = Array.make nqueues 0 in
+ let nready_per_queue = Array.make nqueues 0 in
+ let nindirect_per_queue = Array.make nqueues 0 in
+ let ninvalid_per_queue = Array.make nqueues 0 in
let nall = ref 0 in
let naact = ref 0 in
let naneed = ref 0 in
@@ -2015,8 +2015,8 @@ connected if needed *)
let () =
Heap.add_memstat M.module_name (fun level buf ->
- let nsources_per_queue = Array.create nqueues 0 in
- let nready_per_queue = Array.create nqueues 0 in
+ let nsources_per_queue = Array.make nqueues 0 in
+ let nready_per_queue = Array.make nqueues 0 in
List.iter (fun m ->
for i = 0 to nqueues -1 do
let q = m.manager_sources.(i) in
-
--- 3.1.5-3.1/src/utils/bitstring/pa_bitstring.mlt 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/pa_bitstring.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: pa_bitstring.mlt,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*)
open Printf
-
src/networks/fasttrack/enc_type_80.c
-
--- 3.1.5-3.1/src/networks/bittorrent/bTOptions.ml 2011-03-20 17:59:46.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bTOptions.ml 2017-01-23 01:54:46.000000000 +0000
@@ -177,7 +177,6 @@ let dht_bootstrap_nodes = define_option
(list_option addr_option)
[
"service.ygrek.org.ua",6881;
- "router.utorrent.com",6881;
- "router.transmission.com",6881;
+ "router.bittorrent.com", 8991;
]
-
--- 3.1.5-3.1/src/networks/bittorrent/bT_DHT.ml 2011-07-16 08:59:27.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bT_DHT.ml 2017-01-23 01:54:46.000000000 +0000
@@ -13,9 +13,7 @@ let secret_timeout = minutes 10
let alpha = 3
let log_prefix = "[dht]"
-let lprintf_nl ?exn fmt = ksprintf (fun s ->
- let exn = match exn with Some exn -> " : exn "^Printexc.to_string exn | None -> "" in
- Printf2.lprintf_nl2 log_prefix "%s%s" s exn) fmt
+let lprintf_nl ?exn fmt = Printf2.lprintf_nl2 ?exn log_prefix fmt
let catch f x = try `Ok (f x) with e -> `Exn e
let (&) f x = f x
-
--- 3.1.5-3.1/CHANGES 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/CHANGES 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,22 @@
+Bugs mentioned as #<N> are referencing github issues
+at https://github.com/ygrek/mldonkey/issues
+
+Changelog
+=========
+
+3.1.6 - 2017/01/22
+------------------
+
+* BT: better diagnostics of wrong udp tracker reply
+* BT/DHT: update public router addresses
+* fix buffer overflows in DNS resolution
+* update default blocklist url (Closes #4)
+* fix build with OCaml 4.02 (closes #6)
++ extend command conditions (pause, resume, priority) (ref #9)
+* Fix compilation errors with gcc5 (closes #12) (Christopher Meng)
+* BT: relaxed parsing of bencoded numbers
+* fix build with libminiupnpc 1.9 (closes #13)
+* escape filename based on filesystem, not OS type
+* Fix compilation with OCaml 4.03.0 (Bastien Dejean)
+
+See distrib/ChangeLog for older entries
-
docs/uri-res.txt
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackFunctions.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackFunctions.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,2 @@
+#where "Gnutella" = "Fasttrack"
+#include "src/networks/gnutella/gnutellaFunctions.ml"
-
--- 3.1.5-3.1/src/networks/donkey/donkeyInteractive.ml 2014-03-10 16:51:45.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyInteractive.ml 2017-01-23 01:54:46.000000000 +0000
@@ -615,7 +615,7 @@ let parse_donkey_url url user group =
let md4 = if String.length md4 > 32 then
String.sub md4 0 32 else md4 in
let name =
- let name2 = Filename2.filesystem_compliant name "" 0 in
+ let name2 = Filename2.filesystem_compliant name `Unknown 0 in
if name2 = "" then
Printf.sprintf "urn_ed2k_%s" md4
else
@@ -1297,7 +1297,7 @@ let _ =
let _ =
file_ops.op_file_save_as <- (fun file name ->
add_file_filenames (as_file file) name;
- set_file_best_name (as_file file) name "" 0
+ set_file_best_name (as_file file) name 0
);
file_ops.op_file_shared <- (fun file ->
match file.file_shared with
-
--- 3.1.5-3.1/docs/soulseek_protocol.html 2003-04-02 05:52:24.000000000 +0000
+++ 3.1.6-0ubuntu1/docs/soulseek_protocol.html 2017-01-23 01:54:46.000000000 +0000
@@ -19,7 +19,7 @@
<a name="versionHistory"></a><h2>Version History</h2>
2003-01-26: Added peer messages and login sequence, had revelation about reusing existing peer socket from search result for file request, <a href="http://sourceforge.net/users/brienigma/">BriEnigma</a><br>
2003-01-20: Initial revision, <a href="http://sourceforge.net/users/brienigma/">BriEnigma</a><br>
-CVS version ID: $Id: soulseek_protocol.html,v 1.1 2003/04/02 05:52:24 simon_mld Exp $<br>
+CVS version ID: $Id$<br>
Mental Note: When updating this document, remember to upload the
latest version to the <a href="http://sourceforge.net/docman/?group_id=69129">SourceForge
project documentation web page</a>.
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackComplexOptions.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackComplexOptions.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,5 @@
+#where "gnutella_" = "fasttrack_"
+#where "_gnutella" = "_fasttrack"
+#where "Gnutella" = "Fasttrack"
+#where "GNUT" = "FT"
+#include "src/networks/gnutella/gnutellaComplexOptions.ml"
-
--- 3.1.5-3.1/src/daemon/common/guiEncoding.ml 2010-05-23 09:12:14.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/guiEncoding.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1324,7 +1324,7 @@ let _ =
for best_gui_version = best_gui_version downto 24 do
(* lprintf "best_gui_version: %d\n" best_gui_version; *)
- let proto = Array.create (to_gui_last_opcode+1) best_gui_version in
+ let proto = Array.make (to_gui_last_opcode+1) best_gui_version in
let to_gui = to_gui proto in
let check_to_gui =
check to_gui (GuiDecoding.to_gui proto) in
-
--- 3.1.5-3.1/src/networks/gnutella/gnutellaProto.ml 2007-06-17 02:08:15.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/gnutella/gnutellaProto.ml 2017-01-23 01:54:46.000000000 +0000
@@ -815,8 +815,8 @@ let create_qrt_table words table_size =
lprintf "create_qrt_table\n";
let infinity = 7 in
let table_length = 1 lsl table_size in
- let old_array = Array.create table_length infinity in
- let array = Array.create table_length infinity in
+ let old_array = Array.make table_length infinity in
+ let array = Array.make table_length infinity in
List.iter (fun w ->
let pos = bloom_hash w table_size in
if !verbose then
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackInteractive.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackInteractive.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,7 @@
+#where "_gnutella" = "_fasttrack"
+#where "gnutella_" = "fasttrack_"
+#where "gstats" = "ftstats"
+#where "Gnutella" = "Fasttrack"
+#where "gN" = "fT"
+#where "gnut:" = "ft:"
+#include "src/networks/gnutella/gnutellaInteractive.ml"
-
--- 3.1.5-3.1/src/networks/bittorrent/bencode.ml 2010-11-07 15:02:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/bittorrent/bencode.ml 2017-01-23 01:54:46.000000000 +0000
@@ -19,46 +19,6 @@
open Printf2
-(*
- {
- "announce" = "http://sucs.org:6969/announce";
- "info" = {
- "files" = [
- {
- "length" = 682164224;
- "path" = [
- "Mandrake91-cd1-inst.i586.iso";
- ]
- ;
- }
- ;
- {
- "length" = 681279488;
- "path" = [
- "Mandrake91-cd2-ext.i586.iso";
- ]
- ;
- }
- ;
- {
- "length" = 681574400;
- "path" = [
- "Mandrake91-cd3-i18n.i586.iso";
- ]
- ;
- }
- ;
- ]
- ;
- "name" = "mandrake9.1";
- "piece length" = 262144;
- "pieces" = "[EAd\155ã´gÛ ÓþËf\134Ê«\025\016ô͵,1U\150À
-\132\147îª\n%ù\\é,\012ÿC\008GÈÓd!æ¾öuL!\134Ô\016\152&\017¾\008³¢d\029Ë3\031Ï\134#»×\025\137¡=¢.®\019§´\138î.ñ\151O\137Ùÿ,£ç&\019Àۢç\156.ù\150<Eªª\153\018\145\149d\147[+J=º\155l\139Î\028¡dVÉ\000-\017°Å¤\013\154¼>A¹Ã5ïIt\007\020©ãÚÀÈÈ\014O®ô1\152UÄ\026K\021^ãúì5Í¿ü \026\149\131q\024\015¸]Òþ£\027&\148\\ã-©\028WMÂ5...";
- }
- ;
- }
-
-*)
type value =
| String of string
| Int of int64
@@ -89,7 +49,8 @@ let decode s =
| _ -> iter_i s (pos+1) len
in
let end_pos = iter_i s (pos+1) len in
- (Int (Int64.of_string (String.sub s (pos+1) (end_pos-pos-1)))),
+ let number = String.sub s (pos+1) (end_pos-pos-1) in
+ (Int (try Int64.of_string number with _ -> Int64.of_float (float_of_string number))),
(end_pos+1)
| 'l' ->
let rec iter s pos len list =
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackTypes.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackTypes.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,4 @@
+#where "gnutella_" = "fasttrack_"
+#where "_gnutella" = "_fasttrack"
+#where "Gnutella" = "Fasttrack"
+#include "src/networks/gnutella/gnutellaTypes.ml"
-
--- 3.1.5-3.1/src/networks/donkey/donkeyOvernet.ml 2010-11-01 17:06:16.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyOvernet.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1446,25 +1446,20 @@ let compute_to_ping () =
(* start max three searches for sources *)
let start_max_source_searches () =
+ let current_files2 = ref [] in
+ while (List.length !overnet_searches) < 3 && !current_files <> [] do
+ match !current_files with
+ | [] -> assert false
+ | (file, start, last) :: tl ->
+ current_files := tl;
+ if file_state file = FileDownloading && (last + 900) < last_time () then
begin
- let current_files2 = ref [] in
- (try
- while (List.length !overnet_searches) < 3 && !current_files <> [] do
- let (file, start, last) = List.hd !current_files in
- current_files := List.tl !current_files;
- if file_state file = FileDownloading &&
- (last + 900) < last_time () then begin
- ignore (create_search (FileSearch file) file.file_md4);
- current_files2 := (file, start, last_time ()) :: !current_files2;
- end else
- current_files2 := (file, start, last) :: !current_files2;
- done;
- with Failure "hd" -> ()
- | Failure "tl" -> (); );
- List.iter (fun (file, start, last) ->
- current_files := (file, start, last) :: !current_files
- ) !current_files2;
- end
+ ignore (create_search (FileSearch file) file.file_md4);
+ current_files2 := (file, start, last_time ()) :: !current_files2;
+ end else
+ current_files2 := (file, start, last) :: !current_files2;
+ done;
+ List.iter (fun (file, start, last) -> current_files := (file, start, last) :: !current_files) !current_files2
let enable () =
if !!enable_overnet && not !is_enabled then begin
-
--- 3.1.5-3.1/debian/watch 2015-10-14 08:04:20.000000000 +0000
+++ 3.1.6-0ubuntu1/debian/watch 2017-07-03 17:01:41.000000000 +0000
@@ -1,2 +1,5 @@
-version=3
-http://sf.net/mldonkey/mldonkey-([\d\.]+)\.tar\.bz2
+version=4
+opts="filenamemangle=s%(?:.*?)?mldonkey-(\d[\d.]*)\.tar\.bz2%mldonkey-$1.tar.bz2%" \
+ https://github.com/ygrek/mldonkey/releases \
+ (?:.*?/)?mldonkey-(\d[\d.]*)\.tar\.bz2 debian uupdate
+
-
--- 3.1.5-3.1/debian/patches/series 2015-10-14 08:04:20.000000000 +0000
+++ 3.1.6-0ubuntu1/debian/patches/series 2017-07-03 17:03:12.000000000 +0000
@@ -1,4 +1,3 @@
0001-Use-usr-bin-see-as-default-previewer.patch
0002-Remove-bashisms.patch
0003-Fix-tiger-tree-corruption.patch
-0004-Fix-compilation-with-OCaml-4.02.patch
-
--- 3.1.5-3.1/src/utils/cdk/arg2.mli 2007-02-19 21:35:48.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/cdk/arg2.mli 2017-01-23 01:54:46.000000000 +0000
@@ -11,7 +11,7 @@
(* *)
(***********************************************************************)
-(* $Id: arg2.mli,v 1.6 2007/02/19 21:35:48 spiralvoice Exp $ *)
+(* $Id$ *)
(** Parsing of command line arguments.
-
--- 3.1.5-3.1/src/networks/donkey/donkeyProtoClient.ml 2010-10-23 18:25:14.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyProtoClient.ml 2017-01-23 01:54:46.000000000 +0000
@@ -446,7 +446,7 @@ module QueryChunkMd4Reply = struct (* Re
let md4 = get_md4 s 1 in
let nchunks = get_int16 s 17 in
(* lprintf "nchunks : %d" nchunks; lprint_newline (); *)
- let chunks = Array.create nchunks md4 in
+ let chunks = Array.make nchunks md4 in
for i = 0 to nchunks - 1 do
chunks.(i) <- get_md4 s (19 + i * 16)
done;
@@ -1035,7 +1035,7 @@ module EmuleRequestSourcesReply = struct
if ncount = 0 then [||] else
let slen = (len - 19) / ncount in
(* lprintf "PER SOURCES LEN: %d\n" slen; *)
- let sources = Array.create ncount dummy_source in
+ let sources = Array.make ncount dummy_source in
let rec iter pos i =
if i < ncount then
let ss =
-
src/gtk/newgui/gui_main.ml
--- 3.1.5-3.1/src/gtk/newgui/gui_main.ml 2006-10-31 15:40:05.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/newgui/gui_main.ml 2017-01-23 01:54:46.000000000 +0000
@@ -40,20 +40,17 @@ let chmod_config () =
let save_config =
base_config^".old"
in
- begin
- if Sys.file_exists base_config then
- Printexc2.catch2 "Unix.chmod" Unix.chmod base_config 0o600
- else
- ()
- end;
- begin
- if Sys.file_exists save_config then
- Printexc2.catch2 "Unix.chmod" Unix.chmod save_config 0o600
- else
- ()
- end
-
-let _ =
+ let chmod file =
+ if Sys.file_exists file then
+ try
+ Unix.chmod file 0o600
+ with
+ exn -> lprintf "Exception: chmod %s 0600 : %s\n" file (Printexc2.to_string exn)
+ in
+ chmod base_config;
+ chmod save_config
+
+let () =
(try Options.load O.mldonkey_gui_ini with
Sys_error _ ->
(try Options.save O.mldonkey_gui_ini with _ -> ())
@@ -70,7 +67,7 @@ let _ =
Arg.parse args (Arg.usage args) "mlgui: the GUI to use with mldonkey"
(* Check bindings *)
-let _ =
+let () =
if !!O.keymap_global = [] then
(
let a = O.add_binding O.keymap_global in
@@ -625,6 +622,6 @@ let main () =
never_connected := false
)
-let _ =
+let () =
CommonGlobals.gui_included := true;
main ()
-
src/networks/fasttrack/fasttrackMain.mlt
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackMain.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackMain.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,4 @@
+#where "_gnutella" = "_fasttrack"
+#where "gnutella_" = "fasttrack_"
+
+#include "src/networks/gnutella/gnutellaMain.ml" where "Gnutella" = "Fasttrack"
-
--- 3.1.5-3.1/src/utils/bitstring/bitstring_persistent.mlc4 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/bitstring_persistent.mlc4 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: bitstring_persistent.mlc4,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*)
open Printf
-
src/networks/fasttrack/fasttrackGlobals.ml
-
--- 3.1.5-3.1/src/daemon/common/commonSwarming.ml 2011-01-31 17:17:04.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonSwarming.ml 2017-01-23 01:54:46.000000000 +0000
@@ -710,11 +710,11 @@ let create_swarmer file_name file_size =
s_priorities_bitmap = String.make nblocks priority_zero;
s_priorities_intervals = [(zero, 1)]; (* JAVE init all prios to 1, thus all chunks will be downloaded as usual *)
s_disk_allocated = Bitv.create ndiskblocks false;
- s_blocks = Array.create nblocks EmptyBlock ;
- s_block_pos = Array.create nblocks zero;
- s_availability = Array.create nblocks 0;
- s_nuploading = Array.create nblocks 0;
-(* s_last_seen = Array.create nblocks 0; *)
+ s_blocks = Array.make nblocks EmptyBlock ;
+ s_block_pos = Array.make nblocks zero;
+ s_availability = Array.make nblocks 0;
+ s_nuploading = Array.make nblocks 0;
+(* s_last_seen = Array.make nblocks 0; *)
}
in
swarmer_recompute_priorities_bitmap s;
@@ -838,13 +838,13 @@ let split_blocks s chunk_size =
if Array2.exists ((<>) 0) s.s_nuploading then
lprintf_nl "WARNING: splitting a swarmer beging uploaded to";
- s.s_blocks <- Array.create nblocks EmptyBlock;
+ s.s_blocks <- Array.make nblocks EmptyBlock;
s.s_verified_bitmap <- VB.create nblocks VB.State_missing;
s.s_priorities_bitmap <- String.make nblocks priority_zero;
- s.s_block_pos <- Array.create nblocks zero;
- s.s_availability <- Array.create nblocks 0; (* not preserved ? *)
- s.s_nuploading <- Array.create nblocks 0; (* not preserved ? *)
-(* s.s_last_seen <- Array.create nblocks 0; *)
+ s.s_block_pos <- Array.make nblocks zero;
+ s.s_availability <- Array.make nblocks 0; (* not preserved ? *)
+ s.s_nuploading <- Array.make nblocks 0; (* not preserved ? *)
+(* s.s_last_seen <- Array.make nblocks 0; *)
let rec iter i list =
match list with
@@ -894,9 +894,9 @@ let associate is_primary t s =
t.t_s <- s;
t.t_converted_verified_bitmap <- VB.create t.t_nchunks VB.State_missing;
- t.t_last_seen <- Array.create t.t_nchunks 0;
+ t.t_last_seen <- Array.make t.t_nchunks 0;
t.t_chunk_of_block <- [||];
- t.t_blocks_of_chunk <- Array.create t.t_nchunks [];
+ t.t_blocks_of_chunk <- Array.make t.t_nchunks [];
(* invariant: primary frontend is at the head of swarmer's
[s_networks], and is the first associated with the swarmer *)
@@ -934,8 +934,8 @@ the t_chunk_of_block and t_blocks_of_chu
(* For all networks, adjust the chunks and mappings *)
List.iter (fun t ->
let nchunks = VB.length t.t_converted_verified_bitmap in
- t.t_chunk_of_block <- Array.create nblocks 0;
- t.t_blocks_of_chunk <- Array.create nchunks [];
+ t.t_chunk_of_block <- Array.make nblocks 0;
+ t.t_blocks_of_chunk <- Array.make nchunks [];
let chunk_size = t.t_chunk_size in
for i = 0 to nblocks - 1 do
@@ -983,13 +983,13 @@ let create ss file chunk_size =
t_nverified_chunks = 0;
t_converted_verified_bitmap = VB.create nchunks VB.State_missing;
- t_last_seen = Array.create nchunks 0;
+ t_last_seen = Array.make nchunks 0;
t_verifier = NoVerification;
t_verified = (fun _ _ -> ());
t_chunk_of_block = [||];
- t_blocks_of_chunk = Array.create nchunks [];
+ t_blocks_of_chunk = Array.make nchunks [];
}
in
HT.add frontends_by_num t;
-
--- 3.1.5-3.1/src/daemon/common/commonOptions.ml 2017-07-03 19:12:09.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonOptions.ml 2017-07-03 19:12:07.000000000 +0000
@@ -1046,7 +1046,7 @@ let web_infos = define_option current_se
web_infos = [
(\"server.met\", 0, \"http://www.gruk.org/server.met.gz\");
(\"hublist\", 0, \"http://dchublist.com/hublist.xml.bz2\");
- (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/level1.gz\");
+ (\"guarding.p2p\", 96, \"http://upd.emule-security.org/ipfilter.zip\");
(\"ocl\", 24, \"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\");
(\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\");
(\"geoip.dat\", 168, \"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz\");
@@ -1055,7 +1055,7 @@ let web_infos = define_option current_se
(list_option (tuple3_option (string_option, int_option, string_option)))
[
("guarding.p2p", 96,
- "http://www.bluetack.co.uk/config/level1.gz");
+ "http://upd.emule-security.org/ipfilter.zip");
("server.met", 0,
"http://www.gruk.org/server.met.gz");
("geoip.dat", 0,
@@ -1670,7 +1670,7 @@ let max_displayed_results = define_exper
let options_version = define_expert_option current_section ["options_version"]
~internal: true
"(internal option)"
- int_option 22
+ int_option 23
let max_comments_per_file = define_expert_option current_section ["max_comments_per_file"]
"Maximum number of comments per file"
@@ -2274,4 +2274,9 @@ let rec update_options () =
enable_overnet =:= false;
update 22
+ | 22 ->
+ web_infos_remove "http://www.bluetack.co.uk/config/level1.gz";
+ web_infos_add "guarding.p2p" 0 "http://upd.emule-security.org/ipfilter.zip";
+ update 23
+
| _ -> ()
-
--- 3.1.5-3.1/config/configure.in 2014-03-22 11:09:35.000000000 +0000
+++ 3.1.6-0ubuntu1/config/configure.in 2017-01-23 01:54:46.000000000 +0000
@@ -22,7 +22,7 @@ cd config
MAJOR_VERSION=3
MINOR_VERSION=1
-SUB_VERSION=5 # range 0-7 due to eMule limitations
+SUB_VERSION=6 # range 0-7 due to eMule limitations
# ********** **********
# ********** check for C compiler **********
@@ -220,15 +220,37 @@ ARCH=$arch
# ********** Parse checkout date (CVS) or revision (SVN) if available **********
# ********** **********
+if test -d ../.git; then
+ AC_MSG_NOTICE(checking git revision)
+ AC_CHECK_PROG(GIT,git,yes)
+ SUB_VERSION3="git"
+ if test "$ac_cv_prog_GIT" = "yes"; then
+ GIT_BRANCH=`git symbolic-ref -q --short HEAD`
+ GIT_COMMIT=`git describe --always --tags`
+ case "$GIT_BRANCH" in
+ ""|"master")
+ SCM_VERSION="${GIT_COMMIT}"
+ ;;
+ *)
+ SCM_VERSION="${GIT_COMMIT}-${GIT_BRANCH}"
+ ;;
+ esac
+ else
+ AC_MSG_NOTICE(cannot determine git revision)
+ SCM_VERSION=""
+ fi
+fi
+
if test -d .svn; then
AC_MSG_NOTICE(checking SVN revision)
AC_CHECK_PROG(SVNVERSION,svnversion,svnversion)
if test "$ac_cv_prog_SVNVERSION" = "svnversion"; then
SUB_VERSION3="SVN"
SCM_VERSION=`svnversion -n .`
- else AC_MSG_NOTICE(cannot checking SVN revision... no SVNVERSION)
- SCM_VERSION="cannot find out SVN revision (no SVNVERSION)"
- fi
+ else
+ AC_MSG_NOTICE(cannot checking SVN revision... no SVNVERSION)
+ SCM_VERSION="cannot find out SVN revision (no SVNVERSION)"
+ fi
fi
if test -f ./CVS/Entries ; then
-
--- 3.1.5-3.1/src/gtk/gui/gui_queries_base.ml 2003-05-11 16:06:34.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/gui/gui_queries_base.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1,85 +0,0 @@
-class box () =
- let vbox = GPack.vbox ~homogeneous:false () in
- let wtool1 =
- GButton.toolbar ~orientation:`HORIZONTAL ~style:`BOTH ~space_style:`EMPTY
- ~tooltips:true ~button_relief:`NORMAL
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let wtool2 =
- GButton.toolbar ~orientation:`HORIZONTAL ~style:`BOTH ~space_style:`EMPTY
- ~tooltips:true ~button_relief:`NORMAL
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let box_fields =
- GPack.vbox ~homogeneous:false
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let _anonymous_container_1 =
- GPack.hbox ~homogeneous:false
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let _ =
- GMisc.label ~text:"Network : "
- ~justify:`LEFT ~line_wrap:true
- ~packing:(_anonymous_container_1#pack ~expand:false ~fill:true) ()
- in
- let (nets, nets_wcombo) = Gui_global.networks_combo true in
- let _ =
- _anonymous_container_1#pack nets_wcombo#coerce ~padding: 1
- in
- let _anonymous_container_2 =
- GPack.hbox ~homogeneous:false
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let _ =
- GMisc.label ~text:(Gettext.gettext Gui_messages.max_hits ^ " : ")
- ~justify:`LEFT ~line_wrap:true
- ~packing:(_anonymous_container_2#pack ~expand:false ~fill:true) ()
- in
- let we_max_hits =
- GEdit.entry ~text:"200" ~visibility:true ~editable:true
- ~packing:(_anonymous_container_2#pack ~expand:false ~fill:true) ()
- in
- let hbox_show =
- GPack.hbox ~homogeneous:false
- ~packing:(vbox#pack ~expand:false ~fill:true) ()
- in
- let wchk_show =
- GButton.check_button ~active:false ~draw_indicator:true
- ~packing:(hbox_show#pack ~expand:false ~fill:true) ()
- in
- let _ =
- GMisc.label ~text:(Gettext.gettext Gui_messages.show_hidden_fields)
- ~justify:`LEFT ~line_wrap:true ~xpad:2
- ~packing:(hbox_show#pack ~expand:false ~fill:true) ()
- in
- object
- val vbox = vbox
- val wtool1 = wtool1
- val wtool2 = wtool2
- val box_fields = box_fields
- val we_max_hits = we_max_hits
- val hbox_show = hbox_show
- val wchk_show = wchk_show
- val nets = nets
- val nets_wcombo = nets_wcombo
- method vbox = vbox
- method wtool1 = wtool1
- method wtool2 = wtool2
- method box_fields = box_fields
- method we_max_hits = we_max_hits
- method hbox_show = hbox_show
- method wchk_show = wchk_show
- method coerce = vbox#coerce
- end
-class paned () =
- let wnote_queries =
- GPack.notebook ~tab_pos:`LEFT ~show_tabs:true ~homogeneous_tabs:true
- ~show_border:true ~scrollable:true ~popup:true ()
- in
- object
- val wnote_queries = wnote_queries
- method wnote_queries = wnote_queries
- method coerce = wnote_queries#coerce
- end
-
-
--- 3.1.5-3.1/src/gtk/newgui/gui_com.ml 2005-04-13 21:52:26.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/newgui/gui_com.ml 2017-01-23 01:54:46.000000000 +0000
@@ -47,9 +47,9 @@ let when_disconnected (gui : gui) =
G.clear ()
-let to_gui_protocol_used = Array.create (to_gui_last_opcode+1)
+let to_gui_protocol_used = Array.make (to_gui_last_opcode+1)
GuiProto.best_gui_version
-let from_gui_protocol_used = Array.create
+let from_gui_protocol_used = Array.make
(from_gui_last_opcode+1)
GuiProto.best_gui_version
-
--- 3.1.5-3.1/src/daemon/common/commonComplexOptions.ml 2010-12-19 10:10:24.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonComplexOptions.ml 2017-01-23 01:54:46.000000000 +0000
@@ -154,7 +154,7 @@ module FileOption = struct
set_file_state file file_state;
(try
- set_file_best_name file filename "" 0
+ set_file_best_name file filename 0
with _ -> ());
(try
-
--- 3.1.5-3.1/Makefile 2014-03-22 11:12:25.000000000 +0000
+++ 3.1.6-0ubuntu1/Makefile 2017-01-23 02:16:37.000000000 +0000
@@ -148,9 +148,9 @@ CDK_SRCS += $(CDK)/zlib.ml $(CDK)/zip.m
CDK_SRCS += $(LIB)/autoconf.ml
-CDK_SRCS+= $(LIB)/fifo.ml $(CDK)/arg2.ml $(LIB)/syslog.ml $(CDK)/printf2.ml \
- $(CDK)/heap.ml \
- $(CDK)/printexc2.ml $(CDK)/genlex2.ml \
+CDK_SRCS+= $(LIB)/fifo.ml $(CDK)/arg2.ml $(LIB)/syslog.ml \
+ $(CDK)/printexc2.ml $(CDK)/printf2.ml \
+ $(CDK)/heap.ml $(CDK)/genlex2.ml \
$(CDK)/filepath.ml $(CDK)/string2.ml \
$(CDK)/filename2.ml $(CDK)/array2.ml $(CDK)/hashtbl2.ml \
$(CDK)/unix2.ml $(CDK)/file.ml \
-
src/networks/fasttrack/enc_type_20.c
-
--- 3.1.5-3.1/src/networks/donkey/donkeyMftp.ml 2007-01-15 21:32:56.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyMftp.ml 2017-01-23 01:54:46.000000000 +0000
@@ -167,7 +167,7 @@ let get_tag (names_of_tag : (string * fi
Uint16 v, pos2 + 2
| 9 -> let v = get_uint8 s pos2 in
Uint8 v, pos2 + 1
- | _ when t >= 0x11 & t <= 0x20 -> let v = String.sub s pos2 (t-0x10) in
+ | _ when t >= 0x11 && t <= 0x20 -> let v = String.sub s pos2 (t-0x10) in
String v, pos2 + t - 0x10
| _ ->
if !verbose_unknown_messages then
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackNetwork.ml 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackNetwork.ml 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,135 @@
+(* Copyright 2001, 2002 b8_bavard, b8_fee_carabine, INRIA *)
+(*
+ This file is part of mldonkey.
+
+ mldonkey is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ mldonkey is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with mldonkey; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*)
+
+open Int64ops
+open BasicSocket
+open AnyEndian
+open Printf2
+open Options
+open Md4
+open TcpBufferedSocket
+
+open CommonGlobals
+open CommonTypes
+open CommonOptions
+open CommonHosts
+
+
+(* any = 0 *)
+let name_of_tag =
+ [
+ Field_KNOWN "any", 0;
+ Field_KNOWN "year", 1;
+ Field_Filename, 2;
+ Field_Uid, 3;
+ Field_Title, 4;
+ Field_KNOWN "time", 5;
+ Field_Artist, 6;
+ Field_Album, 8;
+ Field_KNOWN "language", 0x0A;
+ Field_KNOWN "keywords", 0x0C;
+ Field_KNOWN "resolution", 0x0D;
+ Field_KNOWN "genre", 0x0E;
+ Field_KNOWN "OS", 0x10;
+ Field_KNOWN "bitdepth", 0x11;
+ Field_Type, 0x12;
+ Field_KNOWN "quality", 0x15;
+ Field_KNOWN "version", 0x18;
+ Field_KNOWN "comment", 0x1A;
+ Field_Codec, 0x1C; (* "divx" *)
+ Field_KNOWN "rating", 0x1D;
+ Field_Size, 0x21;
+ Field_Type, 0x22; (* "movie", "video clip",... *)
+ Field_KNOWN "49", 49;
+ Field_KNOWN "53", 53;
+ ]
+
+type cipher
+
+type ciphers = {
+ in_cipher : cipher;
+ out_cipher : cipher;
+
+ mutable in_xinu : int64;
+ mutable out_xinu : int64;
+ }
+
+type query_key = unit
+
+type query_operator =
+| Equals
+| Approx
+| AtMost
+| AtLeast
+| Substring
+
+type query_term = query_operator * tag
+
+type search_extension = string * query_term list
+type search_uid = int
+type file_uid = Md5Ext.t
+type file_uri = string
+
+external create_cipher : unit -> cipher = "ml_create_cipher"
+external apply_cipher : cipher -> string -> int -> int -> unit
+ = "ml_apply_cipher"
+external init_cipher : cipher -> unit = "ml_init_cipher"
+external set_cipher : cipher -> int32 -> int -> unit = "ml_set_cipher"
+external get_cipher_from_packet : string -> int -> cipher -> unit
+ = "ml_cipher_packet_get"
+external xor_ciphers : cipher -> cipher -> unit = "ml_xor_ciphers"
+external xor_ciphers2 : cipher -> cipher -> unit = "ml_xor_ciphers2"
+
+external cipher_packet_set : cipher -> string -> int -> unit
+ = "ml_cipher_packet_set"
+external cipher_packet_set_xored : cipher -> string -> int -> cipher -> unit
+ = "ml_cipher_packet_set_xored"
+external cipher_free : cipher -> unit = "ml_cipher_free"
+external cipher_enc_type : cipher -> int = "ml_cipher_enc_type"
+
+let network_name = "KaZaA"
+
+let port = 1214
+let config_file = "fasttrack.ini"
+let options_prefix = "FT-"
+let max_known_peers_default = 20
+
+(* Useless *)
+let redirectors = []
+let has_accept = false
+let accept_header = ""
+
+let accept_ed2kuid = false
+let accept_bitprint = false
+let accept_md5ext = true
+
+ let max_queued_ranges = 1
+
+(* This is the typical reply of a busy FT client.
+ascii:[
+HTTP/1.0 503 Service Unavailable
+Retry-After: 300
+X-Kazaa-Username: K++_www.kazaaKPP.com
+X-Kazaa-Network: KaZaA
+X-Kazaa-IP: 80.56.???.???:3223
+X-Kazaa-SupernodeIP: 80.57.???.???:1070
+*)
+
+let value_to_index _ = ()
+let index_to_value _ = []
-
--- 3.1.5-3.1/src/networks/fasttrack/fasttrackOptions.mlt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/fasttrack/fasttrackOptions.mlt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1,4 @@
+#where "_gnutella" = "_fasttrack"
+#where "gnutella_" = "fasttrack_"
+#where "Gnutella" = "Fasttrack"
+#include "src/networks/gnutella/gnutellaOptions.ml"
-
--- 3.1.5-3.1/docs/http-1.1.txt 1970-01-01 00:00:00.000000000 +0000
+++ 3.1.6-0ubuntu1/docs/http-1.1.txt 2017-01-23 01:54:46.000000000 +0000
@@ -0,0 +1 @@
+Get that document here: http://www.w3.org/Protocols/rfc2616/rfc2616.html
\ No newline at end of file
-
--- 3.1.5-3.1/src/utils/cdk/filename2.ml 2012-06-24 07:59:41.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/cdk/filename2.ml 2017-01-23 01:54:46.000000000 +0000
@@ -138,7 +138,7 @@ let basename filename =
in
iter (path_of_filename filename) filename
-let filesystem_compliant name fs namemax =
+let filesystem_compliant name fstype namemax =
(* replace all illegal characters with a valid one.
assumes all filesystems accept '_'s in filenames *)
let escape_chars p filename =
@@ -200,12 +200,12 @@ let filesystem_compliant name fs namemax
escape_chars macosx_filter name in
let sys_checked_name =
- if Autoconf.windows then
- windows_compliant name
- else if Autoconf.system = "macos" then
- macosx_compliant name
- else
- posix_compliant name in
+ match fstype with
+ | `Win -> windows_compliant name
+ | `Mac -> macosx_compliant name
+ | `Posix
+ | `Unknown -> posix_compliant name
+ in
let fs_checked_name =
let remove_last_spaces s =
@@ -221,9 +221,10 @@ let filesystem_compliant name fs namemax
else String.sub s 0 last_space
in
(* FAT filesystems do not allow files with space as last char *)
- match fs with
- "msdos" -> remove_last_spaces sys_checked_name
- | _ -> sys_checked_name in
+ match fstype with
+ | `Win -> remove_last_spaces sys_checked_name
+ | _ -> sys_checked_name
+ in
let length_checked_name =
if namemax < 1 || String.length sys_checked_name < namemax then
-
src/networks/fasttrack/fasttrackPandora.ml
-
src/gtk2/gui/guiMain.ml
--- 3.1.5-3.1/src/gtk2/gui/guiMain.ml 2011-03-10 19:17:01.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/guiMain.ml 2017-01-23 01:54:46.000000000 +0000
@@ -53,18 +53,15 @@ let chmod_config () =
let save_config =
base_config ^ ".old"
in
- begin
- if Sys.file_exists base_config then
- Printexc2.catch2 "Unix.chmod" Unix.chmod base_config 0o600
- else
- ()
- end;
- begin
- if Sys.file_exists save_config then
- Printexc2.catch2 "Unix.chmod" Unix.chmod save_config 0o600
- else
- ()
- end
+ let chmod file =
+ if Sys.file_exists file then
+ try
+ Unix.chmod file 0o600
+ with
+ exn -> lprintf' "Exception: chmod %s 0600 : %s\n" file (Printexc2.to_string exn)
+ in
+ chmod base_config;
+ chmod save_config
(* {2 Handling core messages} *)
-
src/networks/fasttrack/fasttrackProtocol.ml
-
--- 3.1.5-3.1/src/gtk2/gui/guiNetHtml.ml 2005-10-31 18:34:02.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk2/gui/guiNetHtml.ml 2017-01-23 01:54:46.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: guiNetHtml.ml,v 1.1 2005/10/31 18:34:02 spiralvoice Exp $
+(* $Id$
* ----------------------------------------------------------------------
*
*)
-
--- 3.1.5-3.1/src/gtk/newgui/gui_graph.ml 2005-12-14 21:22:07.000000000 +0000
+++ 3.1.6-0ubuntu1/src/gtk/newgui/gui_graph.ml 2017-01-23 01:54:46.000000000 +0000
@@ -78,25 +78,25 @@ they will be merged further with the pix
call pixmap_from_xpm_d *)
let set_downloads_pixmap_headers w h col1 col2 =
let header =
- Array.create 1 (Printf.sprintf "%d %d 3 1" w h) in
+ Array.make 1 (Printf.sprintf "%d %d 3 1" w h) in
let color_none =
- Array.create 1 (Printf.sprintf ". c None") in
+ Array.make 1 (Printf.sprintf ". c None") in
let color1 =
- Array.create 1 ((Printf.sprintf "a c ") ^ col1) in
+ Array.make 1 ((Printf.sprintf "a c ") ^ col1) in
let color2 =
- Array.create 1 ((Printf.sprintf "b c ") ^ col2) in
+ Array.make 1 ((Printf.sprintf "b c ") ^ col2) in
downloads_pixmap_headers :=
Some (Array.concat [header;color_none;color1;color2])
let set_uploads_pixmap_headers w h col1 col2 =
let header =
- Array.create 1 (Printf.sprintf "%d %d 3 1" w h) in
+ Array.make 1 (Printf.sprintf "%d %d 3 1" w h) in
let color_none =
- Array.create 1 (Printf.sprintf ". c None") in
+ Array.make 1 (Printf.sprintf ". c None") in
let color1 =
- Array.create 1 ((Printf.sprintf "a c ") ^ col1) in
+ Array.make 1 ((Printf.sprintf "a c ") ^ col1) in
let color2 =
- Array.create 1 ((Printf.sprintf "b c ") ^ col2) in
+ Array.make 1 ((Printf.sprintf "b c ") ^ col2) in
uploads_pixmap_headers :=
Some (Array.concat [header;color_none;color1;color2])
@@ -501,7 +501,7 @@ class box () =
download_rate_range := d;
download_timeout := (!download_time_range * 1000 / !width );
downloads_pixmap :=
- Some (Array.create !height (String.make !width '.')) (*;
+ Some (Array.make !height (String.make !width '.')) (*;
Printf.printf "DOWNLOADS GRAPH PROPERTIES HAVE CHANGED\ndownload_timeout : %d\n"
!download_timeout;
flush stdout*)
@@ -516,7 +516,7 @@ class box () =
upload_rate_range := d;
upload_timeout := (!upload_time_range * 1000 / !width );
uploads_pixmap :=
- Some (Array.create !height (String.make !width '.')) (*;
+ Some (Array.make !height (String.make !width '.')) (*;
Printf.printf "UPLOADS GRAPH PROPERTIES HAVE CHANGED\nupload_timeout : %d\n"
!upload_timeout;
flush stdout*)
@@ -530,14 +530,14 @@ class box () =
match !downloads_pixmap with
None ->
downloads_pixmap :=
- Some (Array.create !height (String.make !width '.'));
+ Some (Array.make !height (String.make !width '.'));
| _ -> ()
in
let () =
match !uploads_pixmap with
None ->
uploads_pixmap :=
- Some (Array.create !height (String.make !width '.'));
+ Some (Array.make !height (String.make !width '.'));
| _ -> ()
in
draw_downloads ();
-
--- 3.1.5-3.1/config/Makefile.config.in 2014-02-23 18:18:46.000000000 +0000
+++ 3.1.6-0ubuntu1/config/Makefile.config.in 2017-01-23 01:54:46.000000000 +0000
@@ -9,9 +9,9 @@ CXX=@CXX@
FIX_BROKEN_CPP=@FIX_BROKEN_CPP@
CONFIG_INCLUDES=@CONFIG_INCLUDES@
-OCAMLC=@OCAMLC@
+OCAMLC=@OCAMLC@ -w -3
OCAMLLIB=@OCAMLLIB@
-OCAMLOPT=@OCAMLOPT@ -inline 10
+OCAMLOPT=@OCAMLOPT@ -inline 10 -w -3
OCAMLLEX=@OCAMLLEX@
OCAMLDEP=@OCAMLDEP@ @OCAMLDEP_OPTIONS@
OCAMLDEP_OPTIONS=@OCAMLDEP_OPTIONS@
-
src/networks/fasttrack/fasttrackServers.ml
-
--- 3.1.5-3.1/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch 2015-10-14 08:04:20.000000000 +0000
+++ 3.1.6-0ubuntu1/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 16 Jun 2015 09:58:51 +0200
-Subject: Fix compilation with OCaml 4.02
-
----
- src/utils/net/terminal.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/utils/net/terminal.ml b/src/utils/net/terminal.ml
-index 44a96f4..30650ed 100644
---- a/src/utils/net/terminal.ml
-+++ b/src/utils/net/terminal.ml
-@@ -185,7 +185,7 @@ module Output = struct
- let canal = List.assoc chan !chanmap in
- etat.chan <- Some (chan, canal);
- info (sprintf "connecte au canal '%s'" chan);
-- (* {| canal ALL } *)
-+ (* canal ALL *)
- with Not_found -> (* pas encore de recepteur pour ce canal *)
- try (* on en cree un *)
- let serveur = nsrecord.get_loc chan in
---
-
--- 3.1.5-3.1/src/daemon/common/commonFile.mli 2014-02-23 18:16:11.000000000 +0000
+++ 3.1.6-0ubuntu1/src/daemon/common/commonFile.mli 2017-01-23 01:54:46.000000000 +0000
@@ -92,7 +92,7 @@ val set_file_release : CommonTypes.file
val file_release : CommonTypes.file -> bool
val set_file_state : CommonTypes.file -> CommonTypes.file_state -> unit
val file_best_name : CommonTypes.file -> string
-val set_file_best_name : CommonTypes.file -> string -> string -> int -> unit
+val set_file_best_name : CommonTypes.file -> string -> ?fs:Unix32.fstype -> int -> unit
val add_file_filenames : CommonTypes.file -> string -> unit
val shorten_all_file_filenames : int -> unit
val set_file_format : CommonTypes.file -> CommonTypes.format -> unit
@@ -155,7 +155,7 @@ val set_file_owner : CommonTypes.file ->
val file_owner : CommonTypes.file -> CommonTypes.userdb
val set_file_group : CommonTypes.file -> CommonTypes.groupdb option -> unit
val file_group : CommonTypes.file -> CommonTypes.groupdb option
-val lprintf_file_nl : CommonTypes.file -> ('a, unit, string, unit) Pervasives.format4 -> 'a
+val lprintf_file_nl : ?exn:exn -> CommonTypes.file -> ('a, unit, string, unit) Pervasives.format4 -> 'a
(** [concat_file dir filename] sanitizes [filename] and appends it to [dir] *)
val concat_file : string -> string -> string
-
src/networks/fasttrack/fst_crypt.c
-
--- 3.1.5-3.1/src/utils/bitstring/bitstring.mli 2010-08-29 20:17:57.000000000 +0000
+++ 3.1.6-0ubuntu1/src/utils/bitstring/bitstring.mli 2017-01-23 01:54:46.000000000 +0000
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * $Id: bitstring.mli,v 1.1 2010/08/29 20:17:57 spiralvoice Exp $
+ * $Id$
*)
(**
-
--- 3.1.5-3.1/src/networks/donkey/donkeyComplexOptions.ml 2007-08-03 22:12:58.000000000 +0000
+++ 3.1.6-0ubuntu1/src/networks/donkey/donkeyComplexOptions.ml 2017-01-23 01:54:46.000000000 +0000
@@ -276,7 +276,7 @@ let value_to_file file_size file_state u
(try
set_file_best_name (as_file file)
- (get_value "file_filename" value_to_string) "" 0
+ (get_value "file_filename" value_to_string) 0
with _ -> update_best_name file);
let md4s = try get_value "file_md4s" (value_to_array value_to_md4)
- ...
